Skip to content

chore(sync): merge upstream dev a96327d3e8 and prepare v2.3.2-shuv.1 - #509

Open
shuv1337 wants to merge 109 commits into
integration-v2from
sync-dev-a96327
Open

shuv1337 wants to merge 109 commits into
integration-v2from
sync-dev-a96327

Conversation

@shuv1337

Copy link
Copy Markdown
Owner

Summary

Merge pinned OpenCode dev at a96327d3e8 (104 commits past #508) into integration-v2 and prepare v2.3.2-shuv.1. This PR does not publish, tag, or deploy a release.

Pin Commit
Fork base (#508) 3375c4783abe29355d33239ab7ac2d0c43af13ee
Previous upstream pin / merge base d33b5783338b8b350aafc09f7dc2701eeba52a9a
Merged upstream dev a96327d3e84d795cca231dc30b534193bbc0f47b
Live dev at preflight (not taken) 701eff9e26a2503d5758483bf973100d8ee590a6

Merge and follow-ups

  • Normal two-parent merge c42e006d05 resolves exactly 24 paths. See the per-path conflict table and --remerge-diff instructions. The upstream video clock, TUI lifecycle timing and browser permission suites replace their conflicting carries; the separate fork replay suite survives with updated mocks.
  • Code Mode now exposes tools.shuvcode.session.rename and .move; direct tool names and permission actions are unchanged. Identity, automation restrictions and external-directory tests cover the new paths. Go comes before Console in the Connect picker.
  • Preserve browser status, unretrieved-command replay, reconnect grace and retirement, with upstream deny-first checks, grant lifecycle, wait aliases and path previews. Keep terminal attachment, autocomplete and Night Owl working on OpenTUI 0.9.4. The lifecycle follow-up restores only the fork CLI name in the epilogue assertion.
  • Keep fix(core): cancel orphaned permission asks and auto-approve across session families #429 root-family prompts, hosted-tool activity cleanup, bundled fork plugins, Shuvcode CLI identity and fix(cli): gate npm release on platform package availability #506 npm gating. Claude Agent remains excluded from the plugin registry, config and client lists (17 hidden-provider reference files; zero Claude Agent i18n keys); the folder worker stays on disk but not in the bundle.
  • Retain fork m48; add machine and machine-key as m63 and m64. The generated client has no additional drift after regeneration.

Release prep

Bump the CLI manifest and lockfile to 2.3.2-shuv.1 and add release notes, including the local/dev-only full Code Mode default, default session-part rows, opt-in SQLite FTS, preview API changes and the video-job rollback caveat. Rollback target: v2.3.1-shuv.4 after finishing or cancelling video jobs.

Validation

Gate Result
Conflict markers, whitespace, namespace and hidden-provider scans Pass; zero stale runtime namespaces or Claude Agent translation keys; 17 hidden-provider reference files on both pins
bun install --frozen-lockfile Pass after the merge and release bump; release-prep install made no changes
bun run migration --check (packages/core) Pass; no schema drift
bun run generate (packages/client) Pass; no generated diff
Root bun run check Pass, 40/40 tasks
Focused core, including session replay, permissions, Jev, Antigravity and process-death recovery 344 pass
Core (full suite) 8,022 pass, 16 skip, 11 GitLab OAuth failures. All 11 reproduced on 3375c4783a; port 8080 is occupied on shuvdev.
Video jobs 20 pass over ten repetitions of the two upstream tests
TUI Full initial run: 1,794 pass, 2 skip, 1 cursor-fixture failure. After updating the fixture: 141 focused tests passed, including lifecycle, cursor, Night Owl, and the [90, 6] manual-clock art check.
CLI Full initial run: 514 pass, 7 skip, 3 log-redaction fixture path failures. All three passed after the fixture fix. The launcher suite passed with canonical private paths.
Server / AI 144 pass, 1 skip / 2,306 pass, 29 skip
Schema / Protocol / Util / Plugin / Client 95 / 14 / 156 / 38 / 279 pass
App unit / browser 2,843 / 378 pass
App built e2e (focused) 138 pass across home, settings, session header, and subagent child navigation; four workers using existing system Chromium
Session UI 621 pass
Browser plugin (full suite) 204 pass, including 21 fork replay/preflight tests
Code Mode (full suite) 322 pass; language parity tests now live with psychoscript
Antigravity / Claude / Quota plugins 90 / 43 / 37 pass
CI Effect simplification rule tests and lint Pass
Official TypeScript compiler (core, browser plugin, app) Pass

The chore(sync) title enables the GitHub-hosted unit and e2e gates in addition to typecheck.

Flag: none — upstream sync and release prep

neriousy and others added 30 commits November 19, 2026 13:38
…nomalyco#64912)

Co-authored-by: opencodejr[bot] <348916617+opencodejr[bot]@users.noreply.github.com>
thdxr and others added 29 commits November 19, 2026 21:56
…nomalyco#62649)

Co-authored-by: WTLAIB <205451322+WTLAIB@users.noreply.github.com>
Co-authored-by: Dan Smolsky <dannysmo@gmail.com>
Co-authored-by: Dan Smolsky <78942835+Tarquinen@users.noreply.github.com>
@socket-security

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
Addednpm/​psychoscript@​0.1.28110010091100
Updatednpm/​@​opentui/​core@​0.8.4 ⏵ 0.9.497 +11009498 +1100
Addednpm/​tldts@​7.5.110010010096100
Updatednpm/​@​opentui/​keymap@​0.8.4 ⏵ 0.9.410010099 +198 +1100
Updatednpm/​@​opentui/​solid@​0.8.4 ⏵ 0.9.41001009998 +1100

View full report

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.