@michengai/dsh-archive-manager 1.1.6 → 1.1.7

package/lib/workspace.js

@@ -306,20 +306,9 @@ async function hostRepairFormat(format, children = []) {
     return bound.createRestore(header, { recovery: "recoverable", validation: "transformed" });
   } };
 }
-let activeSessionError;
-async function activeSessionErrorType() {
-  if (activeSessionError !== void 0) return activeSessionError ?? void 0;
-  const workspace = await import("@deepseek-ai/dsh-workspace");
-  activeSessionError = typeof workspace.WorkspaceActiveSessionError === "function" ? workspace.WorkspaceActiveSessionError : null;
-  return activeSessionError ?? void 0;
-}
 function projectionSnapshot(cache, header) {
   return cache.cachedSnapshot(header);
 }
-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) {
@@ -353,12 +342,9 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
   deletedSessionTombstoneLimit = 4096;
   /** 被删生命周期的日志身份（createdAt/cwd）：冷复用探针区分“同 id 新会话”与 stale list() 的依据。 */
   deletedIdentities = /* @__PURE__ */ new Map();
-  archivedSessionPathIndex = /* @__PURE__ */ new Map();
-  archivedSessionPathIndexKey;
   constructor(ctx) {
     super(ctx);
     tolerateStaleFileUploadResolver(ctx);
-    protectArchivedSessionPath(this);
     this.typertRemote = bindTypertRemote(this, this.name);
     for (const method of ARCHIVE_REMOTE_METHODS) markRemoteMethod(this, method);
     registerHostRemote(this.ctx);
@@ -567,26 +553,6 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
       return next;
     });
   }
-  /** 归档集合未变时复用反查表，避免每次 sessionPath 都扫全部工作区记账。 */
-  archivedWorkspacePath(sessionId) {
-    const state = this.requireState();
-    if (!state.archivedSessionIds.includes(sessionId)) return void 0;
-    if (this.archivedSessionPathIndexKey !== state.archivedSessionIds) {
-      const index = /* @__PURE__ */ new Map();
-      const archived = new Set(state.archivedSessionIds);
-      const table = this.requireTable();
-      for (const workspaceId of state.workspaceIds) {
-        const record2 = table.get(workspaceId);
-        if (record2 === void 0) continue;
-        for (const id of record2.sessionIds) {
-          if (archived.has(id)) index.set(id, record2.path);
-        }
-      }
-      this.archivedSessionPathIndex = index;
-      this.archivedSessionPathIndexKey = state.archivedSessionIds;
-    }
-    return this.archivedSessionPathIndex.get(sessionId);
-  }
   /**
    * 只有 persistence.stat 明确说文件不在时才从持久集合摘掉。
    * list/header 读不出不等于文件没了；没有 stat 时宁可不落盘删除。
@@ -754,98 +720,10 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
       await handle.close();
     }
   }
-  /**
-   * 把一个已知会话加入注册表全局归档集合。已归档的 id 不写入；
-   * 未知 id 直接跳过，不抛 `UNKNOWN_SESSION`，避免把幽灵 id 写进集合。
-   * @param sessionId - 要归档的会话。
-   */
-  async archiveSession(sessionId, options) {
-    return this.enqueueOperation(async () => {
-      if (this.requireState().archivedSessionIds.includes(sessionId)) return;
-      if (!await this.sessionKnown(sessionId)) return;
-      const stopActivity = options?.stopActivity === true;
-      const ActiveSession = await activeSessionErrorType();
-      if (!stopActivity && ActiveSession !== void 0) {
-        const activity = await this.sessionActivity(sessionId);
-        if (activity.length > 0) throw new ActiveSession(sessionId, activity);
-      }
-      const state = this.requireState();
-      const pinnedSessionIds = Array.isArray(state.pinnedSessionIds) ? state.pinnedSessionIds.filter((id) => id !== sessionId) : void 0;
-      await this.setState({
-        ...state,
-        archivedSessionIds: [...state.archivedSessionIds, sessionId],
-        ...pinnedSessionIds === void 0 ? {} : { pinnedSessionIds }
-      });
-      if (stopActivity && ActiveSession !== void 0) await this.stopSessionActivity(sessionId);
-    });
-  }
-  /** 宿主用 waterfall 报告仍在运行的回合、子代理、任务和提醒。 */
-  async sessionActivity(sessionId) {
-    const waterfall = hostEvent(this.ctx, "waterfall");
-    if (waterfall === void 0) return [];
-    const activity = await waterfall.call(this.ctx, "workspace/session-activity", { sessionId }, () => Promise.resolve([]));
-    return Array.isArray(activity) ? activity : [];
-  }
-  /** 归档已经写入后再请求停止；提供方失败只记日志，不撤回归档。 */
-  async stopSessionActivity(sessionId) {
-    const parallel = hostEvent(this.ctx, "parallel");
-    if (parallel === void 0) return;
-    try {
-      await parallel.call(this.ctx, "workspace/session-stop", { sessionId });
-    } catch (error) {
-      const failures = error instanceof AggregateError ? error.errors : [error];
-      for (const failure of failures) {
-        this.ctx.logger.warn(`archive-manager: stopping session "${sessionId}" for archive failed: ${String(failure)}`);
-      }
-    }
-  }
-  /**
-   * 把一个会话移出注册表全局归档集合，恢复其正常可见性（其记账位从未
-   * 移动，会话在原工作区位置重新出现）。与官方一致：不做会话存在性检查，
-   * 因为从集合摘掉 id 不会引入未知引用。孤儿归档标记也会被清掉；
-   * 未归档的 id（含不存在的 id）不写入即返回。
-   * @param sessionId - 要取消归档的会话。
-   * @returns 更新后的完整归档集合。
-   */
+  /** 官方负责移出归档集合。这里只补远程接口需要的当前集合，不补工作区记账。 */
   async unarchiveSession(sessionId) {
-    return this.enqueueOperation(async () => {
-      const state = this.requireState();
-      if (!state.archivedSessionIds.includes(sessionId))
-        return { archivedSessionIds: [...state.archivedSessionIds] };
-      const next = {
-        ...state,
-        archivedSessionIds: state.archivedSessionIds.filter(
-          (id) => id !== sessionId
-        )
-      };
-      await this.setState(next);
-      await this.restoreWorkspaceMembership(sessionId);
-      return { archivedSessionIds: [...next.archivedSessionIds] };
-    });
-  }
-  /**
-   * 恢复后重新编入路径索引；若会话已不在任何工作区记账但 cwd 仍对应某工作区，
-   * 则挂回去，避免「恢复并打开」时官方成员过滤把会话从原工作区抹掉。
-   */
-  async restoreWorkspaceMembership(sessionId) {
-    let header;
-    try {
-      header = await this.readSessionHeader(sessionId);
-      await this.indexHeader(header);
-    } catch {
-      return;
-    }
-    const path = this.sessionPaths.get(sessionId);
-    if (path === void 0) return;
-    const table = this.requireTable();
-    for (const workspaceId of this.requireState().workspaceIds) {
-      const record2 = table.get(workspaceId);
-      if (record2 === void 0 || record2.path !== path) continue;
-      if (record2.sessionIds.includes(sessionId)) return;
-      const entity = this.entities.get(workspaceId);
-      if (entity !== void 0) await entity.attachSession(sessionId);
-      return;
-    }
+    await super.unarchiveSession(sessionId);
+    return { archivedSessionIds: [...this.requireState().archivedSessionIds] };
   }
   /**
    * 按作用域永久删除归档会话。跨会话文件删除无法组成事务，因此继续处理
@@ -1062,13 +940,6 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
     if (this.deletedSessionIds.has(header.id)) return;
     return super.indexHeader(header);
   }
-  /** 持久化列表返回快照，这里只取出头部。 */
-  async listStoredHeaders() {
-    return (await this.ctx.sessionPersistence.list()).map((item) => item.header);
-  }
-  async indexHeaders(items) {
-    for (const item of items) await this.indexHeader(item);
-  }
   /** 为未处于实时状态的持久化会话发布相同的移除事件。 */
   async publishColdSessionRemoval(sessionId, sessions) {
     const persistence = this.ctx.get("sessionPersistence");
@@ -1256,40 +1127,6 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
   }
 };
 const workspaceOverlay = Symbol.for("dsh-archive-manager.workspace-overlay");
-function protectArchivedSessionPath(registry) {
-  const host = registry.host;
-  if (typeof host.candidateMatches === "function") {
-    const original = host.candidateMatches;
-    host.candidateMatches = (id, path) => {
-      if (original.call(host, id, path)) return true;
-      if (registry.invalidSessionPaths.has(id)) return false;
-      try {
-        return registry.archivedWorkspacePath(id) === path;
-      } catch {
-        return false;
-      }
-    };
-    return () => {
-      host.candidateMatches = original;
-    };
-  }
-  if (typeof host.sessionPath !== "function") return () => {
-  };
-  const indexedPath = host.sessionPath;
-  host.sessionPath = (id) => {
-    const path = indexedPath.call(host, id);
-    if (path !== void 0) return path;
-    if (registry.invalidSessionPaths.has(id)) return void 0;
-    try {
-      return registry.archivedWorkspacePath(id);
-    } catch {
-      return void 0;
-    }
-  };
-  return () => {
-    host.sessionPath = indexedPath;
-  };
-}
 const remoteMethodDescriptor = "@deepseek-ai/dsh-typert-protocol/remote-methods";
 function markOverlayMethods(registry, methods) {
   const raw = Reflect.get(registry, symbols.original) ?? registry;
@@ -1332,9 +1169,7 @@ function installArchiveWorkspace(registry) {
     deletedSessionIds: /* @__PURE__ */ new Set(),
     deletedSessionOrder: [],
     deletedSessionTombstoneLimit: 4096,
-    deletedIdentities: /* @__PURE__ */ new Map(),
-    archivedSessionPathIndex: /* @__PURE__ */ new Map(),
-    archivedSessionPathIndexKey: void 0
+    deletedIdentities: /* @__PURE__ */ new Map()
   };
   const addedFields = [];
   for (const [key, value] of Object.entries(fields)) {
@@ -1343,8 +1178,9 @@ function installArchiveWorkspace(registry) {
       addedFields.push(key);
     }
   }
-  const restorePath = protectArchivedSessionPath(overlay);
   const restoreRemote = bindOverlayRemote(registry);
+  const originalUnarchive = target.unarchiveSession;
+  const unarchiveDescriptor = Object.getOwnPropertyDescriptor(target, "unarchiveSession");
   const restoredMethods = [];
   const copiedMethods = [];
   for (const name of Object.getOwnPropertyNames(ArchiveWorkspaceRegistry.prototype)) {
@@ -1352,18 +1188,28 @@ function installArchiveWorkspace(registry) {
     const method = Reflect.get(ArchiveWorkspaceRegistry.prototype, name);
     if (typeof method !== "function") continue;
     restoredMethods.push({ name, hadOwn: Object.hasOwn(target, name), previous: target[name] });
-    target[name] = method;
+    if (name === "unarchiveSession") {
+      Object.defineProperty(target, name, {
+        configurable: unarchiveDescriptor?.configurable ?? true,
+        enumerable: unarchiveDescriptor?.enumerable ?? true,
+        writable: true,
+        value: async function(sessionId) {
+          await originalUnarchive.call(this, sessionId);
+          return { archivedSessionIds: [...this.requireState().archivedSessionIds] };
+        }
+      });
+    } else target[name] = method;
     copiedMethods.push(name);
   }
   const restoreMarkers = markOverlayMethods(registry, ARCHIVE_REMOTE_METHODS.filter((method) => copiedMethods.includes(method)));
   target[workspaceOverlay] = true;
   return () => {
     if (target[workspaceOverlay] !== true) return;
-    restorePath();
     restoreMarkers();
     restoreRemote();
     for (const item of restoredMethods.reverse()) {
-      if (item.hadOwn) target[item.name] = item.previous;
+      if (item.name === "unarchiveSession" && unarchiveDescriptor !== void 0) Object.defineProperty(target, item.name, unarchiveDescriptor);
+      else if (item.hadOwn) target[item.name] = item.previous;
       else delete target[item.name];
     }
     for (const key of addedFields) delete target[key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-archive-manager",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "归档、恢复、收藏和永久删除会话，并诊断损坏的会话日志。 · Archive, restore, favorite, and permanently delete sessions, and diagnose damaged session logs.",
   "type": "module",
   "packageManager": "pnpm@11.22.0",