dsh-rewind-plugin 0.1.9 → 0.2.0

package/lib/index.js

@@ -2,101 +2,6 @@
 import { createAssistantMessage } from "@deepseek-ai/dsh-llm";
 import { unlink } from "node:fs/promises";
 
-// src/session-cwd.ts
-import { canonicalPath } from "@deepseek-ai/dsh-sandbox";
-var PARENT_PATH_SEGMENT = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
-function sessionCwd(cwd, requestedPath) {
-  if (cwd === void 0 || !PARENT_PATH_SEGMENT.test(cwd) && !PARENT_PATH_SEGMENT.test(requestedPath)) return cwd;
-  return canonicalPath(cwd);
-}
-function execSessionCwd(exec, requestedPath) {
-  return sessionCwd(exec.agent?.session.header.cwd, requestedPath);
-}
-
-// src/ledger.ts
-var MAX_LEDGER_ENTRIES = 2e3;
-var RewindLedger = class {
-  entries = [];
-  /** Record one committed mutation, dropping the oldest entry when over the cap. */
-  record(entry) {
-    this.entries.push(entry);
-    if (this.entries.length > MAX_LEDGER_ENTRIES) this.entries.shift();
-  }
-  /**
-   * All entries anchored at or after `targetSeq`, newest first. The boundary
-   * is inclusive: rewinding to a message also reverts the changes its own
-   * turn caused (the rewind cut removes that turn's assistant response and
-   * tool calls), so only changes anchored at earlier messages survive.
-   */
-  changesAfter(targetSeq) {
-    const after = [];
-    for (let i = this.entries.length - 1; i >= 0; i--) {
-      const entry = this.entries[i];
-      if (entry.anchorSeq >= targetSeq) after.push(entry);
-    }
-    return after;
-  }
-  /**
-   * Unique per-file impact for preview. A file whose earliest affected change
-   * created it (`before === undefined`) is deleted on restore; any other file
-   * is written back to its pre-target content.
-   */
-  impactsAfter(targetSeq) {
-    const byPath = /* @__PURE__ */ new Map();
-    for (const entry of this.entries) {
-      if (entry.anchorSeq < targetSeq) continue;
-      if (byPath.has(entry.path)) continue;
-      byPath.set(entry.path, { path: entry.path, action: entry.before === void 0 ? "delete" : "restore" });
-    }
-    return [...byPath.values()];
-  }
-  /**
-   * Reverse every change anchored at or after `targetSeq`. Each entry writes
-   * its pre-change content back; a file that did not exist before the target
-   * is deleted instead. Failures are collected per file and never abort the pass.
-   * @param fs - the filesystem service (resolve/readText/writeText/processPath).
-   * @param deleteFile - backend-appropriate file deletion by process path.
-   * @param targetSeq - the rewind target; only later changes are reverted.
-   * @param options - session workspace cwd (relative ledger paths resolve
-   *   against it, mirroring the fs tools) and an optional abort signal.
-   */
-  async restoreAfter(fs, deleteFile, targetSeq, options = {}) {
-    const restored = [];
-    const deleted = [];
-    const failed = [];
-    const restoredSet = /* @__PURE__ */ new Set();
-    const deletedSet = /* @__PURE__ */ new Set();
-    for (const entry of this.changesAfter(targetSeq)) {
-      try {
-        const cwd = sessionCwd(options.cwd, entry.path);
-        const target = await fs.resolve(entry.path, {
-          ...cwd !== void 0 ? { cwd } : {},
-          signal: options.signal
-        });
-        if (entry.before === void 0) {
-          await deleteFile(fs.processPath(target));
-          if (!deletedSet.has(entry.path)) {
-            deletedSet.add(entry.path);
-            deleted.push(entry.path);
-          }
-        } else {
-          await fs.writeText(target, entry.before, void 0, options.signal);
-          if (!restoredSet.has(entry.path)) {
-            restoredSet.add(entry.path);
-            restored.push(entry.path);
-          }
-        }
-      } catch (error) {
-        failed.push({
-          path: entry.path,
-          message: error instanceof Error ? error.message : String(error)
-        });
-      }
-    }
-    return { restored, deleted, failed };
-  }
-};
-
 // src/rewind.ts
 var RewindError = class extends Error {
   constructor(code, message) {
@@ -178,13 +83,181 @@ function planRewind(events, surface, target) {
     surfaceEnd: shadowedSeqs[shadowedSeqs.length - 1]
   };
 }
-function formatCandidate(candidate) {
-  const time = new Date(candidate.time);
-  const hh = String(time.getHours()).padStart(2, "0");
-  const mm = String(time.getMinutes()).padStart(2, "0");
-  return `${candidate.index}. ${hh}:${mm} ${candidate.preview || "(\u65E0\u6587\u672C)"}`;
+
+// src/session-cwd.ts
+import { canonicalPath } from "@deepseek-ai/dsh-sandbox";
+var PARENT_PATH_SEGMENT = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
+function sessionCwd(cwd, requestedPath) {
+  if (cwd === void 0 || !PARENT_PATH_SEGMENT.test(cwd) && !PARENT_PATH_SEGMENT.test(requestedPath)) return cwd;
+  return canonicalPath(cwd);
+}
+function execSessionCwd(exec, requestedPath) {
+  return sessionCwd(exec.agent?.session.header.cwd, requestedPath);
 }
 
+// src/snapshot.ts
+import { mkdir, readFile, readdir, rm, writeFile, lstat } from "node:fs/promises";
+import { join } from "node:path";
+import { homedir } from "node:os";
+var DEFAULT_SNAPSHOT_ROOT = join(homedir(), ".dsh", "rewind-snapshots");
+var SNAPSHOT_ROOT_ENV = "DSH_REWIND_SNAPSHOT_DIR";
+var MAX_ANCHOR_GROUPS = 100;
+function safeFileId(callId) {
+  return callId.replace(/[^a-zA-Z0-9._-]/g, "_");
+}
+async function readEntry(file) {
+  try {
+    const parsed = JSON.parse(await readFile(file, "utf8"));
+    if (typeof parsed.path !== "string" || typeof parsed.anchorSeq !== "number") return void 0;
+    return {
+      callId: String(parsed.callId ?? ""),
+      anchorSeq: parsed.anchorSeq,
+      path: parsed.path,
+      before: typeof parsed.before === "string" ? parsed.before : null,
+      time: typeof parsed.time === "number" ? parsed.time : 0
+    };
+  } catch {
+    return void 0;
+  }
+}
+async function isSymbolicLink(path) {
+  try {
+    return (await lstat(path)).isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
+var SnapshotStore = class {
+  constructor(root = process.env[SNAPSHOT_ROOT_ENV] ?? DEFAULT_SNAPSHOT_ROOT) {
+    this.root = root;
+  }
+  root;
+  /** Absolute path of one anchor group directory. */
+  anchorDir(sessionId, anchorSeq) {
+    return join(this.root, sessionId, String(anchorSeq));
+  }
+  /** Commit one before-backup under its turn's anchor group. */
+  async recordEntry(sessionId, entry) {
+    const dir = this.anchorDir(sessionId, entry.anchorSeq);
+    await mkdir(dir, { recursive: true });
+    const committed = { ...entry, time: Date.now() };
+    await writeFile(join(dir, `${safeFileId(entry.callId)}.json`), JSON.stringify(committed), "utf8");
+    await this.prune(sessionId);
+  }
+  /**
+   * All committed entries anchored at or after `targetSeq`, newest first (for
+   * preview ordering). The boundary is inclusive: rewinding to a message also
+   * reverts the changes its own turn caused (the rewind cut removes that
+   * turn's assistant response and tool calls), so only entries anchored at
+   * earlier messages survive.
+   */
+  async entriesAfter(sessionId, targetSeq) {
+    const sessionDir = join(this.root, sessionId);
+    let names;
+    try {
+      names = await readdir(sessionDir);
+    } catch (error) {
+      if (error.code === "ENOENT") return [];
+      throw error;
+    }
+    const entries = [];
+    for (const name2 of names) {
+      const anchorSeq = Number(name2);
+      if (!Number.isSafeInteger(anchorSeq) || anchorSeq < targetSeq) continue;
+      const files = await readdir(this.anchorDir(sessionId, anchorSeq)).catch(() => []);
+      for (const file of files) {
+        if (!file.endsWith(".json")) continue;
+        const entry = await readEntry(join(this.anchorDir(sessionId, anchorSeq), file));
+        if (entry !== void 0) entries.push(entry);
+      }
+    }
+    return entries.sort((a, b) => b.anchorSeq - a.anchorSeq || b.time - a.time);
+  }
+  /** Per-file restore impact for the earliest entry at/after the target. */
+  async impactsAfter(sessionId, targetSeq) {
+    const earliest = /* @__PURE__ */ new Map();
+    for (const entry of await this.entriesAfter(sessionId, targetSeq)) {
+      const current = earliest.get(entry.path);
+      if (current === void 0 || entry.anchorSeq < current.anchorSeq || entry.anchorSeq === current.anchorSeq && entry.time < current.time) {
+        earliest.set(entry.path, entry);
+      }
+    }
+    return [...earliest.values()].sort((a, b) => a.path.localeCompare(b.path)).map((entry) => ({
+      path: entry.path,
+      action: entry.before === null ? "delete" : "restore"
+    }));
+  }
+  /**
+   * Restore the workspace to the target message's checkpoint: for every path
+   * with entries anchored at or after it, apply the EARLIEST entry — write the
+   * before content back, or delete the file when it was created after the
+   * target. Symbolic links are skipped (reported, never written through).
+   * Failures are per-file and never abort the pass.
+   */
+  async restoreAfter(sessionId, targetSeq, deleteFile) {
+    const restored = [];
+    const deleted = [];
+    const skipped = [];
+    const failed = [];
+    const earliest = /* @__PURE__ */ new Map();
+    for (const entry of await this.entriesAfter(sessionId, targetSeq)) {
+      const current = earliest.get(entry.path);
+      if (current === void 0 || entry.anchorSeq < current.anchorSeq || entry.anchorSeq === current.anchorSeq && entry.time < current.time) {
+        earliest.set(entry.path, entry);
+      }
+    }
+    for (const entry of earliest.values()) {
+      try {
+        if (await isSymbolicLink(entry.path)) {
+          skipped.push(entry.path);
+          continue;
+        }
+        if (entry.before === null) {
+          await deleteFile(entry.path);
+          deleted.push(entry.path);
+        } else {
+          await writeFile(entry.path, entry.before, "utf8");
+          restored.push(entry.path);
+        }
+      } catch (error) {
+        failed.push({ path: entry.path, message: error instanceof Error ? error.message : String(error) });
+      }
+    }
+    return { restored, deleted, skipped, failed };
+  }
+  /**
+   * Drop the session's oldest anchor groups beyond `keep` (default
+   * {@link MAX_ANCHOR_GROUPS}), deleting their whole directories.
+   */
+  async prune(sessionId, keep = MAX_ANCHOR_GROUPS) {
+    const sessionDir = join(this.root, sessionId);
+    let names;
+    try {
+      names = await readdir(sessionDir);
+    } catch (error) {
+      if (error.code === "ENOENT") return;
+      throw error;
+    }
+    const seqs = names.map(Number).filter((seq) => Number.isSafeInteger(seq)).sort((a, b) => a - b);
+    const excess = seqs.length - keep;
+    if (excess <= 0) return;
+    for (const seq of seqs.slice(0, excess)) {
+      await rm(this.anchorDir(sessionId, seq), { recursive: true, force: true });
+    }
+  }
+  /** True when a path exists on disk (used by tests and diagnostics). */
+  async exists(path) {
+    const { stat } = await import("node:fs/promises");
+    try {
+      await stat(path);
+      return true;
+    } catch (error) {
+      if (error.code === "ENOENT") return false;
+      throw error;
+    }
+  }
+};
+
 // src/index.ts
 var name = "dsh-rewind";
 var inject = ["commands", "tools"];
@@ -192,11 +265,8 @@ var TRACKED_TOOLS = /* @__PURE__ */ new Set(["write", "edit", "str_replace_edito
 var MUTATING_EDITOR_COMMANDS = /* @__PURE__ */ new Set(["create", "str_replace", "insert"]);
 var USAGE = [
   "Usage:",
-  "  /rewind                        list recent user messages to rewind to",
-  "  /rewind <\u5E8F\u53F7|@seq>             choose a mode for that message",
-  "  /rewind <\u5E8F\u53F7|@seq> chat        rewind the conversation only",
-  "  /rewind <\u5E8F\u53F7|@seq> both        rewind conversation and restore files",
-  "  /rewind preview <\u76EE\u6807>           show the impact list without executing"
+  "  /rewind                        \u64A4\u56DE\u6700\u8FD1\u4E00\u6761\u7528\u6237\u6D88\u606F\uFF08\u4E0D\u63A5\u53D7\u53C2\u6570\uFF09",
+  "  \u56DE\u9000\u5230\u66F4\u65E9\u7684\u6D88\u606F\u8BF7\u4F7F\u7528\u8BE5\u6D88\u606F\u65C1\u7684\u300C\u56DE\u9000\u300D\u6309\u94AE"
 ].join("\n");
 function mutationPathOf(exec) {
   const args = exec.arguments;
@@ -243,9 +313,9 @@ async function captureBefore(fs, exec, pending) {
   const target = await resolveTarget(fs, path, cwd, exec.signal);
   if (target === void 0) return;
   const before = await readTextOrUndefined(fs, target, exec.signal);
-  pending.set(`${exec.agent?.id ?? "anon"}:${exec.callId}`, { path: target.displayPath, cwd, before });
+  pending.set(`${exec.agent?.id ?? "anon"}:${exec.callId}`, { path: target.displayPath, before });
 }
-async function commitEntry(fs, ledgerFor, pending, exec, result) {
+async function commitEntry(store, pending, exec, result) {
   const key = `${exec.agent?.id ?? "anon"}:${exec.callId}`;
   const capture = pending.get(key);
   if (capture === void 0) return;
@@ -255,20 +325,11 @@ async function commitEntry(fs, ledgerFor, pending, exec, result) {
   if (agent === void 0) return;
   const anchorSeq = anchorSeqOf(agent.session);
   if (anchorSeq === void 0) return;
-  const target = await resolveTarget(fs, capture.path, capture.cwd, exec.signal);
-  if (target === void 0) return;
-  let after;
-  try {
-    after = await readTextOrUndefined(fs, target, exec.signal) ?? "";
-  } catch {
-    return;
-  }
-  ledgerFor(agent.session).record({
-    toolName: exec.name,
+  await store.recordEntry(agent.session.id, {
+    callId: exec.callId,
     anchorSeq,
     path: capture.path,
-    before: capture.before,
-    after
+    before: capture.before ?? null
   });
 }
 function buildMarker() {
@@ -299,7 +360,7 @@ function formatPlan(plan, files) {
       lines.push(`  ${file.action === "restore" ? "\u8FD8\u539F" : "\u5220\u9664"} ${file.path}`);
     }
   } else {
-    lines.push("\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u53F0\u8D26\u8BB0\u5F55\u7684\u5199\u7C7B\u53D8\u66F4\uFF0C\u65E0\u9700\u8FD8\u539F\u6587\u4EF6\u3002");
+    lines.push("\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u5FEB\u7167\u8BB0\u5F55\u7684\u5199\u7C7B\u53D8\u66F4\uFF0C\u65E0\u9700\u8FD8\u539F\u6587\u4EF6\u3002");
   }
   return lines.join("\n");
 }
@@ -322,7 +383,7 @@ async function waitForAgentIdle(agent, signal, timeoutMs = 15e3) {
   }
   return true;
 }
-async function executeRewind(ctx, ledger, invocation, rawTarget, mode) {
+async function executeRewind(ctx, store, invocation, rawTarget, mode) {
   const { agent } = invocation;
   if (agent.status !== "idle") {
     agent.cancel({ kind: "user" });
@@ -352,18 +413,13 @@ async function executeRewind(ctx, ledger, invocation, rawTarget, mode) {
   }
   let restore = "";
   if (mode === "both") {
-    const fs = ctx.get("fs", false);
-    if (fs === void 0) {
-      restore = "\uFF1B\u672A\u627E\u5230\u6587\u4EF6\u7CFB\u7EDF\u670D\u52A1\uFF0C\u672A\u8FD8\u539F\u6587\u4EF6\uFF08\u53EF\u4EC5\u7528 chat \u6A21\u5F0F\u56DE\u9000\u5BF9\u8BDD\uFF09";
-    } else {
-      const outcome = await ledger.restoreAfter(fs, (processPath) => unlink(processPath), plan.targetSeq, {
-        // Relative ledger paths resolve against the session workspace, exactly
-        // as the fs tools resolve them (per-entry in src/ledger.ts).
-        cwd: agent.session.header.cwd,
-        signal: invocation.signal
-      });
-      restore = `\uFF1B\u8FD8\u539F ${outcome.restored.length} \u4E2A\u6587\u4EF6\u3001\u5220\u9664 ${outcome.deleted.length} \u4E2A\u6587\u4EF6${renderFailures(outcome.failed)}`;
-    }
+    const outcome = await store.restoreAfter(agent.session.id, plan.targetSeq, (path) => unlink(path));
+    const parts = [];
+    if (outcome.restored.length > 0) parts.push(`\u8FD8\u539F ${outcome.restored.length} \u4E2A\u6587\u4EF6`);
+    if (outcome.deleted.length > 0) parts.push(`\u5220\u9664 ${outcome.deleted.length} \u4E2A\u6587\u4EF6`);
+    if (outcome.skipped.length > 0) parts.push(`\u8DF3\u8FC7 ${outcome.skipped.length} \u4E2A\u7B26\u53F7\u94FE\u63A5`);
+    restore = parts.length > 0 ? `\uFF1B${parts.join("\u3001")}` : "\uFF1B\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u53EF\u8FD8\u539F\u7684\u5199\u7C7B\u53D8\u66F4";
+    restore += renderFailures(outcome.failed);
   }
   return {
     kind: "success",
@@ -383,21 +439,15 @@ function rewindErrorResult(error) {
   }
   throw error;
 }
-async function handleRewind(ctx, ledger, invocation) {
+async function handleRewind(ctx, store, invocation) {
   const session = invocation.agent.session;
   const input = invocation.rawInput.trim();
   if (input === "") {
-    const candidates = listRewindCandidates(session.events, session.surface.nodes);
+    const candidates = listRewindCandidates(session.events, session.surface.nodes, 1);
     if (candidates.length === 0) {
       return { kind: "error", text: "\u5F53\u524D\u4F1A\u8BDD\u8FD8\u6CA1\u6709\u53EF\u56DE\u9000\u7684\u7528\u6237\u6D88\u606F\u3002" };
     }
-    return {
-      kind: "success",
-      text: `\u9009\u62E9\u8981\u56DE\u9000\u5230\u7684\u7528\u6237\u6D88\u606F\uFF08\u6700\u8FD1\u5728\u4E0A\uFF09\uFF1A
-${candidates.map(formatCandidate).join("\n")}
-
-\u7EE7\u7EED\uFF1A/rewind <\u5E8F\u53F7|@seq>\uFF0C\u6216\u76F4\u63A5 /rewind <\u5E8F\u53F7|@seq> chat|both \u6267\u884C\u3002`
-    };
+    return executeRewind(ctx, store, invocation, `@${candidates[0].seq}`, "chat");
   }
   const parts = input.split(/\s+/);
   if (parts[0] === "preview") {
@@ -409,7 +459,7 @@ ${candidates.map(formatCandidate).join("\n")}
     } catch (error) {
       return rewindErrorResult(error);
     }
-    const impacts = ledger.impactsAfter(plan.targetSeq);
+    const impacts = await store.impactsAfter(session.id, plan.targetSeq);
     return { kind: "success", text: formatPlan(plan, impacts) };
   }
   const target = parts[0];
@@ -427,24 +477,16 @@ ${candidates.map(formatCandidate).join("\n")}
   /rewind ${target} both  \u56DE\u9000\u5BF9\u8BDD\u5E76\u8FD8\u539F\u6587\u4EF6`
     };
   }
-  return executeRewind(ctx, ledger, invocation, target, mode);
+  return executeRewind(ctx, store, invocation, target, mode);
 }
-function apply(ctx) {
-  const ledgers = /* @__PURE__ */ new Map();
-  const ledgerFor = (session) => {
-    let ledger = ledgers.get(session.id);
-    if (ledger === void 0) {
-      ledger = new RewindLedger();
-      ledgers.set(session.id, ledger);
-    }
-    return ledger;
-  };
+function apply(ctx, config) {
+  const store = new SnapshotStore(config?.snapshotDir);
   const pending = /* @__PURE__ */ new Map();
   ctx.effect(function* () {
     yield ctx.commands.register({
       name: "rewind",
       description: "\u5728\u540C\u7A97\u53E3\u5185\u5C06\u5BF9\u8BDD\u56DE\u9000\u5230\u66F4\u65E9\u7684\u7528\u6237\u6D88\u606F\uFF08\u53EF\u540C\u65F6\u8FD8\u539F\u6587\u4EF6\uFF09",
-      handler: (invocation) => handleRewind(ctx, ledgerFor(invocation.agent.session), invocation)
+      handler: (invocation) => handleRewind(ctx, store, invocation)
     });
   }, "dsh-rewind command");
   ctx.inject(["fs"], (scope) => {
@@ -459,15 +501,16 @@ function apply(ctx) {
     });
     scope.on("tools/post-execute", async (exec, result, next) => {
       try {
-        await commitEntry(fs, ledgerFor, pending, exec, result);
+        await commitEntry(store, pending, exec, result);
       } catch (error) {
-        ctx.logger.warn(`[dsh-rewind] ledger commit failed for ${exec.name}: ${error instanceof Error ? error.message : String(error)}`);
+        ctx.logger.warn(`[dsh-rewind] checkpoint commit failed for ${exec.name}: ${error instanceof Error ? error.message : String(error)}`);
       }
       return next();
     });
   });
 }
 export {
+  SnapshotStore,
   apply,
   inject,
   name

package/lib/types/client/index.d.ts

@@ -16,6 +16,11 @@
  * before executing. Execution always goes through `session.command(...)`, the
  * same host path the `/rewind` command uses.
  *
+ * Manual composer input of `/rewind` is deliberately blocked (the guard
+ * below): the command exists only as the per-message button's internal
+ * channel, so any `/rewind` line typed by hand — bare or with arguments — is
+ * stopped with a hint pointing at the button.
+ *
  * @module dsh-rewind/client
  */
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';

package/lib/types/client/locales.d.ts

@@ -15,6 +15,7 @@ export declare const zh: {
     'popover.impact.none': string;
     'popover.confirm': string;
     'popover.back': string;
+    'guard.hint': string;
 };
 /** The rewind namespace key union. */
 export type RewindKey = keyof typeof zh;
@@ -40,4 +41,5 @@ export declare const en: {
     'popover.impact.none': string;
     'popover.confirm': string;
     'popover.back': string;
+    'guard.hint': string;
 };

package/lib/types/client/styles.d.ts

@@ -20,8 +20,9 @@ export declare const CLASS: {
     readonly popoverActions: 'dsh-rewind-popover-actions';
     readonly popoverPrimary: 'dsh-rewind-popover-primary';
     readonly popoverGhost: 'dsh-rewind-popover-ghost';
+    readonly guardHint: 'dsh-rewind-guard-hint';
 };
 /** The ↶ glyph, drawn inline so the bundle stays dependency-free. */
 export declare const REWIND_ICON_SVG: string;
 /** One injected stylesheet (scoped under `.dsh-rewind-*`). */
-export declare const STYLE = "\n.dsh-rewind-btn {\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 28px;\n  height: 28px;\n  padding: 6px;\n  border: none;\n  border-radius: 28px;\n  background: transparent;\n  color: var(--dsw-alias-label-tertiary);\n  cursor: pointer;\n}\n.dsh-rewind-btn:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n  color: var(--dsw-alias-label-secondary);\n}\n\n.dsh-rewind-popover {\n  position: fixed;\n  z-index: 1000;\n  width: 288px;\n  padding: 12px;\n  border-radius: 12px;\n  background: var(--dsw-specific-surface-1, var(--dsw-alias-surface-1, #1f2127));\n  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.32);\n  font-size: 14px;\n  line-height: 20px;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-popover-title {\n  font-size: 14px;\n  font-weight: 600;\n  line-height: 20px;\n}\n.dsh-rewind-popover-target {\n  margin: 4px 0 10px;\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n  word-break: break-all;\n}\n.dsh-rewind-popover-option {\n  display: flex;\n  flex-direction: column;\n  gap: 2px;\n  width: 100%;\n  margin: 0 0 6px;\n  padding: 8px 10px;\n  border: 1px solid transparent;\n  border-radius: 8px;\n  background: transparent;\n  color: inherit;\n  font: inherit;\n  text-align: left;\n  cursor: pointer;\n}\n.dsh-rewind-popover-option:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n.dsh-rewind-popover-option-label {\n  font-weight: 500;\n}\n.dsh-rewind-popover-option-hint {\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-impact {\n  margin: 4px 0 10px;\n  padding: 8px 10px;\n  border-radius: 8px;\n  background: var(--dsw-alias-interactive-bg-hover);\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-secondary);\n  white-space: pre-wrap;\n  max-height: 160px;\n  overflow: auto;\n}\n.dsh-rewind-popover-actions {\n  display: flex;\n  justify-content: flex-end;\n  gap: 8px;\n}\n.dsh-rewind-popover-primary,\n.dsh-rewind-popover-ghost {\n  padding: 5px 12px;\n  border: none;\n  border-radius: 8px;\n  font: inherit;\n  font-size: 13px;\n  line-height: 18px;\n  cursor: pointer;\n}\n.dsh-rewind-popover-primary {\n  background: var(--dsw-alias-accent, var(--dsw-accent, #5b8cff));\n  color: var(--dsw-alias-on-accent, #fff);\n}\n.dsh-rewind-popover-primary:disabled {\n  opacity: 0.5;\n  cursor: default;\n}\n.dsh-rewind-popover-ghost {\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n}\n.dsh-rewind-popover-ghost:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n";
+export declare const STYLE = "\n.dsh-rewind-btn {\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 28px;\n  height: 28px;\n  padding: 6px;\n  border: none;\n  border-radius: 28px;\n  background: transparent;\n  color: var(--dsw-alias-label-tertiary);\n  cursor: pointer;\n}\n.dsh-rewind-btn:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n  color: var(--dsw-alias-label-secondary);\n}\n\n.dsh-rewind-popover {\n  position: fixed;\n  z-index: 1000;\n  width: 288px;\n  padding: 12px;\n  border-radius: 12px;\n  background: var(--dsw-specific-surface-1, var(--dsw-alias-surface-1, #1f2127));\n  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.32);\n  font-size: 14px;\n  line-height: 20px;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-popover-title {\n  font-size: 14px;\n  font-weight: 600;\n  line-height: 20px;\n}\n.dsh-rewind-popover-target {\n  margin: 4px 0 10px;\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n  word-break: break-all;\n}\n.dsh-rewind-popover-option {\n  display: flex;\n  flex-direction: column;\n  gap: 2px;\n  width: 100%;\n  margin: 0 0 6px;\n  padding: 8px 10px;\n  border: 1px solid transparent;\n  border-radius: 8px;\n  background: transparent;\n  color: inherit;\n  font: inherit;\n  text-align: left;\n  cursor: pointer;\n}\n.dsh-rewind-popover-option:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n.dsh-rewind-popover-option-label {\n  font-weight: 500;\n}\n.dsh-rewind-popover-option-hint {\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-impact {\n  margin: 4px 0 10px;\n  padding: 8px 10px;\n  border-radius: 8px;\n  background: var(--dsw-alias-interactive-bg-hover);\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-secondary);\n  white-space: pre-wrap;\n  max-height: 160px;\n  overflow: auto;\n}\n.dsh-rewind-popover-actions {\n  display: flex;\n  justify-content: flex-end;\n  gap: 8px;\n}\n.dsh-rewind-popover-primary,\n.dsh-rewind-popover-ghost {\n  padding: 5px 12px;\n  border: none;\n  border-radius: 8px;\n  font: inherit;\n  font-size: 13px;\n  line-height: 18px;\n  cursor: pointer;\n}\n.dsh-rewind-popover-primary {\n  background: var(--dsw-alias-accent, var(--dsw-accent, #5b8cff));\n  color: var(--dsw-alias-on-accent, #fff);\n}\n.dsh-rewind-popover-primary:disabled {\n  opacity: 0.5;\n  cursor: default;\n}\n.dsh-rewind-popover-ghost {\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n}\n.dsh-rewind-popover-ghost:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.dsh-rewind-guard-hint {\n  position: fixed;\n  z-index: 1000;\n  max-width: min(440px, calc(100vw - 24px));\n  padding: 8px 12px;\n  border-radius: 10px;\n  background: var(--dsw-specific-surface-1, var(--dsw-alias-surface-1, #1f2127));\n  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.32);\n  font-size: 13px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-primary);\n  pointer-events: none;\n}\n";

package/lib/types/index.d.ts

@@ -1,35 +1,58 @@
 /**
- * dsh-rewind host half: the `/rewind` command and the write-class change
- * ledger, composed as one dual-face bundle row (the browser half lives in
- * `src/client/`).
+ * dsh-rewind host half: the `/rewind` command and the Claude-Code-style
+ * checkpoint store, composed as one dual-face bundle row (the browser half
+ * lives in `src/client/`).
  *
  * Rewind mechanism: planning is pure (`src/rewind.ts`); execution appends a
- * marker `user/message` into the session log whose `surfaceOp` replaces every
- * surface node after the target message with the marker. The append-only log
- * (and the rendered transcript) is untouched — only the model-visible surface
- * is cut, so the next request derives its context from the target onward.
- * Mode `both` additionally reverses every ledger-recorded file change that
- * followed the target.
+ * marker `assistant/message` into the session log whose `surfaceOp` replaces
+ * every surface node after the target message with the marker. The
+ * append-only log (and the rendered transcript) is untouched — only the
+ * model-visible surface is cut, so the next request derives its context from
+ * the target onward.
+ *
+ * File restore (mode `both`) follows Claude Code's checkpointing: the plugin
+ * backs up each tracked write-class edit BEFORE it happens (at the
+ * `tools/execute` around-dispatch stage, so an approval short-circuit cannot
+ * skip the capture and a denied call never records), commits the backup under
+ * the turn's anchor message seq at `tools/post-execute`, and a rewind to
+ * message N restores every backup anchored at or after N — modified files are
+ * written back to their pre-edit content, files created after N are deleted.
+ * Backups persist on disk under the dsh data directory (newest 100 message
+ * groups per session), so restores work after a host restart, and they
+ * read/write the real file system with plain `node:fs` — independent of the
+ * fs service. See `src/snapshot.ts`.
  *
  * @module dsh-rewind
  */
 import type { Context } from '@deepseek-ai/cordis';
+export { SnapshotStore } from './snapshot.ts';
+export type { CheckpointEntry, FileImpact, RestoreOutcome } from './snapshot.ts';
 export declare const name = "dsh-rewind";
 export declare const inject: string[];
+/** Plugin config: optional override of the checkpoint store root. */
+export interface RewindConfig {
+    /** Checkpoint store root (defaults to `~/.dsh/rewind-snapshots`). */
+    readonly snapshotDir?: string;
+}
 /**
- * Register the `/rewind` command and the tools-pipeline ledger hooks.
+ * Register the `/rewind` command and the checkpoint pipeline (before-capture
+ * at `tools/execute`, disk commit at `tools/post-execute`).
  *
- * The command is fs-independent and registers immediately. The ledger needs
- * `fs`, so its hooks mount through a dynamic `ctx.inject(['fs'])` — they take
- * effect whenever the fs service becomes available (and never fail the
- * plugin's load when a deployment has no fs).
+ * The command is fs-independent and registers immediately. The checkpoint
+ * pipeline needs `fs` to resolve tracked paths to their real display paths,
+ * so it mounts through a dynamic `ctx.inject(['fs'])` — it takes effect
+ * whenever the fs service becomes available (and never fails the plugin's
+ * load when a deployment has no fs; without it, no entries are recorded and
+ * `both` restores report "no tracked changes").
  *
  * Capture runs in `tools/execute` (the around-dispatch stage), NOT in
  * `tools/pre-execute`: a pre-execute `{ kind: 'ask' }` short-circuit from
  * another plugin (e.g. dsh-edit-approval) skips later pre-execute listeners,
  * and a denied call never dispatches — so approved calls are still captured,
- * denied calls never leave a pending entry behind.
+ * denied calls never leave a pending entry behind. Entries are committed to
+ * disk at `tools/post-execute` under the turn's anchor message seq.
  *
  * @param ctx - context carrying `commands`, `tools`, and an optional `fs`.
+ * @param config - optional override of the checkpoint store root.
  */
-export declare function apply(ctx: Context): void;
+export declare function apply(ctx: Context, config?: RewindConfig): void;

package/lib/types/session-cwd.d.ts

@@ -1,5 +1,5 @@
 /**
- * Session-cwd resolution for ledger reads/restores, mirroring the fs tools'
+ * Session-cwd resolution for snapshot tracking reads, mirroring the fs tools'
  * own rule (`@deepseek-ai/dsh-tool-fs/session-cwd.ts`): relative paths
  * resolve against the calling agent's session workspace
  * (`exec.agent.session.header.cwd`), not the server's launch dir.