Skip to content

chore(sync): merge upstream v2.3.0 and prepare 2.3.0-shuv.1 - #489

Merged
shuv1337 merged 76 commits into
integration-v2from
sync-upstream-230
Nov 13, 2026
Merged

shuv1337 merged 76 commits into
integration-v2from
sync-upstream-230

Conversation

@shuv1337

@shuv1337 shuv1337 commented Nov 13, 2026 •

Copy link
Copy Markdown
Owner

Summary

Normal two-parent merge of upstream v2.3.0, following #484 and #487, with 2.3.0-shuv.1 release preparation in this PR. Targets only shuv1337/shuvcode:integration-v2. No default-branch push, rebase, force-push, tag, release, publish, deployment or live-service change. Stop before merge.

  • Preserve Shuvcode identity, npm-only updates, bundled integrations, crash-recovery safeguards and the approved bounded managed-policy waits.
  • Include directly driven child recovery, pending-work subagent reports, shell timeout fixes, client certificates, 15-second local-model discovery, stable video generation, Code Mode streaming fetch and prompt undo/history fixes.
  • CLI manifest/lockfile: 2.3.0-shuv.1. Upstream manifests: 2.3.0. Upstream release notes are verbatim; earlier fork notes are preserved.

Ancestry

  • Fork base: ac4077949d227a1ff244a6f9f2b398ccf14732ef, including chore(sync): merge upstream dev through 101776024c #487's final fixes and chore(release): 2.2.7-shuv.2 #488.
  • Prior upstream pin: 101776024cc69bafb3f9dc90027ab4d1eab40a2a.
  • Release tag: a6b15d33daf6ab7d35569f6d711fdb630b9f04e7 (v2.3.0), November 13, 2026 at 12:55 AM PST; 70 commits past that pin. Parent 73abe63ac23224d88e739e7028882e547ef65a79.
  • Normal merge: 93364ed1a7a1ad59a55bc75ae5645f85ac2e858b. Newer upstream dev commits are outside this release sync.
  • Final head: a27a4dc3aa8a1d14eefa94c5ae10b24e0f0a995c, open and unmerged.
  • Refreshed origin/upstream. All 158 unmerged fork refs match chore(sync): merge upstream dev through 101776024c #487's audited tips/dispositions; unique histories/diffs and PR status rechecked. No unrelated branch landed or deleted. Stale local integration-v2 was left untouched; topic starts at refreshed origin/integration-v2.

Durable audit and complete branch dispositions.

Conflict resolutions

Twelve paths conflicted:

Paths Resolution
.github/workflows/release.yml Preserve fork deletion.
AGENTS.md, specs/v2/session.md Preserve fork physical-attempt/compaction/prepared-call rules; adopt directly driven child recovery wording.
CHANGELOG.md, packages/cli/package.json, bun.lock Release prep as #484; keep shuvcode name/bin, suffix, fork history/packages/patches.
packages/ai/src/experimental.ts Preserve fork Evaluation exports; adopt upstream video graduation.
packages/app/e2e/regression/timeline-{geometry,stream}.spec.ts Upstream always-background fixtures supersede #487's equivalent adaptations; retain new upstream shell-notice cases.
packages/core/src/session/execution/restart.ts Combine direct-child recovery with prepared identities, ambiguity/cancellation guards and deferred parent ownership. Charge all direct restart budgets before launch; keep job/prepared children out of direct drains and prepared children out of the prepared-owner loop. Remove obsolete blanket child-claim clearing.
packages/core/test/session-execution.test.ts Keep fork activity-lease regression plus new upstream direct-child tests.
packages/tui/src/component/prompt/index.tsx Keep terminal extmarks; adopt undo-aware paste metadata and remove obsolete paste remapping.

Managed policy and fork preservation

Keep #484's upstream behavior: model.list, model.default, provider.list, generate.*, voice.*, websearch.query wait up to 5 seconds, then return 503 if activation is incomplete. Other catalog reads remain non-waiting. Server policy code is unchanged from the fork base; no extra waits added.

Preserve Shuvcode XDG/ports, npm-only updates/publication guard, bundled Claude/Antigravity/Codex/UI plugins, all three Claude Agent SDK hiding layers, tool-activity leases, rich failures, inactivity interruption and headless configuration diagnostics. Claude Agent SDK fixes stay on disk only.

Validation

Bun 1.4.4. Runtime checks use unprivileged namespaces, fresh HOME/XDG/temp roots, an empty environment allowlist and hidden real configuration/credentials/service state. Tests use private loopback networks; build downloads allow network. Synthetic /dev and private /proc only; no privileged/systemd container or host /sys, /run/udev or /run/dbus mount.

Gate Result
bun run check Pass, 40/40 uncached package tasks, lint no errors
Official per-package compiler CI loop Pass
Client generation Pass, no generated drift
Upstream notes / prior fork notes Verbatim / fully preserved
Frozen install Pass, no drift
Full forced unit gate, concurrency 3 35/35 tasks pass, zero cache hits, 6m28s
Core / CLI / TUI / Server 7632 / 477 / 1753 / 139 pass, respectively; 0 failures
Focused execution/recovery 67/67 pass, including all 17 SIGKILL boundaries
Ambiguity / nested prepared-owner regressions, 10 repeats 40/40 pass
Effect simplification rules / lint 10/10 pass / pass
Release-channel native Linux x64 Bun/Node builds Both pass, embedded web UI
Compiled Bun/Node versions Both 2.3.0-shuv.1, automatic release-floor resolution
Compiled service lifecycle smokes Both pass: election/auth/MCP/web UI/plugins/clean stop
GitHub CI on final head a27a4dc3aa All five checks pass: typecheck (2m37s), hygiene, plugin-browser, both Socket checks
Whitespace Pass

Final product source: c1d4594b55. The initial full run caught a genuine recovery interaction: the direct-claim sweep could fail an ambiguous child before prepared-parent recovery, allowing the parent to resume. The follow-up carries ambiguity into prepared recovery and stops the parent too. Existing regression assertions pass ten repeats each and the full gate is green; no tests/timeouts/skips were weakened. The initial failing run reproduced the known Turbo failure-path SIGSEGV (pc_4bef4e2422a7); the green run exits normally.

The initial hygiene finding was a literal local home path in the audit, changed to $HOME without weakening the allowlist. Two batched Node-smoke invocations exited 141 with no log; unchanged standalone reruns pass, including the final build (pc_0cf7e3fd2890). The first post-review full run under concurrent build/typecheck load timed out in an unchanged client service-eviction test; ten standalone repeats pass and the final full gate passes without concurrent builds (pc_45f7a80dd7f4). No timeout/retry/skip changes were made.

No browser E2E/component suite, cross-platform execution or all-target build claimed. ## Independent review

Claude Opus 5.5, high effort, completed the requested read-only review via approved Cursor pool failover. Two high-priority findings, both addressed:

  1. Ambiguous child could resume prepared parent — fixed by 1ddafa6b72, independently verified by the reviewer.
  2. Nested prepared child could acquire a second recovery owner and launch a stopped subtree — fixed by c1d4594b55, excluding the precomputed prepared-child set from the owner loop. New regression failed before the fix and passes afterward, including a second sweep; all four cases pass 40/40 repeats.

All other reviewed fork-preservation/conflict areas were clean. Detailed review and resolution. No GitHub platform approval or independent re-review of the final fix is claimed.

Feature flags

No new fork flag for sync/release metadata. Existing upstream experimental flags remain; stable video generation follows upstream graduation.

Reviewing this large merge

Over 300 files: git fetch origin pull/489/head then review the complete local git diff ac4077949d...FETCH_HEAD; do not rely on GitHub's capped diff endpoint. Inspect git show --remerge-diff 93364ed1a7 for conflict resolutions.

Hona and others added 30 commits November 12, 2026 09:17
…es (anomalyco#63503)

Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
)

Co-authored-by: Filip Hejmowski <fhejmowski@simplito.com>
…cs previews (anomalyco#63560)

Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
rekram1-node and others added 21 commits November 12, 2026 21:56
@socket-security

socket-security Bot commented Nov 13, 2026 •

Copy link
Copy Markdown

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

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Updatednpm/​@​hona/​strobe@​0.29.0 ⏵ 0.34.0100 +110099 +196 +1100

View full report

@shuv1337

Copy link
Copy Markdown
Owner Author

Independent review: findings addressed

Requested Cursor/Claude Opus 5.5, effort high, with approved pool failover. Review ran read-only after this PR opened (resolved seat: Cursor-8). The reviewer inspected the complete local merge/remerge diff and independently reproduced the recovery behavior against the old and merged trees.

Two high-priority findings:

  1. Ambiguous child failure could resume its prepared parent. Already fixed during the full-suite run in 1ddafa6b72; reviewer confirmed the regression on the original PR head and the fix on the follow-up. Prepared recovery now retains the sweep's ambiguity decision instead of treating it as an ordinary result.
  2. Nested prepared child could acquire a second recovery owner and launch a stopped subtree. Fixed in c1d4594b55. The prepared-owner loop excludes the precomputed preparedChildren set, independent of claim iteration order. Added a real-runner regression that failed before the fix (requests=1), now asserts no model call/job/restart notice for the child subtree, and repeats the sweep to guard against later adoption. This case plus the three ambiguity cases pass 40/40 across ten repeats; focused execution/SIGKILL suites pass 67/67.

Reviewer verified clean: normal merge ancestry, all 12 conflict resolutions outside recovery, terminal mentions/paste undo, fork Evaluation exports, E2E fixture adaptations, managed-policy waits, all three hidden-provider layers, package/bin/version identity, verbatim upstream notes/preserved fork history, workflow exclusions and whitespace.

Both findings are addressed. This is an independent review result with implementation follow-up, not a GitHub platform approval or a claim that the reviewer re-reviewed the final fix. Final full-suite/build/check results are maintained in the PR body and docs/sync-2026-11-13.md. PR remains open and unmerged.

@shuv1337
shuv1337 merged commit 37f5865 into integration-v2 Nov 13, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.