dsh-session-conductor 1.3.8 → 1.3.10

package/lib/features/value-index.js

@@ -13,13 +13,10 @@
 // 【落盘】<DSH_HOME>/storages/dsh-session-conductor/value-index.json，原子写（tmp + rename），
 //   节流 2 秒合并多次写入；任何异常都退化为「没有索引」，绝不影响筛选本身。
 
-import { readFileSync, writeFileSync, renameSync, mkdirSync } from "node:fs";
-import path from "node:path";
-
-import { cfg, resolveDshHome } from "../core/config.js";
+import { cfg } from "../core/config.js";
+import { getSection, setSection, saveStoreNow } from "../core/index-store.js";
 
 const VALUE_INDEX_VERSION = 1;
-const VALUE_INDEX_SUBDIR = ["storages", "dsh-session-conductor"];
 const DEFAULT_TTL_HOURS = 24;
 const SAVE_DEBOUNCE_MS = 2000;
 
@@ -29,27 +26,18 @@ let indexPath = null;
 let indexDirty = false;
 let indexTimer = null;
 
-/** 索引文件绝对路径（首次解析后缓存）。 */
-export function valueIndexFilePath(ctx) {
-  if (indexPath !== null) return indexPath;
-  const home = resolveDshHome(ctx, cfg);
-  indexPath = home ? path.join(home, ...VALUE_INDEX_SUBDIR, "value-index.json") : "";
-  return indexPath;
-}
-
-/** 读索引（进程内只读一次；文件不存在/损坏都按空索引处理，不向上抛）。 */
+/** 读索引（进程内只读一次；索引不可用都按空处理，不向上抛）。
+ *  落盘统一走 <DSH_HOME>/storages/dsh-session-conductor/index.json 的 value section。 */
 export function loadValueIndex(ctx) {
   if (indexCache !== null) return indexCache;
   indexCache = { version: VALUE_INDEX_VERSION, entries: {} };
-  const file = valueIndexFilePath(ctx);
-  if (!file) return indexCache;
   try {
-    const parsed = JSON.parse(readFileSync(file, "utf8"));
-    if (parsed?.version === VALUE_INDEX_VERSION && parsed.entries && typeof parsed.entries === "object") {
-      indexCache = { version: VALUE_INDEX_VERSION, entries: parsed.entries };
+    const section = getSection(ctx, "value");
+    if (section?.entries && typeof section.entries === "object") {
+      indexCache = { version: VALUE_INDEX_VERSION, entries: section.entries };
     }
   } catch {
-    // 首次运行 / 文件损坏：按空索引继续，本次算完会覆盖写入
+    // 索引不可用：按空索引继续
   }
   return indexCache;
 }
@@ -112,13 +100,10 @@ export function forgetValueVerdict(ctx, sessionId) {
 
 /** 立即落盘（原子写：tmp + rename）。失败只丢缓存，不抛。 */
 export function saveValueIndexNow(ctx) {
-  const file = valueIndexFilePath(ctx);
-  if (!file || indexCache === null) return;
+  if (indexCache === null) return;
   try {
-    mkdirSync(path.dirname(file), { recursive: true });
-    const tmpPath = `${file}.tmp-${process.pid}`;
-    writeFileSync(tmpPath, JSON.stringify(indexCache), "utf8");
-    renameSync(tmpPath, file);
+    setSection(ctx, "value", { entries: indexCache.entries });
+    saveStoreNow(ctx);
     indexDirty = false;
   } catch {
     // 写盘失败（只读卷/磁盘满）：本次不落盘，下次继续尝试

package/lib/i18n/en.json

@@ -13,6 +13,21 @@
     "tab.archived": "Archived",
     "tab.active": "Active",
     "tab.help": "Help",
+    "tab.trash": "Trash",
+    "trash.retention.label": "Keep",
+    "trash.retention.unit": "days",
+    "trash.retention.save": "Save",
+    "trash.undo": "Undo last delete",
+    "trash.undo.title": "Restore the latest batch ({n})",
+    "trash.restoreSelected": "Restore selected ({n})",
+    "trash.selectAll": "Select all",
+    "trash.empty": "Empty trash",
+    "trash.emptyConfirm": "Emptying the trash permanently deletes {n} sessions (irreversible). Continue?",
+    "trash.restore": "Restore",
+    "trash.emptyList": "Trash is empty",
+    "trash.hint": "Deleting only marks the session; files stay until the retention period ends or you empty the trash",
+    "trash.remaining": "{n} day(s) left",
+    "trash.nothingToUndo": "Nothing to undo",
     "list.empty": "No sessions yet",
     "list.archivedEmpty": "Nothing archived",
     "list.activeEmpty": "No active sessions (live/running)",
@@ -62,8 +77,8 @@
     "action.analyze": "Analyze",
     "action.busy": "Working…",
     "action.retry": "Retry",
-    "confirm.delete.title": "Permanently delete session \"{title}\"?",
-    "confirm.delete.body": "This cannot be undone (the session log will be removed too).",
+    "confirm.delete.title": "Delete session \"{title}\"?",
+    "confirm.delete.body": "The session moves to the Trash and can be restored from the Trash tab at any time. Files are only removed when the retention period (default 7 days) expires or you empty the trash.",
     "error.action": "Action failed: {message}",
     "meta.time.now": "just now",
     "meta.time.minutes": "{n}m ago",
@@ -71,8 +86,8 @@
     "meta.time.days": "{n}d ago",
     "meta.time.months": "{n}mo ago",
     "meta.time.years": "{n}y ago",
-    "help.delete.title": "Delete session (added by this plugin)",
-    "help.delete.desc": "The built-in UI has no way to delete a session. This plugin adds it: refuses to delete a running session, double-checks before deleting, removes the log for good.",
+    "help.delete.title": "Delete sessions (added by this plugin)",
+    "help.delete.desc": "The built-in UI has no way to delete a session; this plugin adds it. Deleting only marks the session - files stay untouched: it goes to the Trash tab, where you can restore one, restore several, or undo the latest batch. Running sessions are refused. Files are really removed only when the retention period expires (configurable, default 7 days) or you empty the trash.",
     "help.autoRename.title": "Auto-rename (added by this plugin)",
     "help.autoRename.desc": "Turn on \"Auto-rename\" for a session and after each finished turn the plugin asks an AI to compare recent session content against the current title; when the topic has clearly drifted it generates a new title and renames automatically. Titles carry a live state suffix: \"（运行中）\" = turn in progress, \"（已中断）\" = crashed/errored and waiting to resume; updated at turn boundaries. Rate-limited (5 min interval, needs a few new messages) to keep token costs low.",
     "help.autoContinue.title": "Auto-resume (added by this plugin)",
@@ -99,10 +114,10 @@
     "search.hits": "{n} sessions matched",
     "search.close": "Collapse results",
     "deleteBatch.action": "Delete selected ({n})",
-    "deleteBatch.confirm.title": "Permanently delete the {n} selected sessions?",
-    "deleteBatch.confirm.body": "This cannot be undone (logs are removed too); running sessions are skipped automatically.",
-    "deleteBatch.done": "Deleted {deleted}{skippedText}",
-    "deleteBatch.skipped": ", skipped {n} (running/undeletable)",
+    "deleteBatch.confirm.title": "Delete the {n} selected sessions?",
+    "deleteBatch.confirm.body": "They move to the Trash and can be restored anytime. Running sessions are skipped automatically.",
+    "deleteBatch.done": "Moved {deleted} to the Trash{skippedText}",
+    "deleteBatch.skipped": ", skipped {n} (running / not deletable)",
     "deleteByRule.action": "Filter",
     "deleteByRule.label.archivedOnly": "Archived only",
     "deleteByRule.label.inactiveDays": "Inactive for more than {n} days (0 = any)",
@@ -202,4 +217,4 @@
     "armCurNone": "Current: not selected",
     "renderFail": "Settings render failed: "
   }
-}
+}

package/lib/i18n/zh.json

@@ -13,6 +13,21 @@
     "tab.archived": "已归档",
     "tab.active": "活跃",
     "tab.help": "说明",
+    "tab.trash": "回收站",
+    "trash.retention.label": "保留",
+    "trash.retention.unit": "天",
+    "trash.retention.save": "保存",
+    "trash.undo": "撤销上次删除",
+    "trash.undo.title": "还原最近一批（{n} 个）",
+    "trash.restoreSelected": "还原选中 ({n})",
+    "trash.selectAll": "全选",
+    "trash.empty": "一键清空",
+    "trash.emptyConfirm": "清空回收站会立即真删 {n} 个会话（不可恢复），确定吗？",
+    "trash.restore": "还原",
+    "trash.emptyList": "回收站是空的",
+    "trash.hint": "删除只是打标记、文件还在；到期（保留天数）或一键清空才真正删盘",
+    "trash.remaining": "剩 {n} 天",
+    "trash.nothingToUndo": "没有可撤销的删除",
     "list.empty": "还没有会话",
     "list.archivedEmpty": "没有已归档的会话",
     "list.activeEmpty": "当前没有活跃会话（live/running）",
@@ -55,8 +70,8 @@
     "action.analyze": "分析",
     "action.busy": "处理中…",
     "action.retry": "重试",
-    "confirm.delete.title": "确定要永久删除会话「{title}」吗？",
-    "confirm.delete.body": "删除后无法恢复（会话日志与记录将一并删除）。",
+    "confirm.delete.title": "确定要删除会话「{title}」吗？",
+    "confirm.delete.body": "会话会移入回收站，可在「回收站」页随时还原；只有到期（保留天数，默认 7 天）或一键清空才真正删盘。",
     "action.undo": "撤回消息",
     "undo.preview.empty": "（无文本消息）",
     "confirm.undo.title": "撤回最后一条消息？",
@@ -72,7 +87,7 @@
     "meta.time.months": "{n}个月前",
     "meta.time.years": "{n}年前",
     "help.delete.title": "删除会话（本插件新增）",
-    "help.delete.desc": "内置界面没有任何删除会话的入口。本插件补上了：拒绝删除运行中的会话，删除前二次确认，删除后日志一并清除、不可恢复。",
+    "help.delete.desc": "内置界面没有任何删除会话的入口，本插件补上了。删除**只打标记、不动会话文件**：会话会进「回收站」标签页，可单条还原、多选还原，或按批次撤销最近一次删除；运行中的会话拒绝删除。真正删盘只发生在回收站到期（保留天数可设，默认 7 天）或「一键清空」。",
     "help.autoRename.title": "自动重命名（本插件新增）",
     "help.autoRename.desc": "给会话勾选「自动重命名」后，每个回合结束，插件会用 AI 分析最近会话内容；发现主题/方向已明显偏离当前标题时，自动生成新标题并改掉。标题会带上实时状态后缀：「（运行中）」= 正在执行回合、「（已中断）」= 崩溃/错误中断待续跑；回合结束自动更新。分析带 5 分钟最小间隔和新增消息数门槛，避免频繁调用浪费额度。",
     "help.autoContinue.title": "自动续跑（本插件新增）",
@@ -99,9 +114,9 @@
     "search.hits": "命中 {n} 个会话",
     "search.close": "收起结果",
     "deleteBatch.action": "删除选中 ({n})",
-    "deleteBatch.confirm.title": "确定要永久删除选中的 {n} 个会话吗？",
-    "deleteBatch.confirm.body": "删除后无法恢复（日志一并清除）；运行中的会话会被自动跳过。",
-    "deleteBatch.done": "已删除 {deleted} 个{skippedText}",
+    "deleteBatch.confirm.title": "确定要删除选中的 {n} 个会话吗？",
+    "deleteBatch.confirm.body": "会移入回收站，可随时还原；运行中的会话会被自动跳过。",
+    "deleteBatch.done": "已移入回收站 {deleted} 个{skippedText}",
     "deleteBatch.skipped": "，跳过 {n} 个（运行中/不可删）",
     "deleteByRule.action": "筛选",
     "deleteByRule.label.archivedOnly": "仅已归档会话",
@@ -202,4 +217,4 @@
     "armCurNone": "当前：未选择",
     "renderFail": "设置页渲染失败："
   }
-}
+}

package/lib/sessions/list-cache.js

@@ -7,45 +7,32 @@
 //  ③ 列表 TTL 缓存与失效（写操作后 invalidateSessionListCache 立即失效）。
 // 列表的构建流程（buildSessionList）在 list.js。
 
-import { readFileSync, writeFileSync, renameSync, mkdirSync } from "node:fs";
-import path from "node:path";
+import { getSection, setSection, saveStoreNow } from "../core/index-store.js";
 import { log } from "../shared/log.js";
-import { cfg, resolveDshHome, autoRenameEnabled, effectiveAutoContinue } from "../core/config.js";
+import { cfg, autoRenameEnabled, effectiveAutoContinue } from "../core/config.js";
 import { continueJobs } from "../core/state.js";
 import { stripArchiveWsPrefix } from "../features/rename/title.js";
 
 /** 缓存文件版本（不符视为空缓存）。 */
 const LIST_CACHE_VERSION = 1;
-/** 缓存文件所在子目录。 */
-const LIST_CACHE_SUBDIR = ["storages", "dsh-session-conductor"];
 
-/** 落盘缓存内容：{ version, entries: { [id]: { rev, title, updatedAt, interruption, inspectError, cwd, createdAt, parentSession } } } */
+/** 内存缓存：{ version, entries: { [id]: { rev, title, updatedAt, interruption, inspectError, cwd, createdAt, parentSession } } }
+ *  落盘统一走 <DSH_HOME>/storages/dsh-session-conductor/index.json 的 list section。 */
 let listDiskCache = null;
-let listDiskCachePath = null;
 let listDiskCacheDirty = false;
 let listDiskCacheTimer = null;
 
-/** 缓存文件绝对路径（首次调用时解析并缓存）。 */
-export function listCacheFilePath(ctx) {
-  if (listDiskCachePath !== null) return listDiskCachePath;
-  const home = resolveDshHome(ctx, cfg);
-  listDiskCachePath = home ? path.join(home, ...LIST_CACHE_SUBDIR, "list-cache.json") : "";
-  return listDiskCachePath;
-}
-
-/** 读落盘缓存（进程内只读一次）。任何异常都退化成空缓存，不向上抛。 */
+/** 读缓存（进程内只读一次）。任何异常都退化成空缓存，不向上抛。 */
 export function loadListDiskCache(ctx) {
   if (listDiskCache !== null) return listDiskCache;
   listDiskCache = { version: LIST_CACHE_VERSION, entries: {} };
-  const file = listCacheFilePath(ctx);
-  if (!file) return listDiskCache;
   try {
-    const parsed = JSON.parse(readFileSync(file, "utf8"));
-    if (parsed?.version === LIST_CACHE_VERSION && parsed.entries !== null && typeof parsed.entries === "object") {
-      listDiskCache = { version: LIST_CACHE_VERSION, entries: parsed.entries };
+    const section = getSection(ctx, "list");
+    if (section?.entries && typeof section.entries === "object") {
+      listDiskCache = { version: LIST_CACHE_VERSION, entries: section.entries };
     }
   } catch {
-    // 首次运行（文件不存在）/ 文件损坏 / JSON 非法：按空缓存继续，本次解析完会覆盖写入
+    // 索引不可用：按空缓存继续，本次解析完会覆盖写入
   }
   return listDiskCache;
 }
@@ -67,14 +54,10 @@ export function scheduleSaveListDiskCache(ctx) {
 /** 立即原子落盘（写临时文件再 rename，避免下次启动读到半个文件）。 */
 export function saveListDiskCacheNow(ctx) {
   if (!listDiskCacheDirty || listDiskCache === null) return;
-  const file = listCacheFilePath(ctx);
-  if (!file) return;
   listDiskCacheDirty = false;
   try {
-    mkdirSync(path.dirname(file), { recursive: true });
-    const tmpPath = `${file}.tmp`;
-    writeFileSync(tmpPath, JSON.stringify(listDiskCache), "utf8");
-    renameSync(tmpPath, file);
+    setSection(ctx, "list", { entries: listDiskCache.entries });
+    saveStoreNow(ctx);
   } catch (error) {
     // 落盘失败只是让下次重新解析，不影响列表功能；记录下来便于诊断
     log(ctx, `会话列表缓存落盘失败（不影响功能）: ${String(error?.message ?? error)}`);
@@ -195,7 +178,6 @@ export function settleListBuild(promise, items) {
 /** 测试钩子：清空列表缓存状态（单测在场景之间调用）。 */
 export function resetListCacheForTest() {
   listDiskCache = null;
-  listDiskCachePath = null;
   listDiskCacheDirty = false;
   if (listDiskCacheTimer !== null) clearTimeout(listDiskCacheTimer);
   listDiskCacheTimer = null;

package/lib/sessions/list.js

@@ -221,6 +221,17 @@ export async function buildSessionList(ctx, opts = {}) { // dsh-skip-func-length
     }
   }
 
+  // 回收站里的会话不进列表：删除只是打标记，文件仍在磁盘上，只是对外隐藏。
+  try {
+    const { trashedIds } = await import("../features/trash.js");
+    const hidden = trashedIds(ctx);
+    if (hidden.size > 0) {
+      for (let i = items.length - 1; i >= 0; i -= 1) {
+        if (hidden.has(items[i].id)) items.splice(i, 1);
+      }
+    }
+  } catch { /* 回收站不可用不影响列表 */ }
+
   items.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
   return items;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-session-conductor",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "description": "DSH session management enhancement: archive/restore sessions, batch & conditional delete, AI auto-rename, interrupted-session auto-resume, release idle sessions, workspace grouping, undo last message, repair damaged session logs, value analysis, full-text search, per-member model switching (list_models / set_member_model), and plan/closing template injection (system-prompt + context).",
   "type": "module",
   "main": "lib/index.js",
@@ -66,4 +66,4 @@
       "./skills/dsh-session-official-doc.md"
     ]
   }
-}
+}