dsh-sessions-manager 3.7.3 → 3.7.5

package/lib/index.js

@@ -960,7 +960,9 @@ function pickInactiveCandidates(items, options = {}) {
   const now = Number.isFinite(options.now) ? options.now : Date.now();
   const cutoff = now - days * DAY_MS;
   const skipStarred = options.skipStarred !== false;
-  const activeId = options.activeSessionId != null ? String(options.activeSessionId) : null;
+  const activeIds = new Set(
+    Array.isArray(options.activeSessionIds) ? options.activeSessionIds.map((id) => String(id)) : options.activeSessionId != null ? [String(options.activeSessionId)] : []
+  );
   const list = Array.isArray(items) ? items : [];
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -970,7 +972,7 @@ function pickInactiveCandidates(items, options = {}) {
     if (seen.has(id)) continue;
     if (item.archived) continue;
     if (skipStarred && item.starred) continue;
-    if (activeId !== null && id === activeId) continue;
+    if (activeIds.has(id)) continue;
     const updatedAt = Number(item.updatedAt);
     if (!Number.isFinite(updatedAt) || updatedAt <= 0) continue;
     if (updatedAt < cutoff) {
@@ -1350,6 +1352,58 @@ function createEmptyScanStore({ dir, file }) {
   };
 }
 
+// src/active-session.js
+var DEFAULT_ACTIVE_TTL_MS = 45 * 1e3;
+var MAX_ACTIVE_REPORTS = 32;
+function isUsableSessionId(value) {
+  return typeof value === "string" && value.length > 0 && value.length <= 200 && !/[\\/\0]/.test(value) && value !== "." && value !== "..";
+}
+function createActiveSessionTracker(options = {}) {
+  const ttl = Number.isFinite(options.ttlMs) ? Number(options.ttlMs) : DEFAULT_ACTIVE_TTL_MS;
+  const now = typeof options.now === "function" ? options.now : () => Date.now();
+  const reports = /* @__PURE__ */ new Map();
+  function trim(at) {
+    for (const [key, value] of reports) if (at - value.at > ttl) reports.delete(key);
+    while (reports.size > MAX_ACTIVE_REPORTS) {
+      const oldest = reports.keys().next().value;
+      if (oldest === void 0) break;
+      reports.delete(oldest);
+    }
+  }
+  function report(clientId, sessionId, at = now()) {
+    const key = typeof clientId === "string" && clientId ? clientId.slice(0, 64) : "default";
+    if (sessionId === null || sessionId === void 0 || sessionId === "") {
+      reports.delete(key);
+      return true;
+    }
+    if (!isUsableSessionId(sessionId)) return false;
+    reports.set(key, { id: String(sessionId), at });
+    trim(at);
+    return true;
+  }
+  function activeIds(at = now()) {
+    const out = /* @__PURE__ */ new Set();
+    for (const [key, value] of reports) {
+      if (at - value.at > ttl) {
+        reports.delete(key);
+        continue;
+      }
+      out.add(value.id);
+    }
+    return out;
+  }
+  return {
+    report,
+    activeIds,
+    get size() {
+      return reports.size;
+    },
+    clear() {
+      reports.clear();
+    }
+  };
+}
+
 // src/handle-era-paths.js
 import { readdir as readdir2, stat as stat2 } from "node:fs/promises";
 import { basename, join as join10 } from "node:path";
@@ -1985,7 +2039,7 @@ function emptyScanCandidate(sizeBytes) {
 }
 
 // src/index.js
-var BUILD_STAMP = true ? "3.7.3+5958fd65" : "dev";
+var BUILD_STAMP = true ? "3.7.5+23dc7e59" : "dev";
 var name = "dsh-sessions-manager";
 var inject = ["webServer", "workspaceRegistry", "sessionPersistence", "sessionQuery", "storageDomain"];
 var MAX_TITLE = 80;
@@ -2052,7 +2106,7 @@ function requireSessionId(value) {
   }
   return value;
 }
-function getActiveSessionId(context) {
+function legacyActiveSessionId(context) {
   try {
     const a = context.get("activeSession");
     if (a != null) return a && a.id != null ? a.id : typeof a === "string" ? a : null;
@@ -2070,6 +2124,12 @@ function getActiveSessionId(context) {
   }
   return null;
 }
+function getActiveSessionIds(context, tracker) {
+  const reported = tracker ? tracker.activeIds() : null;
+  if (reported && reported.size) return reported;
+  const legacy = legacyActiveSessionId(context);
+  return legacy != null ? /* @__PURE__ */ new Set([String(legacy)]) : /* @__PURE__ */ new Set();
+}
 function apply(ctx) {
   const w = ctx.workspaceRegistry;
   const sp = ctx.sessionPersistence;
@@ -2081,6 +2141,7 @@ function apply(ctx) {
   const metaCache = createSessionMetaCache();
   const titleIndex = createTitleIndexStore({ dir: TRASH_DIR, file: join12(TRASH_DIR, "title-index.json") });
   const emptyIndex = createEmptyScanStore({ dir: TRASH_DIR });
+  const activeTracker = createActiveSessionTracker();
   const EMPTY_VERDICT_TTL_MS = 14 * 24 * 3600 * 1e3;
   async function hydrateFromPersist(ids, statsById) {
     const hits = /* @__PURE__ */ new Map();
@@ -2137,6 +2198,19 @@ function apply(ctx) {
     if (result.status === "rejected") return null;
     return result;
   }
+  function projectionTitleOf(liveStore, id) {
+    try {
+      const reg = ctx.get("sessionProjections");
+      if (!reg || typeof reg.cachedSnapshot !== "function") return null;
+      const session = liveStore && liveStore.get && liveStore.get(id);
+      if (!session) return null;
+      const snap = reg.cachedSnapshot(session, ["title"]);
+      const title = snap && snap.values ? snap.values.title : null;
+      return typeof title === "string" && title.length > 0 ? title : null;
+    } catch (e) {
+      return null;
+    }
+  }
   async function archivedState() {
     const d = dom();
     if (!d) throw new Error("workspace domain is not open");
@@ -2756,8 +2830,9 @@ function apply(ctx) {
   }
   async function moveOne(sid, targetPath) {
     requireCapability(capabilities, "move");
-    const activeId = getActiveSessionId(ctx);
-    if (activeId != null && String(activeId) === String(sid)) {
+    const activeIds = getActiveSessionIds(ctx, activeTracker);
+    const activeId = activeIds.values().next().value != null ? activeIds.values().next().value : null;
+    if (activeIds.has(String(sid)) || activeId != null && String(activeId) === String(sid)) {
       const error = new Error("\u4F1A\u8BDD\u6B63\u88AB DSH \u6253\u5F00\uFF0C\u6682\u65F6\u65E0\u6CD5\u79FB\u52A8\uFF1B\u8BF7\u91CD\u542F DSH \u540E\u518D\u8BD5\u3002");
       error.status = 409;
       error.code = "DSM_SESSION_BUSY";
@@ -3225,11 +3300,29 @@ function apply(ctx) {
         createdAt: header && header.createdAt != null ? header.createdAt : meta.createdAt
       });
     }
-    const stillMissing = missing.filter((id) => !persisted.has(id));
+    const stillMissing0 = missing.filter((id) => !persisted.has(id));
+    const projectionMeta = /* @__PURE__ */ new Map();
+    const stillMissing = [];
+    for (const id of stillMissing0) {
+      const title = projectionTitleOf(live, id);
+      if (title == null) {
+        stillMissing.push(id);
+        continue;
+      }
+      const entry = entryById.get(id);
+      const header = entry && entry.header ? entry.header : null;
+      const meta = {
+        title,
+        cwd: header && typeof header.cwd === "string" && header.cwd ? header.cwd : null,
+        createdAt: header && header.createdAt != null ? header.createdAt : null
+      };
+      projectionMeta.set(id, meta);
+      metaCache.set(id, statsById.get(id), meta);
+    }
     if (stillMissing.length) enqueueWarm(stillMissing, statsById, entryById);
     const items = [];
     for (const id of visibleIds) {
-      let meta = metaCache.get(id, statsById.get(id)) || persisted.get(id) || null;
+      let meta = metaCache.get(id, statsById.get(id)) || persisted.get(id) || projectionMeta.get(id) || null;
       if (!meta) {
         meta = { title: null, cwd: null, createdAt: null };
         const entry = entryById.get(id);
@@ -3300,7 +3393,7 @@ function apply(ctx) {
     const candidates = pickInactiveCandidates(items, {
       inactiveDays: days,
       skipStarred: store.settings.skipStarred,
-      activeSessionId: getActiveSessionId(ctx),
+      activeSessionIds: [...getActiveSessionIds(ctx, activeTracker)],
       now
     });
     let archived = 0;
@@ -3636,6 +3729,20 @@ function apply(ctx) {
       path: "/archived-sessions/capabilities",
       handler: async (req, res) => json(res, { ...capabilities, buildStamp: BUILD_STAMP })
     }));
+    disposers.push(ctx.webServer.register({
+      kind: "exact",
+      path: "/archived-sessions/active-session",
+      handler: async (req, res) => {
+        const body = await readJsonBody(req);
+        const clientId = body && typeof body.clientId === "string" ? body.clientId : "default";
+        const sid = body && typeof body.sessionId === "string" && body.sessionId ? body.sessionId : null;
+        const accepted = activeTracker.report(clientId, sid);
+        json(res, {
+          ok: accepted,
+          activeSessionIds: [...activeTracker.activeIds()]
+        });
+      }
+    }));
     disposers.push(ctx.webServer.register({
       kind: "exact",
       path: "/archived-sessions/list",