dsh-sidebar-row-menu 1.4.0 → 1.4.2

package/lib/host/route.js

@@ -1,20 +1,23 @@
 /**
- * HTTP 边界：/open 与 /session/delete。
+ * HTTP 边界：/open、/session/delete 与 /workspace/delete。
  *
- * 浏览器端不能自己打开系统应用，也不该直接碰会话日志，所以这两件事都放在 host：
- *   POST /dsh-sidebar-row-menu/open            打开目录（VS Code / 资源管理器）
- *   POST /dsh-sidebar-row-menu/session/delete  永久删除会话（仅已归档，由 UI 把关）
+ * 浏览器端不能自己打开系统应用，也不该直接碰会话日志，所以这几件事都放在 host：
+ *   POST /dsh-sidebar-row-menu/open             打开目录（VS Code / 资源管理器）
+ *   POST /dsh-sidebar-row-menu/session/delete   永久删除会话（归档范围由 UI 把关）
+ *   POST /dsh-sidebar-row-menu/workspace/delete 永久删除工作区及其全部会话
  */
 
 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';
+import { removeWorkspaceWithSessions } from './workspace-delete.js';
 
 /** 路由前缀；客户端半边硬编码同一个值。 */
 export const ROUTE_PREFIX = '/dsh-sidebar-row-menu';
 export const ROUTE_OPEN = `${ROUTE_PREFIX}/open`;
 export const ROUTE_DELETE = `${ROUTE_PREFIX}/session/delete`;
+export const ROUTE_WORKSPACE_DELETE = `${ROUTE_PREFIX}/workspace/delete`;
 /** 请求体上限（只传路径或会话 id 列表，64KB 足够）。 */
 const MAX_BODY_BYTES = 64 * 1024;
 
@@ -171,8 +174,65 @@ export async function handleSessionDeleteRequest(request, response, ctx) {
   }
 }
 
-/** 构造 webServer 路由对象（kind=prefix）。 */
-export function createOpenRoute(ctx) {
+/**
+ * 处理一次「删除工作区及其全部会话」请求。
+ * 请求体：{ workspaceId: string }。
+ * 200 返回 { ok, sessions, deleted, failed, workspaceDeleted, error?, code? }。
+ * 会话删除有失败时不会删工作区，返回 ok:false 让客户端保留工作区并提示重试。
+ */
+export async function handleWorkspaceDeleteRequest(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_WORKSPACE_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 workspaceId = payload?.workspaceId;
+  if (typeof workspaceId !== 'string' || workspaceId.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', 'workspaceRegistry']) {
+    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 removeWorkspaceWithSessions(ctx, workspaceId);
+    writeJson(response, 200, outcome);
+  } catch (error) {
+    ctx.logger?.warn?.('[dsh-sidebar-row-menu] workspace delete failed:', error);
+    writeJson(response, 500, { ok: false, error: 'delete-failed' });
+  }
+}
+
+/** 构造 webServer 路由对象（kind=prefix）。 */export function createOpenRoute(ctx) {
   return {
     kind: 'prefix',
     path: ROUTE_PREFIX,
@@ -180,6 +240,7 @@ export function createOpenRoute(ctx) {
       const pathname = pathnameOf(request);
       if (pathname === ROUTE_OPEN) return handleOpenRequest(request, response);
       if (pathname === ROUTE_DELETE) return handleSessionDeleteRequest(request, response, ctx);
+      if (pathname === ROUTE_WORKSPACE_DELETE) return handleWorkspaceDeleteRequest(request, response, ctx);
       if (!isLoopbackRequest(request)) {
         writeJson(response, 403, { ok: false, error: 'forbidden' });
         return undefined;

package/lib/host/workspace-delete.js

@@ -0,0 +1,101 @@
+/**
+ * 删除工作区及其下所有会话。
+ *
+ * 内置 `workspaces.delete(id)`（registry.delete）只摘掉工作区登记，会话会被
+ * 重新归到「未分组」。这里先按工作区的 sessionIds 永久删除每个会话日志，
+ * 全部成功后再删工作区登记；任何一个会话删除失败就保留工作区，避免留下
+ * 一堆没人管的「未分组」会话。
+ *
+ * 工作区目录本身不删（和内置行为一致），只删会话日志与工作区记录。
+ */
+
+import { removeSessions } from './session-delete.js';
+
+function service(ctx, name) {
+  try {
+    return ctx.get(name);
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * 永久删除一个工作区及其全部会话。
+ * @param ctx - 宿主插件上下文。
+ * @param workspaceId - 工作区 id。
+ * @returns {Promise<{ok:boolean,sessions:number,deleted:number,failed:number,
+ *   workspaceDeleted:boolean,missing?:boolean,code?:string,error:string}>}
+ */
+export async function removeWorkspaceWithSessions(ctx, workspaceId) {
+  const registry = service(ctx, 'workspaceRegistry');
+  if (
+    registry === null
+    || registry === undefined
+    || typeof registry.get !== 'function'
+    || typeof registry.delete !== 'function'
+  ) {
+    return {
+      ok: false,
+      sessions: 0,
+      deleted: 0,
+      failed: 0,
+      workspaceDeleted: false,
+      code: 'unavailable',
+      error: 'workspace-registry-unavailable',
+    };
+  }
+
+  let workspace;
+  try {
+    workspace = registry.get(workspaceId);
+  } catch (error) {
+    return {
+      ok: false,
+      sessions: 0,
+      deleted: 0,
+      failed: 0,
+      workspaceDeleted: false,
+      code: 'lookup-failed',
+      error: error instanceof Error ? error.message : String(error),
+    };
+  }
+  if (workspace === null || workspace === undefined) {
+    return { ok: true, sessions: 0, deleted: 0, failed: 0, workspaceDeleted: false, missing: true, error: '' };
+  }
+
+  const ids = Array.isArray(workspace.sessionIds)
+    ? workspace.sessionIds.filter((id) => typeof id === 'string' && id.trim() !== '')
+    : [];
+  let deleted = 0;
+  if (ids.length > 0) {
+    const outcome = await removeSessions(ctx, ids);
+    deleted = outcome.deleted ?? 0;
+    if (outcome.ok !== true) {
+      return {
+        ok: false,
+        sessions: ids.length,
+        deleted,
+        failed: outcome.failed ?? Math.max(0, ids.length - deleted),
+        workspaceDeleted: false,
+        code: typeof outcome.code === 'string' ? outcome.code : 'session-delete-failed',
+        error: typeof outcome.error === 'string' ? outcome.error : '',
+      };
+    }
+  }
+
+  let workspaceDeleted = false;
+  try {
+    workspaceDeleted = (await registry.delete(workspaceId)) !== false;
+  } catch (error) {
+    return {
+      ok: false,
+      sessions: ids.length,
+      deleted,
+      failed: 0,
+      workspaceDeleted: false,
+      code: 'workspace-delete-failed',
+      error: error instanceof Error ? error.message : String(error),
+    };
+  }
+  return { ok: true, sessions: ids.length, deleted, failed: 0, workspaceDeleted, error: '' };
+}

package/lib/index.js

@@ -3,19 +3,22 @@
  *
  * 两件事：
  *  1. `/open` 让浏览器请宿主用系统命令打开目录；
- *  2. `/session/delete` 永久删除会话日志（仅 UI 对已归档会话开放）。
+ *  2. `/session/delete` 永久删除会话日志（默认由 UI 对已归档会话开放；
+ *  3. `/workspace/delete` 永久删除工作区及其下全部会话。
  *
- * 具体实现拆成四个模块：
+ * 具体实现拆成六个模块：
  *
- *   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 边界与状态码
+ *   lib/host/security.js          loopback 请求围栏
+ *   lib/host/paths.js             路径校验与 vscode:// URL 编码
+ *   lib/host/launch.js            VS Code / 资源管理器启动
+ *   lib/host/session-delete.js    停跑、摘运行时、删日志、清归档记录
+ *   lib/host/workspace-delete.js  先删会话再摘工作区登记
+ *   lib/host/route.js             HTTP 边界与状态码
  *
  * 浏览器自己不能打开资源管理器，也不该直接删会话日志，所以这些必须放在 host。
  * 打开请求体：{ target: 'vscode' | 'explorer', path: '<绝对目录路径>' }
- * 删除请求体：{ sessionIds: ['<会话 id>', ...] }
+ * 删除会话请求体：{ sessionIds: ['<会话 id>', ...] }
+ * 删除工作区请求体：{ workspaceId: '<工作区 id>' }
  *
  * 删除流程参考 dsh-session-menu v0.1.3（MIT, big-head-pigeon），不引入 Typert 依赖。
  */
@@ -29,8 +32,9 @@ export const inject = ['webServer', 'sessions', 'sessionPersistence', 'sessionQu
 export { isLoopbackRequest } from './host/security.js';
 export { inspectOpenPath, toVscodeFileUrl } from './host/paths.js';
 export { resolveVscodeLauncher } from './host/launch.js';
-export { createOpenRoute, handleSessionDeleteRequest } from './host/route.js';
+export { createOpenRoute, handleSessionDeleteRequest, handleWorkspaceDeleteRequest } from './host/route.js';
 export { DELETE_BATCH_LIMIT, removeSession, removeSessions } from './host/session-delete.js';
+export { removeWorkspaceWithSessions } from './host/workspace-delete.js';
 
 /**
  * 注册路由。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sidebar-row-menu",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "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, with open-with and archived-session cleanup.",
   "keywords": [
@@ -60,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 && node --check lib/host/session-delete.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 && node --check lib/host/workspace-delete.js",
     "build": "npm pack",
     "marketplace:check": "node scripts/marketplace-preflight.mjs",
     "prepack": "npm run check",