dsh-sidebar-row-menu 1.3.4 → 1.4.0

package/lib/host/route.js

@@ -1,15 +1,21 @@
 /**
- * POST /dsh-sidebar-row-menu/open —— 浏览器端请宿主打开目录的唯一边界。
+ * HTTP 边界：/open 与 /session/delete。
+ *
+ * 浏览器端不能自己打开系统应用，也不该直接碰会话日志，所以这两件事都放在 host：
+ *   POST /dsh-sidebar-row-menu/open            打开目录（VS Code / 资源管理器）
+ *   POST /dsh-sidebar-row-menu/session/delete  永久删除会话（仅已归档，由 UI 把关）
  */
 
 import { inspectOpenPath } from './paths.js';
 import { isLoopbackRequest } from './security.js';
 import { openInVscode, revealDirectory } from './launch.js';
+import { DELETE_BATCH_LIMIT, removeSessions } from './session-delete.js';
 
 /** 路由前缀；客户端半边硬编码同一个值。 */
 export const ROUTE_PREFIX = '/dsh-sidebar-row-menu';
 export const ROUTE_OPEN = `${ROUTE_PREFIX}/open`;
-/** 请求体上限（只传一个路径，64KB 足够）。 */
+export const ROUTE_DELETE = `${ROUTE_PREFIX}/session/delete`;
+/** 请求体上限（只传路径或会话 id 列表，64KB 足够）。 */
 const MAX_BODY_BYTES = 64 * 1024;
 
 /** 写一个 JSON 响应；handler 自己拥有响应生命周期。 */
@@ -50,6 +56,10 @@ function readJsonBody(request, limit = MAX_BODY_BYTES) {
   });
 }
 
+function pathnameOf(request) {
+  return new URL(request.url ?? '/', 'http://dsh.invalid').pathname;
+}
+
 /**
  * 处理一次打开请求。
  * 状态码约定：403 非本机 / 405 方法错 / 404 路径或目标资源不存在 /
@@ -64,8 +74,7 @@ export async function handleOpenRequest(request, response) {
     writeJson(response, 405, { ok: false, error: 'method-not-allowed' });
     return;
   }
-  const pathname = new URL(request.url ?? '/', 'http://dsh.invalid').pathname;
-  if (pathname !== ROUTE_OPEN) {
+  if (pathnameOf(request) !== ROUTE_OPEN) {
     writeJson(response, 404, { ok: false, error: 'not-found' });
     return;
   }
@@ -100,11 +109,83 @@ export async function handleOpenRequest(request, response) {
   writeJson(response, 200, { ok: true, via: opened.via });
 }
 
+/**
+ * 处理一次永久删除请求。
+ * 请求体：{ sessionIds: string[] }（1..500，服务端去重）。
+ * 200 返回 { ok, deleted, failed, error?, code? }，部分失败也是 200（客户端据此显示计数）。
+ */
+export async function handleSessionDeleteRequest(request, response, ctx) {
+  if (!isLoopbackRequest(request)) {
+    writeJson(response, 403, { ok: false, error: 'forbidden' });
+    return;
+  }
+  if (request.method !== 'POST') {
+    writeJson(response, 405, { ok: false, error: 'method-not-allowed' });
+    return;
+  }
+  if (pathnameOf(request) !== ROUTE_DELETE) {
+    writeJson(response, 404, { ok: false, error: 'not-found' });
+    return;
+  }
+
+  let payload;
+  try {
+    payload = await readJsonBody(request);
+  } catch {
+    writeJson(response, 400, { ok: false, error: 'bad-request' });
+    return;
+  }
+  const ids = payload?.sessionIds;
+  if (
+    !Array.isArray(ids)
+    || ids.length === 0
+    || ids.length > DELETE_BATCH_LIMIT
+    || ids.some((id) => typeof id !== 'string' || id.trim() === '')
+  ) {
+    writeJson(response, 400, { ok: false, error: 'bad-request' });
+    return;
+  }
+
+  if (ctx === undefined || ctx === null || typeof ctx.get !== 'function') {
+    writeJson(response, 503, { ok: false, error: 'service-unavailable' });
+    return;
+  }
+  for (const name of ['sessions', 'sessionQuery', 'sessionPersistence']) {
+    let available;
+    try {
+      available = ctx.get(name) !== undefined && ctx.get(name) !== null;
+    } catch {
+      available = false;
+    }
+    if (!available) {
+      writeJson(response, 503, { ok: false, error: 'service-unavailable' });
+      return;
+    }
+  }
+  try {
+    const outcome = await removeSessions(ctx, ids);
+    writeJson(response, 200, outcome);
+  } catch (error) {
+    ctx.logger?.warn?.('[dsh-sidebar-row-menu] session delete failed:', error);
+    writeJson(response, 500, { ok: false, error: 'delete-failed' });
+  }
+}
+
 /** 构造 webServer 路由对象（kind=prefix）。 */
-export function createOpenRoute() {
+export function createOpenRoute(ctx) {
   return {
     kind: 'prefix',
     path: ROUTE_PREFIX,
-    handler: handleOpenRequest,
+    handler: (request, response) => {
+      const pathname = pathnameOf(request);
+      if (pathname === ROUTE_OPEN) return handleOpenRequest(request, response);
+      if (pathname === ROUTE_DELETE) return handleSessionDeleteRequest(request, response, ctx);
+      if (!isLoopbackRequest(request)) {
+        writeJson(response, 403, { ok: false, error: 'forbidden' });
+        return undefined;
+      }
+      writeJson(response, 404, { ok: false, error: 'not-found' });
+      return undefined;
+    },
   };
 }

package/lib/host/session-delete.js

@@ -0,0 +1,226 @@
+/**
+ * 永久删除会话：宿主端唯一的破坏性操作。
+ *
+ * 浏览器端删不掉磁盘上的 jsonl 日志，所以删除边界放在 host：
+ *   stopActivity → detachLive → removeTranscript（强校验目录名）→ forget → emit
+ *
+ * 行为参考 dsh-session-menu v0.1.3 的 removeSession（MIT, big-head-pigeon），
+ * 但拆成普通函数 + 动态 ctx.get(...)，不引入 Typert/remote 依赖。
+ * 本插件只删目标会话，不级联删除 fork 子会话。
+ */
+
+import { readdir, rm, stat } from 'node:fs/promises';
+import { basename, dirname, join } from 'node:path';
+
+/** 一次请求最多删除的会话数；与 dsh-session-menu 的上限一致。 */
+export const DELETE_BATCH_LIMIT = 500;
+
+/** 取服务：cordis 里既可用 ctx.sessions，也可用 ctx.get('sessions')。 */
+function service(ctx, name) {
+  try {
+    const value = ctx?.get?.(name);
+    if (value !== undefined && value !== null) return value;
+  } catch {
+    /* get 失败就退回属性访问 */
+  }
+  try {
+    return ctx?.[name];
+  } catch {
+    return undefined;
+  }
+}
+
+async function pathExists(path) {
+  try {
+    await stat(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/** 读取非 live 会话的 header。 */
+async function coldHeader(ctx, id) {
+  try {
+    const records = await service(ctx, 'sessionQuery')?.listSessions?.();
+    for (const record of Array.isArray(records) ? records : []) {
+      if (record?.header?.id === id) return record.header;
+    }
+  } catch {
+    /* 读不到就当作不存在 */
+  }
+  return undefined;
+}
+
+/** 运行中的会话先取消，最多等 3 秒离开 running。 */
+async function stopActivity(ctx, id, live) {
+  if (live === undefined) return;
+  const agents = service(ctx, 'agents');
+  if (agents?.get?.(id)?.status !== 'running') return;
+  try {
+    const controller = service(ctx, 'sessionController');
+    void Promise.resolve(controller?.cancel?.({ sessionId: id })).catch(() => {});
+  } catch {
+    /* 取消失败也继续：下一步 detach 同样会阻止继续写入 */
+  }
+  for (let tick = 0; tick < 30; tick += 1) {
+    if (agents?.get?.(id)?.status !== 'running') return;
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+}
+
+/** 把会话从运行时摘掉；失败只记日志，不影响后续删盘。 */
+function detachLive(ctx, live) {
+  if (live === undefined) return;
+  try {
+    const sessions = service(ctx, 'sessions');
+    const entry = sessions?.liveEntryFor?.(live);
+    sessions?.detachEntered?.(entry);
+  } catch (error) {
+    ctx?.logger?.warn?.(`[dsh-sidebar-row-menu] detach failed for "${live?.header?.id}": ${String(error)}`);
+  }
+}
+
+/** 优先用 sessionPersistence.locate，否则扫 <root>/<project>/<id>。 */
+function transcriptDirectory(ctx, header) {
+  const persistence = service(ctx, 'sessionPersistence');
+  if (persistence === undefined || typeof persistence?.locate !== 'function') return undefined;
+  try {
+    const located = persistence.locate({ id: header.id, cwd: header.cwd });
+    if (typeof located?.path === 'string' && located.path !== '') return dirname(located.path);
+  } catch {
+    /* 退回扫描 */
+  }
+  return undefined;
+}
+
+async function scanTranscriptDirectory(ctx, header) {
+  const root = service(ctx, 'sessionPersistence')?.root;
+  if (typeof root !== 'string' || root === '') return undefined;
+  try {
+    for (const entry of await readdir(root, { withFileTypes: true })) {
+      if (!entry.isDirectory()) continue;
+      if (basename(entry.name) !== entry.name) continue;
+      const candidate = join(root, entry.name, header.id);
+      const found = await stat(candidate).catch(() => undefined);
+      if (found?.isDirectory() === true) return candidate;
+    }
+  } catch {
+    /* 扫描失败交给调用方报错 */
+  }
+  return undefined;
+}
+
+/**
+ * 删除会话日志目录。目录名必须与 session id 逐字一致才会 rm；
+ * 删除后再复查三次，防止 jsonl 句柄把目录写回来。
+ */
+async function removeTranscript(ctx, header) {
+  let directory = transcriptDirectory(ctx, header);
+  if (directory === undefined) directory = await scanTranscriptDirectory(ctx, header);
+  if (directory === undefined || basename(directory) !== header.id) {
+    return { ok: false, code: 'path-unverified', error: `no verified directory for session "${header.id}"` };
+  }
+  try {
+    await rm(directory, { recursive: true, force: true });
+  } catch (error) {
+    return { ok: false, code: 'remove-failed', error: String(error) };
+  }
+  for (let tick = 0; tick < 3; tick += 1) {
+    if (!(await pathExists(directory))) return { ok: true, directory };
+    await new Promise((resolve) => setTimeout(resolve, 150));
+  }
+  return { ok: false, code: 'remove-failed', error: `directory "${directory}" came back after removal` };
+}
+
+/** 清掉归档/置顶记录；两个方法对不存在 id 都是 no-op。 */
+async function forget(ctx, id) {
+  const registry = service(ctx, 'workspaceRegistry');
+  for (const method of ['unarchiveSession', 'unpinSession']) {
+    try {
+      await registry?.[method]?.(id);
+    } catch {
+      /* 账本清理失败不影响已经删掉的日志 */
+    }
+  }
+}
+
+/**
+ * 删除一个会话。
+ * @returns {Promise<{removed:boolean, missing?:boolean, code?:string, error?:string}>}
+ *   removed=true 表示确实删掉了磁盘目录；missing=true 表示本来就不存在（幂等）。
+ */
+export async function removeSession(ctx, id) {
+  const sessions = service(ctx, 'sessions');
+  if (sessions === undefined || typeof sessions?.get !== 'function') {
+    return { removed: false, code: 'unavailable', error: 'sessions service is unavailable' };
+  }
+  const live = sessions.get(id);
+  const header = live?.header ?? (await coldHeader(ctx, id));
+  if (header === undefined) {
+    await forget(ctx, id);
+    return { removed: false, missing: true };
+  }
+
+  await stopActivity(ctx, id, live);
+  detachLive(ctx, live);
+  const removed = await removeTranscript(ctx, header);
+  if (removed.ok !== true) {
+    return { removed: false, code: removed.code, error: removed.error };
+  }
+  await forget(ctx, id);
+  try {
+    ctx?.emit?.('api-session/removed', id);
+  } catch {
+    /* 通知失败不改变删除结果，下一次列表刷新也会消失 */
+  }
+  return { removed: true };
+}
+
+/**
+ * 批量删除（串行，避免同时 rm 多个会话目录）。
+ * @returns {Promise<{ok:boolean, deleted:number, failed:number, error:string, code?:string}>}
+ */
+export async function removeSessions(ctx, ids) {
+  const unique = [];
+  const seen = new Set();
+  for (const id of Array.isArray(ids) ? ids : []) {
+    if (typeof id !== 'string') continue;
+    const value = id.trim();
+    if (value === '' || seen.has(value)) continue;
+    seen.add(value);
+    unique.push(value);
+    if (unique.length >= DELETE_BATCH_LIMIT) break;
+  }
+  if (unique.length === 0) {
+    return { ok: false, deleted: 0, failed: 0, error: 'no session ids', code: 'bad-request' };
+  }
+
+  let deleted = 0;
+  let failed = 0;
+  let firstCode = '';
+  let firstError = '';
+  for (const id of unique) {
+    const outcome = await removeSession(ctx, id);
+    if (outcome.removed === true) {
+      deleted += 1;
+      continue;
+    }
+    if (outcome.missing === true) continue;
+    failed += 1;
+    if (firstCode === '') {
+      firstCode = outcome.code ?? 'remove-failed';
+      firstError = outcome.error ?? '';
+    }
+  }
+  if (failed > 0) {
+    return {
+      ok: false,
+      deleted,
+      failed,
+      error: firstError === '' ? firstCode : firstError,
+      code: 'batch-failed',
+    };
+  }
+  return { ok: true, deleted, failed: 0, error: '' };
+}

package/lib/index.js

@@ -1,42 +1,47 @@
 /**
  * dsh-sidebar-row-menu — 宿主半边（host half）。
  *
- * 只做一件事：把 `/open` 路由挂到 ctx.webServer 上，让浏览器端能请宿主用系统
- * 命令打开目录。具体实现拆成三个模块：
+ * 两件事：
+ *  1. `/open` 让浏览器请宿主用系统命令打开目录；
+ *  2. `/session/delete` 永久删除会话日志（仅 UI 对已归档会话开放）。
  *
- *   lib/host/security.js  loopback 请求围栏
- *   lib/host/paths.js     路径校验与 vscode:// URL 编码
- *   lib/host/launch.js    VS Code / 资源管理器启动
- *   lib/host/route.js     HTTP 边界与状态码
+ * 具体实现拆成四个模块：
  *
- * 浏览器自己不能打开资源管理器，所以这一小块必须放在 host。
- * 请求体：{ target: 'vscode' | 'explorer', path: '<绝对目录路径>' }
+ *   lib/host/security.js        loopback 请求围栏
+ *   lib/host/paths.js           路径校验与 vscode:// URL 编码
+ *   lib/host/launch.js          VS Code / 资源管理器启动
+ *   lib/host/session-delete.js  停跑、摘运行时、删日志、清归档记录
+ *   lib/host/route.js           HTTP 边界与状态码
  *
- * 实现参考 dsh-sidebar-context-menu v0.2.0（MIT, miao-ge）；额外要求路径
- * 必须存在且是目录，因为右键对象既可能是工作区，也可能是会话自己的 cwd。
+ * 浏览器自己不能打开资源管理器，也不该直接删会话日志，所以这些必须放在 host。
+ * 打开请求体：{ target: 'vscode' | 'explorer', path: '<绝对目录路径>' }
+ * 删除请求体：{ sessionIds: ['<会话 id>', ...] }
+ *
+ * 删除流程参考 dsh-session-menu v0.1.3（MIT, big-head-pigeon），不引入 Typert 依赖。
  */
 
 import { createOpenRoute } from './host/route.js';
 
 export const name = 'sidebar-row-menu';
-/** cordis 依赖：网页服务器服务（ctx.webServer）。 */
-export const inject = ['webServer'];
+/** cordis 依赖：网页服务器 + 删除会话时需要读写的宿主服务。 */
+export const inject = ['webServer', 'sessions', 'sessionPersistence', 'sessionQuery', 'workspaceRegistry'];
 
 export { isLoopbackRequest } from './host/security.js';
 export { inspectOpenPath, toVscodeFileUrl } from './host/paths.js';
 export { resolveVscodeLauncher } from './host/launch.js';
-export { createOpenRoute } from './host/route.js';
+export { createOpenRoute, handleSessionDeleteRequest } from './host/route.js';
+export { DELETE_BATCH_LIMIT, removeSession, removeSessions } from './host/session-delete.js';
 
 /**
- * 注册打开路由。
- * @param ctx - 宿主插件上下文（带 webServer 服务）。
+ * 注册路由。
+ * @param ctx - 宿主插件上下文（带 webServer 与会话服务）。
  */
 export function apply(ctx) {
-  const route = createOpenRoute();
+  const route = createOpenRoute(ctx);
   try {
-    ctx.effect(() => ctx.webServer.register(route), 'dsh-sidebar-row-menu: /open route');
+    ctx.effect(() => ctx.webServer.register(route), 'dsh-sidebar-row-menu: routes');
   } catch (error) {
-    // 注册失败不应该拖垮整个插件树：客户端菜单里的两个「打开」会用不了，其余照常。
+    // 注册失败不应该拖垮整个插件树：打开与删除会用不了，其余功能照常。
     ctx.logger?.warn?.('[dsh-sidebar-row-menu] route registration failed:', error);
   }
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dsh-sidebar-row-menu",
-  "version": "1.3.4",
+  "version": "1.4.0",
   "type": "module",
-  "description": "DSH sidebar right-click menus: a self-composed menu for workspace rows, and the native slot menu opened at the pointer for session rows.",
+  "description": "DSH sidebar right-click menus: a self-composed menu for workspace rows, and the native slot menu opened at the pointer for session rows, with open-with and archived-session cleanup.",
   "keywords": [
     "deepseek",
     "dsh",
@@ -35,6 +35,7 @@
     "cordis.patch.yml",
     "README.md",
     "README.en.md",
+    "CHANGELOG.md",
     "LICENSE",
     "NOTICE.md",
     "NOTICE.en.md",
@@ -59,7 +60,7 @@
   "scripts": {
     "test": "node --test test/host.test.mjs test/client.test.mjs",
     "test:local": "node --test --test-isolation=none test/host.test.mjs test/client.test.mjs",
-    "check": "node --check lib/index.js && node --check lib/client.js && node --check lib/host/paths.js && node --check lib/host/security.js && node --check lib/host/launch.js && node --check lib/host/route.js",
+    "check": "node --check lib/index.js && node --check lib/client.js && node --check lib/host/paths.js && node --check lib/host/security.js && node --check lib/host/launch.js && node --check lib/host/route.js && node --check lib/host/session-delete.js",
     "build": "npm pack",
     "marketplace:check": "node scripts/marketplace-preflight.mjs",
     "prepack": "npm run check",