dsh-sessions-manager 3.6.1 → 3.6.2

package/lib/index.js

@@ -702,7 +702,7 @@ function createSessionMetaCache(opts = {}) {
 // src/title-persist-index.js
 import { mkdir as mkdir4, readFile, rename as rename4, writeFile as writeFile4 } from "node:fs/promises";
 import { dirname, join as join5 } from "node:path";
-var TITLE_INDEX_SCHEMA_VERSION = 1;
+var TITLE_INDEX_SCHEMA_VERSION = 2;
 var MAX_ENTRIES = 2e4;
 function normalizeEntry(raw) {
   if (!raw || typeof raw !== "object") return null;
@@ -711,9 +711,13 @@ function normalizeEntry(raw) {
   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;
+  const resolved = raw.resolved === true || raw.resolved === 1;
   if (!fingerprint || fingerprint.startsWith("rev:")) return null;
   if (!title && !cwd) return null;
-  return { title, cwd, createdAt, fingerprint, updatedAt };
+  if (!title && !resolved) return null;
+  const entry = { title, cwd, createdAt, fingerprint, updatedAt };
+  if (resolved) entry.resolved = 1;
+  return entry;
 }
 function normalizeTitleIndex(raw) {
   const entries = {};
@@ -1414,7 +1418,7 @@ function classifyLineage(header, sizeBytes) {
 }
 
 // src/index.js
-var BUILD_STAMP = true ? "3.6.1+f0814a9e" : "dev";
+var BUILD_STAMP = true ? "3.6.2+e36dc3fc" : "dev";
 var name = "dsh-sessions-manager";
 var inject = ["webServer", "workspaceRegistry", "sessionPersistence", "sessionQuery", "storageDomain"];
 var MAX_TITLE = 80;
@@ -1499,20 +1503,6 @@ function getActiveSessionId(context) {
   }
   return null;
 }
-function foldTitle(events) {
-  let found = null;
-  let firstUser = null;
-  for (const ev of events) {
-    if (ev.type === "session/title" && ev.data && typeof ev.data.title === "string" && ev.data.title.length) {
-      found = ev.data.title;
-    }
-    if (firstUser === null && ev.type === "user/message" && ev.data && Array.isArray(ev.data.content)) {
-      const txt = ev.data.content.filter((b) => b && b.type === "text").map((b) => b.text).filter(Boolean).join(" ").trim();
-      if (txt) firstUser = txt;
-    }
-  }
-  return found || firstUser || null;
-}
 function apply(ctx) {
   const w = ctx.workspaceRegistry;
   const sp = ctx.sessionPersistence;
@@ -1538,7 +1528,7 @@ function apply(ctx) {
       if (!stat5 || !entry) continue;
       const fp = persistFingerprintOf(stat5);
       if (!fp) continue;
-      if (fp && entry.fingerprint === fp) {
+      if (entry.fingerprint === fp && (entry.title || entry.resolved)) {
         hits.set(id, { title: entry.title, cwd: entry.cwd, createdAt: entry.createdAt });
       }
     }
@@ -1548,10 +1538,12 @@ function apply(ctx) {
     if (!decoded || !decoded.size) return;
     const batch = {};
     const now = Date.now();
-    for (const [id, meta] of decoded) {
+    for (const [id, pack] of decoded) {
+      if (!pack || !pack.resolved) continue;
+      const meta = pack.meta;
       const fp = persistFingerprintOf(statsById.get(id));
       if (!fp) continue;
-      batch[id] = { title: meta.title, cwd: meta.cwd, createdAt: meta.createdAt, fingerprint: fp, updatedAt: now };
+      batch[id] = { title: meta.title, cwd: meta.cwd, createdAt: meta.createdAt, fingerprint: fp, updatedAt: now, resolved: 1 };
     }
     if (!Object.keys(batch).length) return;
     try {
@@ -1634,6 +1626,60 @@ function apply(ctx) {
   const warmQueue = /* @__PURE__ */ new Map();
   let warmRunning = false;
   let warmKickTimer = null;
+  const WARM_MAX_ATTEMPTS = 5;
+  const warmFail = /* @__PURE__ */ new Map();
+  function warmFpOf(stat5) {
+    return fingerprintOf(stat5) || persistFingerprintOf(stat5);
+  }
+  function warmBlocked(id, fp) {
+    const rec = warmFail.get(id);
+    if (!rec) return 0;
+    if (fp && rec.fp && rec.fp !== fp) {
+      warmFail.delete(id);
+      return 0;
+    }
+    const now = Date.now();
+    return rec.nextAt > now ? rec.nextAt - now : 0;
+  }
+  function warmMarkFailure(id, stat5, header) {
+    const rec = warmFail.get(id) || { count: 0, fp: null, nextAt: 0 };
+    rec.count += 1;
+    rec.fp = warmFpOf(stat5) || rec.fp;
+    if (stat5) rec.stat = stat5;
+    if (header) rec.header = header;
+    const backoff = rec.count >= WARM_MAX_ATTEMPTS ? 60 * 60 * 1e3 : Math.min(5 * 60 * 1e3, 15 * 1e3 * Math.pow(2, rec.count));
+    rec.nextAt = Date.now() + backoff;
+    warmFail.set(id, rec);
+  }
+  function warmPendingNow() {
+    if (!warmHasApi) return false;
+    if (warmRunning || warmQueue.size) return true;
+    for (const rec of warmFail.values()) if (rec.nextAt > Date.now()) return true;
+    return false;
+  }
+  let warmRetryTimer = null;
+  function scheduleWarmRetry() {
+    if (warmRetryTimer) return;
+    let soonest = 0;
+    for (const rec of warmFail.values()) {
+      const wait = rec.nextAt - Date.now();
+      if (wait <= 0) {
+        soonest = 1;
+        break;
+      }
+      if (!soonest || wait < soonest) soonest = wait;
+    }
+    if (!soonest) return;
+    warmRetryTimer = setTimeout(() => {
+      warmRetryTimer = null;
+      const now = Date.now();
+      for (const [id, rec] of warmFail) {
+        if (rec.nextAt <= now && !warmQueue.has(id)) warmQueue.set(id, { stat: rec.stat || null, header: rec.header || null });
+      }
+      if (warmQueue.size) scheduleWarm();
+    }, soonest);
+    if (typeof warmRetryTimer.unref === "function") warmRetryTimer.unref();
+  }
   function scheduleWarm() {
     if (warmKickTimer || warmRunning) return;
     warmKickTimer = setTimeout(() => {
@@ -1644,15 +1690,44 @@ function apply(ctx) {
   }
   function enqueueWarm(ids, statsById, entryById) {
     if (!ids || !ids.length) return;
+    if (!warmHasApi) return;
     for (const id of ids) {
       const key = String(id);
+      const stat5 = statsById ? statsById.get(key) || null : null;
+      const fp = warmFpOf(stat5);
+      if (!fp) continue;
+      const blockedMs = warmBlocked(key, fp);
       const entry = entryById ? entryById.get(key) : null;
+      const rec = warmFail.get(key);
+      if (rec) {
+        rec.stat = stat5 || rec.stat;
+        if (entry) rec.header = entry.header || rec.header;
+      }
+      if (blockedMs > 0) continue;
       warmQueue.set(key, {
-        stat: statsById ? statsById.get(key) || null : null,
+        stat: stat5,
         header: entry && entry.header || null
       });
     }
-    scheduleWarm();
+    if (warmQueue.size) scheduleWarm();
+    scheduleWarmRetry();
+  }
+  async function backfillTrashTitles(decoded) {
+    if (!decoded || !decoded.size) return;
+    try {
+      const items = await readTrash();
+      const worth = items.some((t) => !t.title && decoded.get(String(t.sessionId)) && decoded.get(String(t.sessionId)).meta && decoded.get(String(t.sessionId)).meta.title);
+      if (!worth) return;
+      await mutateTrash((store) => {
+        for (const item of store.items) {
+          if (item.title) continue;
+          const pack = decoded.get(String(item.sessionId));
+          const t = pack && pack.meta && pack.meta.title;
+          if (t) item.title = String(t);
+        }
+      });
+    } catch (e) {
+    }
   }
   async function runWarm() {
     if (warmRunning) return;
@@ -1663,21 +1738,27 @@ function apply(ctx) {
         for (const [id] of batch) warmQueue.delete(id);
         try {
           const ids = batch.map(([id]) => id);
-          const snapshotById = await projectTitles(ids);
+          const resultById = await projectTitlesStatus(ids);
           const decoded = /* @__PURE__ */ new Map();
           const statsById = /* @__PURE__ */ new Map();
           for (const [id, desc] of batch) {
-            const snapshot = snapshotById.has(id) ? snapshotById.get(id) : null;
-            const meta = metaFromSnapshot(snapshot);
+            const r = resultById.get(id);
+            if (!r || !r.resolved) {
+              warmMarkFailure(id, desc.stat, desc.header);
+              continue;
+            }
+            warmFail.delete(id);
+            const meta = metaFromSnapshot(r.snapshot || null);
             if (desc.header) {
               if (typeof desc.header.cwd === "string") meta.cwd = desc.header.cwd;
               if (desc.header.createdAt != null) meta.createdAt = desc.header.createdAt;
             }
             metaCache.set(id, desc.stat, meta);
             statsById.set(id, desc.stat);
-            if (desc.stat) decoded.set(id, meta);
+            decoded.set(id, { meta, resolved: true });
           }
           await persistDecoded(decoded, statsById);
+          await backfillTrashTitles(decoded);
         } catch (e) {
         }
         await new Promise((resolve) => setImmediate(resolve));
@@ -1685,6 +1766,7 @@ function apply(ctx) {
     } finally {
       warmRunning = false;
       if (warmQueue.size) scheduleWarm();
+      scheduleWarmRetry();
     }
   }
   async function collectUsage(preloadedEntries) {
@@ -1804,30 +1886,19 @@ function apply(ctx) {
         cwd = header.cwd || null;
         title = header.title || header.meta && header.meta.title || null;
       }
-      if (!title) {
-        if (typeof sq.readTitleSnapshot === "function") {
-          try {
-            const snap = unwrapSnapshot(await sq.readTitleSnapshot(sid));
-            if (snap && snap.title && snap.title.title) title = String(snap.title.title);
-            if (snap && snap.session) {
-              if (!cwd) cwd = snap.session.cwd || null;
-            }
-          } catch (e) {
-          }
-        }
-      }
       if (!title) {
         try {
-          let folded = null;
-          const summary = await persistence.inspectSession(sid, {
-            onEvents: (events) => {
-              if (!folded) folded = foldTitle(events);
-            }
-          });
-          if (summary && summary.meta && !cwd) cwd = summary.meta.cwd || null;
-          title = folded;
+          const delStat = persistenceEntry && typeof persistenceEntry.revision === "string" && persistenceEntry.revision ? { revision: persistenceEntry.revision, sizeBytes: Number.isFinite(persistenceEntry.sizeBytes) ? Number(persistenceEntry.sizeBytes) : void 0 } : removedPath ? await stat4(removedPath).then((st) => ({ mtimeMs: st.mtimeMs, size: st.size })) : null;
+          if (delStat) {
+            const m = metaCache.get(sid, delStat) || (await hydrateFromPersist([sid], /* @__PURE__ */ new Map([[sid, delStat]]))).get(sid);
+            if (m && m.title) title = String(m.title);
+          }
         } catch (e) {
         }
+        if (!title) {
+          const at = authorityTitleCache.get(sid);
+          if (at) title = String(at);
+        }
       }
     } catch (e) {
     }
@@ -1839,8 +1910,10 @@ function apply(ctx) {
     const archived = await mutateArchived((list) => ({ next: null, value: list.includes(sid) })).catch(() => false);
     await mutateTrash((store) => {
       const entry = {
+        // v3.6.2 #7：不再把 cwd/裸 id 冒充标题永久定格——存 null，预热解出后
+        // backfillTrashTitles 补写；渲染端（t.title || t.sessionId）自然降级。
         sessionId: sid,
-        title: title || cwd || sid,
+        title: title || null,
         cwd: cwd || null,
         header: header || null,
         originalPath: removedPath || null,
@@ -2455,19 +2528,50 @@ function apply(ctx) {
       return { next: null, value: { ok: true, archived: true } };
     });
   }
-  async function projectTitles(ids) {
+  const warmHasApi = typeof sq.readTitleSnapshots === "function" || typeof sq.readTitleSnapshot === "function";
+  async function projectTitlesStatus(ids) {
     const out = /* @__PURE__ */ new Map();
+    const markAll = (resolved) => {
+      for (const id of ids) out.set(String(id), { resolved, snapshot: null });
+    };
     if (!ids || !ids.length) return out;
-    if (typeof sq.readTitleSnapshots !== "function") return out;
-    try {
-      const results = await sq.readTitleSnapshots(ids);
-      if (!Array.isArray(results)) return out;
-      results.forEach((result, index) => {
-        const id = String(ids[index]);
-        out.set(id, unwrapSnapshot(result));
-      });
-    } catch (e) {
+    if (!warmHasApi) {
+      markAll(false);
+      return out;
+    }
+    if (typeof sq.readTitleSnapshots === "function") {
+      let results = null;
+      try {
+        results = await sq.readTitleSnapshots(ids);
+      } catch (e) {
+        results = null;
+      }
+      if (Array.isArray(results)) {
+        results.forEach((result, index) => {
+          const id = String(ids[index]);
+          if (result && result.status === "fulfilled") out.set(id, { resolved: true, snapshot: unwrapSnapshot(result) });
+          else if (result && result.status === "rejected") out.set(id, { resolved: false, snapshot: null });
+          else if (result) out.set(id, { resolved: true, snapshot: unwrapSnapshot(result) });
+          else out.set(id, { resolved: false, snapshot: null });
+        });
+        for (const id of ids) if (!out.has(String(id))) out.set(String(id), { resolved: false, snapshot: null });
+        return out;
+      }
+    }
+    if (typeof sq.readTitleSnapshot === "function") {
+      for (const raw of ids) {
+        const id = String(raw);
+        try {
+          const r = await sq.readTitleSnapshot(id);
+          if (r && r.status === "rejected") out.set(id, { resolved: false, snapshot: null });
+          else out.set(id, { resolved: true, snapshot: unwrapSnapshot(r) });
+        } catch (e) {
+          out.set(id, { resolved: false, snapshot: null });
+        }
+      }
+      return out;
     }
+    markAll(false);
     return out;
   }
   async function allSessionItemsDetailed(opts = {}) {
@@ -2662,40 +2766,53 @@ function apply(ctx) {
       titles: Object.fromEntries(authorityTitleCache),
       trashedSessionIds: store.items.map((item) => String(item.sessionId)),
       purgedSessionIds: activeTombstones,
-      lineage
+      lineage,
+      // v3.6.2：还有预热/退避重试在途 → client 缩短轮询节拍，预热一完成就把
+      // 补齐的标题送回（含面板自动刷新）。无预热 API 时恒 false，绝不假忙。
+      warmPending: warmPendingNow()
     };
   }
   const emptyScanCache = /* @__PURE__ */ new Map();
+  const REFINE_BUDGET = 40;
+  function applyEmptyScan(lineage, id, empty) {
+    if (empty) {
+      const info = lineage[id] || (lineage[id] = { origin: null, parentSession: null, delegationDepth: 0, empty: false });
+      info.empty = true;
+    } else if (lineage[id]) {
+      const info = lineage[id];
+      info.empty = false;
+      if (!info.origin && !info.parentSession) delete lineage[id];
+    }
+  }
   async function refineEmptyLineage(lineage, entries) {
     if (!persistence || typeof persistence.inspectSession !== "function") return;
+    const limiter = createLimiter(4);
+    const todo = [];
     for (const entry of entries) {
       const size = entry && Number.isFinite(entry.sizeBytes) ? entry.sizeBytes : null;
       if (size === null || size > EMPTY_DECODE_LIMIT) continue;
       const id = String(entry.id);
-      let scanned = emptyScanCache.get(id);
-      if (!scanned || scanned.sizeBytes !== size) {
-        let isEmpty = false;
-        try {
-          const types = [];
-          await persistence.inspectSession(id, { onEvents: (batch) => {
-            for (const ev of batch || []) if (types.length < 64) types.push(ev && ev.type);
-          } });
-          isEmpty = isEmptyEventTypes(types);
-        } catch (e) {
-          isEmpty = false;
-        }
-        scanned = { sizeBytes: size, empty: isEmpty };
-        emptyScanCache.set(id, scanned);
-      }
-      if (scanned.empty) {
-        const info = lineage[id] || (lineage[id] = { origin: null, parentSession: null, delegationDepth: 0, empty: false });
-        info.empty = true;
-      } else if (lineage[id]) {
-        const info = lineage[id];
-        info.empty = false;
-        if (!info.origin && !info.parentSession) delete lineage[id];
+      const scanned = emptyScanCache.get(id);
+      if (scanned && scanned.sizeBytes === size) {
+        applyEmptyScan(lineage, id, scanned.empty);
+        continue;
       }
+      if (todo.length < REFINE_BUDGET) todo.push({ id, size });
     }
+    await Promise.all(todo.map(({ id, size }) => limiter(async () => {
+      let isEmpty = false;
+      try {
+        const types = [];
+        await persistence.inspectSession(id, { onEvents: (batch) => {
+          for (const ev of batch || []) if (types.length < 64) types.push(ev && ev.type);
+        } });
+        isEmpty = isEmptyEventTypes(types);
+      } catch (e) {
+        isEmpty = false;
+      }
+      emptyScanCache.set(id, { sizeBytes: size, empty: isEmpty });
+      applyEmptyScan(lineage, id, isEmpty);
+    })));
     const live = /* @__PURE__ */ new Set();
     for (const entry of entries) {
       const size = entry && Number.isFinite(entry.sizeBytes) ? entry.sizeBytes : null;
@@ -3094,7 +3211,7 @@ function apply(ctx) {
       path: "/archived-sessions/sessions",
       handler: async (req, res) => {
         try {
-          json(res, { items: await allSessionItems() });
+          json(res, { items: await allSessionItems(), warmPending: warmPendingNow() });
         } catch (e) {
           json(res, { error: String(e && e.message || e) }, 500);
         }
@@ -3198,9 +3315,18 @@ function apply(ctx) {
             });
             if (Number.isFinite(sizeBytes)) sizeById.set(id, sizeBytes);
           };
+          const lineageStats = /* @__PURE__ */ new Map();
+          const lineageHeaders = /* @__PURE__ */ new Map();
           try {
             for (const entry of await persistence.listEntries()) {
               addHeader(entry.header, entry.sizeBytes);
+              const eid = entry && entry.id != null ? String(entry.id) : null;
+              if (eid) {
+                lineageHeaders.set(eid, { header: entry && entry.header || null });
+                if (entry && typeof entry.revision === "string" && entry.revision) {
+                  lineageStats.set(eid, Number.isFinite(entry.sizeBytes) ? { revision: entry.revision, sizeBytes: Number(entry.sizeBytes) } : { revision: entry.revision });
+                }
+              }
               if (entry && entry.id != null) persistedIds.add(String(entry.id));
             }
           } catch (e) {
@@ -3252,11 +3378,17 @@ function apply(ctx) {
             n.children.forEach(walk);
           };
           nodes.forEach(walk);
-          const titles = await projectTitles(allIds);
+          const lineageIds = allIds.map(String);
+          const { cached: lineageCached, missing: lineageMissing } = metaCache.partition(lineageIds, lineageStats);
+          const lineagePersisted = await hydrateFromPersist(lineageMissing, lineageStats);
+          for (const [id, meta] of lineagePersisted) metaCache.set(id, lineageStats.get(id), meta);
+          const lineageRest = lineageMissing.filter((id) => !lineagePersisted.has(id));
+          if (lineageRest.length) enqueueWarm(lineageRest, lineageStats, lineageHeaders);
+          const truncateTitle = (t) => t ? t.length > MAX_TITLE ? t.slice(0, MAX_TITLE) + "\u2026" : t : null;
           const titleOf = (id) => {
-            const snap = titles.get(id);
-            const m = snap ? metaFromSnapshot(snap) : null;
-            return m && m.title || null;
+            const key = String(id);
+            const m = lineageCached.get(key) || lineagePersisted.get(key);
+            return truncateTitle(m && m.title || authorityTitleCache.get(key) || null);
           };
           const fill = (n) => {
             n.title = titleOf(n.sessionId);