[quickbeard]

Syncs upstream v1.18.3 → v1.18.4 per the runbook in DIVERGENCES.md (3-way patch between release tags, fork-deleted paths filtered out).

Conflicts resolved (all per existing divergence-table rows)

• packages/app/src/pages/layout-new.tsx — took upstream's new state.debugTools gate on DebugBar; kept the <TabsInfoPopup /> mount deleted.
• packages/opencode/script/build.ts — kept the CODEV_* define names; took upstream's treeSitterWorkerPath fix for OTUI_TREE_SITTER_WORKER_PATH.
• packages/app/src/components/titlebar.tsx — took upstream's channel const refactor, renamed its source to VITE_CODEV_CHANNEL per the env-var rename row.
• sdks/vscode/package.json — kept fork name/publisher/branding; took version 1.18.4.

Policy audit

• No new OPENCODE_* env vars, opencode.json/.opencode references, or files under fork-deleted directories.
• Locale changes touch only en/es; remaining opencode strings added are all in the deliberately-not-renamed list (trust.opencode.ai, ai.opencode.desktop appId, i18n keys, a test fixture path).
• No DIVERGENCES.md changes needed — every conflict matched its existing row and no row went stale.

Verification

• bun install regenerated bun.lock.
• bun turbo typecheck — 31/31 packages pass.

🤖 Generated with Claude Code