fix(snapshot): fix revert not restoring files due to absolute path issue by Twisted928 · Pull Request #8631 · anomalyco/opencode

Twisted928 · 2026-01-15T08:46:50Z

Summary
Fix TUI Revert feature not actually reverting file changes in workspace.
Root Cause
Snapshot.patch() returns absolute paths in the files array, but git checkout expects paths relative to the worktree. This caused checkout to fail silently, leaving files unchanged while the session state showed them as "reverted".
Changes
Core Fix (packages/opencode/src/snapshot/index.ts)

Convert absolute paths to relative using path.relative(Instance.worktree, file)
Use normalized gitPath for all git commands
Safety Guards
Worktree escape protection: Skip files outside worktree using Filesystem.contains() + path.isAbsolute() check
Empty path protection: Skip when relativePath === ""
Windows compatibility: Normalize path separators (\ → /) for git pathspec
Directory creation: Add fs.mkdir() before fs.writeFile() in git show fallback
Tests (packages/opencode/test/snapshot/snapshot.test.ts)
Added 13 new test cases:
patch returns absolute paths and revert handles them correctly
revert restores modified file content correctly
revert handles deeply nested files with absolute paths
revert handles files with spaces in names
revert handles multiple sequential patches correctly
revert with patches array containing multiple items
revert deletes file created after snapshot
revert restores deleted file
patch files relative path computation is correct
revert works when process cwd differs from worktree
revert skips files outside worktree
revert skips patch with empty relativePath
revert creates parent directory when using fallback
Testing
All 52 snapshot tests pass (39 existing + 13 new)
Typecheck passes

Root cause: Snapshot.patch() returns absolute paths in files array, but git checkout expects paths relative to worktree, causing checkout to fail silently and files not being restored. Changes: - Convert absolute paths to relative using path.relative() - Add safety guards: worktree escape check, empty path check - Normalize path separators for Windows compatibility - Add fs.mkdir() before fs.writeFile() in git show fallback - Add 13 test cases covering the fix and edge cases Fixes TUI Revert not actually reverting file changes in workspace.

github-actions · 2026-01-15T08:47:01Z

Thanks for your contribution!

This PR doesn't have a linked issue. All PRs must reference an existing issue.

Please:

Open an issue describing the bug/feature (if one doesn't exist)
Add Fixes #<number> or Closes #<number> to this PR description

See CONTRIBUTING.md for details.

github-actions · 2026-01-15T08:47:22Z

The following comment was made by an LLM, it may be inaccurate:

No duplicate PRs found

yimingll · 2026-01-19T13:43:41Z

I tested this fix locally and can confirm it works correctly. The revert feature now properly restores files as expected. Would appreciate seeing this merged soon. 👍

@Twisted928

Based on PR anomalyco#8631 by @Twisted928, this adds 8 additional test scenarios: - Unicode/Chinese character filenames (skipped - reveals bug) - Emoji filenames (skipped - reveals bug) - Symlink handling - Large file handling (1MB) - Binary file handling - Concurrent operations - Empty file handling - Restore to empty state Co-authored-by: Twisted <46923858+Twisted928@users.noreply.github.com>

Twisted928 · 2026-01-27T02:47:02Z

@rekram1-node review pr plz

Root cause: Snapshot.patch() returns absolute paths in files array, but git checkout expects paths relative to worktree, causing checkout to fail silently and files not being restored. Changes: - Convert absolute paths to relative using path.relative() - Add safety guards: worktree escape check, empty path check - Normalize path separators for Windows compatibility - Add fs.mkdir() before fs.writeFile() in git show fallback - Add 13 test cases covering the fix and edge cases Fixes TUI Revert not actually reverting file changes in workspace. Based on PR anomalyco#8631 by Twisted928

rekram1-node · 2026-01-27T20:35:14Z

/review

github-actions · 2026-01-27T20:36:37Z

lgtm

rekram1-node · 2026-01-28T07:21:36Z

I think this all makes sense, will review more tmr

Root cause: Snapshot.patch() returns absolute paths in files array, but git checkout expects paths relative to worktree, causing checkout to fail silently and files not being restored. Changes: - Convert absolute paths to relative using path.relative() - Add safety guards: worktree escape check, empty path check - Normalize path separators for Windows compatibility - Add fs.mkdir() before fs.writeFile() in git show fallback - Add 13 test cases covering the fix and edge cases Fixes TUI Revert not actually reverting file changes in workspace. Based on PR anomalyco#8631 by Twisted928

rekram1-node · 2026-01-29T18:18:33Z

Looks like a test is failing now?

ENOENT: no such file or directory, open '/tmp/opencode-test-9o219frjhtu/文件.txt'
path: "/tmp/opencode-test-9o219frjhtu/文件.txt",
syscall: "open",
errno: -2,
code: "ENOENT"

(fail) unicode filenames modification and restore [68.14ms]

rekram1-node · 2026-01-29T19:25:26Z

packages/opencode/test/snapshot/snapshot.test.ts

+  })
+})
+
+test("revert restores modified file content correctly", async () => {


These tests don't really test anything it seems?

They still pass with the old code

Root cause: Snapshot.patch() returns absolute paths in files array, but git checkout expects paths relative to worktree, causing checkout to fail silently and files not being restored. Changes: - Convert absolute paths to relative using path.relative() - Add safety guards: worktree escape check, empty path check - Normalize path separators for Windows compatibility - Add fs.mkdir() before fs.writeFile() in git show fallback - Add 13 test cases covering the fix and edge cases Fixes TUI Revert not actually reverting file changes in workspace. Based on PR anomalyco#8631 by Twisted928

…ript - Add list of upstream PRs (anomalyco#5547, anomalyco#8631, anomalyco#9658, anomalyco#10796) that are open but merged in this fork - Update sync script to check if these PRs are merged in upstream before rebasing, preventing duplicate commits

github-actions · 2026-03-31T06:25:09Z

Closing this pull request because it has had no updates for more than 60 days. If you plan to continue working on it, feel free to reopen or open a new PR.

github-actions bot added the needs:issue label Jan 15, 2026

Twisted928 mentioned this pull request Jan 15, 2026

i input /undo just undo conversation，not file #8098

Closed

github-actions bot removed the needs:issue label Jan 15, 2026

yimingll mentioned this pull request Jan 19, 2026

test(snapshot): add extended test cases for revert functionality #9408

Closed

Twisted928 added 2 commits January 22, 2026 15:34

Merge branch 'dev' into fix/snapshot-revert-absolute-path

cb77a26

Merge branch 'dev' into fix/snapshot-revert-absolute-path

bbebca5

Twisted928 and others added 2 commits January 28, 2026 10:56

Merge branch 'dev' into fix/snapshot-revert-absolute-path

295c4ce

Merge branch 'dev' into fix/snapshot-revert-absolute-path

54ab97f

rekram1-node reviewed Jan 29, 2026

View reviewed changes

thdxr force-pushed the dev branch from cbab81f to 2d3c7a0 Compare January 30, 2026 04:50

opencode-agent bot force-pushed the dev branch from 00637c0 to 71e0ba2 Compare January 30, 2026 14:32

thdxr force-pushed the dev branch 2 times, most recently from f802701 to f1ae801 Compare January 30, 2026 14:36

thdxr force-pushed the dev branch from f1ae801 to 08fa7f7 Compare January 30, 2026 14:37

github-actions bot closed this Mar 31, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(snapshot): fix revert not restoring files due to absolute path issue#8631

fix(snapshot): fix revert not restoring files due to absolute path issue#8631
Twisted928 wants to merge 5 commits intoanomalyco:devfrom
Twisted928:fix/snapshot-revert-absolute-path

Twisted928 commented Jan 15, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

yimingll commented Jan 19, 2026

Uh oh!

Twisted928 commented Jan 27, 2026

Uh oh!

rekram1-node commented Jan 27, 2026

Uh oh!

github-actions bot commented Jan 27, 2026

Uh oh!

rekram1-node commented Jan 28, 2026

Uh oh!

rekram1-node commented Jan 29, 2026

Uh oh!

rekram1-node Jan 29, 2026

Uh oh!

github-actions bot commented Mar 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Twisted928 commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

yimingll commented Jan 19, 2026

Uh oh!

Twisted928 commented Jan 27, 2026

Uh oh!

rekram1-node commented Jan 27, 2026

Uh oh!

github-actions bot commented Jan 27, 2026

Uh oh!

rekram1-node commented Jan 28, 2026

Uh oh!

rekram1-node commented Jan 29, 2026

Uh oh!

rekram1-node Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Twisted928 commented Jan 15, 2026 •

edited

Loading