Sync-reconciliation: restore #929's translate-callback fix + the pre-sync guard (#964) - #965
Merged
Merged
Conversation
…llback + the pre-sync guard (#964) The Sep 9 fork→overlay sync (ff7b69c) overwrote amicode-side fixes with stale fork state: #929's 3-arg promptDesignPlaceholder(mode(), placeholder(), t) fix (59b447e) was regressed back to the fork's 2-arg call — the materialized helper (upstream v1.18.29) calls the third argument in the non-shell branch, so every non-shell composer render threw minified 'n is not a function'. Aaron hit it live post-cutover 2026-09-10 and fixed the deployed dist-app; this commits that fix to the overlay (manifest hash updated in step). - restore the 3-arg call with the language.t adapter + a comment naming the regressing sync - prompt_input_design_placeholder_964.test.ts: the regression test — source + contract-replica assertion of the 3-arg invocation (no render harness; the prompt-input-clipboard-structure.test.ts precedent) - overlay_known_fixes_964.test.ts: the pre-sync guard — a fixture list of the overlay's known-fixed hunks (#929 translate callback, #832 diff_version shape + guarded delete, #832 session.exportTrace locales) iterated by one test; a future sync that reverts any fails naming the fix Verified: extension vitest (new tests green), pnpm run typecheck, drift gate PASS (617 files). The sync source mirror lands on harmoniqs/opencode 964-mirrors → local/amicode.
|
Important Draft PR not reviewedDraft PRs are not automatically reviewed by default.
To automatically review draft PRs, update your CodeRabbit configuration: reviews:
auto_review:
drafts: trueThanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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.
Summary
The Sep 9 fork→overlay sync (ff7b69c) clobbered amicode-side fixes. This PR restores them and adds the guard that catches the next occurrence.
promptDesignPlaceholder(mode(), placeholder(), t)call in the overlay'sprompt-input-v2.tsx, with the comment naming the regressing sync. The materialized helper (upstream v1.18.29) calls the translate callback in the non-shell branch, so the regressed 2-arg call threw minifiedn is not a functionon every non-shell composer render. Manifest hash updated in step; drift gate PASS.prompt_input_design_placeholder_964.test.ts: source + contract-replica assertion of the 3-arg invocation (headless; theprompt-input-clipboard-structure.test.tsprecedent — no render harness).overlay_known_fixes_964.test.ts: a fixture list (file, hunk signature, fix reference) of the overlay's known-fixed hunks — fix: restore V2 composer translation callback #929's translate callback, chore: fix pre-existing main breakages blocking clean overlay composition (#821) #832'sdiff_versionshape + guarded delete, chore: fix pre-existing main breakages blocking clean overlay composition (#821) #832'ssession.exportTracelocale set — iterated by one test. A future sync that reverts any fails naming the fix.Closes #964 (mirror + sweep findings tracked on the fork PR).
Verification
pnpm run typecheckclean[drift-gate] PASS: overlay and manifest are in sync (617 files)Mirror
The fork-side mirror (harmoniqs/opencode
964-mirrors→local/amicode) carries the same hunks so the next sync brings the fix, not the regression.