@duke-dsh-plugins/dsh-archive-manager 1.4.0 → 1.5.0

package/README.md

@@ -22,6 +22,7 @@
 > - **DSH < 0.1.7**：完整归档管理面板（侧栏底部"归档"按钮 → 分组列表 / 搜索 / 还原 / 删除）。
 > - **DSH ≥ 0.1.7**：DSH 自带归档管理（侧栏筛选"仅显示已归档"、行内取消归档），本插件**只补上它缺少的删除功能**——归档会话的 "…" 菜单里多一行"删除会话…"、行尾悬停多一个 🗑 按钮，点击弹出永久删除二次确认框；不再显示本插件自己的面板按钮。
 > - 识别方式是**特性检测**（0.1.7 新增的两个行操作槽位是否声明），不是版本号，因此任何中间版本都会落到正确的一侧。
+> - **支持 DSH 0.1.x 与 0.2.x**。0.2.0 起 DSH 会校验插件声明的 `@deepseek-ai/dsh*` peer 版本范围，不匹配就**整个 bundle 静默跳过**（插件直接消失，控制台只多一行 `skipping profile bundle ...`）；v1.5.0 已放行 0.2.x 并同时保留 0.1.x。
 
 ## 功能
 
@@ -94,6 +95,8 @@ dsh-archive-manager/
 ├── client.js           # Client 半：归档管理 UI bundle
 ├── typert.host.js      # Typert Host manifest（Remote 方法描述）
 ├── cordis.patch.yml    # dsh bundle patch（挂载行）
+├── verify-*.mjs        # 四个验证脚本（构造 / typert 线上契约 / client apply / 真实安装）
+├── scripts/            # check-profile-bundle.mjs：DSH 会不会跳过本插件的自检
 ├── .github/workflows/  # GitHub Actions 发布
 ├── AGENTS.md           # 面向 AI agent 的开发指南（含踩坑）
 └── LICENSE             # MIT
@@ -103,12 +106,17 @@ dsh-archive-manager/
 
 ```bash
 npm run check                    # node --check index.js client.js typert.host.js
-npm run verify                   # 三个验证脚本：构造 / 双版本 typert 线上契约 / client apply 冒烟
+npm run verify                   # 四个验证脚本：构造 / 双版本 typert 线上契约 / client apply 冒烟 / 真实 DSH 安装
+node scripts/check-profile-bundle.mjs --sandbox   # 用真实 dsh-app-boot 确认本插件不会被跳过
 dsh plugin --profile web add /path/to/dsh-archive-manager   # 安装/重装到本机 DSH profile
 ```
 
 `verify-typert-compat.mjs` 会用**真实 DSH 安装**里的 `validateTypertManifest` 与 `TypertRegistry` 校验本插件的线格式（同时覆盖 0.1.5 与 0.1.7 两套规则）：默认探测本机 DSH 安装与 `.tmppkg/v017/`（npm 拉取的 0.1.7 包），也可用 `DSH_INSTALL_015` / `DSH_INSTALL_017` 环境变量指定。
 
+`verify-real-install.mjs` 补的是另一个洞——前三个脚本跑在仓库自带的旧版依赖上，在"根本不加载插件"的 DSH 上也会全绿。它直接拿本机 DSH 安装的 `dsh-app-boot.evaluatePluginCompatibility` 跑 0.2.0 的 peer 闸门、断言 0.1.5/0.1.7/当前运行时三条版本线都满足、把 `index.js` 重新绑定到该安装的 cordis/typert-protocol 上构造服务，并在 0.1.x 与 0.2.x 两种磁盘布局上各真删一次会话。
+
+`scripts/check-profile-bundle.mjs --sandbox` 会建一个临时 profile、用软链把**本工作树**挂进去，再调用真实 dsh-app-boot 的 profile 加载器，直接回答"dsh 会不会跳过我"。它不碰任何 DSH home，所以随时可跑。
+
 详见 [AGENTS.md](AGENTS.md)——记录了 DSH 正式插件（Host/Client/Typert 三件套）的完整机制和踩坑。
 
 ## License

package/index.js

@@ -23,8 +23,9 @@
 
 import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import { Service } from "@deepseek-ai/cordis";
-import { existsSync } from "node:fs";
+import { existsSync, statSync } from "node:fs";
 import { rm } from "node:fs/promises";
+import { basename, dirname, extname } from "node:path";
 
 /**
  * Mark one instance method as a Remote export without relying on decorator
@@ -71,6 +72,36 @@ function readArchived(domain) {
   return [];
 }
 
+/**
+ * Resolve the session directory that owns a session's log artifact.
+ *
+ * `sessionPersistence.locate(header).path` changed meaning across DSH majors:
+ *   - DSH < 0.2.0: the session DIRECTORY (`…/<project>/<sessionId>/`), which is
+ *     what `rm(..., { recursive: true })` was written against.
+ *   - DSH >= 0.2.0 (`dsh-session-persistence-jsonl`): the current generation's
+ *     log FILE inside that directory (`…/<project>/<sessionId>/session.v4.jsonl.zstd`).
+ *     Removing only that file would leave the directory and any older generation
+ *     (`session.v3.jsonl.zstd`) behind, so a restart could resurrect the session —
+ *     exactly what "永久删除" must not do.
+ *
+ * So: prefer `stat` on the path itself; when the artifact is already gone, fall
+ * back to the name shape — a located log file always carries an extension
+ * (`session.v4.jsonl.zstd`), while a per-session directory never does.
+ *
+ * @param {string} locatedPath - `sessionPersistence.locate(header).path`.
+ * @returns {string} the directory to remove.
+ */
+function deletionTarget(locatedPath) {
+  const target = String(locatedPath);
+  try {
+    if (statSync(target).isDirectory()) return target;
+    if (statSync(target).isFile()) return dirname(target);
+  } catch {
+    /* artifact already gone — infer from the path shape below */
+  }
+  return extname(basename(target)) === "" ? target : dirname(target);
+}
+
 export class ArchiveManagerService extends TypertRemoteService {
   static inject = [
     "workspaceRegistry",
@@ -194,9 +225,20 @@ export class ArchiveManagerService extends TypertRemoteService {
       return { ok: false, error: { code: "agent-running", message: "该会话的智能体正在运行中，请等待其完成或停止后再删除" } };
     }
     const header = await this.findHeader(sessionId);
+    const sessionPersistence = this.ctx.get("sessionPersistence");
+    if (header && (!sessionPersistence || typeof sessionPersistence.locate !== "function")) {
+      // The header exists but this build cannot tell us where its log lives.
+      // Claiming success here would silently keep the session on disk.
+      return {
+        ok: false,
+        error: {
+          code: "locate-unavailable",
+          message: "当前 DSH 版本的会话存储未提供 locate()，无法定位会话日志目录，已保留归档条目",
+        },
+      };
+    }
     let location;
     if (header) {
-      const sessionPersistence = this.ctx.get("sessionPersistence");
       try {
         location = sessionPersistence.locate(header);
       } catch {
@@ -206,7 +248,7 @@ export class ArchiveManagerService extends TypertRemoteService {
     let removed = false;
     let fileError;
     if (location && location.path) {
-      const target = String(location.path);
+      const target = deletionTarget(location.path);
       try {
         // Delete straight from the host process via node:fs — no shell, no
         // PowerShell, no sandbox escalation, so this behaves identically on
@@ -214,7 +256,8 @@ export class ArchiveManagerService extends TypertRemoteService {
         // the host's own privileges, which makes the sandbox ACL dance the
         // previous shell-based implementation needed unnecessary. maxRetries
         // absorbs transient Windows file locks (antivirus / indexers) and is
-        // a no-op elsewhere.
+        // a no-op elsewhere. The whole owning session directory goes, so older
+        // format generations cannot survive the delete (DSH >= 0.2.0).
         await rm(target, { recursive: true, force: true, maxRetries: 3, retryDelay: 200 });
         removed = !existsSync(target);
         if (!removed) fileError = "path-still-exists";
@@ -263,8 +306,10 @@ export class ArchiveManagerService extends TypertRemoteService {
         const session = sessions.get(id);
         if (session === undefined) continue; // not live in memory → not a ghost
         const location = sessionPersistence.locate(session.header);
-        // Live but the log directory is gone → ghost the client hides.
-        if (location && location.path && !existsSync(String(location.path))) ghostIds.push(id);
+        // Live but the log is gone → ghost the client hides. Probed against the
+        // owning session directory, i.e. exactly what `delete` removes: on DSH
+        // >= 0.2.0 `locate` names the current generation's file inside it.
+        if (location && location.path && !existsSync(deletionTarget(location.path))) ghostIds.push(id);
       } catch {
         /* skip */
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duke-dsh-plugins/dsh-archive-manager",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Archive manager for DeepSeek Harness: DSH < 0.1.7 gets the grouped search/restore/delete panel; DSH >= 0.1.7 adds the delete action missing from the built-in archive management.",
   "repository": {
     "type": "git",
@@ -36,14 +36,14 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-storage-domain": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-typert-protocol": "^0.1.0-rc.6"
+    "@deepseek-ai/dsh-storage-domain": "^0.1.0-rc.6 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-typert-protocol": "^0.1.0-rc.6 || ^0.2.0-rc.1"
   },
   "dependencies": {
     "zod": "^4.4.3"
   },
   "scripts": {
     "check": "node --check index.js && node --check client.js && node --check typert.host.js",
-    "verify": "node verify-constructor.mjs && node verify-typert-compat.mjs && node verify-client-apply.mjs"
+    "verify": "node verify-constructor.mjs && node verify-typert-compat.mjs && node verify-client-apply.mjs && node verify-real-install.mjs"
   }
 }