dsh-delete-conversation 1.0.0 → 1.0.1

package/README.md

@@ -37,8 +37,9 @@ dsh plugin add dsh-delete-conversation
 
 ## 安全边界
 
-- **正在运行的会话不能删。** 它有活跃的 Agent 持有写锁，且界面还指着它。
-  这种情况接口返回 `409`，弹窗里会提示你先结束它或改为归档。
+- **正在跑的会话不能删。** 只有该会话此刻真的在跑一轮（Agent 状态为
+  `running`）才会被拒；打开过、停在空闲状态的会话可以正常删除。
+  这种情况接口返回 `409`，弹窗里会提示你先结束它。
 - **只在同源、回环地址上的请求会被受理。** 带了 `forwarded` / `x-forwarded-for` /
   `x-real-ip` 的转发请求一律 `403`，所以把这个端口暴露到公网也不会被人隔着隧道删会话。
 - **每个会话 id 都按格式校验**（`session-<uuid>`），不合法直接拒。

package/lib/index.js

@@ -165,35 +165,92 @@ async function detachFromWorkspaces(ctx, sessionId) {
 }
 
 /**
- * Whether an Agent currently owns this Session in this process.
+ * Whether this Session is mid-turn right now.
+ *
+ * `ctx.agents.get(id)` answers "is this Session loaded", not "is it busy": a
+ * Session you merely opened stays registered with status `idle` for the life of
+ * the process. Only `running` means a turn is actually driving the Session, so
+ * that — and not mere presence — is what must refuse deletion.
  * @param ctx - host context.
  * @param sessionId - stored Session id.
- * @returns true when the Session is live and must not be deleted.
+ * @returns true when the Session is running a turn and must not be deleted.
  */
-function sessionIsLive(ctx, sessionId) {
+function sessionIsRunning(ctx, sessionId) {
   const agents = ctx.get('agents');
   if (agents === undefined) return false;
   try {
-    return agents.get(sessionId) !== undefined;
+    return agents.get(sessionId)?.status === 'running';
   } catch {
     return false;
   }
 }
 
+/**
+ * The live Session object for this id, when this process has it loaded.
+ * @param ctx - host context.
+ * @param sessionId - stored Session id.
+ * @returns the live Session, or undefined when it is cold.
+ */
+function liveSession(ctx, sessionId) {
+  try {
+    return ctx.get('sessions')?.get(sessionId);
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Drop a loaded-but-idle Session from this process.
+ *
+ * DSH has no public "close this Session" call: a Session you merely opened stays
+ * registered (status `idle`) until the process exits, and that live copy is what
+ * would put the sidebar row back on the next refresh. So the deletion announces
+ * the official disposal edge first — which makes the persistence writer, the
+ * projection cache and the Session controller each close and forget their own
+ * state — and then removes the two registry entries that kept it visible.
+ * Both lookups are feature-detected: if a future DSH renames these internals the
+ * deletion still removes every stored file, and simply reports that the live
+ * copy could not be unloaded.
+ * @param ctx - host context.
+ * @param sessionId - stored Session id.
+ * @param session - the live Session object.
+ * @returns how many registry entries were removed.
+ */
+function unloadLiveSession(ctx, sessionId, session) {
+  try {
+    ctx.emit('session/disposed', session);
+  } catch (error) {
+    log('disposal notification failed', { sessionId, message: error instanceof Error ? error.message : String(error) });
+  }
+  let removed = 0;
+  for (const serviceName of ['sessions', 'agents']) {
+    try {
+      const store = ctx.get(serviceName)?.store;
+      if (store instanceof Map && store.delete(sessionId)) removed += 1;
+    } catch {}
+  }
+  return removed;
+}
+
 /**
  * Permanently delete one stored Session.
  * @param ctx - host context.
  * @param sessionId - stored Session id.
  * @returns a result describing what was removed.
- * @throws {Error} when the id is malformed, the Session is live, or the log cannot be removed.
+ * @throws {Error} when the id is malformed, the Session is mid-turn, or the log cannot be removed.
  */
 async function deleteSession(ctx, sessionId) {
   if (!SESSION_ID_PATTERN.test(sessionId)) throw new Error('invalid session id');
-  if (sessionIsLive(ctx, sessionId)) {
-    const error = new Error('该会话正在运行，无法删除；请先归档或结束它。');
+  if (sessionIsRunning(ctx, sessionId)) {
+    const error = new Error('该会话正在运行，无法删除；请先结束它，或等它跑完。');
     error.code = 'session-active';
     throw error;
   }
+  // Unload the live copy BEFORE touching files: the disposal edge makes the
+  // projection cache flush one last time, which would otherwise rewrite the
+  // cache file this deletion is about to remove.
+  const session = liveSession(ctx, sessionId);
+  const unloaded = session === undefined ? 0 : unloadLiveSession(ctx, sessionId, session);
   const directories = sessionDirectories(sessionId);
   const cacheFile = join(PROJCACHE_DIR, `${sessionId}.json`);
   const hadCache = existsSync(cacheFile);
@@ -215,6 +272,14 @@ async function deleteSession(ctx, sessionId) {
     }
   }
   const workspace = await detachFromWorkspaces(ctx, sessionId);
+  // Tell every open client to drop the row now. This is the same event the host
+  // broadcasts when a Session leaves the store, so the sidebar follows the
+  // deletion instead of waiting for the next baseline pull.
+  try {
+    ctx.emit('api-session/removed', sessionId);
+  } catch (error) {
+    log('removal broadcast failed', { sessionId, message: error instanceof Error ? error.message : String(error) });
+  }
   log('session deleted', { sessionId, directories, cacheRemoved, workspace });
   return { sessionId, directories, cacheRemoved, workspace, existed: true };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-delete-conversation",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "DSH 插件：在侧边栏会话的「…」菜单里加一项「删除会话」，彻底删除该会话的日志、工作区归属与投影缓存。Adds a \"Delete session\" action to the DeepSeek Harness sidebar session menu that permanently removes the stored session.",
   "type": "module",
   "main": "./lib/index.js",