dsh-sessions-manager 3.4.1 → 3.4.2

package/lib/index.js

@@ -1,6 +1,6 @@
 // src/index.js
-import { mkdir as mkdir3, realpath, rename as rename3, stat, unlink, writeFile as writeFile3 } from "node:fs/promises";
-import { basename, dirname, isAbsolute, join as join3 } from "node:path";
+import { mkdir as mkdir4, realpath, rename as rename4, stat, unlink, writeFile as writeFile4 } from "node:fs/promises";
+import { basename, dirname as dirname2, isAbsolute, join as join4 } from "node:path";
 import { readFileSync as readFileSync4 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
 
@@ -500,12 +500,116 @@ function createSessionMetaCache(opts = {}) {
   };
 }
 
+// src/title-persist-index.js
+import { mkdir as mkdir3, readFile, rename as rename3, writeFile as writeFile3 } from "node:fs/promises";
+import { dirname, join as join3 } from "node:path";
+var TITLE_INDEX_SCHEMA_VERSION = 1;
+var MAX_ENTRIES = 2e4;
+function normalizeEntry(raw) {
+  if (!raw || typeof raw !== "object") return null;
+  const title = typeof raw.title === "string" ? raw.title : null;
+  const cwd = typeof raw.cwd === "string" ? raw.cwd : null;
+  const createdAt = typeof raw.createdAt === "number" ? raw.createdAt : null;
+  const fingerprint = typeof raw.fingerprint === "string" && raw.fingerprint ? raw.fingerprint : null;
+  const updatedAt = typeof raw.updatedAt === "number" ? raw.updatedAt : 0;
+  if (!fingerprint || !title && !cwd) return null;
+  return { title, cwd, createdAt, fingerprint, updatedAt };
+}
+function normalizeTitleIndex(raw) {
+  const entries = {};
+  if (raw && typeof raw === "object" && raw.entries && typeof raw.entries === "object") {
+    for (const [id, entry] of Object.entries(raw.entries)) {
+      if (typeof id !== "string" || !id || id.length > 200) continue;
+      const normalized = normalizeEntry(entry);
+      if (normalized) entries[id] = normalized;
+    }
+  }
+  return { schemaVersion: TITLE_INDEX_SCHEMA_VERSION, entries };
+}
+function mergeEntries(left, right) {
+  const merged = { ...left };
+  for (const [id, entry] of Object.entries(right)) merged[id] = entry;
+  const ids = Object.keys(merged);
+  if (ids.length > MAX_ENTRIES) {
+    ids.sort((a, b) => (merged[a].updatedAt || 0) - (merged[b].updatedAt || 0));
+    for (const id of ids.slice(0, ids.length - MAX_ENTRIES)) delete merged[id];
+  }
+  return merged;
+}
+function createTitleIndexStore({ dir, file }) {
+  let cache = null;
+  let chain = Promise.resolve();
+  const path = file || join3(dir, "title-index.json");
+  async function readRaw() {
+    try {
+      return normalizeTitleIndex(JSON.parse(await readFile(path, "utf8")));
+    } catch (e) {
+      return normalizeTitleIndex(null);
+    }
+  }
+  function enqueue(mutator) {
+    const operation = chain.then(async () => {
+      const store = cache || (cache = (await readRaw()).entries);
+      await mutator(store);
+      return store;
+    });
+    chain = operation.catch(() => {
+    });
+    return operation;
+  }
+  return {
+    // 只读：内存优先，未加载过才落盘一次。绝不抛错。
+    async entries() {
+      if (cache) return cache;
+      cache = (await readRaw()).entries;
+      return cache;
+    },
+    // 批量合并写入（原子替换）。失败静默：索引只是加速器，坏了下次重解码。
+    async merge(batch) {
+      const right = {};
+      for (const [id, entry] of Object.entries(batch || {})) {
+        const normalized = normalizeEntry(entry);
+        if (normalized) right[String(id)] = normalized;
+      }
+      if (!Object.keys(right).length) return false;
+      await enqueue(async (store) => {
+        const next = mergeEntries(store, right);
+        await mkdir3(dirname(path), { recursive: true });
+        const tmp = join3(dirname(path), `.title-index-${process.pid}-${Date.now()}.tmp`);
+        await writeFile3(tmp, JSON.stringify({ schemaVersion: TITLE_INDEX_SCHEMA_VERSION, entries: next }), { encoding: "utf8", mode: 384 });
+        await rename3(tmp, path);
+        cache = next;
+      });
+      return true;
+    },
+    async remove(ids) {
+      const wanted = new Set((ids || []).map(String));
+      if (!wanted.size) return false;
+      await enqueue(async (store) => {
+        let changed = false;
+        for (const id of wanted) {
+          if (id in store) {
+            delete store[id];
+            changed = true;
+          }
+        }
+        if (!changed) return;
+        await mkdir3(dirname(path), { recursive: true });
+        const tmp = join3(dirname(path), `.title-index-${process.pid}-${Date.now()}.tmp`);
+        await writeFile3(tmp, JSON.stringify({ schemaVersion: TITLE_INDEX_SCHEMA_VERSION, entries: store }), { encoding: "utf8", mode: 384 });
+        await rename3(tmp, path);
+      });
+      return true;
+    }
+  };
+}
+
 // src/index.js
 var name = "dsh-sessions-manager";
 var inject = ["webServer", "workspaceRegistry", "sessionPersistence", "sessionQuery", "storageDomain"];
 var MAX_TITLE = 80;
-var TRASH_DIR = process.env.DSH_SESSIONS_MANAGER_TRASH_DIR || join3(homedir3(), ".dsh", "sessions-manager-trash");
-var TRASH_INDEX = join3(TRASH_DIR, "index.json");
+var TRASH_DIR = process.env.DSH_SESSIONS_MANAGER_TRASH_DIR || join4(homedir3(), ".dsh", "sessions-manager-trash");
+var TRASH_INDEX = join4(TRASH_DIR, "index.json");
 var TRASH_SCHEMA_VERSION = 2;
 var DEFAULT_TRASH_SETTINGS = Object.freeze({ retentionDays: 0 });
 var FETCH_TOOL_RE = /search|fetch|download|browse/i;
@@ -590,6 +694,40 @@ function apply(ctx) {
   const dom = () => ctx.storageDomain.get("workspace");
   const authorityTitleCache = /* @__PURE__ */ new Map();
   const metaCache = createSessionMetaCache();
+  const titleIndex = createTitleIndexStore({ dir: TRASH_DIR, file: join4(TRASH_DIR, "title-index.json") });
+  async function hydrateFromPersist(ids, statsById) {
+    const hits = /* @__PURE__ */ new Map();
+    if (!ids || !ids.length) return hits;
+    let store;
+    try {
+      store = await titleIndex.entries();
+    } catch (e) {
+      return hits;
+    }
+    for (const id of ids) {
+      const stat2 = statsById.get(id);
+      const entry = store && store[id];
+      if (!stat2 || !entry) continue;
+      const fp = fingerprintOf(stat2);
+      if (fp && entry.fingerprint === fp) {
+        hits.set(id, { title: entry.title, cwd: entry.cwd, createdAt: entry.createdAt });
+      }
+    }
+    return hits;
+  }
+  function persistDecoded(decoded, statsById) {
+    if (!decoded || !decoded.size) return;
+    const batch = {};
+    const now = Date.now();
+    for (const [id, meta] of decoded) {
+      const fp = fingerprintOf(statsById.get(id));
+      if (!fp) continue;
+      batch[id] = { title: meta.title, cwd: meta.cwd, createdAt: meta.createdAt, fingerprint: fp, updatedAt: now };
+    }
+    if (!Object.keys(batch).length) return;
+    titleIndex.merge(batch).catch(() => {
+    });
+  }
   function metaFromSnapshot(o) {
     let title = null, createdAt = null, cwd = null;
     if (o) {
@@ -686,6 +824,7 @@ function apply(ctx) {
       }
     }
     metaCache.set(key, statInfo, meta);
+    if (opts.collectDecoded && statInfo) opts.collectDecoded(key, meta);
     return buildItem(key, meta, usage, opts.exposeUsage);
   }
   async function collectUsage(preloadedHeaders) {
@@ -746,10 +885,10 @@ function apply(ctx) {
     return (await readTrashStore()).items;
   }
   async function writeTrashStore(store) {
-    await mkdir3(TRASH_DIR, { recursive: true });
-    const tmp = join3(TRASH_DIR, `.index-${process.pid}-${Date.now()}.tmp`);
-    await writeFile3(tmp, JSON.stringify(normalizeTrashStore(store), null, 2), { encoding: "utf8", mode: 384 });
-    await rename3(tmp, TRASH_INDEX);
+    await mkdir4(TRASH_DIR, { recursive: true });
+    const tmp = join4(TRASH_DIR, `.index-${process.pid}-${Date.now()}.tmp`);
+    await writeFile4(tmp, JSON.stringify(normalizeTrashStore(store), null, 2), { encoding: "utf8", mode: 384 });
+    await rename4(tmp, TRASH_INDEX);
   }
   function mutateTrash(mutator) {
     const operation = trashMutation.then(async () => {
@@ -855,7 +994,7 @@ function apply(ctx) {
       } catch (e) {
       }
       if (!target && typeof entry.originalPath === "string") target = entry.originalPath;
-      const targetOwnsSession = target && (basename(dirname(target)) === sid || basename(target).includes(sid));
+      const targetOwnsSession = target && (basename(dirname2(target)) === sid || basename(target).includes(sid));
       if (target && !targetOwnsSession) {
         const error = new Error("\u65E5\u5FD7\u8DEF\u5F84\u4E0E\u4F1A\u8BDD ID \u4E0D\u5339\u914D\uFF0C\u5DF2\u505C\u6B62\u6C38\u4E45\u5220\u9664");
         error.status = 409;
@@ -948,8 +1087,8 @@ function apply(ctx) {
   async function moveTargetWorkspace(rawPath) {
     if (typeof rawPath !== "string" || !rawPath.trim()) throw new Error("\u7F3A\u5C11\u76EE\u6807\u5DE5\u4F5C\u533A\u8DEF\u5F84");
     let p = String(rawPath).trim();
-    if (p.startsWith("~/")) p = join3(homedir3(), p.slice(2));
-    if (!isAbsolute(p)) p = join3(homedir3(), p);
+    if (p.startsWith("~/")) p = join4(homedir3(), p.slice(2));
+    if (!isAbsolute(p)) p = join4(homedir3(), p);
     let canonical = null;
     try {
       canonical = await realpath(p);
@@ -957,7 +1096,7 @@ function apply(ctx) {
       canonical = null;
     }
     if (canonical === null) {
-      await mkdir3(p, { recursive: true });
+      await mkdir4(p, { recursive: true });
       canonical = await realpath(p);
     }
     return { canonical, entity: await w.create(canonical, basename(canonical) || "workspace") };
@@ -995,13 +1134,13 @@ function apply(ctx) {
       if (!oldPath || !newPath || oldPath === newPath) return false;
       const backupPath = `${oldPath}.move-backup-${Date.now()}`;
       try {
-        await mkdir3(dirname(newPath), { recursive: true });
-        await rename3(oldPath, backupPath);
+        await mkdir4(dirname2(newPath), { recursive: true });
+        await rename4(oldPath, backupPath);
         await rewriteFrame0Cwd(backupPath, canonical);
-        await rename3(backupPath, newPath);
+        await rename4(backupPath, newPath);
       } catch (e) {
         try {
-          await rename3(backupPath, oldPath);
+          await rename4(backupPath, oldPath);
         } catch (_) {
         }
         if (e && e.code !== "ENOENT") throw e;
@@ -1047,7 +1186,7 @@ function apply(ctx) {
         const backupPath = oldPath ? `${oldPath}.move-backup-${Date.now()}` : null;
         if (backupPath) {
           try {
-            await rename3(oldPath, backupPath);
+            await rename4(oldPath, backupPath);
           } catch (e) {
             if (e && e.code !== "ENOENT") throw new Error("\u79FB\u52A8\u5931\u8D25\uFF1A\u65E0\u6CD5\u5907\u4EFD\u65E7\u7684\u4F1A\u8BDD\u65E5\u5FD7");
           }
@@ -1055,7 +1194,7 @@ function apply(ctx) {
         const restore = async () => {
           if (backupPath) {
             try {
-              await rename3(backupPath, oldPath);
+              await rename4(backupPath, oldPath);
             } catch (_) {
             }
           }
@@ -1203,15 +1342,24 @@ function apply(ctx) {
     const usage = await collectUsage(headers);
     const statsById = new Map(visibleIds.map((id) => [id, { mtimeMs: usage.mtimeById.get(id), size: usage.sizeById.get(id) }]));
     const { cached, missing } = metaCache.partition(visibleIds, statsById);
-    const snapshotById = await projectTitles(missing);
+    const persisted = await hydrateFromPersist(missing, statsById);
+    for (const [id, meta] of persisted) metaCache.set(id, statsById.get(id), meta);
+    const stillMissing = missing.filter((id) => !persisted.has(id));
+    const snapshotById = await projectTitles(stillMissing);
+    const decoded = /* @__PURE__ */ new Map();
+    const collectDecoded = (id, meta) => {
+      decoded.set(id, meta);
+    };
     const CHUNK = 6;
     for (let i = 0; i < visibleIds.length; i += CHUNK) {
       const res2 = await Promise.all(visibleIds.slice(i, i + CHUNK).map((id) => resolveOne(id, usage, {
         exposeUsage: !!(opts && opts.usage),
-        preloaded: snapshotById.has(id) ? snapshotById.get(id) : void 0
+        preloaded: snapshotById.has(id) ? snapshotById.get(id) : void 0,
+        collectDecoded
       })));
       for (const it of res2) items.push({ ...it, archived: currentArchived.has(it.sessionId) });
     }
+    persistDecoded(decoded, statsById);
     let starredSet = /* @__PURE__ */ new Set();
     try {
       starredSet = new Set((await stars.read()).starredSessionIds);
@@ -1278,17 +1426,26 @@ function apply(ctx) {
       const usage = await collectUsage(headers);
       const statsById = new Map(ids.map((id) => [id, { mtimeMs: usage.mtimeById.get(id), size: usage.sizeById.get(id) }]));
       const { cached, missing } = metaCache.partition(ids, statsById);
-      const snapshotById = await projectTitles(missing);
+      const persisted = await hydrateFromPersist(missing, statsById);
+      for (const [id, meta] of persisted) metaCache.set(id, statsById.get(id), meta);
+      const rest = missing.filter((id) => !persisted.has(id));
+      const snapshotById = await projectTitles(rest);
+      const decoded = /* @__PURE__ */ new Map();
+      const collectDecoded = (id, meta) => {
+        decoded.set(id, meta);
+      };
       for (const id of ids) {
-        let meta = cached.get(id) || null;
+        let meta = cached.get(id) || persisted.get(id) || null;
         if (!meta) {
           const snapshot = snapshotById.has(id) ? snapshotById.get(id) : typeof sq.readTitleSnapshot === "function" ? await sq.readTitleSnapshot(id).catch(() => null) : null;
           const next = metaFromSnapshot(snapshot);
           metaCache.set(id, statsById.get(id), next);
+          if (statsById.get(id)) collectDecoded(id, next);
           meta = next;
         }
         if (meta && meta.title) authorityTitleCache.set(id, String(meta.title));
       }
+      persistDecoded(decoded, statsById);
     }
     return {
       titles: Object.fromEntries(authorityTitleCache),
@@ -1619,6 +1776,8 @@ function apply(ctx) {
           if (!sid) return json(res, { ok: false, error: "missing sessionId" }, 400);
           const out = await purgeFromTrash(sid);
           metaCache.invalidate(sid);
+          titleIndex.remove([sid]).catch(() => {
+          });
           json(res, out);
         } catch (e) {
           json(res, { ok: false, error: String(e && e.message || e) }, 500);
@@ -1638,6 +1797,8 @@ function apply(ctx) {
             try {
               results.push({ sessionId: sid, ok: true, ...await purgeFromTrash(sid) });
               metaCache.invalidate(sid);
+              titleIndex.remove([sid]).catch(() => {
+              });
             } catch (e) {
               results.push({ sessionId: sid, ok: false, error: String(e && e.message || e) });
             }
@@ -1819,8 +1980,16 @@ function apply(ctx) {
           const patch = {};
           if (body && Object.prototype.hasOwnProperty.call(body, "inactiveDays")) patch.inactiveDays = body.inactiveDays;
           if (body && Object.prototype.hasOwnProperty.call(body, "skipStarred")) patch.skipStarred = body.skipStarred;
-          const settings = Object.keys(patch).length ? await autoArchive.update(patch) : (await autoArchive.read()).settings;
-          const sweep = await autoArchiveSweep();
+          const isPatch = Object.keys(patch).length > 0;
+          const settings = isPatch ? await autoArchive.update(patch) : (await autoArchive.read()).settings;
+          let sweep;
+          if (isPatch) {
+            sweep = await autoArchiveSweep();
+          } else {
+            void autoArchiveSweep().catch(() => {
+            });
+            sweep = { triggered: true };
+          }
           const store = await autoArchive.read();
           json(res, {
             ok: true,