diff --git a/packages/opencode/src/session/revert.ts b/packages/opencode/src/session/revert.ts
index 7afe44e2ce37..ee06338536fb 100644
--- a/packages/opencode/src/session/revert.ts
+++ b/packages/opencode/src/session/revert.ts
@@ -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 {
@@ -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 })
@@ -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
     })