@lijian-ui/dsh-session-cleaner 0.1.0 → 0.1.2

package/lib/index.js

@@ -5,25 +5,48 @@ import * as fs from "fs";
 import * as path from "path";
 import { homedir } from "os";
 import { zstdDecompressSync } from "node:zlib";
+
 //#region src/session-store.ts
 /**
-* 会话存储层（session-cleaner host half）
-* ------------------------------------------------------------------
-* 直接操作 dsh 官方文件层（无需官方 API）：
-*
-*   sessions 树：  ~/.dsh/sessions/<encoded-workspace>/<sessionId>/session.jsonl.zstd
-*   workspace 状态：~/.dsh/storages/workspace.json
-*                    - global.archivedSessionIds   ← 归档状态（与官方 UI 共享）
-*                    - tables.workspaces[*].sessionIds ← 会话归属
-*   projcache：    ~/.dsh/storages/session_projcache.json（删除时必须清，否则旧投影残留）
-*
-* 删除 = 三处清理：session 目录 + projcache + workspace.json（sessionIds/archivedSessionIds）。
-* 归档/恢复 = 读写 workspace.json 的 global.archivedSessionIds（单真相源与官方打通）。
-*
-* ⚠️ 已知边界：归档/恢复直接改文件，host 内存态不会热更新——插件页面以文件为准（准确），
-* 官方 UI 的隐藏/恢复在 dsh 重启后同步。删除同理（已删除的会话从文件层消失，官方 UI
-* 重启后不再列出）。
+
+* dsh 会话 ID ↔ 文件系统目录名 编解码（与 dsh-session-persistence-jsonl 的 encodeSegment 对齐）。
+
+* dsh 把 sessionId 中的非 [A-Za-z0-9._-] 字符编码为 ~XXXX（charCode 的 4 位十六进制大写）。
+
+* 例如 `im:qq-s5ey:c2c:...` → `im~003Aqq-s5ey~003Ac2c~003A...`。
+
+* session-cleaner 扫描文件系统得到编码后的目录名，需要解码回原始 ID 才能与 workspace.json 的 sessionIds 匹配。
+
 */
+function encodeSegment(raw) {
+	if (raw.length === 0) return raw;
+	if (raw === ".") return "~002E";
+	if (raw === "..") return "~002E~002E";
+	let out = "";
+	for (let i = 0; i < raw.length; i++) {
+		const code = raw.charCodeAt(i);
+		const ch = String.fromCharCode(code);
+		if (ch !== "~" && /^[A-Za-z0-9._-]$/.test(ch)) out += ch;
+		else out += "~" + code.toString(16).toUpperCase().padStart(4, "0");
+	}
+	return out;
+}
+function decodeSegment(encoded) {
+	let out = "";
+	for (let i = 0; i < encoded.length;) {
+		if (encoded[i] === "~" && i + 5 <= encoded.length) {
+			const hex = encoded.slice(i + 1, i + 5);
+			if (/^[0-9A-Fa-f]{4}$/.test(hex)) {
+				out += String.fromCharCode(parseInt(hex, 16));
+				i += 5;
+				continue;
+			}
+		}
+		out += encoded[i];
+		i++;
+	}
+	return out;
+}
 /** dsh 用户数据目录（与桌面壳 buildDshEnv 的 DSH_HOME 保持一致） */
 function dshHome() {
 	return process.env.DSH_HOME ?? path.join(homedir(), ".dsh");
@@ -77,8 +100,11 @@ function writeArchived(archived) {
 	writeJsonAtomic(workspaceFile(), ws);
 }
 /**
+
 * 扫描全部 session（文件层权威）。
+
 * 遍历 ~/.dsh/sessions/<workspace>/<sessionId>/，结合 workspace.json 标注状态。
+
 */
 function listSessions() {
 	const root = sessionsRoot();
@@ -86,7 +112,7 @@ function listSessions() {
 	if (!fs.existsSync(root)) return out;
 	const archived = readArchived();
 	const ws = readWorkspace();
-	const activeIds = /* @__PURE__ */ new Set();
+	const activeIds = new Set();
 	for (const w of Object.values(ws.tables?.workspaces ?? {})) for (const id of w.sessionIds ?? []) activeIds.add(id);
 	for (const workspaceDir of fs.readdirSync(root, { withFileTypes: true })) {
 		if (!workspaceDir.isDirectory()) continue;
@@ -106,13 +132,13 @@ function listSessions() {
 				continue;
 			}
 			out.push(stripUndefined({
-				id: entry.name,
+				id: decodeSegment(entry.name),
 				workspaceDir: workspaceDir.name,
 				dir,
 				sizeBytes,
 				mtimeMs,
-				archived: archived.has(entry.name),
-				active: activeIds.has(entry.name),
+				archived: archived.has(decodeSegment(entry.name)),
+				active: activeIds.has(decodeSegment(entry.name)),
 				title: readSessionTitle(logFile)
 			}));
 		}
@@ -136,11 +162,12 @@ function removeFromProjcache(id) {
 	if (!fs.existsSync(file)) return;
 	const data = readJson(file, null);
 	if (data === null) return;
+	const encodedId = encodeSegment(id);
 	const walk = (o) => {
 		if (!o || typeof o !== "object") return false;
 		let changed = false;
 		for (const k of Object.keys(o)) {
-			if (String(k).includes(id)) {
+			if (String(k).includes(id) || String(k).includes(encodedId)) {
 				delete o[k];
 				changed = true;
 				continue;
@@ -152,16 +179,21 @@ function removeFromProjcache(id) {
 	if (walk(data)) writeJsonAtomic(file, data);
 }
 /**
+
 * 真删除会话（不可恢复，调用方必须已二次确认）：
+
 * ① 删会话目录；② 清 projcache；③ 清 workspace.json（sessionIds + archivedSessionIds）。
+
 * 返回已删除的目录路径。
+
 */
 function deleteSession(id) {
 	const root = sessionsRoot();
+	const encodedId = encodeSegment(id);
 	let target = null;
 	if (fs.existsSync(root)) for (const workspaceDir of fs.readdirSync(root, { withFileTypes: true })) {
 		if (!workspaceDir.isDirectory()) continue;
-		const dir = path.join(root, workspaceDir.name, id);
+		const dir = path.join(root, workspaceDir.name, encodedId);
 		if (fs.existsSync(path.join(dir, "session.jsonl.zstd"))) {
 			target = dir;
 			break;
@@ -198,9 +230,13 @@ function unarchiveSession(id) {
 	return { ok: true };
 }
 /**
+
 * 多帧 zstd 解码：dsh 的 session 日志每次追加写一个独立 zstd 帧
+
 * （文件里多个 magic 头），Node 的 zstdDecompressSync 只解第一帧——
+
 * 必须按 magic 位置逐帧解压拼接。
+
 */
 function zstdDecompressAll(input) {
 	const magic = Buffer.from([
@@ -228,7 +264,8 @@ function zstdDecompressAll(input) {
 function readSessionLines(logFile) {
 	try {
 		if (!fs.existsSync(logFile)) return null;
-		return zstdDecompressAll(fs.readFileSync(logFile)).toString("utf8").split("\n").filter(Boolean);
+		const raw = zstdDecompressAll(fs.readFileSync(logFile));
+		return raw.toString("utf8").split("\n").filter(Boolean);
 	} catch {
 		return null;
 	}
@@ -255,14 +292,15 @@ function extractHeader(lines) {
 			cwd: header.cwd
 		};
 	} catch {
-		return;
+		return void 0;
 	}
 }
 /** 从消息事件提取纯文本（宽容解析各种 content 形态） */
 function messageText(message) {
 	if (typeof message === "string") return message;
 	if (!message || typeof message !== "object") return "";
-	const content = message["content"];
+	const m = message;
+	const content = m["content"];
 	if (typeof content === "string") return content;
 	if (Array.isArray(content)) return content.map((part) => {
 		if (typeof part === "string") return part;
@@ -287,15 +325,19 @@ function readSessionTitle(logFile) {
 	return extractTitle(lines);
 }
 /**
+
 * 读取会话预览：header 元数据 + 最近 N 条用户/助手消息文本。
+
 * 找不到文件抛错（调用方转 RPC 错误）。
+
 */
 function previewSession(id, limit = 12) {
 	const root = sessionsRoot();
+	const encodedId = encodeSegment(id);
 	let logFile = null;
 	if (fs.existsSync(root)) for (const workspaceDir of fs.readdirSync(root, { withFileTypes: true })) {
 		if (!workspaceDir.isDirectory()) continue;
-		const candidate = path.join(root, workspaceDir.name, id, "session.jsonl.zstd");
+		const candidate = path.join(root, workspaceDir.name, encodedId, "session.jsonl.zstd");
 		if (fs.existsSync(candidate)) {
 			logFile = candidate;
 			break;
@@ -331,6 +373,7 @@ function previewSession(id, limit = 12) {
 		messages: messages.slice(-limit)
 	});
 }
+
 //#endregion
 //#region src/remote.ts
 const SERVICE = "sessionCleanerRemote";
@@ -341,8 +384,11 @@ const codec = (typeSymbol) => ({
 	schema: { parse: (v) => v }
 });
 /**
+
 * 注册到 `ctx.typert` 的 host 面契约。
+
 * face: 'host' + invocations（client 侧的 $mount 贡献则带 descriptors）。
+
 */
 const CONTRIBUTION = {
 	package: PACKAGE,
@@ -428,8 +474,11 @@ const CONTRIBUTION = {
 	}
 };
 /**
+
 * Remote 服务实现。构造时注册 `sessionCleanerRemote` cordis 服务，
+
 * 上面的贡献让 API gateway 能分发四个方法。
+
 */
 var SessionCleanerApi = class extends TypertRemoteService {
 	constructor(ctx) {
@@ -461,6 +510,7 @@ function registerSessionCleanerRemote(ctx) {
 	new SessionCleanerApi(ctx);
 	ctx.effect(() => ctx.get("typert").register(CONTRIBUTION), "session-cleaner: typert contribution");
 }
+
 //#endregion
 //#region src/index.ts
 /**
@@ -493,17 +543,19 @@ function apply(ctx) {
 */
 function installConsoleLoggerExporter(ctx) {
 	try {
-		ctx.root.logger?.exporter?.({
+		const logger = ctx.root.logger;
+		logger?.exporter?.({
 			colors: 0,
 			export: (message) => {
 				const { name = "session-cleaner", type = "log", args = [] } = message;
-				const line = `[${name}] ${args.map((arg) => arg instanceof Error ? arg.stack ?? arg.message : typeof arg === "string" ? arg : (() => {
+				const rendered = args.map((arg) => arg instanceof Error ? arg.stack ?? arg.message : typeof arg === "string" ? arg : (() => {
 					try {
 						return JSON.stringify(arg);
 					} catch {
 						return String(arg);
 					}
-				})()).join(" ")}`;
+				})()).join(" ");
+				const line = `[${name}] ${rendered}`;
 				if (type === "error") console.error(line);
 				else if (type === "warn") console.warn(line);
 				else if (type === "debug") console.debug(line);
@@ -512,5 +564,6 @@ function installConsoleLoggerExporter(ctx) {
 		});
 	} catch {}
 }
+
 //#endregion
-export { Config, apply, inject };
+export { Config, apply, inject };

package/package.json

@@ -1,87 +1,87 @@
-{
-  "name": "@lijian-ui/dsh-session-cleaner",
-  "version": "0.1.0",
-  "description": "Session management plugin for DeepSeek Harness (dsh): list / delete / archive & restore sessions, with a built-in \"Archived\" group and a delete confirm dialog (real delete, not trash). 为 DeepSeek Harness 提供会话管理：列表 / 真删除（二次确认）/ 归档分组与恢复。",
-  "license": "MIT",
-  "type": "module",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/index.d.ts",
-      "default": "./lib/index.js"
-    },
-    "./client": {
-      "default": "./lib/client.js"
-    },
-    "./cordis.patch.yml": "./cordis.patch.yml",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib/**/*.js",
-    "lib/**/*.d.ts",
-    "cordis.patch.yml",
-    "README.md",
-    "README.en.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "build": "tsdown",
-    "watch": "tsdown --watch",
-    "typecheck": "tsc --noEmit",
-    "prepare": "npm run build"
-  },
-  "keywords": [
-    "deepseek-harness",
-    "dsh",
-    "dsh-plugin",
-    "session",
-    "session-cleaner",
-    "archive",
-    "delete",
-    "cordis"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lijian-ui/dsh-session-cleaner.git"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-api-gateway"
-      ],
-      "platform": "web",
-      "immediately": true
-    }
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "*",
-    "@deepseek-ai/schemastery": "*",
-    "@deepseek-ai/dsh-settings": "*",
-    "@deepseek-ai/dsh-typert-protocol": "*"
-  },
-  "devDependencies": {
-    "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/schemastery": "3.18.1",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-schema-form": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-api-gateway": "0.1.0-rc.6",
-    "@types/node": "^22.0.0",
-    "@types/react": "^18.3.0",
-    "react": "^18.2.0",
-    "tsdown": "^0.12.0",
-    "typescript": "^5.6.0"
-  }
-}
+{
+  "name": "@lijian-ui/dsh-session-cleaner",
+  "version": "0.1.2",
+  "description": "Session management plugin for DeepSeek Harness (dsh): list / delete / archive & restore sessions, with a built-in \"Archived\" group and a delete confirm dialog (real delete, not trash). 为 DeepSeek Harness 提供会话管理：列表 / 真删除（二次确认）/ 归档分组与恢复。",
+  "license": "MIT",
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./client": {
+      "default": "./lib/client.js"
+    },
+    "./cordis.patch.yml": "./cordis.patch.yml",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib/**/*.js",
+    "lib/**/*.d.ts",
+    "cordis.patch.yml",
+    "README.md",
+    "README.en.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "build": "tsdown",
+    "watch": "tsdown --watch",
+    "typecheck": "tsc --noEmit",
+    "prepare": "npm run build"
+  },
+  "keywords": [
+    "deepseek-harness",
+    "dsh",
+    "dsh-plugin",
+    "session",
+    "session-cleaner",
+    "archive",
+    "delete",
+    "cordis"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lijian-ui/dsh-session-cleaner.git"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-api-gateway"
+      ],
+      "platform": "web",
+      "immediately": true
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "*",
+    "@deepseek-ai/dsh-settings": "*",
+    "@deepseek-ai/dsh-typert-protocol": "*",
+    "@deepseek-ai/schemastery": "*"
+  },
+  "devDependencies": {
+    "@deepseek-ai/cordis": "4.0.1",
+    "@deepseek-ai/dsh-api-gateway": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-schema-form": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-settings": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.0-rc.6",
+    "@deepseek-ai/schemastery": "3.18.1",
+    "@types/node": "^22.0.0",
+    "@types/react": "^18.3.0",
+    "react": "^18.2.0",
+    "tsdown": "^0.12.0",
+    "typescript": "^5.6.0"
+  }
+}