dsh-sessions-manager 3.5.2 → 3.5.3

package/lib/index.js

@@ -666,6 +666,121 @@ function createTitleIndexStore({ dir, file }) {
   };
 }
 
+// src/handle-era-paths.js
+import { readdir, stat } from "node:fs/promises";
+import { basename, join as join4 } from "node:path";
+
+// src/path-guard.js
+function splitSegments(target) {
+  return String(target).replace(/[\\/]+$/, "").split(/[\\/]/).filter((seg) => seg.length > 0);
+}
+function stripDriveLetter(segments) {
+  return segments.length > 0 && /^[A-Za-z]:$/.test(segments[0]) ? segments.slice(1) : segments;
+}
+function pathOwnsSession(target, sid) {
+  if (typeof target !== "string" || target.length === 0) return false;
+  if (typeof sid !== "string" || sid.length === 0) return false;
+  const segments = stripDriveLetter(splitSegments(target));
+  if (segments.length === 0) return false;
+  const file = segments[segments.length - 1];
+  if (segments.length >= 2 && segments[segments.length - 2] === sid) return true;
+  if (file.includes(sid)) {
+    const ID_CHAR = /[A-Za-z0-9_-]/;
+    let from = 0;
+    while (true) {
+      const at = file.indexOf(sid, from);
+      if (at < 0) return false;
+      const before = at > 0 ? file[at - 1] : "";
+      const after = at + sid.length < file.length ? file[at + sid.length] : "";
+      if (!(before && ID_CHAR.test(before)) && !(after && ID_CHAR.test(after))) return true;
+      from = at + 1;
+    }
+  }
+  return false;
+}
+
+// src/handle-era-paths.js
+var GENERATION_LOG_RE = /^session\.v\d+\.jsonl(\.zst(d)?)?$/;
+function isSafeChar(ch) {
+  return ch !== "~" && /^[A-Za-z0-9._-]$/.test(ch);
+}
+function projectKeyFor(cwd) {
+  const s = String(cwd);
+  if (s.length === 0) throw new Error("cannot encode an empty project path");
+  let readable = "";
+  let separatorRun = false;
+  for (let i = 0; i < s.length; i++) {
+    const ch = s[i];
+    if (ch === "/" || ch === "\\" || ch === ":") {
+      if (!separatorRun) readable += "-";
+      separatorRun = true;
+    } else if (isSafeChar(ch)) {
+      readable += ch;
+      separatorRun = false;
+    } else {
+      readable += "~" + s.charCodeAt(i).toString(16).toUpperCase().padStart(4, "0");
+      separatorRun = false;
+    }
+  }
+  return "--" + (readable.replace(/^-+/, "") || "root").slice(0, 251) + "--";
+}
+function encodeSegmentFor(raw) {
+  const s = String(raw);
+  if (s.length === 0) throw new Error("cannot encode an empty path segment");
+  if (s === ".") return "~002E";
+  if (s === "..") return "~002E~002E";
+  let out = "";
+  for (let i = 0; i < s.length; i++) {
+    const ch = s[i];
+    out += isSafeChar(ch) ? ch : "~" + s.charCodeAt(i).toString(16).toUpperCase().padStart(4, "0");
+  }
+  return out;
+}
+function resolveSessionRoot(sp) {
+  const root = sp && typeof sp === "object" ? sp.root : void 0;
+  return typeof root === "string" && root.length > 0 ? root : null;
+}
+function deriveSessionDir(root, cwd, id) {
+  const project = cwd === void 0 || cwd === null || cwd === "" ? join4(root, "_no-cwd") : join4(root, projectKeyFor(cwd));
+  return join4(project, encodeSegmentFor(id));
+}
+async function locateSessionArtifacts(sp, header) {
+  const root = resolveSessionRoot(sp);
+  if (!root || !header || header.id == null) return null;
+  const sid = String(header.id);
+  let sessionDir;
+  try {
+    sessionDir = deriveSessionDir(root, header.cwd, sid);
+  } catch (e) {
+    return null;
+  }
+  if (basename(sessionDir) !== encodeSegmentFor(sid)) return null;
+  let entries;
+  try {
+    const st = await stat(sessionDir);
+    if (!st.isDirectory()) return null;
+    entries = await readdir(sessionDir);
+  } catch (e) {
+    return null;
+  }
+  const generationFiles = entries.filter((name2) => GENERATION_LOG_RE.test(name2));
+  if (generationFiles.length === 0) return null;
+  generationFiles.sort((a, b) => {
+    const va = Number((a.match(/^session\.v(\d+)\./) || [])[1] || 0);
+    const vb = Number((b.match(/^session\.v(\d+)\./) || [])[1] || 0);
+    return vb - va;
+  });
+  const logPath = join4(sessionDir, generationFiles[0]);
+  if (!pathOwnsSession(logPath, sid)) return null;
+  return {
+    root,
+    projectDir: join4(root, header.cwd === void 0 || header.cwd === null || header.cwd === "" ? "_no-cwd" : projectKeyFor(header.cwd)),
+    sessionDir,
+    logPath,
+    generationFiles
+  };
+}
+
 // src/compat/persistence.js
 var DEFAULT_CHUNK = 400;
 var MAX_CHUNKS = 2e4;
@@ -859,124 +974,9 @@ function requireCapability(capabilities, name2) {
   throw error;
 }
 
-// src/path-guard.js
-function splitSegments(target) {
-  return String(target).replace(/[\\/]+$/, "").split(/[\\/]/).filter((seg) => seg.length > 0);
-}
-function stripDriveLetter(segments) {
-  return segments.length > 0 && /^[A-Za-z]:$/.test(segments[0]) ? segments.slice(1) : segments;
-}
-function pathOwnsSession(target, sid) {
-  if (typeof target !== "string" || target.length === 0) return false;
-  if (typeof sid !== "string" || sid.length === 0) return false;
-  const segments = stripDriveLetter(splitSegments(target));
-  if (segments.length === 0) return false;
-  const file = segments[segments.length - 1];
-  if (segments.length >= 2 && segments[segments.length - 2] === sid) return true;
-  if (file.includes(sid)) {
-    const ID_CHAR = /[A-Za-z0-9_-]/;
-    let from = 0;
-    while (true) {
-      const at = file.indexOf(sid, from);
-      if (at < 0) return false;
-      const before = at > 0 ? file[at - 1] : "";
-      const after = at + sid.length < file.length ? file[at + sid.length] : "";
-      if (!(before && ID_CHAR.test(before)) && !(after && ID_CHAR.test(after))) return true;
-      from = at + 1;
-    }
-  }
-  return false;
-}
-
 // src/handle-era-ops.js
 import { mkdir as mkdir4, readFile as readFile2, rename as rename4, rm, unlink, writeFile as writeFile4 } from "node:fs/promises";
 import { join as join5 } from "node:path";
-
-// src/handle-era-paths.js
-import { readdir, stat } from "node:fs/promises";
-import { basename, join as join4 } from "node:path";
-var GENERATION_LOG_RE = /^session\.v\d+\.jsonl(\.zst(d)?)?$/;
-function isSafeChar(ch) {
-  return ch !== "~" && /^[A-Za-z0-9._-]$/.test(ch);
-}
-function projectKeyFor(cwd) {
-  const s = String(cwd);
-  if (s.length === 0) throw new Error("cannot encode an empty project path");
-  let readable = "";
-  let separatorRun = false;
-  for (let i = 0; i < s.length; i++) {
-    const ch = s[i];
-    if (ch === "/" || ch === "\\" || ch === ":") {
-      if (!separatorRun) readable += "-";
-      separatorRun = true;
-    } else if (isSafeChar(ch)) {
-      readable += ch;
-      separatorRun = false;
-    } else {
-      readable += "~" + s.charCodeAt(i).toString(16).toUpperCase().padStart(4, "0");
-      separatorRun = false;
-    }
-  }
-  return "--" + (readable.replace(/^-+/, "") || "root").slice(0, 251) + "--";
-}
-function encodeSegmentFor(raw) {
-  const s = String(raw);
-  if (s.length === 0) throw new Error("cannot encode an empty path segment");
-  if (s === ".") return "~002E";
-  if (s === "..") return "~002E~002E";
-  let out = "";
-  for (let i = 0; i < s.length; i++) {
-    const ch = s[i];
-    out += isSafeChar(ch) ? ch : "~" + s.charCodeAt(i).toString(16).toUpperCase().padStart(4, "0");
-  }
-  return out;
-}
-function resolveSessionRoot(sp) {
-  const root = sp && typeof sp === "object" ? sp.root : void 0;
-  return typeof root === "string" && root.length > 0 ? root : null;
-}
-function deriveSessionDir(root, cwd, id) {
-  const project = cwd === void 0 || cwd === null || cwd === "" ? join4(root, "_no-cwd") : join4(root, projectKeyFor(cwd));
-  return join4(project, encodeSegmentFor(id));
-}
-async function locateSessionArtifacts2(sp, header) {
-  const root = resolveSessionRoot(sp);
-  if (!root || !header || header.id == null) return null;
-  const sid = String(header.id);
-  let sessionDir;
-  try {
-    sessionDir = deriveSessionDir(root, header.cwd, sid);
-  } catch (e) {
-    return null;
-  }
-  if (basename(sessionDir) !== encodeSegmentFor(sid)) return null;
-  let entries;
-  try {
-    const st = await stat(sessionDir);
-    if (!st.isDirectory()) return null;
-    entries = await readdir(sessionDir);
-  } catch (e) {
-    return null;
-  }
-  const generationFiles = entries.filter((name2) => GENERATION_LOG_RE.test(name2));
-  if (generationFiles.length === 0) return null;
-  generationFiles.sort((a, b) => {
-    const va = Number((a.match(/^session\.v(\d+)\./) || [])[1] || 0);
-    const vb = Number((b.match(/^session\.v(\d+)\./) || [])[1] || 0);
-    return vb - va;
-  });
-  const logPath = join4(sessionDir, generationFiles[0]);
-  if (!pathOwnsSession(logPath, sid)) return null;
-  return {
-    root,
-    projectDir: join4(root, header.cwd === void 0 || header.cwd === null || header.cwd === "" ? "_no-cwd" : projectKeyFor(header.cwd)),
-    sessionDir,
-    logPath,
-    generationFiles
-  };
-}
-
-// src/handle-era-ops.js
 var MOVE_BATCH = 400;
 function conflictError(message) {
   const error = new Error(message);
@@ -1010,7 +1010,7 @@ async function ensureNoActiveWriter(sp, sid) {
   await closeQuietly2(handle);
 }
 async function purgeSessionArtifacts(sp, sid, header) {
-  const artifacts = await locateSessionArtifacts2(sp, header);
+  const artifacts = await locateSessionArtifacts(sp, header);
   if (!artifacts) {
     const error = new Error("\u65E0\u6CD5\u5B9A\u4F4D\u8BE5\u4F1A\u8BDD\u7684\u7269\u7406\u65E5\u5FD7\u76EE\u5F55\uFF0C\u5DF2\u505C\u6B62\u6C38\u4E45\u5220\u9664");
     error.status = 409;
@@ -1060,7 +1060,7 @@ async function relocateRewrittenBackup({ sid, canonical, backupPath, artifacts }
   return targetDir;
 }
 async function moveSessionToCwd({ sp, sid, header, canonical, events = [], inheritedEventCount = 0 }) {
-  const artifacts = await locateSessionArtifacts2(sp, header);
+  const artifacts = await locateSessionArtifacts(sp, header);
   if (!artifacts) {
     const error = new Error("\u65E0\u6CD5\u5B9A\u4F4D\u8BE5\u4F1A\u8BDD\u7684\u7269\u7406\u65E5\u5FD7\uFF0C\u5DF2\u505C\u6B62\u79FB\u52A8");
     error.status = 409;
@@ -1645,13 +1645,26 @@ function apply(ctx) {
         throw error;
       }
       let target = null;
+      let locatedHeader = null;
       try {
         const entries = await persistence.listEntries();
         const current = entries.find((entry2) => entry2.id === sid);
-        const located = current && persistence.locate(current.header);
+        locatedHeader = current ? current.header : null;
+        const located = current ? await persistence.locateVerified(current.header) : null;
         if (located && typeof located.path === "string") target = located.path;
       } catch (e) {
       }
+      if (!locatedHeader && typeof persistence.statSession === "function") {
+        try {
+          const snap = await persistence.statSession(sid);
+          if (snap && snap.header) {
+            locatedHeader = snap.header;
+            const located = await persistence.locateVerified(snap.header);
+            if (located && typeof located.path === "string") target = located.path;
+          }
+        } catch (e) {
+        }
+      }
       if (!target && typeof entry.originalPath === "string") target = entry.originalPath;
       if (!target) {
         const error = new Error("\u65E0\u6CD5\u786E\u8BA4\u8BE5\u4F1A\u8BDD\u7684\u7269\u7406\u65E5\u5FD7\u4F4D\u7F6E\uFF0C\u5DF2\u505C\u6B62\u6C38\u4E45\u5220\u9664");