Upstream sync: anomalyco/opencode dev into scratch-conflict-test (2026-09-27) (conflicts)

[pminevp]

Automated merge of anomalyco/opencode dev @ b471c2b449 (XCOD-118).

• Before: 9 days behind upstream (63 commits).
• After merging: up to date with upstream.
• Upstream commits: 63
• Upstream PRs: chore(go): retire Union Alpha anomalyco/opencode#49718, docs: restore GPT-5.6 Sol pricing anomalyco/opencode#49724, docs(web): link kimaki to product website anomalyco/opencode#49735, feat(console): switch install links to v2 anomalyco/opencode#49874, docs: add Qwen3.8 Flash to Zen anomalyco/opencode#49888, docs: add DeepSeek V4.1 Flash to Zen anomalyco/opencode#49897, fix(console): use v2 desktop downloads anomalyco/opencode#49931, refactor(console): redirect desktop downloads anomalyco/opencode#49984, chore(ci): refresh v2 models.dev snapshot on a schedule anomalyco/opencode#50030, ci: sync v2 catalog once a day anomalyco/opencode#50194, fix(stats): paginate sync aggregates anomalyco/opencode#50198, fix(stats): retry transient query failures anomalyco/opencode#50205, docs(web): extend DeepSeek promotion anomalyco/opencode#50255, fix(opencode): bump togetherai so streams report usage anomalyco/opencode#50264, fix(opencode): hoist Bedrock tool images except Claude, Nova, and Llama 4 anomalyco/opencode#50272, feat: add Grok 4.7 to Zen and Go anomalyco/opencode#50288, docs: add MiMo V2.6 models anomalyco/opencode#50395, fix(core): resolve npm package entrypoint to a file under Node anomalyco/opencode#50413, fix(core): break filesystem search import cycle anomalyco/opencode#50439, feat(go): add Space Bunny promotion anomalyco/opencode#50572, feat(openai): allow GPT-6 Sol and Luna with Codex anomalyco/opencode#50704, docs(web): add Claude Opus 5.5, GPT 6 Sol, and GPT 6 Luna to Zen anomalyco/opencode#50708, fix(console): restrict legacy access to Black anomalyco/opencode#50716, maint(gitlab): bump gitlab-ai-provider to 6.16.0 anomalyco/opencode#50742, fix(gemini): switch thinking default logic anomalyco/opencode#50841, chore: bump gitlab-ai-provider to 6.18.0 anomalyco/opencode#50890, feat(go): add GPT 6 Luna to Go pages anomalyco/opencode#50947, fix(opencode): redact credentials in debug config anomalyco/opencode#50956, fix(go): include DeepSeek V4 Flash in chart anomalyco/opencode#51032, fix(stats): attribute Hy4 preview traffic to Tencent anomalyco/opencode#51050, fix(stats): use capability fallbacks in comparison radar anomalyco/opencode#51161, fix(ci): use GPT-6 Luna for issue automation anomalyco/opencode#51261, docs(zen): document Qwen3.8 Max anomalyco/opencode#51321, fix(go): make DeepSeek $60 allowance permanent anomalyco/opencode#51364, refactor(core): share a browser opener across opencode and tui anomalyco/opencode#51414, docs(go): add LongCat 2.5 Preview Free to V1 pages anomalyco/opencode#51488, fix(opencode): catch completed MCP browser launcher failures anomalyco/opencode#51538

⚠️ Merge conflicts

This branch is the upstream tip, not a merge: the workflow never resolves conflicts. Resolve it
with a normal merge commit (never squash or rebase, or upstream drops out of dev's history):

git fetch origin && git checkout upstream-sync/2026-09-27-scratch-conflict-test && git merge origin/dev
# fix the files below, then record the upstream base and lag this build will report:
bun script/upstream-version.ts && bun script/upstream-sync.ts stamp --upstream b471c2b4495747353af768fbf2e0790c9d820ce2
git add -A && git commit --no-edit && git push

• .github/workflows/duplicate-issues.yml
• .github/workflows/triage.yml
• bun.lock
• nix/hashes.json
• packages/app/package.json
• packages/cli/package.json
• packages/codemode/package.json
• packages/console/app/package.json
• packages/console/core/package.json
• packages/console/function/package.json
• packages/console/mail/package.json
• packages/console/support/package.json
• packages/core/package.json
• packages/desktop/package.json
• packages/effect-drizzle-sqlite/package.json
• packages/effect-sqlite-node/package.json
• packages/enterprise/package.json
• packages/function/package.json
• packages/http-recorder/package.json
• packages/llm/package.json
• packages/opencode/package.json
• packages/opencode/src/cli/cmd/debug/config.ts
• packages/plugin/package.json
• packages/sdk/js/package.json
• packages/server/package.json
• packages/session-ui/package.json
• packages/slack/package.json
• packages/stats/app/package.json
• packages/stats/core/package.json
• packages/stats/server/package.json
• packages/tui/package.json
• packages/ui/package.json
• packages/web/package.json
• packages/web/src/content/docs/ecosystem.mdx
• sdks/vscode/package.json

🔴 Upstream changed CI or release plumbing

Check each of these before merging: the fork's workflows differ from upstream on purpose.

• 🔴 .github/actions/setup-bun/action.yml
• 🔴 .github/workflows/duplicate-issues.yml
• 🔴 .github/workflows/models-snapshot.yml
• 🔴 .github/workflows/triage.yml

Lunos-owned paths touched by upstream

Upstream changed files that Lunos has modified on purpose (.github/lunos-owned-paths). Review these by hand, even if the merge is clean.

• .github/actions/setup-bun/action.yml
• .github/workflows/duplicate-issues.yml
• .github/workflows/models-snapshot.yml
• .github/workflows/triage.yml
• packages/core/src/npm.ts
• packages/opencode/package.json
• packages/opencode/src/plugin/digitalocean.ts
• packages/opencode/src/plugin/openai/codex.ts
• packages/opencode/src/plugin/snowflake-cortex.ts

Merge with a merge commit, not squash or rebase: otherwise the upstream commits never reach dev and the lag doesn't fall.

Tests

Waiting for the test and typecheck runs on this branch.

Upstream commits (63)

• b471c2b fix(opencode): catch completed MCP browser launcher failures (fix(opencode): catch completed MCP browser launcher failures anomalyco/opencode#51538)
• a42f393 docs(web): link kimaki to product website (docs(web): link kimaki to product website anomalyco/opencode#49735)
• b65de4d docs(go): add LongCat 2.5 Preview Free to V1 pages (docs(go): add LongCat 2.5 Preview Free to V1 pages anomalyco/opencode#51488)
• 696f41b chore: update nix node_modules hashes
• 29f07e0 refactor(core): share a browser opener across opencode and tui (refactor(core): share a browser opener across opencode and tui anomalyco/opencode#51414)
• adee738 chore: generate
• 543c686 fix(go): make DeepSeek $60 allowance permanent (fix(go): make DeepSeek $60 allowance permanent anomalyco/opencode#51364)
• 34aa427 docs(zen): document Qwen3.8 Max (docs(zen): document Qwen3.8 Max anomalyco/opencode#51321)
• 16c56fe fix(ci): use GPT-6 Luna for issue automation (fix(ci): use GPT-6 Luna for issue automation anomalyco/opencode#51261)
• 6df0d5d fix(stats): use capability fallbacks in comparison radar (fix(stats): use capability fallbacks in comparison radar anomalyco/opencode#51161)
• 0f54984 fix(stats): attribute Hy4 preview traffic to Tencent (fix(stats): attribute Hy4 preview traffic to Tencent anomalyco/opencode#51050)
• 0027387 fix(go): include DeepSeek V4 Flash in chart (fix(go): include DeepSeek V4 Flash in chart anomalyco/opencode#51032)
• 5fcfb06 chore: update nix node_modules hashes
• 79e8eee chore: bump gitlab-ai-provider to 6.18.0 (chore: bump gitlab-ai-provider to 6.18.0 anomalyco/opencode#50890)
• 82d4c89 fix(opencode): redact credentials in debug config (fix(opencode): redact credentials in debug config anomalyco/opencode#50956)
• 1d6c3c0 feat(go): add GPT 6 Luna to Go pages (feat(go): add GPT 6 Luna to Go pages anomalyco/opencode#50947)
• 610df0b fix(gemini): switch thinking default logic (fix(gemini): switch thinking default logic anomalyco/opencode#50841)
• 7cb044e chore: generate
• 1b4a6db feat(go): add Space Bunny promotion (feat(go): add Space Bunny promotion anomalyco/opencode#50572)
• 18ef3cc chore: update nix node_modules hashes
• 45719ac maint(gitlab): bump gitlab-ai-provider to 6.16.0 (maint(gitlab): bump gitlab-ai-provider to 6.16.0 anomalyco/opencode#50742)
• 2406400 chore: generate
• fe51b0b fix(console): restrict legacy access to Black (fix(console): restrict legacy access to Black anomalyco/opencode#50716)
• 6ea95e5 docs(web): add Claude Opus 5.5, GPT 6 Sol, and GPT 6 Luna to Zen (docs(web): add Claude Opus 5.5, GPT 6 Sol, and GPT 6 Luna to Zen anomalyco/opencode#50708)
• fc827ea chore: generate
• 3a35b45 feat(openai): allow GPT-6 Sol and Luna with Codex (feat(openai): allow GPT-6 Sol and Luna with Codex anomalyco/opencode#50704)
• fe3f3a4 sync release versions for v1.18.32
• f5ce4f8 fix(core): break filesystem search import cycle (fix(core): break filesystem search import cycle anomalyco/opencode#50439)
• f54ce31 chore: generate
• 32808ad docs: add MiMo V2.6 models (docs: add MiMo V2.6 models anomalyco/opencode#50395)
• ba341c6 fix(core): resolve npm package entrypoint to a file under Node (fix(core): resolve npm package entrypoint to a file under Node anomalyco/opencode#50413)
• e059ac5 feat: add Grok 4.7 to Zen and Go (feat: add Grok 4.7 to Zen and Go anomalyco/opencode#50288)
• 70a2469 fix(console): authenticate inference proxy
• cf494c2 fix(console): forward client IP to inference
• c101347 fix(opencode): hoist Bedrock tool images except Claude, Nova, and Llama 4 (fix(opencode): hoist Bedrock tool images except Claude, Nova, and Llama 4 anomalyco/opencode#50272)
• 0e3dfd1 chore: update nix node_modules hashes
• 8bf288e fix(opencode): bump togetherai so streams report usage (fix(opencode): bump togetherai so streams report usage anomalyco/opencode#50264)
• 17b7678 docs(web): extend DeepSeek promotion (docs(web): extend DeepSeek promotion anomalyco/opencode#50255)
• d870e22 fix(stats): retry transient query failures (fix(stats): retry transient query failures anomalyco/opencode#50205)
• 45ad8dc fix(stats): paginate sync aggregates (fix(stats): paginate sync aggregates anomalyco/opencode#50198)
• 8b2de73 chore: generate
• ac88182 ci: sync v2 catalog once a day (ci: sync v2 catalog once a day anomalyco/opencode#50194)
• ebb7b76 docs(web): align Jev section heading
• 11be5bc docs(web): document Jev usage
• 83abc64 chore(ci): refresh v2 models.dev snapshot on a schedule (chore(ci): refresh v2 models.dev snapshot on a schedule anomalyco/opencode#50030)
• fee476b refactor(console): redirect desktop downloads (refactor(console): redirect desktop downloads anomalyco/opencode#49984)
• ae93d4a fix(console): use v2 desktop downloads (fix(console): use v2 desktop downloads anomalyco/opencode#49931)
• 9a53565 chore: generate
• 61eae88 docs(web): add Jev models to Zen
• 34b4c3c fix(console): update systemone endpoints
• 3c7f191 fix(web): add v2 banner border and restore header hairline
• 7c22dbb fix(web): use neutral colors for v2 banner
• 6da6d47 fix(web): render v2 banner full width below header
• f1aacab feat(web): add v2 announcement banner to legacy docs
• 4e1c496 chore: generate
• a6cad77 docs: add DeepSeek V4.1 Flash to Zen (docs: add DeepSeek V4.1 Flash to Zen anomalyco/opencode#49897)
• ae2da69 docs: add Qwen3.8 Flash to Zen (docs: add Qwen3.8 Flash to Zen anomalyco/opencode#49888)
• 285cff5 feat(console): switch install links to v2 (feat(console): switch install links to v2 anomalyco/opencode#49874)
• 5f9d918 chore: generate
• 1573a7b support jev
• 3dd1b30 docs: restore GPT-5.6 Sol pricing (docs: restore GPT-5.6 Sol pricing anomalyco/opencode#49724)
• e80db11 chore: generate
• a7f2373 chore(go): retire Union Alpha (chore(go): retire Union Alpha anomalyco/opencode#49718)

[pminevp]

Scratch test for XCOD-118 (deliberately conflicting sync): produced this draft PR labelled upstream-conflict listing the conflicting files, as required. Closing; not for merge.