dsh-workspace-api-key 0.2.2 → 0.2.4

package/README.md

@@ -36,7 +36,7 @@ Host half (`lib/index.js`):
 - 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)
 
@@ -72,7 +72,7 @@ Then add `"dsh-workspace-api-key"` to `dsh.profile.bundles` in that profile's `p
 
 ```sh
 node test/host.test.mjs     # 125 assertions
-node test/client.test.mjs   # 121 assertions
+node test/client.test.mjs   # 130 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.

package/README.zh.md

@@ -36,7 +36,7 @@ DSH 只从一个全局凭据 ref（默认 `DEEPSEEK_API_KEY`）解析 DeepSeek k
 - 自己的账本（哪一层对应哪个 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 接口（仅限回环）
 
@@ -72,10 +72,10 @@ pnpm add "dsh-workspace-api-key@github:COH2357/dsh-workspace-api-key"
 
 ```sh
 node test/host.test.mjs     # 125 条断言
-node test/client.test.mjs   # 121 条断言
+node test/client.test.mjs   # 130 条断言
 ```
 
-两个套件都不需要启动 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

@@ -212,6 +212,11 @@ window.__ModuleLoader__.load({
       return parts[parts.length - 1] ?? p
     }
 
+    /** 会话按最近使用排序。 */
+    function sortByUpdated(rows) {
+      return rows.slice().sort((a, b) => (b?.updatedAt ?? 0) - (a?.updatedAt ?? 0))
+    }
+
     /** 浏览器端 sessions 服务快照 → 顶层会话条目（子代理会话不算）。 */
     function clientSessionEntries(sessions) {
       const snap = sessions?.list?.getSnapshot?.()
@@ -237,9 +242,10 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * 用浏览器端的会话列表重建「工作区/目录 → 会话」的树。
-     * 宿主行（含 key 层级）按 sessionId 合并进来；宿主没给出的会话用
-     * /state 里的覆盖记录补出层级，保证按钮不会因为宿主列表为空而消失。
+     * 用浏览器端的会话列表补全「工作区/目录 → 会话」的树。
+     * 宿主行始终保留（不会被浏览器端列表挤掉），浏览器端额外只做两件事：
+     * 给同名会话补标题/cwd，以及把宿主漏掉的会话补进来（层级从 /state 的
+     * 覆盖记录推出）。这样宿主列表为空时面板照样有会话可列。
      */
     function mergeSessions(state, sessions) {
       const entries = clientSessionEntries(sessions)
@@ -261,18 +267,27 @@ window.__ModuleLoader__.load({
         if (key !== undefined) workspaceByPath.set(key, ws)
       }
 
-      const buckets = new Map()
-      const extras = new Map()
+      // 第一遍：宿主行能补什么就补什么，宿主没有的会话合成一行。
+      const enriched = new Map()
+      const additions = []
       for (const entry of entries) {
         const host = hostRows.get(entry.sessionId)
-        const cwd = typeof host?.cwd === 'string' && host.cwd !== '' ? host.cwd : entry.cwd
+        if (host !== undefined) {
+          const patch = {}
+          if ((host.title === undefined || host.title === '') && entry.title !== undefined) patch.title = entry.title
+          if ((host.cwd === undefined || host.cwd === '') && entry.cwd !== undefined) patch.cwd = entry.cwd
+          if (Object.keys(patch).length > 0) enriched.set(entry.sessionId, { ...host, ...patch })
+          continue
+        }
+        const cwd = entry.cwd
         const pathKey = normKey(cwd)
         const ws = pathKey !== undefined ? workspaceByPath.get(pathKey) : undefined
-        let row = host
-        if (row === undefined) {
-          const own = overrideBySession.get(entry.sessionId)
-          const level = own !== undefined ? 'session' : ws?.configured === true ? 'workspace' : 'default'
-          row = {
+        const own = overrideBySession.get(entry.sessionId)
+        const level = own !== undefined ? 'session' : ws?.configured === true ? 'workspace' : 'default'
+        additions.push({
+          pathKey,
+          workspace: ws,
+          row: {
             sessionId: entry.sessionId,
             title: entry.title,
             cwd,
@@ -297,45 +312,50 @@ window.__ModuleLoader__.load({
             effectiveTitle: undefined,
             invalid: (level === 'session' ? own?.invalid : level === 'workspace' ? ws?.invalid : null) ?? null,
             mismatch: null,
-          }
-        } else {
-          const patch = {}
-          if ((row.title === undefined || row.title === '') && entry.title !== undefined) patch.title = entry.title
-          if ((row.cwd === undefined || row.cwd === '') && cwd !== undefined) patch.cwd = cwd
-          if (Object.keys(patch).length > 0) row = { ...row, ...patch }
-        }
-        const bucketKey = pathKey ?? ''
-        const target = ws !== undefined ? buckets : extras
-        const list = target.get(ws !== undefined ? ws.path : bucketKey) ?? []
-        list.push(row)
-        target.set(ws !== undefined ? ws.path : bucketKey, list)
+          },
+        })
       }
 
-      const sorted = (rows) => rows.slice().sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0))
-      const workspaces = (state.workspaces ?? []).map((ws) => (
-        { ...ws, sessions: sorted(buckets.get(ws.path) ?? []) }
-      ))
+      const fill = (rows) => (Array.isArray(rows) ? rows : [])
+        .map((row) => enriched.get(row?.sessionId) ?? row)
+
+      // 第二遍：宿主结构照旧，浏览器端多出来的会话按 cwd 归档。
+      const workspaces = (state.workspaces ?? []).map((ws) => {
+        const rows = fill(ws.sessions)
+        for (const item of additions) {
+          if (item.workspace?.path === ws.path) rows.push(item.row)
+        }
+        return { ...ws, sessions: sortByUpdated(rows) }
+      })
+
       const ungrouped = []
+      const extras = new Map()
+      for (const item of additions) {
+        if (item.workspace !== undefined) continue
+        const key = item.pathKey ?? ''
+        const list = extras.get(key) ?? []
+        list.push(item.row)
+        extras.set(key, list)
+      }
+      for (const group of (state.ungrouped ?? [])) {
+        const key = normKey(group?.path) ?? String(group?.path ?? '')
+        const rows = fill(group.sessions)
+        for (const row of (extras.get(key) ?? [])) rows.push(row)
+        extras.delete(key)
+        ungrouped.push({ ...group, sessions: sortByUpdated(rows) })
+      }
       for (const [key, rows] of extras) {
-        const known = (state.ungrouped ?? []).find((group) => normKey(group?.path) === key)
-        const path = known?.path ?? rows[0]?.cwd ?? undefined
+        const path = key !== '' ? key : undefined
         ungrouped.push({
-          ...(known ?? {
-            id: undefined,
-            path,
-            title: path !== undefined && path !== '' ? dirName(path) : '（没有目录）',
-            kind: 'directory',
-            configured: false,
-            exists: true,
-          }),
-          sessions: sorted(rows),
+          id: undefined,
+          path: rows[0]?.cwd ?? path,
+          title: path !== undefined && path !== '' ? dirName(path) : '（没有目录）',
+          kind: 'directory',
+          configured: false,
+          exists: true,
+          sessions: sortByUpdated(rows),
         })
       }
-      for (const group of (state.ungrouped ?? [])) {
-        if (!ungrouped.some((item) => item.path === group.path)) {
-          ungrouped.push({ ...group, sessions: sorted(buckets.get(group.path) ?? []) })
-        }
-      }
       return { ...state, workspaces, ungrouped, sessionSource: 'client' }
     }
 
@@ -485,12 +505,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(() => {
@@ -1011,13 +1050,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 }
@@ -1047,12 +1088,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/package.json

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