Skip to content

chore(sync): merge upstream v2.3.1 and prepare 2.3.1-shuv.1 - #502

Merged
shuv1337 merged 129 commits into
integration-v2from
sync-upstream-231
Nov 18, 2026
Merged

shuv1337 merged 129 commits into
integration-v2from
sync-upstream-231

Conversation

@shuv1337

Copy link
Copy Markdown
Owner

Merges upstream v2.3.1 (c769de8300, 127 commits past the #497 pin 0fad04b3d5) into integration-v2 and prepares 2.3.1-shuv.1: CLI manifest and lockfile only. Root/workspace manifests take upstream 2.3.1. It also carries #501, which adds Gemini 4 Carbon and Hydrogen to the bundled Antigravity plugin. Normal two-parent merge e38dd71500, plus one docs commit (audit + changelog).

Full audit: docs/sync-2026-11-17-v2.3.1.md.

Conflicts (12)

  • Process-daemon workflows: kept deleted.
  • permission.ts: upstream same-step reject scoping + fork claim-before-yield deletes.
  • tool.ts: fork executeCall / ToolActivity lease / rich failures kept; upstream Code Mode background jobs moved inside executeCall.
  • subagent.ts: fork durable subagent recovery kept; depth check uses upstream SubagentDepth.
  • migration.gen.ts: fork subagent-operation migration + upstream automation migrations; migration --check clean.
  • TUI session route: fork root-family permission routing (fix(core): cancel orphaned permission asks and auto-approve across session families #429) kept; upstream's per-subagent prompt display not adopted.
  • Tests: both sides' new tests kept; catalog expectation follows upstream.
  • CHANGELOG.md, bun.lock, CLI package.json: fork identity, 2.3.1-shuv.1.

Beyond the textual conflicts: Code Mode search("…") now uses upstream's implementation, and the fork's redundant patch is dropped. The Claude Agent i18n keys upstream re-added in 62 locales are removed.

Validation

Root bun run check passes 40/40, as do client generate (no drift), frozen install and migration check. Package suites are green except environment-only failures that are pre-existing or reproduce on the base: core GitLab OAuth port ×11, TUI dialog-shell-output ×2. Details are in the audit.

CI unit + e2e (from the chore(sync) title) are the release gate. Once this merges, publish.yml dispatches 2.3.1-shuv.1 on latest.

Visual

<svg xmlns="http://www.w3.org/2000/svg" width="240" height="72" viewBox="0 0 240 72" fill="none" stroke="currentColor" font-family="ui-sans-serif,system-ui" font-size="10">
<style>.m{animation:m 4s ease-in-out infinite}@keyframes m{0%,20%{transform:translateX(0)}60%,100%{transform:translateX(70px)}}@media (prefers-reduced-motion:reduce){.m{animation:none;transform:translateX(70px)}}</style>
<path d="M16 22h200M16 50h120" opacity=".35"/>
<path d="M136 50 C170 50 170 22 206 22" opacity=".6"/>
<circle cx="16" cy="22" r="4"/><circle cx="16" cy="50" r="4"/>
<text x="24" y="16" fill="currentColor" stroke="none" opacity=".6">shuvcode</text><text x="24" y="66" fill="currentColor" stroke="none" opacity=".6">upstream v2.3.1</text>
<g class="m"><circle cx="136" cy="22" r="5" fill="currentColor" stroke="none"/></g>
<text x="150" y="40" fill="currentColor" stroke="none">2.3.1-shuv.1</text>
</svg>

rekram1-node and others added 30 commits November 15, 2026 21:16
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
…neutral restyle (anomalyco#64209)

Co-authored-by: opencodejr[bot] <348916617+opencodejr[bot]@users.noreply.github.com>
…nt e2e (anomalyco#64221)

Co-authored-by: opencodejr[bot] <348916617+opencodejr[bot]@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
…anomalyco#64243)

Co-authored-by: MrMushrooooom <19261047+MrMushrooooom@users.noreply.github.com>
rekram1-node and others added 28 commits November 17, 2026 11:53
@shuv1337
shuv1337 merged commit 6777b6f into integration-v2 Nov 18, 2026
7 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.