dsh-sessions-manager 3.7.6 → 3.7.8

package/lib/index.js

@@ -2019,13 +2019,61 @@ var LIFECYCLE_EVENT_TYPES = /* @__PURE__ */ new Set([
   "sandbox/mode",
   "approval/policy"
 ]);
-function isEmptyEventTypes(types) {
-  if (!Array.isArray(types)) return false;
-  for (const t of types) {
-    if (typeof t !== "string" || !LIFECYCLE_EVENT_TYPES.has(t)) return false;
+function isInjectedMessage(msg) {
+  const src = msg && typeof msg === "object" ? msg.source : null;
+  if (!src || typeof src !== "object") return false;
+  if (src.form === "instructions") return true;
+  return typeof src.kind === "string" && src.kind.startsWith("plugin:");
+}
+function isNoiseEvent(event) {
+  const type = typeof event === "string" ? event : event && typeof event === "object" ? event.type : null;
+  if (typeof type !== "string") return false;
+  if (LIFECYCLE_EVENT_TYPES.has(type)) return true;
+  if (type !== "agent/inbox/spliced") return false;
+  const data = event && typeof event === "object" ? event.data : null;
+  if (!data || typeof data !== "object") return false;
+  const removed = Number(data.removedCount);
+  if (Number.isFinite(removed) && removed > 0) return false;
+  if (!Array.isArray(data.inserted)) return false;
+  if (data.inserted.length === 0) return true;
+  return data.inserted.every(isInjectedMessage);
+}
+function isEmptyEventTypes(events) {
+  if (!Array.isArray(events)) return false;
+  for (const ev of events) {
+    if (!isNoiseEvent(ev)) return false;
   }
   return true;
 }
+var SUBAGENT_CASCADE_LIMIT = 500;
+function subagentDescendantsOf(headers, rootId, limit = SUBAGENT_CASCADE_LIMIT) {
+  const root = rootId == null ? "" : String(rootId);
+  if (!root) return [];
+  const kidsOf = /* @__PURE__ */ new Map();
+  for (const h of Array.isArray(headers) ? headers : []) {
+    if (!h || typeof h !== "object" || h.id == null || h.origin !== "subagent") continue;
+    const id = String(h.id);
+    const parent = h.parentSession != null ? String(h.parentSession) : "";
+    if (!parent || parent === id) continue;
+    if (!kidsOf.has(parent)) kidsOf.set(parent, []);
+    kidsOf.get(parent).push(id);
+  }
+  const max = Number.isFinite(limit) && limit > 0 ? Math.floor(limit) : SUBAGENT_CASCADE_LIMIT;
+  const out = [];
+  const visited = /* @__PURE__ */ new Set([root]);
+  const queue = [root];
+  while (queue.length && out.length < max) {
+    const cur = queue.shift();
+    for (const kid of kidsOf.get(cur) || []) {
+      if (visited.has(kid)) continue;
+      visited.add(kid);
+      out.push(kid);
+      queue.push(kid);
+      if (out.length >= max) break;
+    }
+  }
+  return out;
+}
 function classifyLineage(header) {
   if (!header || typeof header !== "object") return null;
   const origin = header.origin === "subagent" ? "subagent" : null;
@@ -2039,7 +2087,7 @@ function emptyScanCandidate(sizeBytes) {
 }
 
 // src/index.js
-var BUILD_STAMP = true ? "3.7.6+68c2ab69" : "dev";
+var BUILD_STAMP = true ? "3.7.8+846b91ab" : "dev";
 var name = "dsh-sessions-manager";
 var inject = ["webServer", "workspaceRegistry", "sessionPersistence", "sessionQuery", "storageDomain"];
 var MAX_TITLE = 80;
@@ -2523,7 +2571,7 @@ function apply(ctx) {
     } catch (e) {
     }
   }
-  async function deleteOne(sid) {
+  async function deleteOne(sid, opts = {}) {
     requireSessionId(sid);
     let header = null;
     let cwd = null;
@@ -2531,7 +2579,7 @@ function apply(ctx) {
     let removedPath = null;
     let persistenceEntry = null;
     try {
-      const entries = await persistence.listEntries();
+      const entries = Array.isArray(opts.entries) ? opts.entries : await persistence.listEntries();
       const found = entries.find((entry) => entry.id === sid) || null;
       persistenceEntry = found;
       header = found ? found.header : null;
@@ -2576,6 +2624,7 @@ function apply(ctx) {
         wasArchived: archived,
         deletedAt: Date.now()
       };
+      if (opts.cascadeFrom) entry.cascadeFrom = String(opts.cascadeFrom);
       const at = store.items.findIndex((t) => String(t.sessionId) === sid);
       if (at >= 0) store.items[at] = entry;
       else store.items.push(entry);
@@ -2583,6 +2632,64 @@ function apply(ctx) {
     });
     return { ok: true, trashed: true };
   }
+  function subagentDescendantIdsFrom(entries, rootId) {
+    const headers = [];
+    for (const entry of Array.isArray(entries) ? entries : []) {
+      if (entry && entry.header) headers.push(entry.header);
+    }
+    return subagentDescendantsOf(headers, rootId);
+  }
+  async function deleteWithSubagents(sid, opts = {}) {
+    let entries = Array.isArray(opts.entries) ? opts.entries : null;
+    if (!entries) {
+      try {
+        entries = await persistence.listEntries();
+      } catch (e) {
+        entries = null;
+      }
+    }
+    const out = await deleteOne(sid, { entries });
+    const cascade = opts.cascade !== false;
+    if (!cascade || !entries) return { ...out, cascaded: 0, cascadedIds: [] };
+    const kids = subagentDescendantIdsFrom(entries, sid);
+    let alreadyTrashed = null;
+    try {
+      const store = await readTrashStore();
+      alreadyTrashed = new Set(store.items.map((t) => String(t.sessionId)));
+    } catch (e) {
+      alreadyTrashed = null;
+    }
+    const cascadedIds = [];
+    for (const kid of kids) {
+      if (alreadyTrashed && alreadyTrashed.has(String(kid))) continue;
+      try {
+        await deleteOne(kid, { entries, cascadeFrom: sid });
+        metaCache.invalidate(kid);
+        cascadedIds.push(kid);
+      } catch (e) {
+      }
+    }
+    return { ...out, cascaded: cascadedIds.length, cascadedIds };
+  }
+  async function cascadeTrashChildren(sid, op) {
+    let kids = [];
+    try {
+      const store = await readTrashStore();
+      kids = store.items.filter((t) => String(t.cascadeFrom || "") === String(sid)).map((t) => String(t.sessionId));
+    } catch (e) {
+      return [];
+    }
+    const results = [];
+    for (const kid of kids) {
+      try {
+        results.push({ sessionId: kid, ok: true, ...await op(kid) });
+        metaCache.invalidate(kid);
+      } catch (e) {
+        results.push({ sessionId: kid, ok: false, error: String(e && e.message || e) });
+      }
+    }
+    return results;
+  }
   async function verifyTrashRestore(sid) {
     const sessions = ctx.get("sessions");
     if (sessions && sessions.get && sessions.get(sid)) {
@@ -3496,6 +3603,18 @@ function apply(ctx) {
     const payload = {
       titles: Object.fromEntries(authorityTitleCache),
       trashedSessionIds: store.items.map((item) => String(item.sessionId)),
+      // issue #16：回收站按 cwd 的条数。折叠分组下上游把 group.sessions 收回成
+      // 空数组，client 拿不到成员 id，只能用「组内会话总数 − 本组回收站条数」
+      // 还原展开按钮该显示的数字；有了这份统计，那次扣减才是准确的而非估算。
+      trashedCountByCwd: (() => {
+        const acc = {};
+        for (const item of store.items) {
+          const cwd = typeof item.cwd === "string" ? item.cwd : "";
+          if (!cwd) continue;
+          acc[cwd] = (acc[cwd] || 0) + 1;
+        }
+        return acc;
+      })(),
       purgedSessionIds: activeTombstones,
       lineage,
       // v3.6.2：还有预热/退避重试在途 → client 缩短轮询节拍，预热一完成就把
@@ -3549,11 +3668,29 @@ function apply(ctx) {
         const persistBatch = {};
         for (const [id, desc] of batch) {
           try {
-            const types = [];
+            const events = [];
             await persistence.inspectSession(id, { onEvents: (b) => {
-              for (const ev of b || []) if (types.length < 64) types.push(ev && ev.type);
+              for (const ev of b || []) {
+                if (events.length >= 64) break;
+                if (!ev) {
+                  events.push(void 0);
+                  continue;
+                }
+                if (ev.type !== "agent/inbox/spliced") {
+                  events.push({ type: ev.type });
+                  continue;
+                }
+                const data = ev.data && typeof ev.data === "object" ? ev.data : null;
+                events.push({
+                  type: ev.type,
+                  data: data ? {
+                    removedCount: data.removedCount,
+                    inserted: Array.isArray(data.inserted) ? data.inserted.map((m) => ({ source: m && typeof m === "object" ? m.source : null })) : null
+                  } : null
+                });
+              }
             } });
-            const isEmpty = isEmptyEventTypes(types);
+            const isEmpty = isEmptyEventTypes(events);
             emptyScanCache.set(id, { sizeBytes: desc.sizeBytes, empty: isEmpty });
             persistBatch[id] = { empty: isEmpty ? 1 : 0, fingerprint: `sz:${desc.sizeBytes}`, updatedAt: Date.now() };
           } catch (e) {
@@ -3826,7 +3963,7 @@ function apply(ctx) {
           const body = await readJsonBody(req);
           const sid = body && typeof body.sessionId === "string" ? body.sessionId : null;
           if (!sid) return json(res, { ok: false, error: "missing sessionId" }, 400);
-          const out = await deleteOne(sid);
+          const out = await deleteWithSubagents(sid, { cascade: body.cascadeSubagents !== false });
           metaCache.invalidate(sid);
           json(res, out);
         } catch (e) {
@@ -3843,15 +3980,30 @@ function apply(ctx) {
           const ids = parseIds(body);
           if (!ids || ids.length === 0) return json(res, { ok: false, error: "missing sessionIds" }, 400);
           const results = [];
+          let cascadeEntries = null;
+          try {
+            cascadeEntries = await persistence.listEntries();
+          } catch (e) {
+            cascadeEntries = null;
+          }
+          const cascade = body.cascadeSubagents !== false;
+          const done = /* @__PURE__ */ new Set();
           for (const sid of ids) {
             try {
-              results.push({ sessionId: sid, ok: true, ...await deleteOne(sid) });
+              if (done.has(sid)) {
+                results.push({ sessionId: sid, ok: true, trashed: true, cascaded: 0 });
+                continue;
+              }
+              const out = cascade && cascadeEntries ? await deleteWithSubagents(sid, { cascade: true, entries: cascadeEntries }) : await deleteOne(sid, { entries: cascadeEntries });
+              done.add(sid);
+              if (Array.isArray(out.cascadedIds)) for (const k of out.cascadedIds) done.add(k);
+              results.push({ sessionId: sid, ok: true, ...out });
               metaCache.invalidate(sid);
             } catch (e) {
               results.push({ sessionId: sid, ok: false, error: String(e && e.message || e) });
             }
           }
-          json(res, { ok: true, deleted: results.filter((r) => r.ok).length, results });
+          json(res, { ok: true, deleted: results.filter((r) => r.ok).length, cascaded: results.reduce((n, r) => n + (Number(r.cascaded) || 0), 0), results });
         } catch (e) {
           json(res, { ok: false, code: e && e.code, error: String(e && e.message || e) }, errorStatus(e));
         }
@@ -3920,7 +4072,8 @@ function apply(ctx) {
           if (!sid) return json(res, { ok: false, error: "missing sessionId" }, 400);
           const out = await restoreFromTrash(sid);
           metaCache.invalidate(sid);
-          json(res, out);
+          const cascaded = await cascadeTrashChildren(sid, (kid) => restoreFromTrash(kid));
+          json(res, { ...out, cascaded: cascaded.filter((r) => r.ok).length, cascadedResults: cascaded.length ? cascaded : void 0 });
         } catch (e) {
           json(res, { ok: false, code: e && e.code, error: String(e && e.message || e) }, errorStatus(e));
         }
@@ -3944,7 +4097,19 @@ function apply(ctx) {
             await emptyIndex.remove([sid]);
           } catch (e) {
           }
-          json(res, out);
+          const cascaded = await cascadeTrashChildren(sid, async (kid) => {
+            const r = await purgeFromTrash(kid);
+            try {
+              await titleIndex.remove([kid]);
+            } catch (e) {
+            }
+            try {
+              await emptyIndex.remove([kid]);
+            } catch (e) {
+            }
+            return r;
+          });
+          json(res, { ...out, cascaded: cascaded.filter((r) => r.ok).length });
         } catch (e) {
           json(res, { ok: false, code: e && e.code, error: String(e && e.message || e) }, errorStatus(e));
         }
@@ -3967,6 +4132,18 @@ function apply(ctx) {
               });
               await emptyIndex.remove([sid]).catch(() => {
               });
+              await cascadeTrashChildren(sid, async (kid) => {
+                const r = await purgeFromTrash(kid);
+                try {
+                  await titleIndex.remove([kid]);
+                } catch (e) {
+                }
+                try {
+                  await emptyIndex.remove([kid]);
+                } catch (e) {
+                }
+                return r;
+              });
             } catch (e) {
               results.push({ sessionId: sid, ok: false, error: String(e && e.message || e) });
             }