[shuv1337]

Issue for this PR

Upstream sync. No linked issue.

Type of change

• Bug fix
• New feature
• Refactor / code improvement
• Documentation

What does this PR do?

Merges anomalyco/opencode dev through e1b3b0596a into integration-v2. That is 198 commits after the dev-side release: v2.2.5 (4878a0e30f); the tag v2.2.5 (9bbb8ce18c) is a different commit on the old v2 line. No newer release tag exists, so the CLI stays shuvcode@2.2.5-shuv.1.

• Base: integration-v2 @ d11b92b561 (includes fix: hide the upstream Claude Agent provider #467–fix(core): unblock unit gate (dynamic provider order, code-mode cache test) #471)
• Head: merge/upstream-dev-2026-11-04 @ 35a5a12f77
• Merge parents: d11b92b561 and e1b3b0596a
• Commits on this PR vs base: 200 (upstream range plus this merge commit)

No open fork PRs. Unmerged origin/* branches are pre-V2 history or work already landed under other SHAs. None were merged or deleted here.

Kept

• Package and bin shuvcode, version 2.2.5-shuv.1, npm dist-tag updater, ports 0x1337 / 0x1338, Global.app = "shuvcode"
• @shuvcode/claude-plugin / ClaudePlugin
• fix: hide the upstream Claude Agent provider #467 hide: ClaudeAgentPlugin is not registered, ConfigProviderPlugin skips hidden provider ids, client lists call isHiddenProvider, AGENTS.md note stays. packages/core/src/plugin/provider/claude-agent/** stays on disk
• fix(tui): unblock unit gate (stale session read, test theme) #470/fix(core): unblock unit gate (dynamic provider order, code-mode cache test) #471: routeSessionID memo in app.tsx, test theme pins, DynamicProviderPlugin registered after SDK hooks, code-mode cache test
• Empty/whitespace tool-result handling (fix(ai): drop blank text from Anthropic error tool results #461–fix(ai): drop blank text from Bedrock error tool results #463) on the renamed input APIs
• opencode-pty npm 0.4.0 matches Cargo.toml
• check-process-daemon.yml and release-process-daemon.yml stay deleted

Conflict resolutions

Area	Resolution
packages/cli/package.json	Kept name shuvcode, version 2.2.5-shuv.1, bin shuvcode
bun.lock	Regenerated with bun install (Bun 1.4.4) from upstream resolutions plus fork packages
bunfig.toml	Upstream @hona/strobe* excludes, plus fork @agentclientprotocol/sdk and opentui-spinner
packages/ai protocols (openai-chat, gemini, mistral, bedrock)	Kept fork rich/empty/whitespace tool-error lowering (toolErrorContent) on upstream's input request shape
packages/ai/src/tool-runtime.ts	Kept structured Tool.Error content on the error result; upstream no longer emits a separate tool-error event
packages/ai/src/effect.ts	Upstream export * from "./public.js", plus fork export * as LLM and the dispatch/provider aliases
packages/ai experimental evaluation / System One	HttpOptions is a plain interface now; dropped HttpOptions.make / mergeHttpOptions
Connect dialog	Took upstream's connection state machine. Did not add the Claude Agent setup UI
CLI run	One-off run uses autostart: false and the fork setup client; archive-before-prompt kept
Updater	--allow-scripts for the fork package name; --force for the native shuvcode artifact, not shuvcode-node
Location activity	Fork idle interrupt / background jobs, plus upstream retained() so an open terminal is not evicted
Glob / grep permissions	Permission.invocation(context) plus the fork's undefined-metadata filter
cross-spawn-spawner	Upstream handleInputErrors
packages/desktop/script/profile-by-source.ts	Deleted with upstream's strobe refactor
Process-daemon workflows	Stayed deleted

How did you verify your code works?

• bun run typecheck across fork CI packages (pre-push hook: 40/40)
• tsc (typecheck:tsc) on ai, core, cli, app, tui, and util
• bun install --frozen-lockfile
• bun turbo test --concurrency=3 --filter='!@opencode/desktop' --filter='!@opencode/update': 35/35 packages, exit 0. One TUI spinner assertion failed once under the loaded parallel run and passed on the package rerun and the final cached suite

Visual

Not a user-facing UI change.

Screenshots / recordings

None.

Checklist

• I have tested my changes locally
• I have not included unrelated changes in this PR

  

[socket-security]

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	npm/​@​hona/​strobe@​0.6.0
	npm/​@​effect/​sql-sqlite-bun@​4.0.6 ⏵ 4.1.0	+1		+1	+1
	npm/​@​effect/​sql-sqlite-node@​4.1.0
	npm/​@​effect/​opentelemetry@​4.0.6 ⏵ 4.1.0				+1
	npm/​@​effect/​platform-node-shared@​4.0.6 ⏵ 4.1.0			+1
	npm/​@​effect/​platform-node@​4.0.6 ⏵ 4.1.0			+2
	npm/​effect@​4.0.6 ⏵ 4.1.0	+1		+1
	npm/​@​opentui/​core@​0.8.0 ⏵ 0.8.1	+1		+1	+1
	npm/​@​opentui/​keymap@​0.8.0 ⏵ 0.8.1	+1		+1	+1
	npm/​@​opentui/​solid@​0.8.0 ⏵ 0.8.1	+1		+1	+1

View full report