Repository navigation
fix(core): preserve renamed files when undoing changes - #45383
Merged
Merged
Conversation
jinhuang712
pushed a commit
to jinhuang712/opencode
that referenced
this pull request
Sep 26, 2026
brentyates-swx
pushed a commit
to swxtchio/swx-opencode-archive
that referenced
this pull request
Nov 4, 2026
(cherry picked from commit d68031b)
brentyates-swx
added a commit
to swxtchio/swx-opencode-archive
that referenced
this pull request
Nov 4, 2026
* chore(opencode): plan upstream backports - Keep all four assigned fixes as separate full-SHA cherry-pick -x commits. - Adapt producer-driven regressions at the fork RPC, browser launcher, V2 undo, and Copilot stream/replay boundaries. - Prove each changed behavior with focused red/green runs, then record provenance and compatibility in CHANGESET.md. Claude-Session: unknown * fix(opencode): answer a failed TUI worker request instead of hanging (anomalyco#54936) Co-authored-by: James Long <[email protected]> (cherry picked from commit bbad8f3) * fix(opencode): catch completed MCP browser launcher failures (anomalyco#51538) Co-authored-by: rekram1-node <[email protected]> (cherry picked from commit b471c2b) * fix(core): preserve renamed files when undoing changes (anomalyco#45383) (cherry picked from commit d68031b) * fix(core): accept interleaved Copilot reasoning_opaque values (anomalyco#54207) (cherry picked from commit b2a3926) * test(opencode): cover RPC worker failures Claude-Session: unknown * test(opencode): cover completed browser exit races Claude-Session: unknown * test(core): adapt rename undo regression to SessionV2 Claude-Session: unknown * test(core): prove interleaved Copilot reasoning replay Claude-Session: unknown * test(opencode): assert completed launcher failure result Claude-Session: unknown * test(opencode): await isolated RPC outcomes together Claude-Session: unknown * test(opencode): keep RPC worker cleanup bounded Claude-Session: unknown * test(core): exercise rename through projected revert Claude-Session: unknown * test(core): use branded paths in rename regression Claude-Session: unknown * docs(opencode): record upstream backports Claude-Session: unknown * docs(opencode): record mutation-backed regressions Claude-Session: unknown * test(opencode): inline delayed browser test flow Claude-Session: unknown * test(opencode): acknowledge delayed launcher readiness Claude-Session: unknown * docs(opencode): clarify Copilot replay coverage Claude-Session: unknown * docs(opencode): describe delayed browser fixture acknowledgments Claude-Session: unknown --------- Co-authored-by: Damian Nowak <[email protected]> Co-authored-by: James Long <[email protected]> Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com> Co-authored-by: rekram1-node <[email protected]> Co-authored-by: Kit Langton <[email protected]> Co-authored-by: Aiden Cline <[email protected]>
brentyates-swx
added a commit
to swxtchio/swx-opencode-archive
that referenced
this pull request
Nov 6, 2026
Merge only 055d95b, the first parent of promotion 5caf1f9, across the 696f41b..055d95b range of 84 upstream commits. Preserve the V1 CLI/server and SessionPrompt owners plus the fork queue, asks, usage, SQLite retry, process-group and retention paths. Keep both .gitignore rules; retain Bun 1.4.4 and Solid 1.9.15 while taking the xAI 3.0.139 patch; keep the native FFF library copy and macOS ad-hoc re-signing. Reconcile the in-range anomalyco#51538 and anomalyco#54207 backports at their existing production owners and retain the stronger fork browser and Copilot replay controls; keep anomalyco#54936 and anomalyco#45383 within the selected cut boundary. nix/hashes.json refresh pending: values come from the FFF native platform validation nix-node-modules job logs (all four systems) once the PR leaves draft. Claude-Session: unknown
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.
Why
Undoing a file rename can remove the renamed file without restoring its original path. Snapshot change lists use rename-aware
git diff --name-only, which reports only the destination; the revert plan therefore removes that destination but never restores the source.What Changes
Enumerate tree changes with
--no-renames, matching the existing per-file diff behavior. Both paths are then included in newly recorded snapshot change lists.old name.txtrenamed tonew name.txtThe regression uses a real Git repository, Location-scoped snapshots, durable Session event projection, and the public
Session.revert.stage/clearoperations. It also verifies that clearing staged Undo restores the renamed path and content, and that unrelated later edits survive both operations. Only model execution is disabled. A lower-level test verifies filename enumeration and added/deleted diffs with Git rename detection explicitly enabled.Scope
One Git comparison flag, its explanation, regression coverage, and a Core patch changeset. This fixes newly computed snapshot file lists; it does not rewrite older Session history whose persisted file lists already omitted a rename source.
Verification
consistent-returnwarning ingit.ts.