@omdp/dsh-archived-sessions 0.3.1 → 0.3.3

package/README.md

@@ -65,6 +65,8 @@ pnpm add @omdp/dsh-archived-sessions -w
 
 ### 变更记录
 
+- **0.3.3**（2026-09-10）：**修复 0.3.2 的删除回归**——0.3.2 把会话根目录改为 `DSH_HOME` 推导时拼出了**混合分隔符**路径（`C:\Users\xj\.dsh/sessions/...`），而删除前校验 `assertSessionDirName` 的 basename 提取对混合分隔符失效（先按 `/` 切再按 `\` 切，把名字切成残缺片段），导致所有删除被"拒绝删除非会话目录"拦截。修复：① basename 提取改为按分隔符整体切分；② 根目录统一为 `/`。删除/孤儿清理恢复正常。
+- **0.3.2**（2026-09-10）：修两处 fork 遗留——① client 半区的模块 id 仍是 `@muwinds/dsh-archived-sessions`（未随包名改），浏览器端按 `@omdp/...` 找不到模块、设置页不显示；② 会话根目录改为从 `DSH_HOME` 环境变量推导（`<DSH_HOME>/sessions`，缺省 `~/.dsh/sessions`），不再硬编码本机路径。
 - **0.3.1**（2026-09-10）：**修复 0.3.0 的发布事故**——0.3.0 的 tarball 里没有 `lib/`（仓库 `.gitignore` 的 `**/lib/` 规则把源码吞了，npm 只打包到 4 个文件），安装后插件加载失败会拖垮 DSH；0.3.1 补回 `lib/index.js` + `lib/client.js`（发布前已核对 tarball 内容）。
 - **0.3.0**（2026-09-10）：fork 自 0.2.0；适配 DSH 0.1.5-rc.1（list 快照形状 + 路径自解析）；按树删除子会话；孤儿清理；删除路径安全校验。
 
@@ -127,6 +129,8 @@ pnpm add @omdp/dsh-archived-sessions -w
 
 ### Changelog
 
+- **0.3.3** (2026-09-10): **fixes a 0.3.2 delete regression** — 0.3.2 derived the session root from `DSH_HOME` with a **mixed-separator** path (`C:\Users\xj\.dsh/sessions/...`), and the pre-delete guard `assertSessionDirName`'s basename extraction broke on mixed separators (it sliced by `/` then by `\`, producing a truncated fragment), so every delete was rejected with "拒绝删除非会话目录". Fixed: ① basename extraction now splits on either separator; ② roots are normalized to `/`. Delete and orphan sweep work again.
+- **0.3.2** (2026-09-10): fixes two fork leftovers — ① the client half's module id was still `@muwinds/dsh-archived-sessions` (not renamed with the package), so the browser could not find the module and the settings page never rendered; ② the session root is now derived from the `DSH_HOME` environment variable (`<DSH_HOME>/sessions`, falling back to `~/.dsh/sessions`) instead of a hard-coded local path.
 - **0.3.1** (2026-09-10): **fixes a 0.3.0 release accident** — the 0.3.0 tarball contained no `lib/` (the repo's `**/lib/` gitignore rule swallowed the source, so npm packed only 4 files); installing it broke the plugin load and could take DSH down. 0.3.1 restores `lib/index.js` + `lib/client.js` (tarball contents verified before publishing).
 - **0.3.0** (2026-09-10): forked from 0.2.0; DSH 0.1.5-rc.1 support (snapshot list shape + self path resolution); tree delete; orphan sweep; deletion path safety check.
 

package/lib/client.js

@@ -1,5 +1,5 @@
 window.__ModuleLoader__.load({
-  id: "@muwinds/dsh-archived-sessions",
+  id: "@omdp/dsh-archived-sessions",
   factory: (require) => {
     var module = { exports: {} };
     var exports = module.exports;

package/lib/index.js

@@ -118,7 +118,8 @@ function dangerPolicy(ctx) {
  */
 function assertSessionDirName(dirPath) {
   const last = dirPath.replace(/[\\/]+$/, "");
-  const name = last.slice(last.lastIndexOf("/") + 1, last.length).slice(last.lastIndexOf("\\") + 1);
+  const parts = last.split(/[\\/]/);
+  const name = parts[parts.length - 1];
   const ok = /^session-[0-9a-fA-F-]{36}$/.test(name) || /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(name);
   if (!ok) throw new Error("拒绝删除非会话目录: " + dirPath);
 }
@@ -256,8 +257,39 @@ function projectKey(cwd) {
   return `--${(readable.replace(/^-+/, "") || "root").slice(0, 251)}--`;
 }
 
-/** Candidate JSONL session roots, probed in order. */
-const CANDIDATE_ROOTS = ["C:\\Users\\xj\\.dsh\\sessions"];
+/** Read an environment variable without assuming `process` exists. */
+function env(name) {
+  try {
+    return typeof process !== "undefined" && process.env ? process.env[name] : undefined;
+  } catch (e) {
+    return undefined;
+  }
+}
+
+/**
+ * Candidate JSONL session roots, probed in order at call time.
+ *
+ * DSH stores every session under `<DSH_HOME>/sessions` (DSH_HOME defaults to
+ * `~/.dsh`), and the abstract sessionPersistence service exposes no root, so the
+ * location is derived from the environment rather than hard-coded — the plugin
+ * then works on any machine and any DSH_HOME.
+ */
+function candidateRoots() {
+  const out = [];
+  const push = (p) => {
+    if (typeof p !== "string" || p.length === 0) return;
+    const trimmed = p.replace(/[\\/]+$/, "").replace(/\\/g, "/");
+    if (trimmed.length > 0 && !out.includes(trimmed)) out.push(trimmed);
+  };
+  const home = env("DSH_HOME");
+  if (typeof home === "string" && home.replace(/[\\/]+$/, "").length > 0) {
+    push(home + "/sessions");
+  } else {
+    const userHome = env("USERPROFILE") || env("HOME");
+    if (typeof userHome === "string" && userHome.length > 0) push(userHome + "/.dsh/sessions");
+  }
+  return out;
+}
 
 /** Build one session's on-disk directory path under a candidate root. */
 function buildSessionDir(root, header) {
@@ -275,8 +307,10 @@ function buildSessionDir(root, header) {
 async function resolveSessionLocation(ctx, header) {
   const fsSvc = ctx.get("fs");
   const backend = jsonlBackend && typeof jsonlBackend.sessionDir === "function" ? jsonlBackend : null;
+  const roots = candidateRoots();
+  if (roots.length === 0) return { path: "", found: false };
   let last = null;
-  for (const root of CANDIDATE_ROOTS) {
+  for (const root of roots) {
     let dirPath;
     if (backend && typeof jsonlBackend.projectDir === "function") {
       try {
@@ -611,7 +645,7 @@ async function handleOrphans(ctx) {
     } catch (e) {
       location = null;
     }
-    if (!location) continue;
+    if (!location || typeof location.path !== "string" || location.path.length === 0) continue;
     const dirPath = location.path;
     let sizeBytes = 0;
     if (fsSvc) {
@@ -655,7 +689,7 @@ async function handleSweep(ctx) {
     } catch (e) {
       location = null;
     }
-    if (!location) continue;
+    if (!location || typeof location.path !== "string" || location.path.length === 0) continue;
     const dirPath = location.path;
     try {
       await removeDir(ctx, dirPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omdp/dsh-archived-sessions",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Archived-sessions manager for the DeepSeek Harness web UI: list / unarchive / delete / detail from Settings. · DSH 归档会话管理：设置页查看、释放、删除已归档会话（含按树删除子会话与孤儿清理）。",
   "type": "module",
   "main": "lib/index.js",