Automate upstream sync: notturno sentinel (weekly + dispatch) — keep fork, pull mothership - #160
Draft
aarontrowbridge wants to merge 5 commits into
Draft
Automate upstream sync: notturno sentinel (weekly + dispatch) — keep fork, pull mothership#160aarontrowbridge wants to merge 5 commits into
aarontrowbridge wants to merge 5 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
…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.
7 tasks
…sweep 2026-08-20)
Copy link
Copy Markdown
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command. ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: b08247bd-479b-4edd-9a37-b9897d7dc8e3 You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file. Use the checkbox below for a quick retry:
Comment @coderabbitai help to get the list of available commands. |
Sorry, something went wrong.
jack-champagne
force-pushed
the
local/amicode
branch
from
88d63c9 to
3779ab8
Compare
August 28, 2026 20:19
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/opencode is 5 days / 77 commits / 3 releases behind anomalyco/opencode (v1.18.12 @ 7fe99387 → v1.18.15 @ d7b115f + HEAD 0bff28de, 493 files). Cutting the next v*-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:
Follow-up: trigger the workflow (dispatch) to open the actual notturno/merge-upstream-2026-08-09 PR that lands the one-off 7fe99387 → 0bff28de merge (27 files). That PR must then:
Verification this PR: workflow file lint + dry-run via workflow_dispatch with dry_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