Skip to content

fix: edit tool error after undo #4923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AdiY00 wants to merge 5 commits into from
Closed

fix: edit tool error after undo #4923

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3c00dd
fix: edit tool error after undo
AdiY00 Nov 30, 2025
fa6a70a
Update Nix flake.lock and hashes
actions-user Nov 30, 2025
fdf61ce
Merge branch 'dev' into fix/edit-error-after-revert
AdiY00 Dec 1, 2025
41c89bb
Merge branch 'sst:dev' into fix/edit-error-after-revert
AdiY00 Dec 20, 2025
2edd892
Merge branch 'dev' into fix/edit-error-after-revert
AdiY00 Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion packages/opencode/src/session/revert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { splitWhen } from "remeda"
import { Storage } from "../storage/storage"
import { Bus } from "../bus"
import { SessionPrompt } from "./prompt"
import { FileTime } from "../file/time"
import { SessionSummary } from "./summary"

export namespace SessionRevert {
Expand Down Expand Up @@ -57,6 +58,12 @@ export namespace SessionRevert {
const session = await Session.get(input.sessionID)
revert.snapshot = session.revert?.snapshot ?? (await Snapshot.track())
await Snapshot.revert(patches)
// Update FileTime for reverted files so the edit tool doesn't see them as externally modified
for (const patch of patches) {
for (const file of patch.files) {
FileTime.read(input.sessionID, file)
}
}
if (revert.snapshot) revert.diff = await Snapshot.diff(revert.snapshot)
const rangeMessages = all.filter((msg) => msg.info.id >= revert!.messageID)
const diffs = await SessionSummary.computeDiff({ messages: rangeMessages })
Expand All @@ -82,7 +89,14 @@ export namespace SessionRevert {
SessionPrompt.assertNotBusy(input.sessionID)
const session = await Session.get(input.sessionID)
if (!session.revert) return session
if (session.revert.snapshot) await Snapshot.restore(session.revert.snapshot)
if (session.revert.snapshot) {
const patch = await Snapshot.patch(session.revert.snapshot)
await Snapshot.restore(session.revert.snapshot)
// Update FileTime for restored files so the edit tool doesn't see them as externally modified
for (const file of patch.files) {
FileTime.read(input.sessionID, file)
}
}
const next = await Session.update(input.sessionID, (draft) => {
draft.revert = undefined
})
Expand Down