dsh-rewind-plugin 0.21.0 → 0.21.1

package/lib/index.js

@@ -1,6 +1,6 @@
 // src/index.ts
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { copyFile as copyFile2, rm as rm2, stat as stat2, unlink } from "node:fs/promises";
+import { copyFile as copyFile3, rm as rm2, stat as stat3, unlink } from "node:fs/promises";
 import z from "@deepseek-ai/schemastery";
 
 // src/locales.ts
@@ -490,21 +490,20 @@ function planRewind(events, surface, target) {
 }
 
 // src/snapshot.ts
-import { createHash } from "node:crypto";
-import { chmod, copyFile, lstat, mkdir, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
-import { basename, dirname, isAbsolute, join, relative, sep } from "node:path";
+import { chmod, copyFile as copyFile2, lstat as lstat2, mkdir, readFile as readFile3, readdir as readdir2, rename as rename2, rm, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
+import { basename as basename2, dirname as dirname3, join as join3 } from "node:path";
 import { resolveDshHome } from "@deepseek-ai/dsh-home-paths";
-var SNAPSHOT_DIR_NAME = "rewind-snapshots";
+
+// src/snapshot-format.ts
+import { createHash } from "node:crypto";
+import { readFile } from "node:fs/promises";
+import { basename, dirname, join, relative, sep } from "node:path";
 var SIDECAR_SUFFIX = ".before";
 var PENDING_DIR = ".pending";
 var RESCUE_DIR = "rescue";
 var JOURNAL_PREFIX = "journal-";
 var LEGACY_JOURNAL_PREFIX = "restore-journal-";
-var PENDING_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
-var COMPARE_CHUNK_BYTES = 64 * 1024;
 var REPLACEMENT_CHAR = "\uFFFD";
-var DEFAULT_MAX_FILE_BYTES = 8 * 1024 * 1024;
-var MAX_ANCHOR_GROUPS = 100;
 var CURRENT_STORE_VERSION = 2;
 var UnknownStoreVersionError = class extends Error {
   constructor(version, source) {
@@ -522,84 +521,6 @@ function textSourceOf(text) {
 function isLinkEntry(entry) {
   return "ref" in entry;
 }
-async function sameFileBytes(aPath, bPath) {
-  const sizes = await Promise.all([stat(aPath), stat(bPath)]);
-  if (sizes[0].size !== sizes[1].size) return false;
-  const [a, b] = await Promise.all([open(aPath, "r"), open(bPath, "r")]);
-  try {
-    const aChunk = Buffer.allocUnsafe(COMPARE_CHUNK_BYTES);
-    const bChunk = Buffer.allocUnsafe(COMPARE_CHUNK_BYTES);
-    for (; ; ) {
-      const [ra, rb] = await Promise.all([
-        a.read(aChunk, 0, COMPARE_CHUNK_BYTES, null),
-        b.read(bChunk, 0, COMPARE_CHUNK_BYTES, null)
-      ]);
-      if (ra.bytesRead !== rb.bytesRead) return false;
-      if (ra.bytesRead === 0) return true;
-      if (!aChunk.subarray(0, ra.bytesRead).equals(bChunk.subarray(0, rb.bytesRead))) return false;
-    }
-  } finally {
-    await Promise.all([a.close(), b.close()]);
-  }
-}
-async function sameFileBuffer(path, bytes) {
-  const st = await stat(path);
-  if (st.size !== bytes.length) return false;
-  const handle = await open(path, "r");
-  try {
-    const chunk = Buffer.allocUnsafe(COMPARE_CHUNK_BYTES);
-    let offset = 0;
-    for (; ; ) {
-      const read = await handle.read(chunk, 0, Math.min(COMPARE_CHUNK_BYTES, bytes.length - offset), offset);
-      if (read.bytesRead === 0) return offset === bytes.length;
-      if (!chunk.subarray(0, read.bytesRead).equals(bytes.subarray(offset, offset + read.bytesRead))) return false;
-      offset += read.bytesRead;
-    }
-  } finally {
-    await handle.close();
-  }
-}
-function isEnoent(error) {
-  return error?.code === "ENOENT";
-}
-var defaultProbe = {
-  async matches(source, path) {
-    try {
-      if (source === null) {
-        await stat(path);
-        return false;
-      }
-      if (source.kind === "blob") return await sameFileBytes(path, source.path);
-      if (source.kind === "text") return await sameFileBuffer(path, source.bytes);
-      return (await readFile(path)).toString("utf8") === source.text;
-    } catch (error) {
-      if (isEnoent(error)) return source === null ? true : false;
-      return void 0;
-    }
-  },
-  async copy(path, dest) {
-    try {
-      await copyFile(path, dest);
-      const st = await stat(dest);
-      return { kind: "copied", size: st.size };
-    } catch (error) {
-      if (isEnoent(error)) {
-        const source = await stat(path).catch(() => void 0);
-        if (source === void 0) return { kind: "absent" };
-      }
-      return { kind: "failed", message: error instanceof Error ? error.message : String(error) };
-    }
-  },
-  async size(path) {
-    try {
-      const st = await stat(path);
-      return st.isFile() ? st.size : void 0;
-    } catch {
-      return void 0;
-    }
-  },
-  isLink: isLinkPath
-};
 function safeFileId(callId) {
   return callId.replace(/[^a-zA-Z0-9._-]/g, "_");
 }
@@ -607,12 +528,6 @@ function safeSessionId(sessionId) {
   const safe = sessionId.replace(/[^a-zA-Z0-9._-]/g, "_");
   return safe === ".." || safe === "." ? "session" : safe;
 }
-async function writeJsonAtomic(file, data, afterTempWrite) {
-  const tmp = `${file}.tmp`;
-  await writeFile(tmp, JSON.stringify(data), "utf8");
-  afterTempWrite?.();
-  await rename(tmp, file);
-}
 var RESTORE_JOURNAL_STATES = /* @__PURE__ */ new Set(["running", "rollback-running", "completed", "rolled-back", "recovery-required"]);
 function isRawJournalRef(value) {
   if (value === null) return true;
@@ -814,6 +729,109 @@ async function readEntry(file, anchorSeq) {
   if (parsed.before === null) return { ...base, before: null, size: 0 };
   return { ...base, before: textSourceOf(parsed.before), size: Buffer.byteLength(parsed.before, "utf8") };
 }
+function isSafeLinkRef(ref) {
+  return /^[0-9]+\/[a-zA-Z0-9._-]+\.json$/.test(ref);
+}
+function isSafeBackupRef(ref) {
+  if (ref.length === 0 || ref.startsWith("/") || ref.includes("\\")) return false;
+  const segments = ref.split("/");
+  if (segments.length !== 2 && segments.length !== 3) return false;
+  if (segments.length === 3 && segments[0] !== RESCUE_DIR) return false;
+  return segments.every((segment) => segment !== "." && segment !== ".." && /^[a-zA-Z0-9._-]+$/.test(segment));
+}
+
+// src/snapshot-fs.ts
+import { copyFile, lstat, open, readFile as readFile2, readdir, realpath, rename, stat, writeFile } from "node:fs/promises";
+import { dirname as dirname2, isAbsolute, join as join2, relative as relative2, sep as sep2 } from "node:path";
+var COMPARE_CHUNK_BYTES = 64 * 1024;
+async function sameFileBytes(aPath, bPath) {
+  const sizes = await Promise.all([stat(aPath), stat(bPath)]);
+  if (sizes[0].size !== sizes[1].size) return false;
+  const [a, b] = await Promise.all([open(aPath, "r"), open(bPath, "r")]);
+  try {
+    const aChunk = Buffer.allocUnsafe(COMPARE_CHUNK_BYTES);
+    const bChunk = Buffer.allocUnsafe(COMPARE_CHUNK_BYTES);
+    for (; ; ) {
+      const [ra, rb] = await Promise.all([
+        a.read(aChunk, 0, COMPARE_CHUNK_BYTES, null),
+        b.read(bChunk, 0, COMPARE_CHUNK_BYTES, null)
+      ]);
+      if (ra.bytesRead !== rb.bytesRead) return false;
+      if (ra.bytesRead === 0) return true;
+      if (!aChunk.subarray(0, ra.bytesRead).equals(bChunk.subarray(0, rb.bytesRead))) return false;
+    }
+  } finally {
+    await Promise.all([a.close(), b.close()]);
+  }
+}
+async function sameFileBuffer(path, bytes) {
+  const st = await stat(path);
+  if (st.size !== bytes.length) return false;
+  const handle = await open(path, "r");
+  try {
+    const chunk = Buffer.allocUnsafe(COMPARE_CHUNK_BYTES);
+    let offset = 0;
+    for (; ; ) {
+      const read = await handle.read(chunk, 0, Math.min(COMPARE_CHUNK_BYTES, bytes.length - offset), offset);
+      if (read.bytesRead === 0) return offset === bytes.length;
+      if (!chunk.subarray(0, read.bytesRead).equals(bytes.subarray(offset, offset + read.bytesRead))) return false;
+      offset += read.bytesRead;
+    }
+  } finally {
+    await handle.close();
+  }
+}
+function isEnoent(error) {
+  return error?.code === "ENOENT";
+}
+var defaultProbe = {
+  async matches(source, path) {
+    try {
+      if (source === null) {
+        await stat(path);
+        return false;
+      }
+      if (source.kind === "blob") return await sameFileBytes(path, source.path);
+      if (source.kind === "text") return await sameFileBuffer(path, source.bytes);
+      return (await readFile2(path)).toString("utf8") === source.text;
+    } catch (error) {
+      if (isEnoent(error)) return source === null ? true : false;
+      return void 0;
+    }
+  },
+  async copy(path, dest) {
+    try {
+      const live = await lstat(path).catch(() => void 0);
+      if (live !== void 0 && !live.isFile() && !live.isSymbolicLink()) {
+        return { kind: "failed", message: `not a regular file: ${path}` };
+      }
+      await copyFile(path, dest);
+      const st = await stat(dest);
+      return { kind: "copied", size: st.size };
+    } catch (error) {
+      if (isEnoent(error)) {
+        const source = await stat(path).catch(() => void 0);
+        if (source === void 0) return { kind: "absent" };
+      }
+      return { kind: "failed", message: error instanceof Error ? error.message : String(error) };
+    }
+  },
+  async size(path) {
+    try {
+      const st = await stat(path);
+      return st.isFile() ? st.size : void 0;
+    } catch {
+      return void 0;
+    }
+  },
+  isUnsafeTarget
+};
+async function writeJsonAtomic(file, data, afterTempWrite) {
+  const tmp = `${file}.tmp`;
+  await writeFile(tmp, JSON.stringify(data), "utf8");
+  afterTempWrite?.();
+  await rename(tmp, file);
+}
 async function dirBytes(dir) {
   let names;
   try {
@@ -823,7 +841,7 @@ async function dirBytes(dir) {
   }
   let total = 0;
   for (const name2 of names) {
-    const full = join(dir, name2);
+    const full = join2(dir, name2);
     const st = await lstat(full).catch(() => void 0);
     if (st === void 0) continue;
     if (st.isDirectory()) total += await dirBytes(full);
@@ -831,10 +849,10 @@ async function dirBytes(dir) {
   }
   return total;
 }
-async function isLinkPath(path) {
+async function isUnsafeTarget(path) {
   try {
-    const stat3 = await lstat(path);
-    return stat3.isSymbolicLink() || stat3.nlink > 1;
+    const st = await lstat(path);
+    return !st.isFile() || st.nlink > 1;
   } catch {
     return false;
   }
@@ -844,14 +862,29 @@ async function nearestExistingAncestor(dir) {
   for (; ; ) {
     const st = await lstat(current).catch(() => void 0);
     if (st !== void 0) return current;
-    const parent = dirname(current);
+    const parent = dirname2(current);
     if (parent === current) return void 0;
     current = parent;
   }
 }
+async function locationPin(path) {
+  const dir = dirname2(path);
+  try {
+    return await realpath(dir);
+  } catch (error) {
+    if (!isEnoent(error)) return void 0;
+  }
+  const ancestor = await nearestExistingAncestor(dir);
+  if (ancestor === void 0) return void 0;
+  try {
+    return join2(await realpath(ancestor), relative2(ancestor, dir));
+  } catch {
+    return void 0;
+  }
+}
 async function parentStillMatches(path, recorded) {
   if (recorded === void 0) return true;
-  const dir = dirname(path);
+  const dir = dirname2(path);
   try {
     return await realpath(dir) === recorded;
   } catch (error) {
@@ -861,23 +894,13 @@ async function parentStillMatches(path, recorded) {
   if (ancestor === void 0) return false;
   try {
     const real = await realpath(ancestor);
-    const inside = relative(real, recorded);
-    const escapes = inside === ".." || inside.startsWith(`..${sep}`) || isAbsolute(inside);
+    const inside = relative2(real, recorded);
+    const escapes = inside === ".." || inside.startsWith(`..${sep2}`) || isAbsolute(inside);
     return inside !== "" && !escapes;
   } catch {
     return false;
   }
 }
-function isSafeLinkRef(ref) {
-  return /^[0-9]+\/[a-zA-Z0-9._-]+\.json$/.test(ref);
-}
-function isSafeBackupRef(ref) {
-  if (ref.length === 0 || ref.startsWith("/") || ref.includes("\\")) return false;
-  const segments = ref.split("/");
-  if (segments.length !== 2 && segments.length !== 3) return false;
-  if (segments.length === 3 && segments[0] !== RESCUE_DIR) return false;
-  return segments.every((segment) => segment !== "." && segment !== ".." && /^[a-zA-Z0-9._-]+$/.test(segment));
-}
 async function dirSizeAndLastActive(dir) {
   let size = 0;
   let lastActiveMs = 0;
@@ -901,12 +924,18 @@ async function dirSizeAndLastActive(dir) {
     }
     for (const name2 of names) {
       if (name2.startsWith(".") && name2 !== PENDING_DIR) continue;
-      await visit(join(current, name2));
+      await visit(join2(current, name2));
     }
   };
   await visit(dir);
   return { size, lastActiveMs };
 }
+
+// src/snapshot.ts
+var SNAPSHOT_DIR_NAME = "rewind-snapshots";
+var PENDING_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
+var DEFAULT_MAX_FILE_BYTES = 8 * 1024 * 1024;
+var MAX_ANCHOR_GROUPS = 100;
 var SnapshotStore = class _SnapshotStore {
   /** Debounce window for the per-commit prune (keeps the readdir+sort off the hot path). */
   static PRUNE_INTERVAL_MS = 1e3;
@@ -967,11 +996,11 @@ var SnapshotStore = class _SnapshotStore {
     this.dedup = opts?.dedup ?? true;
     this.maxFileBytes = opts?.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES;
     this.maxAnchorGroups = opts?.maxAnchorGroups ?? MAX_ANCHOR_GROUPS;
-    this.root = root ?? join(resolveDshHome(opts?.dshHome), SNAPSHOT_DIR_NAME);
+    this.root = root ?? join3(resolveDshHome(opts?.dshHome), SNAPSHOT_DIR_NAME);
   }
   /** Absolute path of one session's snapshot directory (id sanitized). */
   sessionDir(sessionId) {
-    return join(this.root, safeSessionId(sessionId));
+    return join3(this.root, safeSessionId(sessionId));
   }
   /**
    * True when `size` bytes is over the per-file cap, so it must not be backed
@@ -987,7 +1016,7 @@ var SnapshotStore = class _SnapshotStore {
   }
   /** Absolute path of one anchor group directory. */
   anchorDir(sessionId, anchorSeq) {
-    return join(this.sessionDir(sessionId), String(anchorSeq));
+    return join3(this.sessionDir(sessionId), String(anchorSeq));
   }
   /** Absolute file ref (relative to the session dir) of an entry. */
   entryRefOf(sessionId, callId, anchorSeq) {
@@ -1036,9 +1065,9 @@ var SnapshotStore = class _SnapshotStore {
    * never committed is either unlinked by its caller or collected by `prune`.
    */
   async stageCapture(sessionId, key) {
-    const dir = join(this.sessionDir(sessionId), PENDING_DIR);
+    const dir = join3(this.sessionDir(sessionId), PENDING_DIR);
     await mkdir(dir, { recursive: true });
-    return join(dir, `${safeFileId(key)}-${shortHash(key)}${SIDECAR_SUFFIX}`);
+    return join3(dir, `${safeFileId(key)}-${shortHash(key)}${SIDECAR_SUFFIX}`);
   }
   /**
    * Seed a session's dedup state from the existing (bounded) on-disk window:
@@ -1073,7 +1102,7 @@ var SnapshotStore = class _SnapshotStore {
     if (seen.has(key)) throw new Error(`link cycle at ${entry.path} (${key})`);
     seen.add(key);
     if (!isSafeLinkRef(entry.ref)) throw new Error(`unsafe link ref ${entry.ref} for ${entry.path}`);
-    const referenced = await readEntry(join(this.sessionDir(sessionId), entry.ref), refAnchorOf(entry.ref));
+    const referenced = await readEntry(join3(this.sessionDir(sessionId), entry.ref), refAnchorOf(entry.ref));
     if (referenced === void 0) throw new Error(`dangling link ${entry.ref} for ${entry.path}`);
     return this.resolveBefore(sessionId, referenced, seen);
   }
@@ -1087,7 +1116,7 @@ var SnapshotStore = class _SnapshotStore {
   async validatedSource(entry) {
     const source = entry.before;
     if (source === null || source.kind !== "blob") return source;
-    const st = await stat(source.path).catch((error) => {
+    const st = await stat2(source.path).catch((error) => {
       if (isEnoent(error)) throw new Error(`missing backup sidecar ${source.path} for ${entry.path}`);
       throw error;
     });
@@ -1122,10 +1151,10 @@ var SnapshotStore = class _SnapshotStore {
    */
   async writeSidecar(dest, source) {
     const tmp = `${dest}.tmp`;
-    if (source.kind === "blob") await copyFile(source.path, tmp);
-    else if (source.kind === "text") await writeFile(tmp, source.bytes);
-    else await writeFile(tmp, Buffer.from(source.text, "utf8"));
-    await rename(tmp, dest);
+    if (source.kind === "blob") await copyFile2(source.path, tmp);
+    else if (source.kind === "text") await writeFile2(tmp, source.bytes);
+    else await writeFile2(tmp, Buffer.from(source.text, "utf8"));
+    await rename2(tmp, dest);
   }
   /**
    * Place one entry's sidecar next to its entry file: MOVE a staged capture
@@ -1135,10 +1164,10 @@ var SnapshotStore = class _SnapshotStore {
    */
   async placeSidecar(entryFile, content) {
     if (content.source === null) return null;
-    const dest = join(dirname(entryFile), sidecarName(basename(entryFile)));
-    if (content.staged !== void 0) await rename(content.staged.file, dest);
+    const dest = join3(dirname3(entryFile), sidecarName(basename2(entryFile)));
+    if (content.staged !== void 0) await rename2(content.staged.file, dest);
     else await this.writeSidecar(dest, content.source);
-    const st = await stat(dest);
+    const st = await stat2(dest);
     return { source: { kind: "blob", path: dest }, size: st.size };
   }
   /**
@@ -1148,12 +1177,12 @@ var SnapshotStore = class _SnapshotStore {
   async commit(sessionId, entry, content, opts) {
     const time = Math.max(Date.now(), this.lastEntryTime + 1);
     this.lastEntryTime = time;
-    const parent = await realpath(dirname(entry.path)).catch(() => void 0);
+    const parent = await locationPin(entry.path);
     await this.ensureDedupSeeded(sessionId);
     await this.assertKnownStoreVersion(sessionId);
     const dir = this.anchorDir(sessionId, entry.anchorSeq);
     await mkdir(dir, { recursive: true });
-    const file = join(dir, entryFileName(entry.callId));
+    const file = join3(dir, entryFileName(entry.callId));
     const selfRef = this.entryRefOf(sessionId, entry.callId, entry.anchorSeq);
     const key = `${sessionId}\0${entry.path}`;
     const prior = this.lastEntry.get(key);
@@ -1249,7 +1278,7 @@ var SnapshotStore = class _SnapshotStore {
     const sessionDir = this.sessionDir(sessionId);
     let names;
     try {
-      names = await readdir(sessionDir);
+      names = await readdir2(sessionDir);
     } catch (error) {
       if (error.code === "ENOENT") return [];
       throw error;
@@ -1258,10 +1287,10 @@ var SnapshotStore = class _SnapshotStore {
     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(() => []);
+      const files = await readdir2(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), anchorSeq);
+        const entry = await readEntry(join3(this.anchorDir(sessionId, anchorSeq), file), anchorSeq);
         if (entry !== void 0) entries.push(entry);
       }
     }
@@ -1329,7 +1358,7 @@ var SnapshotStore = class _SnapshotStore {
         continue;
       }
       try {
-        if (await probe.isLink(entry.path)) {
+        if (await probe.isUnsafeTarget(entry.path)) {
           skipped.push(entry.path);
           continue;
         }
@@ -1424,7 +1453,7 @@ var SnapshotStore = class _SnapshotStore {
           }
         );
         if (applied === "skipped") {
-          journalAction.failed = `parent directory moved or repointed: ${dirname(action.path)}`;
+          journalAction.failed = `path moved or repointed: ${action.path}`;
           await this.saveJournal(journal);
           failed.push({ path: action.path, message: journalAction.failed });
           continue;
@@ -1455,7 +1484,7 @@ var SnapshotStore = class _SnapshotStore {
   }
   /** Absolute path of one restore-op journal file (the current prefix). */
   journalPath(sessionId, opId) {
-    return join(this.sessionDir(sessionId), `${JOURNAL_PREFIX}${safeFileId(opId)}.json`);
+    return join3(this.sessionDir(sessionId), `${JOURNAL_PREFIX}${safeFileId(opId)}.json`);
   }
   /**
    * Locate an existing journal file for an op: the current prefix first, then
@@ -1465,9 +1494,9 @@ var SnapshotStore = class _SnapshotStore {
   async findJournalFile(sessionId, opId) {
     const dir = this.sessionDir(sessionId);
     for (const name2 of [`${JOURNAL_PREFIX}${safeFileId(opId)}.json`, `${LEGACY_JOURNAL_PREFIX}${safeFileId(opId)}.json`]) {
-      const file = join(dir, name2);
+      const file = join3(dir, name2);
       try {
-        await stat(file);
+        await stat2(file);
         return file;
       } catch {
         continue;
@@ -1502,18 +1531,18 @@ var SnapshotStore = class _SnapshotStore {
   async beginRestore(sessionId, targetSeq, actions, probe) {
     const sessionDir = this.sessionDir(sessionId);
     try {
-      await this.pruneTerminalJournals(sessionDir, await readdir(sessionDir));
+      await this.pruneTerminalJournals(sessionDir, await readdir2(sessionDir));
     } catch (error) {
       if (!isEnoent(error)) throw error;
     }
     const id = `op-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
-    const rescueDir = join(sessionDir, RESCUE_DIR, safeFileId(id));
+    const rescueDir = join3(sessionDir, RESCUE_DIR, safeFileId(id));
     let rescueDirReady = false;
     const journalActions = [];
     for (const [index, action] of actions.entries()) {
       let rescue = null;
       let rescueError;
-      const dest = join(rescueDir, `${index}${SIDECAR_SUFFIX}`);
+      const dest = join3(rescueDir, `${index}${SIDECAR_SUFFIX}`);
       try {
         if (!rescueDirReady) {
           await mkdir(rescueDir, { recursive: true });
@@ -1525,7 +1554,7 @@ var SnapshotStore = class _SnapshotStore {
       } catch (error) {
         rescueError = error instanceof Error ? error.message : String(error);
       }
-      const rescueMode = (await stat(action.path).catch(() => void 0))?.mode;
+      const rescueMode = (await stat2(action.path).catch(() => void 0))?.mode;
       const journalAction = {
         path: action.path,
         action: action.action,
@@ -1561,7 +1590,7 @@ var SnapshotStore = class _SnapshotStore {
     if (file === void 0) return void 0;
     let parsed;
     try {
-      parsed = JSON.parse(await readFile(file, "utf8"));
+      parsed = JSON.parse(await readFile3(file, "utf8"));
     } catch (error) {
       throw new Error(`restore journal ${file} is corrupt: ${error instanceof Error ? error.message : String(error)}`);
     }
@@ -1580,7 +1609,7 @@ var SnapshotStore = class _SnapshotStore {
     const sessionDir = this.sessionDir(sessionId);
     let names;
     try {
-      names = await readdir(sessionDir);
+      names = await readdir2(sessionDir);
     } catch (error) {
       if (isEnoent(error)) return { journals: [], corrupt: [] };
       throw error;
@@ -1590,7 +1619,7 @@ var SnapshotStore = class _SnapshotStore {
     for (const name2 of names) {
       if (!isJournalName(name2)) continue;
       try {
-        const parsed = JSON.parse(await readFile(join(sessionDir, name2), "utf8"));
+        const parsed = JSON.parse(await readFile3(join3(sessionDir, name2), "utf8"));
         if (!isRestoreJournal(parsed)) {
           corrupt.push({ file: name2, message: "journal failed schema validation" });
           continue;
@@ -1600,7 +1629,7 @@ var SnapshotStore = class _SnapshotStore {
           corrupt.push({ file: name2, message: "journal references are invalid" });
           continue;
         }
-        journal.sourceFile = join(sessionDir, name2);
+        journal.sourceFile = join3(sessionDir, name2);
         journals.push(journal);
       } catch (error) {
         corrupt.push({ file: name2, message: error instanceof Error ? error.message : String(error) });
@@ -1632,6 +1661,7 @@ var SnapshotStore = class _SnapshotStore {
    */
   async applyActionToDisk(kind, path, content, deleteFile, opts) {
     if (!await parentStillMatches(path, opts?.parent)) return "skipped";
+    if (await isUnsafeTarget(path)) return "skipped";
     if (kind === "delete") {
       try {
         await deleteFile(path);
@@ -1642,17 +1672,17 @@ var SnapshotStore = class _SnapshotStore {
       }
     }
     if (content === null) throw new Error(`restore of ${path} has no recorded content`);
-    await mkdir(dirname(path), { recursive: true });
-    const current = (await stat(path).catch(() => void 0))?.mode;
+    await mkdir(dirname3(path), { recursive: true });
+    const current = (await stat2(path).catch(() => void 0))?.mode;
     let widened = false;
     if (current !== void 0 && (current & 128) === 0) {
       await chmod(path, current | 128).catch(() => void 0);
       widened = true;
     }
     try {
-      if (content.kind === "blob") await copyFile(content.path, path);
-      else if (content.kind === "text") await writeFile(path, content.bytes);
-      else await writeFile(path, Buffer.from(content.text, "utf8"));
+      if (content.kind === "blob") await copyFile2(content.path, path);
+      else if (content.kind === "text") await writeFile2(path, content.bytes);
+      else await writeFile2(path, Buffer.from(content.text, "utf8"));
     } catch (error) {
       if (widened && current !== void 0) await chmod(path, current).catch(() => void 0);
       throw error;
@@ -1802,7 +1832,7 @@ var SnapshotStore = class _SnapshotStore {
           }
         );
         if (applied === "skipped") {
-          action.failed = `parent directory moved or repointed: ${dirname(action.path)}`;
+          action.failed = `path moved or repointed: ${action.path}`;
           await this.saveJournal(journal);
           failed.push({ path: action.path, message: action.failed });
           continue;
@@ -1892,7 +1922,7 @@ var SnapshotStore = class _SnapshotStore {
           }
         );
         if (applied === "skipped") {
-          journal.rollbackError = `parent directory moved or repointed: ${action.path}`;
+          journal.rollbackError = `path moved or repointed: ${action.path}`;
           journal.state = "recovery-required";
           await this.saveJournal(journal);
           failed.push({ path: action.path, message: journal.rollbackError });
@@ -1949,13 +1979,13 @@ var SnapshotStore = class _SnapshotStore {
     const sessionDir = this.sessionDir(sessionId);
     let names;
     try {
-      names = await readdir(sessionDir);
+      names = await readdir2(sessionDir);
     } catch (error) {
       if (isEnoent(error)) return;
       throw error;
     }
     await this.pruneTerminalJournals(sessionDir, names);
-    await this.prunePendingCaptures(join(sessionDir, PENDING_DIR));
+    await this.prunePendingCaptures(join3(sessionDir, PENDING_DIR));
     const seqs = names.map(Number).filter((seq) => Number.isSafeInteger(seq)).sort((a, b) => a - b);
     const excess = seqs.length - keep;
     if (excess <= 0) return;
@@ -1963,10 +1993,10 @@ var SnapshotStore = class _SnapshotStore {
     for (const seq of await this.pinnedAnchors(sessionDir, names)) doomed.delete(seq);
     if (doomed.size === 0) return;
     for (const seq of seqs.slice(excess)) {
-      const files = await readdir(this.anchorDir(sessionId, seq)).catch(() => []);
+      const files = await readdir2(this.anchorDir(sessionId, seq)).catch(() => []);
       for (const file of files) {
         if (!file.endsWith(".json")) continue;
-        const entryFile = join(this.anchorDir(sessionId, seq), file);
+        const entryFile = join3(this.anchorDir(sessionId, seq), file);
         let entry;
         try {
           entry = await readEntry(entryFile, seq);
@@ -1997,9 +2027,9 @@ var SnapshotStore = class _SnapshotStore {
             time: entry.time
           };
         } else {
-          const dest = join(dirname(entryFile), sidecarName(basename(entryFile)));
+          const dest = join3(dirname3(entryFile), sidecarName(basename2(entryFile)));
           await this.writeSidecar(dest, source);
-          const st = await stat(dest);
+          const st = await stat2(dest);
           real = {
             callId: entry.callId,
             anchorSeq: entry.anchorSeq,
@@ -2031,14 +2061,14 @@ var SnapshotStore = class _SnapshotStore {
   async prunePendingCaptures(pendingDir) {
     let names;
     try {
-      names = await readdir(pendingDir);
+      names = await readdir2(pendingDir);
     } catch {
       return;
     }
     const cutoff = Date.now() - PENDING_MAX_AGE_MS;
     for (const name2 of names) {
-      const file = join(pendingDir, name2);
-      const st = await lstat(file).catch(() => void 0);
+      const file = join3(pendingDir, name2);
+      const st = await lstat2(file).catch(() => void 0);
       if (st === void 0 || !st.isFile() || st.mtimeMs >= cutoff) continue;
       await rm(file, { force: true });
     }
@@ -2056,7 +2086,7 @@ var SnapshotStore = class _SnapshotStore {
       if (!isJournalName(name2)) continue;
       let parsed;
       try {
-        parsed = JSON.parse(await readFile(join(sessionDir, name2), "utf8"));
+        parsed = JSON.parse(await readFile3(join3(sessionDir, name2), "utf8"));
       } catch {
         continue;
       }
@@ -2086,12 +2116,12 @@ var SnapshotStore = class _SnapshotStore {
   async pruneTerminalJournals(sessionDir, names) {
     for (const name2 of names) {
       if (!isJournalName(name2)) continue;
-      const file = join(sessionDir, name2);
+      const file = join3(sessionDir, name2);
       try {
-        const parsed = JSON.parse(await readFile(file, "utf8"));
+        const parsed = JSON.parse(await readFile3(file, "utf8"));
         if (parsed.state === "completed" || parsed.state === "rolled-back") {
           await rm(file, { force: true });
-          await rm(join(sessionDir, RESCUE_DIR, safeFileId(journalOpIdOf(name2))), { recursive: true, force: true });
+          await rm(join3(sessionDir, RESCUE_DIR, safeFileId(journalOpIdOf(name2))), { recursive: true, force: true });
         }
       } catch {
       }
@@ -2100,7 +2130,7 @@ var SnapshotStore = class _SnapshotStore {
   /** True when a path exists on disk. */
   async exists(path) {
     try {
-      await stat(path);
+      await stat2(path);
       return true;
     } catch (error) {
       if (isEnoent(error)) return false;
@@ -2147,17 +2177,17 @@ var SnapshotStore = class _SnapshotStore {
     const report = () => ({ scanned, deleted, freedBytes, kept, remainingBytes, skippedActive, dryRun });
     let names;
     try {
-      names = await readdir(this.root);
+      names = await readdir2(this.root);
     } catch (error) {
       if (error.code === "ENOENT") return report();
       throw error;
     }
     for (const name2 of names) {
       if (name2.startsWith(".")) continue;
-      const full = join(this.root, name2);
+      const full = join3(this.root, name2);
       let st;
       try {
-        st = await lstat(full);
+        st = await lstat2(full);
       } catch {
         continue;
       }
@@ -2226,7 +2256,7 @@ var SnapshotStore = class _SnapshotStore {
     const sessionDir = this.sessionDir(sessionId);
     let names;
     try {
-      names = await readdir(sessionDir);
+      names = await readdir2(sessionDir);
     } catch (error) {
       if (isEnoent(error)) return { anchorGroups: 0, entries: 0, journals: 0, bytes: 0 };
       throw error;
@@ -2237,8 +2267,8 @@ var SnapshotStore = class _SnapshotStore {
     let bytes = 0;
     for (const name2 of names) {
       if (name2.startsWith(".") && name2 !== PENDING_DIR) continue;
-      const full = join(sessionDir, name2);
-      const st = await lstat(full).catch(() => void 0);
+      const full = join3(sessionDir, name2);
+      const st = await lstat2(full).catch(() => void 0);
       if (st === void 0) continue;
       if (st.isDirectory()) {
         if (name2 === PENDING_DIR || name2 === RESCUE_DIR) {
@@ -2247,7 +2277,7 @@ var SnapshotStore = class _SnapshotStore {
         }
         if (!Number.isSafeInteger(Number(name2))) continue;
         anchorGroups++;
-        for (const file of await readdir(full).catch(() => [])) {
+        for (const file of await readdir2(full).catch(() => [])) {
           if (file.endsWith(".json")) entries++;
         }
         bytes += await dirBytes(full);
@@ -2308,7 +2338,7 @@ var SnapshotStore = class _SnapshotStore {
    */
   async readFormatVersion(sessionId) {
     try {
-      const raw = await readFile(join(this.sessionDir(sessionId), _SnapshotStore.FORMAT_FILE), "utf8");
+      const raw = await readFile3(join3(this.sessionDir(sessionId), _SnapshotStore.FORMAT_FILE), "utf8");
       const parsed = Number(raw.trim());
       return Number.isFinite(parsed) ? parsed : null;
     } catch {
@@ -2327,10 +2357,10 @@ var SnapshotStore = class _SnapshotStore {
   async markFormatVersion(sessionId, sessionVersion) {
     const dir = this.sessionDir(sessionId);
     await mkdir(dir, { recursive: true });
-    const file = join(dir, _SnapshotStore.FORMAT_FILE);
+    const file = join3(dir, _SnapshotStore.FORMAT_FILE);
     const tmp = `${file}.tmp`;
-    await writeFile(tmp, `${sessionVersion}`, "utf8");
-    await rename(tmp, file);
+    await writeFile2(tmp, `${sessionVersion}`, "utf8");
+    await rename2(tmp, file);
   }
   /**
    * Set the session-format version the store stamps onto every snapshot it
@@ -2350,7 +2380,7 @@ var SnapshotStore = class _SnapshotStore {
    */
   async readStoreVersion(sessionId) {
     try {
-      const raw = await readFile(join(this.sessionDir(sessionId), _SnapshotStore.STORE_FILE), "utf8");
+      const raw = await readFile3(join3(this.sessionDir(sessionId), _SnapshotStore.STORE_FILE), "utf8");
       const parsed = Number(raw.trim());
       return Number.isFinite(parsed) ? parsed : null;
     } catch {
@@ -2365,10 +2395,10 @@ var SnapshotStore = class _SnapshotStore {
   async markStoreVersion(sessionId, storeVersion) {
     const dir = this.sessionDir(sessionId);
     await mkdir(dir, { recursive: true });
-    const file = join(dir, _SnapshotStore.STORE_FILE);
+    const file = join3(dir, _SnapshotStore.STORE_FILE);
     const tmp = `${file}.tmp`;
-    await writeFile(tmp, `${storeVersion}`, "utf8");
-    await rename(tmp, file);
+    await writeFile2(tmp, `${storeVersion}`, "utf8");
+    await rename2(tmp, file);
   }
   /**
    * Refuse to plan against (or write into) a session whose store format is
@@ -2380,7 +2410,7 @@ var SnapshotStore = class _SnapshotStore {
   async assertKnownStoreVersion(sessionId) {
     const version = await this.readStoreVersion(sessionId);
     if (version !== null && version > CURRENT_STORE_VERSION) {
-      throw new UnknownStoreVersionError(version, join(this.sessionDir(sessionId), _SnapshotStore.STORE_FILE));
+      throw new UnknownStoreVersionError(version, join3(this.sessionDir(sessionId), _SnapshotStore.STORE_FILE));
     }
   }
   /**
@@ -2425,7 +2455,7 @@ async function reconcileTracked(store, sessionId, anchorSeq, tracked, probe = de
   let recorded = 0;
   for (const path of tracked) {
     try {
-      if (await probe.isLink(path)) continue;
+      if (await probe.isUnsafeTarget(path)) continue;
       if (store.isOverFileCap(await probe.size?.(path))) continue;
       const last = await store.lastKnownContent(sessionId, path);
       if (last !== void 0 && last !== null && last.kind !== "lossyText") {
@@ -2453,8 +2483,8 @@ async function reconcileTracked(store, sessionId, anchorSeq, tracked, probe = de
 }
 
 // src/snapshot-cleanup.ts
-import { mkdir as mkdir2, readFile as readFile2, rename as rename2, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname2, join as join2 } from "node:path";
+import { mkdir as mkdir2, readFile as readFile4, rename as rename3, writeFile as writeFile3 } from "node:fs/promises";
+import { dirname as dirname4, join as join4 } from "node:path";
 import { resolveDshHome as resolveDshHome2 } from "@deepseek-ai/dsh-home-paths";
 var DEFAULT_MAX_AGE_DAYS = 30;
 var DEFAULT_CLEANUP_CONFIG = { enabled: false, maxAgeDays: DEFAULT_MAX_AGE_DAYS };
@@ -2481,11 +2511,11 @@ function volatileCleanupStore(settings, writer) {
 var AUTO_SWEEP_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 var STATE_FILENAME = "snapshot-cleanup-last-sweep.json";
 function resolveCleanupStatePath(dshHome) {
-  return join2(resolveDshHome2(dshHome), STATE_FILENAME);
+  return join4(resolveDshHome2(dshHome), STATE_FILENAME);
 }
 async function loadLastSweepAt(path) {
   try {
-    const raw = JSON.parse(await readFile2(path, "utf8"));
+    const raw = JSON.parse(await readFile4(path, "utf8"));
     const value = raw["lastSweepAt"];
     return typeof value === "number" && Number.isFinite(value) ? value : 0;
   } catch {
@@ -2494,9 +2524,9 @@ async function loadLastSweepAt(path) {
 }
 async function saveLastSweepAt(path, ms) {
   const tmp = `${path}.tmp`;
-  await mkdir2(dirname2(path), { recursive: true });
-  await writeFile2(tmp, JSON.stringify({ lastSweepAt: ms }), "utf8");
-  await rename2(tmp, path);
+  await mkdir2(dirname4(path), { recursive: true });
+  await writeFile3(tmp, JSON.stringify({ lastSweepAt: ms }), "utf8");
+  await rename3(tmp, path);
 }
 function isAborted(signal) {
   return signal?.aborted === true;
@@ -2675,6 +2705,7 @@ async function captureBefore(fs, workingDirectory, store, exec, pending) {
   const cwd = await workingDirectory.ensure(agent, exec.signal);
   const target = await resolveTarget(fs, path, cwd, exec.signal);
   if (target === void 0) return;
+  if (fs.processPathFromHostPath(target.displayPath) === void 0) return;
   const info = await fs.stat(target, exec.signal).catch((error) => {
     if (isNotFoundError(error)) return void 0;
     throw error;
@@ -2689,9 +2720,9 @@ async function captureBefore(fs, workingDirectory, store, exec, pending) {
   const staged = await store.stageCapture(agent.session.id, key);
   let backup;
   try {
-    await copyFile2(target.displayPath, staged);
-    const st = await stat2(staged);
-    const source = await stat2(target.displayPath).catch(() => void 0);
+    await copyFile3(target.displayPath, staged);
+    const st = await stat3(staged);
+    const source = await stat3(target.displayPath).catch(() => void 0);
     backup = {
       file: staged,
       size: st.size,