Repository navigation
chore(sync): merge upstream v2.3.1 and prepare 2.3.1-shuv.1 - #502
Merged
Merged
Conversation
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>
…ost-call arguments (anomalyco#64513)
…ons (anomalyco#64511) Co-authored-by: James Long <james@anoma.ly>
…bals be constructible (anomalyco#64472)
…nomalyco#64525) Co-authored-by: James Long <james@anoma.ly>
…st (anomalyco#64530) Co-authored-by: James Long <james@anoma.ly>
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges upstream v2.3.1 (
c769de8300, 127 commits past the #497 pin0fad04b3d5) intointegration-v2and prepares2.3.1-shuv.1: CLI manifest and lockfile only. Root/workspace manifests take upstream2.3.1. It also carries #501, which adds Gemini 4 Carbon and Hydrogen to the bundled Antigravity plugin. Normal two-parent mergee38dd71500, plus one docs commit (audit + changelog).Full audit:
docs/sync-2026-11-17-v2.3.1.md.Conflicts (12)
permission.ts: upstream same-step reject scoping + fork claim-before-yield deletes.tool.ts: forkexecuteCall/ToolActivitylease / rich failures kept; upstream Code Mode background jobs moved insideexecuteCall.subagent.ts: fork durable subagent recovery kept; depth check uses upstreamSubagentDepth.migration.gen.ts: fork subagent-operation migration + upstream automation migrations;migration --checkclean.CHANGELOG.md,bun.lock, CLIpackage.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 checkpasses 40/40, as doclientgenerate (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, TUIdialog-shell-output×2. Details are in the audit.CI
unit+e2e(from thechore(sync)title) are the release gate. Once this merges,publish.ymldispatches2.3.1-shuv.1onlatest.Visual