dsh-recall-plugin 2.4.6 → 2.4.8

package/lib/snapshots.js

@@ -140,6 +140,20 @@ function parseTagsWithTime(text) {
   }
   return out;
 }
+function judgeStoreFormat(raw, supported) {
+  if (raw === null) return { ok: false, v: null, reason: "unreadable" };
+  const t = String(raw == null ? "" : raw).trim();
+  let v;
+  if (!t) {
+    v = 1;
+  } else {
+    if (!/^\d+$/.test(t)) return { ok: false, v: null, reason: "corrupt" };
+    v = parseInt(t, 10);
+    if (v < 1) return { ok: false, v: null, reason: "corrupt" };
+  }
+  if (v > supported) return { ok: false, v, reason: "future" };
+  return { ok: true, v, reason: t ? "ok" : "absent" };
+}
 function createSnapshots(ctx, rt, config) {
   const sessions = ctx.sessions;
   const state = rt.state;
@@ -149,9 +163,58 @@ function createSnapshots(ctx, rt, config) {
   const FUSE_BACKOFF_BASE_MS = 5 * 60 * 1e3;
   const FUSE_BACKOFF_CAP_MS = 60 * 60 * 1e3;
   const snapFailures = /* @__PURE__ */ new Map();
+  const SUPPORTED_FORMAT = 1;
+  const FORMAT_OK_TTL_MS = 3e4;
+  const formatOkAt = /* @__PURE__ */ new Map();
+  const formatBlockedAt = /* @__PURE__ */ new Map();
+  function formatFile(store) {
+    return store.dir + (rt.isWin ? "\\" : "/") + "format";
+  }
+  async function readFormatRaw(store) {
+    try {
+      return S.stripBom(await rt.runShell(S.fileReadCmd(formatFile(store)), { stdoutMaxBytes: 4096 }));
+    } catch (error) {
+      return null;
+    }
+  }
+  async function storeFormatVerdict(store) {
+    const at = formatOkAt.get(store.dir);
+    if (at !== void 0 && Date.now() - at < FORMAT_OK_TTL_MS) return { ok: true, v: SUPPORTED_FORMAT, reason: "ok" };
+    const verdict = judgeStoreFormat(await readFormatRaw(store), SUPPORTED_FORMAT);
+    if (verdict.ok && verdict.reason === "ok") formatOkAt.set(store.dir, Date.now());
+    return verdict;
+  }
+  function formatBlockedThrottled(store, verdict) {
+    const last = formatBlockedAt.get(store.dir) || 0;
+    if (Date.now() - last < 5 * 60 * 1e3) return;
+    formatBlockedAt.set(store.dir, Date.now());
+    const detail = verdict.reason === "future" ? "\u78C1\u76D8\u683C\u5F0F\u6807\u8BB0\u4E3A v" + verdict.v + "\uFF08\u672C\u63D2\u4EF6\u652F\u6301 v" + SUPPORTED_FORMAT + "\uFF09\uFF1A\u5199\u5165\u5DF2\u6682\u505C\uFF08\u5FEB\u7167/\u64A4\u56DE/\u6E05\u7406\uFF09\uFF0C\u5217\u8868\u4ECD\u53EF\u67E5\u770B\uFF1B\u8BF7\u5347\u7EA7\u63D2\u4EF6" : verdict.reason === "corrupt" ? "\u78C1\u76D8\u683C\u5F0F\u6807\u8BB0\u5185\u5BB9\u975E\u6CD5\uFF08\u5E94\u4E3A " + SUPPORTED_FORMAT + "\uFF09\uFF1A\u5199\u5165\u5DF2\u6682\u505C\uFF08\u5FEB\u7167/\u64A4\u56DE/\u6E05\u7406\uFF09\uFF1B\u8BF7\u68C0\u67E5\u8BE5 store \u76EE\u5F55\u4E0B\u7684 format \u6587\u4EF6" : "\u8BFB\u4E0D\u5230\u5FEB\u7167\u5E93\u7684\u78C1\u76D8\u683C\u5F0F\u6807\u8BB0\uFF08\u73AF\u5883\u672A\u5C31\u7EEA\u6216\u6587\u4EF6\u4E0D\u53EF\u8BFB\uFF09\uFF1A\u672C\u6B21\u5199\u5165\u5DF2\u6682\u505C\uFF0C\u4E0B\u4E00\u6761\u6D88\u606F\u81EA\u52A8\u91CD\u8BD5\uFF1B\u6301\u7EED\u51FA\u73B0\u8BF7\u68C0\u67E5\u8BE5 store \u76EE\u5F55\u6743\u9650";
+    rt.recordError("recall store format blocked: " + detail);
+  }
+  async function guardStoreFormat(store) {
+    const verdict = await storeFormatVerdict(store);
+    if (verdict.ok) return true;
+    formatBlockedThrottled(store, verdict);
+    return false;
+  }
+  async function stampStoreFormat(store, verdict) {
+    if (!verdict.ok || verdict.reason !== "absent") return;
+    try {
+      await rt.writeTextViaShell(formatFile(store), String(SUPPORTED_FORMAT));
+      formatOkAt.set(store.dir, Date.now());
+    } catch (error) {
+      rt.recordError("recall format stamp failed: " + String(error));
+    }
+  }
   async function saveIndex(root, sessionId) {
     const store = state.stores.get(root);
     if (!store) return;
+    const verdict = await storeFormatVerdict(store);
+    if (!verdict.ok) {
+      formatBlockedThrottled(store, verdict);
+      return;
+    }
+    await stampStoreFormat(store, verdict);
     const entries = Array.from(state.snapshots.entries()).filter(([, s]) => s.root === root).map(([id, s]) => {
       const rec = { id, time: s.time, root: s.root, sessionId: s.sessionId };
       const fb = state.snapFeedback.get(id);
@@ -168,6 +231,7 @@ function createSnapshots(ctx, rt, config) {
     if (state.indexLoaded.has(root)) return;
     const store = state.stores.get(root);
     if (!store) return;
+    if (!await guardStoreFormat(store)) return;
     let raw = "";
     let truncated = false;
     try {
@@ -259,6 +323,7 @@ function createSnapshots(ctx, rt, config) {
   async function recordLineage(root, childId, parentId) {
     const store = state.stores.get(root);
     if (!store) return;
+    if (!await guardStoreFormat(store)) return;
     const sep = rt.isWin ? "\\" : "/";
     const existing = await loadLineage(root);
     if (!existing.some((e) => e.childId === childId && e.parentId === parentId)) {
@@ -313,6 +378,7 @@ function createSnapshots(ctx, rt, config) {
     if (buildArtifactRootSegment(root, BASE(), rt.isWin)) return;
     let store = await rt.resolveStore(root);
     store = await rt.tryUpgradeToHome(root);
+    if (!await guardStoreFormat(store)) return;
     const g = await rt.ensureGit(root, store);
     if (!g.ok) {
       setFeedback(messageId, { failed: true, ...buildFeedbackError(g.error || "\u672A\u77E5\u539F\u56E0") });
@@ -336,7 +402,10 @@ function createSnapshots(ctx, rt, config) {
     const keep = rec && (rec.failed || Array.isArray(rec.skipped) && rec.skipped.length);
     if (keep) state.snapFeedback.set(id, rec);
     else state.snapFeedback.delete(id);
-    if (state.snapFeedback.size > 200) state.snapFeedback.delete(state.snapFeedback.keys().next().value);
+    if (state.snapFeedback.size > 200) {
+      const oldest = state.snapFeedback.keys().next().value;
+      if (oldest !== void 0) state.snapFeedback.delete(oldest);
+    }
   }
   async function feedbackFor(sessionId, messageId) {
     const rec = state.snapFeedback.get(String(messageId || ""));
@@ -391,8 +460,8 @@ function createSnapshots(ctx, rt, config) {
       if (!m) {
         return { ok: false, partial: true, error: "\u56DE\u9000\u811A\u672C\u672A\u6B63\u5E38\u5B8C\u6210\uFF08\u5DE5\u4F5C\u533A\u53EF\u80FD\u5904\u4E8E\u534A\u56DE\u9000\u72B6\u6001\uFF09\uFF1A" + text.slice(0, 300) };
       }
-      const deleted = parseInt(m[1], 10);
-      const restored = parseInt(m[2], 10);
+      const deleted = parseInt(m[1] ?? "", 10);
+      const restored = parseInt(m[2] ?? "", 10);
       return { ok: true, count: (Number.isNaN(deleted) ? 0 : deleted) + (Number.isNaN(restored) ? 0 : restored) };
     } catch (error) {
       const re = error;
@@ -461,11 +530,12 @@ function createSnapshots(ctx, rt, config) {
       return [];
     }
   }
-  return { saveIndex, loadIndex, readExclude, writeExclude, rebuildOrphans, captureSnapshot, diffFor, rollbackFor, resolveCutSeq, resolveStaleQueueItemIds, feedbackFor, loadLineage, recordLineage };
+  return { saveIndex, loadIndex, readExclude, writeExclude, rebuildOrphans, captureSnapshot, diffFor, rollbackFor, resolveCutSeq, resolveStaleQueueItemIds, feedbackFor, loadLineage, recordLineage, guardStoreFormat };
 }
 export {
   createSnapshots,
   isSafetySnapshotId,
+  judgeStoreFormat,
   parseChanges,
   parseDiffOutput,
   parseSkipped,

package/lib/store.js

@@ -29,7 +29,7 @@ async function resolvePosixHomeBase(deps, inputs) {
 }
 function parseCleanupResult(out) {
   const m = String(out || "").match(/CLEANUP_OTHER_INSTANCE\s+(\d+)/);
-  if (m) return { otherPid: parseInt(m[1], 10), skippedFresh: false };
+  if (m) return { otherPid: parseInt(m[1] ?? "", 10), skippedFresh: false };
   if (String(out || "").indexOf("CLEANUP_SKIPPED_FRESH_LOCK") >= 0) return { otherPid: null, skippedFresh: true };
   return { otherPid: null, skippedFresh: false };
 }
@@ -84,8 +84,10 @@ async function runViaSpawn(spawn, req) {
           const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk));
           chunks.push(buf);
           total += buf.length;
-          while (chunks.length > 1 && total - chunks[0].length > maxBytes) {
-            total -= chunks[0].length;
+          while (chunks.length > 1) {
+            const head = chunks[0];
+            if (!head || total - head.length <= maxBytes) break;
+            total -= head.length;
             chunks.shift();
           }
         },
@@ -275,7 +277,7 @@ function createRuntime(ctx, config, deps) {
   }
   function extractGitDir(command) {
     const m = String(command).match(/(?:^|\n)[ \t]*(?:\$g|g)[ \t]*=[ \t]*'([^']+)/);
-    return m ? m[1] : null;
+    return m ? m[1] ?? null : null;
   }
   async function cleanupAfterGitFailure(command) {
     if (!command || String(command).indexOf("RECALL_CLEANUP") >= 0) return;
@@ -487,7 +489,7 @@ function createRuntime(ctx, config, deps) {
       const out = scripts.stripBom(await runShell(scripts.ensureGitScript(store, gitExe, config.baseExcludes), { stdoutMaxBytes: 4096 }));
       state.gitReady.add(store.git);
       const m = out.match(/GIT_OK\s+(\d+)/);
-      state.gcLastAt.set(store.git, m ? parseInt(m[1], 10) * 1e3 : Date.now());
+      state.gcLastAt.set(store.git, m ? parseInt(m[1] ?? "", 10) * 1e3 : Date.now());
       return { ok: true };
     } catch (error) {
       recordError("recall ensureGit failed: " + String(error));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-recall-plugin",
-  "version": "2.4.6",
+  "version": "2.4.8",
   "description": "在 DSH 中撤回自己发过的消息：工作区文件与对话历史一起回到那条消息发出之前，消息的文本与附件自动放回输入框，改完即可重发。文件走独立影子 git 快照（不碰项目自身的 git），对话走官方 sessions.fork，原会话归档可找回。",
   "icon": "assets/icon.svg",
   "type": "module",
@@ -34,6 +34,7 @@
     "check:upgrade": "node scripts/check-upgrade.mjs",
     "build": "node scripts/build-host.mjs && node scripts/build-client.mjs",
     "test": "vitest run tests/unit",
+    "test:client": "vitest run --config vitest.client.config.ts",
     "test:probe": "vitest run tests/probe",
     "verify:host": "node scripts/verify-host.mjs",
     "typecheck": "tsc --noEmit"
@@ -65,7 +66,8 @@
         "0.1.7-alpha.2": "compatible",
         "0.1.7-rc.1": "compatible",
         "0.1.7-rc.2": "compatible",
-        "0.2.0-rc.1": "compatible"
+        "0.2.0-rc.1": "compatible",
+        "0.2.0-rc.2": "compatible"
       }
     }
   },
@@ -90,7 +92,11 @@
     "@deepseek-ai/schemastery": "^3.18.4",
     "@types/node": "^20.19.43",
     "@types/react": "^18.3.31",
+    "@types/react-dom": "^18.3.7",
     "esbuild": "^0.28.1",
+    "jsdom": "^29.1.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "typescript": "^5.9.3",
     "vitest": "^4.1.11"
   }