dsh-workspace-api-key 0.2.5 → 0.2.7

package/README.md

@@ -31,8 +31,9 @@ Host half (`lib/index.js`):
 - matches that directory against `workspaceRegistry.list()` after normalizing both sides (absolute, trailing separator removed, lower-cased on Windows);
 - derives a stable ref per level — `DEEPSEEK_API_KEY_WS_<first 16 hex chars of sha1(normalized path), upper-cased>` for a workspace and `DEEPSEEK_API_KEY_SS_<first 16 hex chars of sha1(session id), upper-cased>` for a session (a session id contains `-` and cannot be a ref name) — writes the key through the credentials service, and serves that ref's value;
 - rewrites only refs a provider actually reads: the default ref, every adapter's configured `apiKeyEnv`, and its own generated refs. Every other ref passes through untouched;
-- builds the session list from the `sessionController` service (`list()`, unwrapping its `{items: […]}` envelope) and falls back to the live `sessions` service (`ctx.get('sessions').list()`), so the panel still has sessions when the controller is missing, throws, or returns an empty list. Subagent sessions (`origin: 'subagent'`, or a `parentSession`) are dropped from both sources — the persisted list contains them, and without that filter one workspace with a single real session showed thirteen;
+- builds the session list from the `sessionController` service (`list()`, unwrapping its `{items: […]}` envelope) and falls back to the live `sessions` service (`ctx.get('sessions').list()`), so the panel still has sessions when the controller is missing, throws, or returns an empty list. It hides the two kinds of session the sidebar hides: subagent sessions (`origin: 'subagent'`, or a `parentSession`) and *blank* sessions (created but never prompted — the sidebar shows only the one currently open). Without those two filters one workspace with a single real session listed thirteen;
 - reports its own version and a session probe (`available`, `shape`, `source`, `count`, `withoutCwd`, `subagents`, `samples`, `error`, plus sample workspace paths) in `/wsk-api/state`, so the panel can say *why* no sessions are listed: a stale host half (only a page reload instead of an app restart), a missing `sessionController`, a throwing `list()`, an unexpected envelope shape, or a `cwd` that matches no workspace path;
+- lists a directory that is not a registered workspace only if the sidebar would show it. It cannot decide that itself, because "only the currently open blank session counts" is knowledge the browser side holds (`retainedBy.mainView`), so it sends every such directory plus a `blank` flag per session and a `hiddenBlankDirs` list naming the ones whose sessions are all blank — the browser half applies the same verdict the sidebar does;
 - keeps its own bookkeeping (which level maps to which ref, invalid flags, the provider a key was recorded for) in `$DSH_HOME/storages/dsh-workspace-api-key.json`;
 - observes failures through the `agent/request-error` waterfall without ever returning `{kind: 'retry'}` — it only records the verdict and calls `next()`.
 
@@ -51,7 +52,7 @@ The browser half (`lib/client.js`) registers into the `sidebar.panellist` slot (
 
 Only loopback callers are accepted (`127.0.0.1`, `::1`, `::ffff:127.0.0.1`) with a same-origin or absent `Origin`. No response ever contains a plaintext key, only a mask.
 
-Workspace targets may be directories that are not registered workspaces; such entries appear as ungrouped directories next to the workspaces they belong to.
+Workspace targets may be directories that are not registered workspaces; such entries appear as ungrouped directories, and only the ones the sidebar would actually show — a directory whose only sessions are brand-new and still empty (the sidebar shows just the currently open one) is not listed.
 
 ## Install
 
@@ -71,11 +72,11 @@ Then add `"dsh-workspace-api-key"` to `dsh.profile.bundles` in that profile's `p
 ## Tests
 
 ```sh
-node test/host.test.mjs     # 130 assertions
-node test/client.test.mjs   # 134 assertions
+node test/host.test.mjs     # 136 assertions
+node test/client.test.mjs   # 145 assertions
 ```
 
-Neither suite needs a running DSH process. The host suite drives `apply()` against a mock context (fake `credentials`, `workspaceRegistry`, `agents`, `sessionController`, `sessions`, `webServer`, stubbed `fetch`) and covers ref derivation, the session → workspace → default cascade, workspace matching, redirecting a second adapter's `apiKeyEnv`, clearing back to the default, 401/402/429/5xx classification, the loopback and origin checks, state persistence, and the session probe including the `{items}` envelope, the live-session fallback, and subagent sessions being dropped. The client suite loads `lib/client.js` through a minimal `window.__ModuleLoader__` plus a small React runtime, renders the panel and the overlay, and asserts slot registration, the first render, session expand/collapse, per-session saving and testing, sessions recovered from the browser-side store when the host has none (with `displayTitle` winning and subagent sessions hidden), the ungrouped-directory card, the stale and mismatch prompts, the "go configure" hand-off, graceful degradation without a session list, and back-navigation when `ctx.get('layout')` only becomes available after the plugin was applied.
+Neither suite needs a running DSH process. The host suite drives `apply()` against a mock context (fake `credentials`, `workspaceRegistry`, `agents`, `sessionController`, `sessions`, `webServer`, stubbed `fetch`) and covers ref derivation, the session → workspace → default cascade, workspace matching, redirecting a second adapter's `apiKeyEnv`, clearing back to the default, 401/402/429/5xx classification, the loopback and origin checks, state persistence, and the session probe including the `{items}` envelope, the live-session fallback, and subagent and blank sessions being hidden. The client suite loads `lib/client.js` through a minimal `window.__ModuleLoader__` plus a small React runtime, renders the panel and the overlay, and asserts slot registration, the first render, session expand/collapse, per-session saving and testing, sessions recovered from the browser-side store when the host has none (with `displayTitle` winning and subagent sessions hidden), the ungrouped-directory card, the stale and mismatch prompts, the "go configure" hand-off, graceful degradation without a session list, and back-navigation when `ctx.get('layout')` only becomes available after the plugin was applied.
 
 ## Requirements and limits
 

package/README.zh.md

@@ -31,7 +31,8 @@ DSH 只从一个全局凭据 ref（默认 `DEEPSEEK_API_KEY`）解析 DeepSeek k
 - 把该目录与 `workspaceRegistry.list()` 做规范化后比对（绝对化、去掉尾部分隔符、Windows 折大小写）；
 - 由每一层派生出稳定的 ref —— 工作区是 `DEEPSEEK_API_KEY_WS_<sha1(规范化路径) 前 16 位十六进制大写>`，会话是 `DEEPSEEK_API_KEY_SS_<sha1(会话 id) 前 16 位十六进制大写>`（会话 id 含 `-`，不能直接当 ref 名）——通过凭据服务写入 key，并返回这个 ref 的值；
 - 只改写 provider 真正会读的 ref：默认 ref、每个适配器配置的 `apiKeyEnv`，以及插件自己生成的 ref；其它 ref 原样透传；
-- 会话列表来自 `sessionController` 服务（`list()`，会拆开它 `{items: […]}` 的信封），控件缺失 / 抛错 / 列表为空时再退到宿主 live 会话服务（`ctx.get('sessions').list()`），所以那种情况下面板仍能列出会话；两个来源都会丢掉子代理会话（`origin: 'subagent'` 或带 `parentSession`）——持久化列表里本来就含它们，不过滤的话一个只有 1 个真实会话的工作区会列出 13 个；
+- 会话列表来自 `sessionController` 服务（`list()`，会拆开它 `{items: […]}` 的信封），控件缺失 / 抛错 / 列表为空时再退到宿主 live 会话服务（`ctx.get('sessions').list()`），所以那种情况下面板仍能列出会话；侧栏藏起来的两种会话这里也藏：子代理会话（`origin: 'subagent'` 或带 `parentSession`）和**空会话**（建了但一句话都没发过，侧栏只显示当前开着的那个）。两种都不过滤的话，一个只有 1 个真实会话的工作区会列出 13 个；
+- 不是注册工作区的目录，只有侧栏真的会显示它才会被列出来。这件事宿主判不了：「空会话里只有当前开着的那个算数」是浏览器端才知道的事（`retainedBy.mainView`），所以宿主把这种目录连同每个会话的 `blank` 标记一起发出去，并用 `hiddenBlankDirs` 点名「里面全是空会话」的目录，由浏览器半边套用与侧栏一致的判据；
 - `/wsk-api/state` 会带上插件自身版本与会话探针（`available`、`shape`、`source`、`count`、`withoutCwd`、`subagents`、`samples`、`error`，以及工作区路径样本），面板据此说明**为什么**没有列出会话：宿主半边是旧版本（只刷新了页面而没重启应用）、没有 `sessionController`、`list()` 抛错、信封形状不认识，还是会话的 `cwd` 与任何工作区路径都对不上；
 - 自己的账本（哪一层对应哪个 ref、失效标记、key 是给哪个服务商记的）落在 `$DSH_HOME/storages/dsh-workspace-api-key.json`；
 - 通过 `agent/request-error` waterfall 观察失败，但**从不**返回 `{kind: 'retry'}`——只记录判定结果并 `next()` 放行。
@@ -51,7 +52,7 @@ DSH 只从一个全局凭据 ref（默认 `DEEPSEEK_API_KEY`）解析 DeepSeek k
 
 只接受本机回环调用（`127.0.0.1`、`::1`、`::ffff:127.0.0.1`），且 `Origin` 必须同源或缺失。任何响应都不会包含明文 key，只有掩码。
 
-工作区目标也接受不是注册工作区的目录；这类条目会作为「未分组目录」和它们所属的工作区一起列在面板里。
+工作区目标也接受不是注册工作区的目录；这类条目会作为「未分组目录」列在面板里，且只列侧栏真的会显示的目录——一个目录里若只有「刚建好、一句话都没发过」的空会话，侧栏不会显示它（空会话里只有当前打开的那个算数），面板也不会列。
 
 ## 安装
 
@@ -71,11 +72,11 @@ pnpm add "dsh-workspace-api-key@github:COH2357/dsh-workspace-api-key"
 ## 测试
 
 ```sh
-node test/host.test.mjs     # 130 条断言
-node test/client.test.mjs   # 134 条断言
+node test/host.test.mjs     # 136 条断言
+node test/client.test.mjs   # 145 条断言
 ```
 
-两个套件都不需要启动 DSH。宿主套件用一个假 ctx（假的 `credentials`、`workspaceRegistry`、`agents`、`sessionController`、`sessions`、`webServer`，以及打桩的 `fetch`）驱动 `apply()`，覆盖 ref 派生、会话→工作区→默认的级联、工作区匹配、把第二个适配器的 `apiKeyEnv` 一起重定向、清回默认、401/402/429/5xx 的判定、回环与来源校验、状态落盘，以及会话探针（含 `{items}` 信封与 live 兜底）。浏览器套件通过一个极小的 `window.__ModuleLoader__` 与自制 React 运行时加载 `lib/client.js`，渲染出面板与覆盖层，断言槽注册、首屏渲染、会话折叠/展开、会话级保存与测试、宿主列不出会话时从浏览器端存储恢复会话（标题取 `displayTitle`、隐藏子代理会话、浏览器端只认识一部分会话时不挤掉宿主行）、会话列表服务晚于插件提供时的重试、未分组目录卡片、失效与不匹配提醒、「去配置」的交接、没有会话列表时的降级，以及 `ctx.get('layout')` 在插件 apply 之后才可用时返回键仍然有效。
+两个套件都不需要启动 DSH。宿主套件用一个假 ctx（假的 `credentials`、`workspaceRegistry`、`agents`、`sessionController`、`sessions`、`webServer`，以及打桩的 `fetch`）驱动 `apply()`，覆盖 ref 派生、会话→工作区→默认的级联、工作区匹配、把第二个适配器的 `apiKeyEnv` 一起重定向、清回默认、401/402/429/5xx 的判定、回环与来源校验、状态落盘，以及会话探针（含 `{items}` 信封与 live 兜底）。浏览器套件通过一个极小的 `window.__ModuleLoader__` 与自制 React 运行时加载 `lib/client.js`，渲染出面板与覆盖层，断言槽注册、首屏渲染、会话折叠/展开、会话级保存与测试、宿主列不出会话时从浏览器端存储恢复会话（标题取 `displayTitle`、隐藏子代理会话与空会话、浏览器端只认识一部分会话时不挤掉宿主行）、会话列表服务晚于插件提供时的重试、未分组目录卡片、失效与不匹配提醒、「去配置」的交接、没有会话列表时的降级，以及 `ctx.get('layout')` 在插件 apply 之后才可用时返回键仍然有效。
 
 ## 要求与限制
 

package/lib/client.js

@@ -236,6 +236,9 @@ window.__ModuleLoader__.load({
             : typeof item.title === 'string' && item.title !== '' ? item.title : undefined,
           updatedAt: typeof item.updatedAt === 'number' ? item.updatedAt : 0,
           running: item.running === true,
+          // 还没发过消息的「空会话」：侧栏只显示当前选中的那个，其余都藏起来。
+          blank: item.blank === true,
+          current: ((item.retainedBy?.mainView ?? 0) > 0),
         })
       }
       return entries
@@ -246,20 +249,43 @@ window.__ModuleLoader__.load({
      * 宿主行始终保留（不会被浏览器端列表挤掉），浏览器端额外只做两件事：
      * 给同名会话补标题/cwd，以及把宿主漏掉的会话补进来（层级从 /state 的
      * 覆盖记录推出）。这样宿主列表为空时面板照样有会话可列。
+     * 侧栏还藏两种会话，这里跟着藏：子代理会话（跟随父会话）和「空会话」
+     * ——后者是建了但一句话都没发过的会话，侧栏只显示当前选中的那一个。
      */
     function mergeSessions(state, sessions) {
-      const entries = clientSessionEntries(sessions)
+      const allEntries = clientSessionEntries(sessions)
       if (state === null || state === undefined) return state
       const isTopLevel = (row) => row?.parentSessionId === undefined && row?.origin !== 'subagent'
-      if (entries.length === 0) {
-        // 没有浏览器端列表时也把子代理会话滤掉（宿主新版本已经过滤，这里兜旧宿主）。
-        const clean = (rows) => (Array.isArray(rows) ? rows : []).filter(isTopLevel)
-        return {
-          ...state,
-          workspaces: (state.workspaces ?? []).map((ws) => ({ ...ws, sessions: clean(ws.sessions) })),
-          ungrouped: (state.ungrouped ?? []).map((group) => ({ ...group, sessions: clean(group.sessions) })),
+      /** 当前正开着的空会话：侧栏会把它当「新会话」显示，所以也保留。 */
+      const currentIds = new Set(allEntries.filter((entry) => entry.current).map((entry) => entry.sessionId))
+      const entries = allEntries.filter((entry) => !entry.blank || entry.current)
+      const isVisible = (row) => row?.sessionId !== undefined
+        ? isTopLevel(row) && (row.blank !== true || currentIds.has(row.sessionId))
+        : isTopLevel(row)
+      // 诊断用：被藏起来的空会话按 id 去重（同一个会话可能同时出现在两侧）。
+      const blankIds = new Set()
+      for (const entry of allEntries) {
+        if (entry.blank && !entry.current) blankIds.add(entry.sessionId)
+      }
+      for (const group of [...(state.workspaces ?? []), ...(state.ungrouped ?? [])]) {
+        let index = 0
+        for (const row of (Array.isArray(group?.sessions) ? group.sessions : [])) {
+          index += 1
+          if (!isTopLevel(row) || row?.blank !== true || currentIds.has(row?.sessionId)) continue
+          blankIds.add(row?.sessionId ?? `${group?.path ?? ''}#${index}`)
         }
       }
+      const blankSkipped = blankIds.size
+      if (entries.length === 0) {
+        // 没有浏览器端列表时也把子代理/空会话滤掉（宿主新版本已经过滤，这里兜旧宿主）。
+        const clean = (rows) => (Array.isArray(rows) ? rows : []).filter(isVisible)
+        const workspaces = (state.workspaces ?? []).map((ws) => ({ ...ws, sessions: clean(ws.sessions) }))
+        // 未分组目录：过滤后一个会话都不剩的就不列（侧栏对空目录同样什么都不显示）。
+        const ungrouped = (state.ungrouped ?? [])
+          .map((group) => ({ ...group, sessions: clean(group.sessions) }))
+          .filter((group) => (group.sessions?.length ?? 0) > 0)
+        return { ...state, workspaces, ungrouped, sessionBlanks: blankSkipped }
+      }
 
       const hostRows = new Map()
       for (const group of [...(state.workspaces ?? []), ...(state.ungrouped ?? [])]) {
@@ -329,7 +355,7 @@ window.__ModuleLoader__.load({
       }
 
       const fill = (rows) => (Array.isArray(rows) ? rows : [])
-        .filter(isTopLevel)
+        .filter(isVisible)
         .map((row) => enriched.get(row?.sessionId) ?? row)
 
       // 第二遍：宿主结构照旧，浏览器端多出来的会话按 cwd 归档。
@@ -355,6 +381,8 @@ window.__ModuleLoader__.load({
         const rows = fill(group.sessions)
         for (const row of (extras.get(key) ?? [])) rows.push(row)
         extras.delete(key)
+        // 过滤后没有会话的目录不再列（宿主新版本已经不产生这种组，这里兜旧宿主）。
+        if (rows.length === 0) continue
         ungrouped.push({ ...group, sessions: sortByUpdated(rows) })
       }
       for (const [key, rows] of extras) {
@@ -369,7 +397,7 @@ window.__ModuleLoader__.load({
           sessions: sortByUpdated(rows),
         })
       }
-      return { ...state, workspaces, ungrouped, sessionSource: 'client' }
+      return { ...state, workspaces, ungrouped, sessionSource: 'client', sessionBlanks: blankSkipped }
     }
 
     function modelText(session) {
@@ -657,7 +685,8 @@ window.__ModuleLoader__.load({
       // 这里把两者都显式画出来，用户截一张图就能定位。
       const probe = state?.sessionProbe
       const hostIsStale = state !== null && state.storeVersion === undefined
-      const clientCount = clientSessionEntries(sessionStore).length
+      const clientCount = clientSessionEntries(sessionStore)
+        .filter((entry) => !entry.blank || entry.current).length
       const sessionTotal = [...grouped, ...ungrouped].reduce(
         (sum, ws) => sum + (Array.isArray(ws.sessions) ? ws.sessions.length : 0), 0)
 
@@ -675,9 +704,15 @@ window.__ModuleLoader__.load({
         const listError = probe?.error !== undefined ? ` · list 报错：${probe.error}` : ''
         const noCwd = probe?.withoutCwd > 0 ? ` · ${probe.withoutCwd} 个没有 cwd` : ''
         const subs = probe?.subagents > 0 ? ` · 已跳过 ${probe.subagents} 个子代理会话` : ''
+        const blanks = (view?.sessionBlanks ?? 0) > 0 ? ` · 已跳过 ${view.sessionBlanks} 个空会话` : ''
+        // 宿主只标注「这个目录里只有还没说过话的空会话」，列不列由本文件按侧栏语义决定
+        // （空会话里只有当前打开的那一个算数）——所以这里说的是「宿主标了几个」。
+        const blankDirs = Array.isArray(state.hiddenBlankDirs) && state.hiddenBlankDirs.length > 0
+          ? ` · ${state.hiddenBlankDirs.length} 个目录只有空会话（未分组里不列）`
+          : ''
         return `插件 v${hostVersion} · 状态存储 v${state.storeVersion ?? '—'}`
           + ` · 宿主会话列表：${sessions}${listError}${noCwd}${subs}`
-          + ` · 浏览器会话列表：${clientCount} 个`
+          + ` · 浏览器会话列表：${clientCount} 个${blanks}${blankDirs}`
           + ` · 工作区 ${grouped.length} + 未分组 ${ungrouped.length} · 挂在目录下的会话 ${sessionTotal}`
       }
 
@@ -1035,7 +1070,8 @@ window.__ModuleLoader__.load({
             ? h('div', { className: 'wsk-card' },
                 h('h4', null, `未分组目录（${ungrouped.length}）`),
                 h('div', { className: 'wsk-hint', style: { marginBottom: 6 } },
-                  '这些目录里的会话没有挂在工作区下（侧栏的「未分组」），同样可以单独配置。'),
+                  '这些目录里的会话没有挂在工作区下（侧栏的「未分组」），同样可以单独配置。'
+                  + '只有侧栏真的会显示的目录才列在这里（刚建好、还没发过消息的空会话不算）。'),
                 h('div', { className: 'wsk-list' }, ungrouped.map((ws) => renderWorkspace(ws))))
             : null,
 

package/lib/index.js

@@ -1048,6 +1048,21 @@ async function workspaceRow(ctx, state, { id, path: dir, title, kind }, rows, cl
   }
 }
 
+/**
+ * 侧栏会不会真的显示这一行。
+ * 侧栏对「还没发过消息的空会话」（sessionController 的 blank 标记）只显示当前打开的那一个，
+ * 其余全部藏起来（另见 lib/client.js 同名判据与 @deepseek-ai/dsh-client-ui-workspace 的
+ * sessionVisible）。空目录之所以要按这个判据过滤：见 snapshot() 里 ungrouped 的注释。
+ */
+function sidebarVisibleRow(row) {
+  return row?.blank !== true
+}
+
+/** 目录里至少有一个「侧栏会显示」的会话（没有会话的目录不算）。 */
+function hasVisibleSession(rows) {
+  return Array.isArray(rows) && rows.some((row) => sidebarVisibleRow(row))
+}
+
 async function snapshot(ctx, state) {
   const credentials = ctx.get('credentials')
   const defaultRefName = 'DEEPSEEK_API_KEY'
@@ -1105,10 +1120,18 @@ async function snapshot(ctx, state) {
   }
 
   // 未注册成工作区、但确实有会话的目录（侧栏的「未分组」）：也能单独给会话配 key。
+  // 注意：**不在这里过滤**。侧栏对一个目录显不显示，取决于「目录里有没有它真的显示出来的
+  // 会话」，而「空会话只显示当前打开的那一个」这条规则只有浏览器端知道（会话 store 的
+  // retainedBy.mainView）。宿主这边只把目录和 blank 标记原样发出去，由 lib/client.js 按
+  // 同一个判据决定列不列 —— 以前面板会冒出侧栏上并不存在的「未分组目录」（用户实测：
+  // E:\web 与插件自己的目录，各自只有一个还没说过话的空会话）。
   const ungrouped = []
+  const hiddenBlankDirs = []
   for (const [norm, list] of byCwd) {
     if (claimed.has(norm)) continue
     const dir = typeof list[0]?.cwd === 'string' ? list[0].cwd : norm
+    // 诊断用：这个目录里一个「真实会话」都没有（界面把它藏起来，但用户能看到原因）。
+    if (!hasVisibleSession(list)) hiddenBlankDirs.push(dir)
     ungrouped.push(await workspaceRow(ctx, state, { id: undefined, path: dir, title: basename(dir) || dir, kind: 'directory' }, list))
   }
 
@@ -1166,6 +1189,9 @@ async function snapshot(ctx, state) {
     statePath: stateFilePath(),
     workspaces,
     ungrouped,
+    // 诊断：这些未分组目录里只有空会话，界面按侧栏语义会把它藏起来（不直接从这里删，
+    // 因为「当前打开的空会话」要显示，而这件事只有浏览器端知道）。
+    hiddenBlankDirs,
     sessionOverrides,
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-workspace-api-key",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "A DeepSeek Harness plugin that binds a separate DeepSeek API key to each workspace, or to a single session, so the spend of one key stays with the sessions you choose.",
   "type": "module",
   "license": "MIT",