sync: upstream v1.14.22 (eb7555d3c on dev) - #3
Merged
Alezander9 merged 87 commits intoApr 26, 2026
Merged
Alezander9 merged 87 commits into
Alezander9 merged 87 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Co-authored-by: Frank <frank@anoma.ly>
…er (#20089) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Brings anomalyco/opencode dev branch up to the v1.14.22 release point. Target commit 'sync release versions for v1.14.22' (eb7555d) stays on upstream/dev so the drift checker keeps working against our recorded SHA. Conflicts resolved: - packages/opencode/package.json: kept @browser-use/browsercode-core name, took upstream version bump to 1.14.22. - bun.lock: took upstream then regenerated via 'bun install' to match our workspace dep set (@browser-use/bcode-browser). Verification: - bun install clean. - bun turbo typecheck --filter=...browsercode-packages: 5/5 passed (@browser-use/browsercode-core, @browser-use/bcode-browser, @opencode-ai/shared, @opencode-ai/plugin, @opencode-ai/sdk). No Yellow-zone modifications (rebrand, banner, USER_AGENT, bin/bcode, scriptName, mDNS domain) overlapped with upstream changes in this window. UPSTREAM.md sync log updated. Drift checker path typo (scripts/ -> script/) fixed in the same edit.
Resolves conflicts from feature work landed on main while this sync PR was open (PRs #4 SYNC.md, #5 A2 vendor harness, #6 A4 browser_execute, #7 A5/A7 permission + streaming). Conflicts resolved: - UPSTREAM.md: kept the v1.14.22 sync row added by this branch and main's expanded drift-checker docs (required-remotes block). - bun.lock + packages/opencode/package.json: auto-merge took both upstream version bump (1.14.19 -> 1.14.22) and main's @browser-use/bcode-browser workspace dep. Verified by regenerating the lock with bun install (no changes needed) and running the filtered turbo typecheck (5/5 pass). - packages/opencode/src/tool/registry.ts: auto-merged. Both branches added to the tool list in non-overlapping ways. End-to-end smoke on the merged tree: BrowserExecute pipeline streams 8 chunks via the new onChunk hook and returns the expected exit code. Pipeline intact across the merge.
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
17 participants
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
First real upstream sync using the protocol from UPSTREAM.md + script/check-upstream.sh. Brings anomalyco/opencode up to the v1.14.22 release point (85 upstream commits since our baseline 3e8abac6).
Target anchor: eb7555d3c — the sync release versions for v1.14.22 commit on dev, not the v1.14.22 tag commit itself. The tag commit is a sibling of dev; anchoring on the dev commit keeps the drift checker simple and avoids walking off-branch.
Conflicts resolved
Only 2 real conflicts for 85 commits of upstream churn. Everything else auto-merged.
Verification
Yellow-zone audit
Checked upstream did not touch files we modified in the rebrand commit (866a1a9): bin/bcode, scriptName call sites, USER_AGENT, banner/wordmark, mDNS domain, root package.json name — none touched by upstream in 3e8abac6..eb7555d3c. No re-resolution needed.
Housekeeping in this PR
Process notes
First execution of the sync loop we designed last session. It worked. The drift checker plus the filtered typecheck plus the small Yellow-zone surface made this a ~15-minute job. Full reflection posted to thread.