[shuv1337]

Issue for this PR

N/A — upstream sync into integration-v2.

Type of change

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

What does this PR do?

Brings Shuvcode from upstream V2 2.0.30 to v2.0.32 plus current dev, at 60a5a6ca7c. The source range e25b7abf89..60a5a6ca7c contains 78 upstream commits. The latest V2 tag is v2.0.32 (843a6c514e); dev includes 45 commits beyond their shared release point. Both refs were rechecked before pushing.

• CLI version is 2.0.32-shuv.1. Preserves package/bin identity, ports, ShuvTunnel patches, npm updates, fork CI/publishing, and the nightowl default.
• Adopts upstream voice, session-list/cursor, provider, filesystem, shell-output, and experimental-dialog changes. Keeps fork prompt-key validation while moving pagination to upstream's Schema/Core implementation.
• Migrates the four private plugins and packages/script to upstream's TypeScript 7 dependency. Reconciles the durable subagent-event and theme expectations, and removes an auto-merged duplicate import. Client/OpenAPI generation was run from source.

The fork's previous upstream commit 4267960a5a and current upstream counterpart e25b7abf89 have the identical tree 1840f1a052d65bffe784c2a3b0a6b74f8ea60a97. An ancestry-only merge connects that already integrated snapshot without changing files; the next commit is the regular two-parent merge of dev. This avoids replaying old source changes. Reviewed the 344-file local diff and git show --remerge-diff 2a3d757c80.

How did you verify your code works?

• Pass: lint, all 30 package typechecks selected by fork CI, generated client/OpenAPI checks, frozen install excluding upstream console/stats, website typecheck/build/link validation, native Linux CLI build including web assets, and compiled-service smoke test.
• Passing complete suites: AI 1,834; TUI 1,566; app 933; client 238 on rerun; schema 69; protocol 9; all four private plugins 183; plus the other runtime/library suites. The server's initial OAuth callback timeout passes on its 12-test file rerun.
• Full-run limits: Core: 6,805 pass / 33 skip / 3 fail. Two worktree cases could not find Bun in spawned login shells; the full 35-test worktree file passes with the test shell PATH supplied. The remaining MCP descendant test also fails on pre-sync 6c248f7cc7: the killed child remains a zombie under container PID 1, so kill(pid, 0) never reports it gone.
• Source CLI fixtures: 346 pass / 7 skip / 44 fail: 39 subprocess cases miss the Solid preload from isolated working directories; five lifecycle/standalone cases encounter unreaped orphan processes. Representative failures in both source-CLI files, lifecycle restart, and standalone shutdown also reproduce on 6c248f7cc7. These fixtures were left unchanged; the compiled-service smoke passes.
• Broad root check: lint passes; the all-repository typecheck is blocked by upstream console's locked https://pkg.pr.new/@solidjs/start@dfb2020 dependency returning 404. Console/stats are outside fork CI. Live provider requests, browser e2e, and ShuvTunnel bridge access were not exercised.

Screenshots / recordings

Upstream UI changes are covered by the existing TUI and app suites above; no recording captured.

Checklist

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

Pre-sync fork branch inventory (117 unmerged refs)

Refreshed every fork branch with git fetch --prune origin '+refs/heads/*:refs/remotes/origin/*'. The local work branch matches origin/integration-v2 at 6c248f7cc7; it has no unmerged local work. Reviewed unique commit/file changes and PR states. No missing fix needs reconciliation.

Already landed by an equivalent merge or squash:

Fork branch	Landed PR
cursor/ab-check-git-ad5d	#388
cursor/antigravity-quota-errors-c5e1	#427
cursor/cli-test-env-a867	#396
cursor/client-test-contract-de6d	#421
cursor/core-test-node-a8d0	#426
cursor/dependency-inspection-a7f4	#395
cursor/host-deploy-channel-5f72	#414
cursor/jj-pr-review-149d	#423
cursor/large-pr-diff-87a3	#394
cursor/legacy-health-probe-5e6a	#424
cursor/live-service-binary-8c38	#390
cursor/persist-session-log-5c6b	#422
cursor/pre-sync-checklist-b97e	#389
cursor/remote-port-probes-4afe	#392
cursor/standalone-global-flag-1969	#428
cursor/tui-probe-404-7466	#418
cursor/whitespace-check-docs-bdca	#387
fleet-hygiene	#451, #452 (all four files identical to default)
fm/sc-361-jj-channel	#377
fm/sc-362-agent-model	#378
fm/sc-363-prompt-keys	#393
fm/sc-373-jev	#397
fm/sc-ci-reenable	#420
fm/sc-cursor-378	#431
fm/sc-e2e-timeline	#432
fm/sc-folderswitch-quarantine	#439
fm/sc-i407-toolcall-recovery	#437
fm/sc-i411-watcher-flake	#433
fm/sc-i412-run-admission	#434
fm/sc-i438-tab-popover	#442
sc-cursor-377	#430
sc-permission-fixes	#429

Preserved unmerged: native-supervisor is closed PR #440, outside this sync. Closed proposals cursor/ci-integration-v2-61f7 (#415) and cursor/stdin-epipe-listener-968d (#425) were superseded by #420/#441, as recorded in #447. All three branches remain unchanged.

Obsolete legacy/V1 or pre-rewrite work: the prior decisions in #447/#450 still apply. Recent tips on eleven legacy branches only update flake.lock; they add no missing V2 fix. Each of these 82 refs is preserved:

• 191-merge
• 197-consolidate-ask-tool-implementations
• 73-fix-branding-update-message
• 73-fix-branding-upgrade
• add-model-favorites
• add-pr-4515
• config-hot-reload
• copilot/install-bun-version-1-3-3
• copilot/resolve-upstream-sync-conflict
• copilot/sub-pr-105
• copilot/sub-pr-27
• copilot/sub-pr-325
• copilot/sub-pr-97
• dev-pr
• feat-v186
• feat/codex-multi-account
• feat/image-preview-tabs
• feat/reconnect
• feat/save-favorite-models-desktop
• feat/skills-registry
• feat/tui-variant-cycle-tooltip
• fix-prefill
• fix-tui-img-attachments
• fix/directory-handling-combined
• fix/file-viewer-add-img-support
• fix/file-viewer-blank-content
• fix/mobile-timeline-rail
• fix/root-file-view
• integration
• integration-backup-20260915
• intergation-streamline
• merge-PRs
• merge-v1.0.153
• merge-v1.1.39
• mobile-pairing
• model-diag-cleanup
• opencode/happy-mountain
• opencode/issue102-20251210030021
• opencode/issue113-20251211062235
• opencode/issue114-20251211062613
• opencode/issue117-20251211083034
• opencode/issue120-20251211165001
• opencode/issue126-20251211201237
• opencode/issue144-20251219021522
• opencode/issue146-20251219134518
• opencode/issue151-20251220031612
• opencode/issue152-20251220033120
• opencode/issue155-20251220035024
• opencode/issue157-20251220040932
• opencode/issue159-20251220111304
• opencode/issue161-20251220123030
• opencode/issue167-20251220154038
• opencode/issue169-20251220160245
• opencode/issue176-20251221020906
• opencode/issue178-20251221030922
• opencode/issue67-20251201020527
• opencode/issue68-20251201093246
• opencode/issue70-20251201190836
• opencode/issue74-20251202181455
• opencode/issue77-20251202201913
• opencode/issue78-20251203114126
• opencode/issue80-20251204034025
• opencode/issue83-20251204041504
• opencode/issue86-20251204220607
• opencode/issue89-20251205204907
• opencode/issue99-20251209180809
• plugin-slash-commands
• prompt-shuvcode
• reply-routing-recovery
• revert-pr-4773-subagent-restrictions
• sewer56-subagent-restrict
• shuvbotta/anthropic-claude-code
• shuvbotta/codemode-fixes
• shuvcode-dev
• shuvcode-dev-backup-v1.0.223
• sidebar-fix
• sync-latest-v2
• sync-v2-aug13
• sync-v2-sep
• sync/upstream-v1.1.20
• tui-variant-cycle-tooltip
• v1.1.1.1-integration-test

Review follow-up and final validation

• Fixed inherited provider-package comparison so a no-op OpenAI package override preserves catalog reasoning limits and variant overlays. Added model/provider/alias regression cases; the same cases pass on the pre-PR base, fail on the original head, and pass with the fix. Provider + variant suites: 55 pass; provider suite repeated ten times under full-core load: 380 pass.
• Fixed the source CLI subprocess fixtures to create their normal Solid preload configuration in isolated directories, including standalone self-spawns. Preserved assertions and added stderr to success-exit diagnostics. Full local CLI: 390 pass, 7 skip, 0 fail; source launch repeated ten times under full CLI load: 10 pass.
• Full root lint/typecheck and the unmodified pre-push hook pass (39 typecheck tasks). Final hosted full test/build/generated-client/browser/component workflow: https://github.com/shuv1337/shuvcode/actions/runs/39202048958 . All final-head PR checks pass.
• Full local macOS core: 6799 pass, 43 skip, one existing WAL-sidecar fixture failure, also reproduced on exact pre-PR base 6c248f7; the relevant implementation and test are unchanged. Hosted Linux core passes.

Fix commits: 165a69d and eb0fa10.

Release execution

Merged as d9a29db3fa3d86e81e1d9b016d5488f0afcace33. The normal release workflow for 2.0.32-shuv.1 / latest is running on that exact commit: https://github.com/shuv1337/shuvcode/actions/runs/39203496138 . Publication and artifact verification are still pending.