dsh-session-conductor 1.3.8 → 1.3.9

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.9",
   "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"
     ]
   }
-}
+}