@michengai/dsh-archive-manager 1.0.9 → 1.0.11

package/lib/workspace.js

@@ -273,6 +273,24 @@ function hostEvent(ctx, name) {
   const caller = ctx[name];
   return typeof caller === "function" ? caller : void 0;
 }
+const fileUploadResolverRestart = Symbol.for("dsh-archive-manager.file-upload-resolver-restart");
+const staleFileUploadResolver = "file-upload: Agent resolver is already registered";
+function tolerateStaleFileUploadResolver(ctx) {
+  const uploads = ctx.get?.("fileUploads");
+  const original = uploads?.registerAgentResolver;
+  if (uploads === void 0 || typeof original !== "function" || original[fileUploadResolverRestart] === true) return;
+  const registerAgentResolver = function(resolve2) {
+    try {
+      return original.call(this, resolve2);
+    } catch (error) {
+      if (!(error instanceof Error) || error.message !== staleFileUploadResolver || !Object.hasOwn(this, "agentResolver")) throw error;
+      this.agentResolver = void 0;
+      return original.call(this, resolve2);
+    }
+  };
+  registerAgentResolver[fileUploadResolverRestart] = true;
+  uploads.registerAgentResolver = registerAgentResolver;
+}
 var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
   static inject = [
     "storageDomain",
@@ -292,6 +310,7 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
   archivedSessionPathIndexKey;
   constructor(ctx) {
     super(ctx);
+    tolerateStaleFileUploadResolver(ctx);
     const indexedPath = this.host.sessionPath;
     this.host.sessionPath = (id) => {
       const path = indexedPath(id);
@@ -800,9 +819,17 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
       const deletedSessionIds = [];
       const skippedSessionIds = [];
       const failures = [];
+      let descendantHeaders;
+      try {
+        descendantHeaders = await this.listStoredHeaders();
+      } catch (error) {
+        this.ctx.logger.warn(
+          `archive-manager: batch descendant listing failed; each cascade will retry: ${String(error)}`
+        );
+      }
       for (const sessionId of requestedSessionIds) {
         try {
-          const result = await this.deleteSessionCore(sessionId);
+          const result = await this.deleteSessionCore(sessionId, descendantHeaders);
           if (result?.skipped) skippedSessionIds.push(sessionId);
           else deletedSessionIds.push(sessionId);
         } catch (error) {
@@ -880,7 +907,7 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
     });
   }
   /** 串行化后的删除主体（级联路径复用：它已持有操作链，绝不能再入队）。 */
-  async deleteSessionCore(sessionId) {
+  async deleteSessionCore(sessionId, descendantHeaders) {
     if (!await this.sessionKnown(sessionId)) {
       await this.cleanupUnknownArchivedSession(sessionId);
       return { deleted: true, skipped: true };
@@ -897,7 +924,7 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
     const projCache = this.ctx.get("sessionProjectionCache");
     await projCache?.whenIdle?.();
     if (projCache !== void 0) await projCache.delete(sessionId);
-    await this.deleteDescendants(sessionId);
+    await this.deleteDescendants(sessionId, descendantHeaders);
     await this.cleanSpill(sessionId);
     await this.removeTranscriptDirectory(sessionId);
     const state = this.requireState();
@@ -1127,23 +1154,28 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
   /** 尽力而为的级联删除：删除 `sessionId` 的 SUBAGENT 子会话。
    * 仅头部标记 `origin: "subagent"` 的会话参与：单凭 `parentSession` 有歧义
    *（fork 分支也携带它），而 fork 分支是独立的用户会话，绝不能被级联删除。 */
-  async deleteDescendants(sessionId) {
+  async deleteDescendants(sessionId, storedHeaders) {
     try {
       const descendants = [];
+      const collected = /* @__PURE__ */ new Set();
       const sessions = this.ctx.get("sessions");
       if (sessions !== void 0)
         for (const session of sessions.list()) {
-          if (session.header.parentSession === sessionId && session.header.origin === "subagent")
+          if (session.header.parentSession === sessionId && session.header.origin === "subagent") {
             descendants.push(session.id);
+            collected.add(session.id);
+          }
         }
-      for (const header of await this.listStoredHeaders()) {
-        if (header.parentSession === sessionId && header.origin === "subagent" && !descendants.includes(header.id))
+      for (const header of storedHeaders ?? await this.listStoredHeaders()) {
+        if (header.parentSession === sessionId && header.origin === "subagent" && !collected.has(header.id)) {
           descendants.push(header.id);
+          collected.add(header.id);
+        }
       }
       for (const childId of descendants) {
         try {
           if (!await this.sessionKnown(childId)) continue;
-          await this.deleteSessionCore(childId);
+          await this.deleteSessionCore(childId, storedHeaders);
         } catch (error) {
           this.ctx.logger.warn(
             `archive-manager: cascade delete of subagent session "${childId}" (child of "${sessionId}") failed: ${String(error)}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-archive-manager",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "NPM-installable DSH Web plugin for managing archived sessions.",
   "type": "module",
   "packageManager": "pnpm@11.22.0",