Automate upstream sync: notturno sentinel (weekly + dispatch) — keep fork, pull mothership - #160
Draft
aarontrowbridge wants to merge 3 commits into
Draft
Automate upstream sync: notturno sentinel (weekly + dispatch) — keep fork, pull mothership#160aarontrowbridge wants to merge 3 commits into
aarontrowbridge wants to merge 3 commits into
Conversation
Removes AmicoMark from ThinkingLine (keeps prop as deprecated no-op), collapses 3-col grid to 2-col with meta flush left, and shuffles verbs per reload + random per-mount start. Stories/comments updated.
…patch) Adds .github/workflows/upstream-sync.yml — scheduled Mondays 09:00 UTC + workflow_dispatch, fetches anomalyco/opencode dev, opens notturno/merge-upstream-YYYY-MM-DD against local/amicode. - Zero-conflict merges: commit + push + open PR (hitl) ready for CI - Conflicted merges: abort markers, commit .upstream-sync/report.md with file list + policy, push + open PR for hand-merge Keeps the fork (never drops amicode surfaces) — just pulls mothership improvements automatically. Handles sst → anomalyco rename, sets git identity (fixes harmoniqs/amico#322). Related to #159
7 tasks
…n for current view parity Keeps PR current with latest viewed UI fixes (context ring, starter chips, etc. are already on local/amicode) plus thinker-line clean (5f8afb4). No rebase — preserves merge trace per fork policy.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #159
Problem:
harmoniqs/opencodeis 5 days / 77 commits / 3 releases behindanomalyco/opencode(v1.18.12 @ 7fe99387→v1.18.15 @ d7b115f+ HEAD0bff28de, 493 files). Cutting the nextv*-amicode.*release without syncing bakes stale fixes in and raises next sync's cost (27 conflict files already overlap).Approach: keep the fork, automate the pull:
.github/workflows/upstream-sync.yml— thenotturno-style sentinel (weekly Mondays 09:00 UTC +workflow_dispatch). Fetchesanomalyco/opencodedev(handlessst → anomalycorename), createsnotturno/merge-upstream-YYYY-MM-DDfromorigin/local/amicode, attempts merge:AMICODE-PATCHES.md+ version bump).upstream-sync/report.mdwith file list + policy (AMICODE-PATCHES.mdadopt/keep/re-deletedebug-bar.tsx/bun.locktheirs/i18n), push + open PRhitlfor hand-mergeharmoniqs/amico#322), writes parity stats, never drops amicode surfaces, never pushes to upstream.Follow-up: trigger the workflow (dispatch) to open the actual
notturno/merge-upstream-2026-08-09PR that lands the one-off7fe99387 → 0bff28demerge (27 files). That PR must then:AMICODE-PATCHES.md+ bump workspace versions to1.18.15env -u OPENCODE_CONFIG_CONTENT bun test+typecheck+OPENCODE_CHANNEL=devgatev1.18.15-amicode.1viaamicode-release.ymlVerification this PR: workflow file lint + dry-run via
workflow_dispatchwithdry_run: true(reports overlap/conflicts without pushing). No runtime merge in this PR.Slack: pinged
#amico(ts 1786296735.200299) — blocking next release on #159.Fixes #159