dsh-workspace-api-key 0.2.3 → 0.2.5

package/README.md

@@ -31,12 +31,12 @@ 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 are filtered out of that fallback;
-- reports its own version and a session probe (`available`, `shape`, `source`, `count`, `withoutCwd`, `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;
+- 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;
+- 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;
 - 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()`.
 
-The browser half (`lib/client.js`) registers into the `sidebar.panellist` slot (`order: 1`), the `main` slot (key `workspace-api-key`) and the `shell.overlay` slot (the entering-a-session warning), the same slots `dsh-skill-mcp-panel` and `dsh-429-guard` use. It is plain `React.createElement` with no build step and no bundled dependencies. It merges the host rows with the browser-side `sessions` store (`ctx.get('sessions').list.getSnapshot()`, which is what the sidebar itself renders), so session titles come from `displayTitle` and sessions stay visible even when the host cannot list them. The overlay asks `/wsk-api/check?sessionId=…&path=…` about the session that currently owns the main view, asks at most once per session, and its buttons only ever navigate to the panel — the panel is where a key can actually be changed.
+The browser half (`lib/client.js`) registers into the `sidebar.panellist` slot (`order: 1`), the `main` slot (key `workspace-api-key`) and the `shell.overlay` slot (the entering-a-session warning), the same slots `dsh-skill-mcp-panel` and `dsh-429-guard` use. It is plain `React.createElement` with no build step and no bundled dependencies. It merges the host rows with the browser-side `sessions` store (`ctx.get('sessions').list.getSnapshot()`, which is what the sidebar itself renders), so session titles come from `displayTitle`, host rows are never dropped when that store only knows a subset, and sessions stay visible even when the host cannot list them. That store is provided by `dsh-api-session-controller` *after* the plugin's `apply()`, so both the panel and the overlay retry for it (every 500 ms, at most 40 times) instead of giving up on the first render. The overlay asks `/wsk-api/check?sessionId=…&path=…` about the session that currently owns the main view, asks at most once per session, and its buttons only ever navigate to the panel — the panel is where a key can actually be changed.
 
 ### HTTP API (loopback only)
 
@@ -71,11 +71,11 @@ Then add `"dsh-workspace-api-key"` to `dsh.profile.bundles` in that profile's `p
 ## Tests
 
 ```sh
-node test/host.test.mjs     # 125 assertions
-node test/client.test.mjs   # 124 assertions
+node test/host.test.mjs     # 130 assertions
+node test/client.test.mjs   # 134 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 and the live-session fallback. 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 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.
 
 ## Requirements and limits
 

package/README.zh.md

@@ -31,12 +31,12 @@ 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()`），所以那种情况下面板仍能列出会话（该兜底会过滤掉子代理会话）；
-- `/wsk-api/state` 会带上插件自身版本与会话探针（`available`、`shape`、`source`、`count`、`withoutCwd`、`samples`、`error`，以及工作区路径样本），面板据此说明**为什么**没有列出会话：宿主半边是旧版本（只刷新了页面而没重启应用）、没有 `sessionController`、`list()` 抛错、信封形状不认识，还是会话的 `cwd` 与任何工作区路径都对不上；
+- 会话列表来自 `sessionController` 服务（`list()`，会拆开它 `{items: […]}` 的信封），控件缺失 / 抛错 / 列表为空时再退到宿主 live 会话服务（`ctx.get('sessions').list()`），所以那种情况下面板仍能列出会话；两个来源都会丢掉子代理会话（`origin: 'subagent'` 或带 `parentSession`）——持久化列表里本来就含它们，不过滤的话一个只有 1 个真实会话的工作区会列出 13 个；
+- `/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()` 放行。
 
-浏览器半边（`lib/client.js`）注册到 `sidebar.panellist` 槽（`order: 1`）、`main` 槽（key 为 `workspace-api-key`）与 `shell.overlay` 槽（点进会话时的提醒），和 `dsh-skill-mcp-panel`、`dsh-429-guard` 用的是同一套槽。全部是朴素的 `React.createElement`，没有构建步骤，也不打包任何依赖。它会把宿主行与浏览器端 `sessions` 存储（`ctx.get('sessions').list.getSnapshot()`，也就是侧栏自己渲染的数据）合并起来，因此标题取自 `displayTitle`，宿主列不出会话时面板也照样有会话可列。覆盖层向 `/wsk-api/check?sessionId=…&path=…` 查询当前占据主视图的会话，每个会话最多问一次，它的按钮只负责把你带到面板——改 key 只能由面板里的操作完成。
+浏览器半边（`lib/client.js`）注册到 `sidebar.panellist` 槽（`order: 1`）、`main` 槽（key 为 `workspace-api-key`）与 `shell.overlay` 槽（点进会话时的提醒），和 `dsh-skill-mcp-panel`、`dsh-429-guard` 用的是同一套槽。全部是朴素的 `React.createElement`，没有构建步骤，也不打包任何依赖。它会把宿主行与浏览器端 `sessions` 存储（`ctx.get('sessions').list.getSnapshot()`，也就是侧栏自己渲染的数据）合并起来，因此标题取自 `displayTitle`，浏览器端只认识一部分会话时也不会把宿主行挤掉，宿主列不出会话时面板也照样有会话可列。这个存储由 `dsh-api-session-controller` 在插件 `apply()` **之后**才提供，所以面板与覆盖层都会为它重试（每 500ms 一次，最多 40 次），而不是首次渲染拿不到就放弃。覆盖层向 `/wsk-api/check?sessionId=…&path=…` 查询当前占据主视图的会话，每个会话最多问一次，它的按钮只负责把你带到面板——改 key 只能由面板里的操作完成。
 
 ### HTTP 接口（仅限回环）
 
@@ -71,11 +71,11 @@ pnpm add "dsh-workspace-api-key@github:COH2357/dsh-workspace-api-key"
 ## 测试
 
 ```sh
-node test/host.test.mjs     # 125 条断言
-node test/client.test.mjs   # 124 条断言
+node test/host.test.mjs     # 130 条断言
+node test/client.test.mjs   # 134 条断言
 ```
 
-两个套件都不需要启动 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

@@ -249,11 +249,23 @@ window.__ModuleLoader__.load({
      */
     function mergeSessions(state, sessions) {
       const entries = clientSessionEntries(sessions)
-      if (state === null || state === undefined || entries.length === 0) return state
+      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 hostRows = new Map()
       for (const group of [...(state.workspaces ?? []), ...(state.ungrouped ?? [])]) {
         for (const row of (Array.isArray(group?.sessions) ? group.sessions : [])) {
+          // 子代理会话不是独立会话（宿主新版本已经过滤，这里对旧宿主再兜一层）。
+          if (!isTopLevel(row)) continue
           if (row?.sessionId !== undefined) hostRows.set(row.sessionId, row)
         }
       }
@@ -317,6 +329,7 @@ window.__ModuleLoader__.load({
       }
 
       const fill = (rows) => (Array.isArray(rows) ? rows : [])
+        .filter(isTopLevel)
         .map((row) => enriched.get(row?.sessionId) ?? row)
 
       // 第二遍：宿主结构照旧，浏览器端多出来的会话按 cwd 归档。
@@ -505,12 +518,31 @@ window.__ModuleLoader__.load({
       // 浏览器端的会话列表（含标题、cwd）会随时变化：变了就重渲染。
       const sessionStore = sessionsService(props?.sessions)
       const [sessionTick, setSessionTick] = useState(0)
+      // 这个服务由 dsh-api-session-controller 在 effect 里晚于插件 apply 提供：
+      // 首次渲染拿不到就轮询一段时间，否则面板永远等不到会话列表。
+      const [storeMissing, setStoreMissing] = useState(false)
       useEffect(() => {
         const store = sessionStore?.list
-        if (store === undefined || store === null || typeof store.subscribe !== 'function') return undefined
+        if (store === undefined || store === null || typeof store.subscribe !== 'function') {
+          setStoreMissing(true)
+          return undefined
+        }
+        setStoreMissing(false)
         const off = store.subscribe(() => setSessionTick((tick) => tick + 1))
         return () => { if (typeof off === 'function') off() }
       }, [sessionStore])
+      useEffect(() => {
+        if (!storeMissing) return undefined
+        let tries = 0
+        const timer = setInterval(() => {
+          tries += 1
+          if (sessionsService(props?.sessions) !== undefined || tries >= 40) {
+            clearInterval(timer)
+            setSessionTick((tick) => tick + 1)
+          }
+        }, 500)
+        return () => clearInterval(timer)
+      }, [storeMissing])
 
       // 让覆盖层能立刻刷新面板（点「去配置」时面板可能已经挂载着）。
       useEffect(() => {
@@ -642,8 +674,9 @@ window.__ModuleLoader__.load({
               + (probe.source === 'sessions' ? '（live 兜底）' : '')
         const listError = probe?.error !== undefined ? ` · list 报错：${probe.error}` : ''
         const noCwd = probe?.withoutCwd > 0 ? ` · ${probe.withoutCwd} 个没有 cwd` : ''
+        const subs = probe?.subagents > 0 ? ` · 已跳过 ${probe.subagents} 个子代理会话` : ''
         return `插件 v${hostVersion} · 状态存储 v${state.storeVersion ?? '—'}`
-          + ` · 宿主会话列表：${sessions}${listError}${noCwd}`
+          + ` · 宿主会话列表：${sessions}${listError}${noCwd}${subs}`
           + ` · 浏览器会话列表：${clientCount} 个`
           + ` · 工作区 ${grouped.length} + 未分组 ${ungrouped.length} · 挂在目录下的会话 ${sessionTotal}`
       }
@@ -1031,13 +1064,15 @@ window.__ModuleLoader__.load({
 
         useEffect(() => {
           ensureStyles()
-          const sessions = ctx.get('sessions')
-          if (sessions === undefined || sessions === null) return undefined
-
           let disposed = false
+          let timer = null
+          let unsubscribe = null
+          let tries = 0
+          let list = null
+
           const currentSession = () => {
             try {
-              const snapshot = sessions.list?.getSnapshot?.()
+              const snapshot = list?.getSnapshot?.()
               const byId = snapshot?.byId ?? {}
               for (const [id, item] of Object.entries(byId)) {
                 if (Number(item?.retainedBy?.mainView) > 0) return { id, cwd: item?.cwd }
@@ -1067,12 +1102,26 @@ window.__ModuleLoader__.load({
             }
           }
 
-          evaluate()
-          const unsubscribe = typeof sessions.list?.subscribe === 'function'
-            ? sessions.list.subscribe(() => { evaluate() })
-            : undefined
+          // 会话列表服务由 dsh-api-session-controller 在 effect 里晚于插件 apply 提供
+          // （覆盖层更早挂载），所以这里要有上限地重试，否则永远看不到会话。
+          const attach = () => {
+            if (disposed) return
+            const sessions = ctx.get('sessions')
+            if (sessions === null || sessions === undefined) {
+              tries += 1
+              if (tries < 40) timer = setTimeout(attach, 500)
+              return
+            }
+            list = sessions.list ?? null
+            evaluate()
+            unsubscribe = typeof sessions.list?.subscribe === 'function'
+              ? sessions.list.subscribe(() => { evaluate() })
+              : null
+          }
+          attach()
           return () => {
             disposed = true
+            if (timer !== null) clearTimeout(timer)
             if (typeof unsubscribe === 'function') unsubscribe()
           }
         }, [])

package/lib/index.js

@@ -263,9 +263,16 @@ async function sessionProbe(ctx) {
       shape = 'throw'
     }
   }
+  // 子代理会话（origin: 'subagent' / 带 parentSession）也在这份列表里，
+  // 但侧栏不把它们当独立会话显示（它们是某个会话派生出来的）。
+  // 一并过滤，否则一个工作区会冒出几十个「会话」（用户实测过 13 个里 12 个是子代理）。
+  const isSubagentRow = (row) => row?.parentSessionId !== undefined || row?.origin === 'subagent'
+  const allRows = list
+  const visibleRows = allRows.filter((row) => !isSubagentRow(row))
+  const skippedSubagents = allRows.length - visibleRows.length
   // sessionController 给不出任何会话时（服务缺失、list 抛错、列表为空……），
   // 用宿主 live 会话服务兜底，让界面至少能列出「当前装载中的会话」。
-  let rows = list
+  let rows = visibleRows
   let source = rows.length > 0 ? 'sessionController' : undefined
   if (rows.length === 0) {
     const live = liveSessionRows(ctx)
@@ -285,12 +292,14 @@ async function sessionProbe(ctx) {
     }
     if (samples.length < 5 && !samples.includes(cwd)) samples.push(cwd)
   }
-  log('sessionProbe:', rows.length, 'rows from', source ?? 'none', ',', withoutCwd, 'without cwd, shape', shape)
+  log('sessionProbe:', rows.length, 'rows from', source ?? 'none', ',', withoutCwd, 'without cwd, shape', shape,
+    ',', skippedSubagents, 'subagent rows skipped')
   return {
     available: source !== undefined,
     rows,
     count: rows.length,
     withoutCwd,
+    subagents: skippedSubagents,
     samples,
     shape,
     source,
@@ -1133,6 +1142,7 @@ async function snapshot(ctx, state) {
       available: probe.available,
       count: probe.count,
       withoutCwd: probe.withoutCwd ?? 0,
+      subagents: probe.subagents ?? 0,
       error: probe.error,
       samples: probe.samples ?? [],
       shape: probe.shape,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-workspace-api-key",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "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",