dsh-workspace-api-key 0.2.14 → 0.2.15

package/README.md

@@ -36,7 +36,7 @@ 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;
-- tells search credentials apart from chat credentials. The official new Search/Fetch API (`web.searchProvider === 'deepseek-search-api'`) resolves its key itself, and it defaults to the same `DEEPSEEK_API_KEY` the chat uses, so the ref alone cannot say why a key is being asked for. The host half therefore wraps `ctx.web.search` / `ctx.web.fetch` in an `AsyncLocalStorage` scope and applies the search rule only when `credentials.resolve` runs inside it — a session's own key first (always), then, if that workspace ticked `同步搜索 API`, the workspace key and then the system default, otherwise its own search default ref when the panel holds one, and only then the ref the search plugin configured. The legacy Messages-based search keeps the plain chat cascade, because that route *is* a messages request;
+- tells search credentials apart from chat credentials **by ref, not by wrapping the web seam**. The official new Search/Fetch API resolves its key under `web-deepseek-api.apiKeyEnv`, which this plugin points at its own `DEEPSEEK_API_KEY_SEARCH` at startup and whenever the panel saves a search key, so a search resolve is recognisable from the ref alone: chat never asks for it. Earlier 0.2.x releases wrapped `ctx.web.search` / `ctx.web.fetch` in an `AsyncLocalStorage` scope instead; that patch is gone from 0.2.15 on, because a wrapper around the web seam can leave `web_search` / `web_fetch` waiting until their 30/60 s tool budget expires (it hangs even for addresses that fail instantly, e.g. `http://127.0.0.1:1/`). The rule itself is unchanged: a session's own key first (always), then, if the workspace ticked `同步搜索 API`, the workspace key and then the system default, otherwise the panel's search default ref when it holds one, and only then the ref the search plugin configured. The legacy Messages-based search keeps the plain chat cascade, because that route *is* a messages request;
 - 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;
@@ -79,7 +79,7 @@ The command forwards its arguments to pnpm inside the profile directory, so the
 pnpm add dsh-workspace-api-key          # or: npm install dsh-workspace-api-key
 ```
 
-Pin a version with `dsh-workspace-api-key@0.2.14`, or install straight from the repository with `dsh-workspace-api-key@github:COH2357/dsh-workspace-api-key` (a git-hosted plugin is built from source on install).
+Pin a version with `dsh-workspace-api-key@0.2.15`, or install straight from the repository with `dsh-workspace-api-key@github:COH2357/dsh-workspace-api-key` (a git-hosted plugin is built from source on install).
 
 Then add `"dsh-workspace-api-key"` to `dsh.profile.bundles` in that profile's `package.json` and restart DSH. For local development, use a link instead:
 

package/README.zh.md

@@ -36,7 +36,7 @@ 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 原样透传；
-- 把「搜索请求」和「聊天请求」分开。官方新版 Search/Fetch API（`web.searchProvider === 'deepseek-search-api'`）自己解析 key，而它默认读的又是聊天用的 `DEEPSEEK_API_KEY`，所以光看 ref 分不出这次要 key 是为了什么。宿主半边因此把 `ctx.web.search` / `ctx.web.fetch` 包进一个 `AsyncLocalStorage` 作用域，只有当 `credentials.resolve` 在这个作用域里被调用时才套用搜索规则：先看会话自己的 key（永远最优先），再看该工作区有没有勾「同步搜索 API」，勾了就依次用工作区 key、系统默认 key；没勾时先用插件面板自己持有的搜索默认 ref（若配了），最后才用搜索插件配置的那个 ref。旧版基于 Messages 的搜索仍然走原来的聊天层级，因为那条路线本身就是一次 messages 请求；
+- 把「搜索请求」和「聊天请求」分开——**按 ref 分辨，而不是包住 web 服务**。官方新版 Search/Fetch API 自己解析 key，用的是 `web-deepseek-api.apiKeyEnv` 指向的凭据；本插件在启动时（以及面板每次保存搜索 key 时）把它指到插件自有的 `DEEPSEEK_API_KEY_SEARCH`，于是只看 ref 就能认出「这是搜索在要 key」：聊天永远不会解析这个 ref。0.2.15 起删掉了原先「把 `ctx.web.search` / `ctx.web.fetch` 包进 `AsyncLocalStorage`」的做法——包住 web 服务可能让 `web_search` / `web_fetch` 一直挂到工具 30/60 秒预算耗尽（连 `http://127.0.0.1:1/` 这种必然立刻失败的地址也一样挂）。规则本身没变：先看会话自己的 key（永远最优先），再看该工作区有没有勾「同步搜索 API」，勾了就依次用工作区 key、系统默认 key；没勾时先用插件面板自己持有的搜索默认 ref（若配了），最后才用搜索插件配置的那个 ref。旧版基于 Messages 的搜索仍然走原来的聊天层级，因为那条路线本身就是一次 messages 请求；
 - 会话列表来自 `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` 与任何工作区路径都对不上；
@@ -79,7 +79,7 @@ dsh plugin --profile web add dsh-workspace-api-key
 pnpm add dsh-workspace-api-key          # 或者：npm install dsh-workspace-api-key
 ```
 
-锁版本用 `dsh-workspace-api-key@0.2.14`；直接从仓库装则用 `dsh-workspace-api-key@github:COH2357/dsh-workspace-api-key`（git 来源的插件会在安装时现场构建）。
+锁版本用 `dsh-workspace-api-key@0.2.15`；直接从仓库装则用 `dsh-workspace-api-key@github:COH2357/dsh-workspace-api-key`（git 来源的插件会在安装时现场构建）。
 
 然后把 `"dsh-workspace-api-key"` 加进该 profile `package.json` 的 `dsh.profile.bundles`，重启 DSH。本地开发用 link 代替：
 

package/lib/index.js

@@ -32,7 +32,6 @@
 
 import { mkdirSync, writeFileSync, readFileSync, existsSync } from 'node:fs'
 import { createHash } from 'node:crypto'
-import { AsyncLocalStorage } from 'node:async_hooks'
 import { homedir } from 'node:os'
 import { join, dirname, basename, resolve as pathResolve } from 'node:path'
 
@@ -72,13 +71,44 @@ const SEARCH_FETCH_PROVIDER_ID = 'deepseek-fetch-api'
 const SEARCH_DEFAULT_REF = 'DEEPSEEK_API_KEY_SEARCH'
 
 /**
- * 搜索通道标记：包住 `ctx.web.search` / `ctx.web.fetch`，在它们的异步调用链里
- * 打一个 AsyncLocalStorage 标记。`credentials.resolve` 的 wrapper 据此知道
- * 「这次取 key 是搜索/抓取在要，还是聊天在要」——两者用的是同一把
- * `DEEPSEEK_API_KEY` 时，除此之外没有别的可靠区分方式（resolve 只收到 ref）。
+ * 官方「网页搜索」配置的缓存。
+ *
+ * 早期版本包过 `ctx.web.search` / `ctx.web.fetch`（AsyncLocalStorage）来分辨
+ * 「这次取 key 的是搜索还是聊天」。那样做把插件挂进了 web 工具的调用链里：一旦
+ * wrapper 出问题，`web_search` / `web_fetch` 会一直挂到工具的 30/60 秒超时
+ * （连 `http://127.0.0.1:1/` 这种必然立刻失败的地址也一样）。0.2.15 起不再包
+ * `ctx.web`，改成**按 ref 分辨**：搜索 provider 解析的是搜索自己的 ref
+ * （官方页的 `apiKeyEnv`，被本插件接管后就是 `DEEPSEEK_API_KEY_SEARCH`），
+ * 聊天通道永远不会解析这个 ref。
+ *
+ * 配置本身用缓存：`credentials.resolve` 是热路径，不能每次都去 `settings.describe()`。
+ */
+/** 重新读一次官方「网页搜索」配置（同步，无缓存——配置随时可能被官方页改掉）。 */
+function refreshWebCache(ctx) {
+  try {
+    return readWebSettings(ctx)
+  } catch {
+    return webDefaults()
+  }
+}
+
+/** 取官方「网页搜索」配置。 */
+function currentWeb(ctx) {
+  return refreshWebCache(ctx)
+}
+
+/**
+ * 这次 `credentials.resolve` 是不是搜索/抓取在要 key。
+ * 只看 ref：搜索 ref 由官方页的 `apiKeyEnv` 决定，聊天通道不会用到它。
  */
-const searchScope = new AsyncLocalStorage()
-const WEB_SCOPE_MARK = Symbol.for('dsh-workspace-api-key/web-scope')
+function isSearchRefFor(ctx, ref) {
+  if (typeof ref !== 'string' || ref === '') return false
+  const web = currentWeb(ctx)
+  if (web.apiChannel !== true) return false
+  // 官方页还没被接管时，搜索用的是聊天那把 ref：这时分辨不了，按聊天处理（安全）。
+  if (web.searchKeyEnv === DEFAULT_API_KEY_REF) return ref === SEARCH_DEFAULT_REF
+  return ref === SEARCH_DEFAULT_REF || ref === web.searchKeyEnv || ref === web.legacyKeyEnv
+}
 
 // 幂等标记：同一进程里可能被 apply 多次（热重载），只装一层 wrapper。
 const INSTALL_KEY = Symbol.for('dsh-workspace-api-key/installed')
@@ -1262,8 +1292,8 @@ async function probeSearch(ctx, state, key, web) {
 export function apply(ctx) {
   const state = loadState()
 
-  // ── 1. 包装 credentials.resolve + 标记搜索/抓取通道 ─────────────────
-  installWebScope(ctx)
+  // ── 1. 包装 credentials.resolve（按 ref 分辨搜索/抓取通道）──────────
+  refreshWebCache(ctx)
   installResolver(ctx, state)
   // 「直接禁用官方页面里的搜索 key 设置」：把官方 apiKeyEnv 指到插件自有 ref（异步、失败不影响启动）。
   void reconcileOfficialSearchRef(ctx)
@@ -1316,54 +1346,6 @@ export function apply(ctx) {
   )
 }
 
-/**
- * 装上搜索/抓取通道标记：把 `ctx.web.search` / `ctx.web.fetch` 包一层
- * AsyncLocalStorage，让 resolve wrapper 知道「这次取 key 的是搜索，不是聊天」。
- * 装不上就静默跳过——不影响任何既有行为（只是无法区分通道）。
- */
-function installWebScope(ctx) {
-  if (globalThis[WEB_SCOPE_MARK] !== undefined) {
-    log('web scope already installed; skipping')
-    return
-  }
-  let web
-  try {
-    web = ctx.get('web')
-  } catch {
-    web = undefined
-  }
-  if (web === undefined) return
-
-  const originals = {}
-  for (const method of ['search', 'fetch']) {
-    if (typeof web[method] !== 'function') continue
-    const original = web[method].bind(web)
-    originals[method] = original
-    try {
-      web[method] = (...args) => searchScope.run(true, () => original(...args))
-    } catch {
-      delete originals[method]
-    }
-  }
-  if (Object.keys(originals).length === 0) return
-
-  globalThis[WEB_SCOPE_MARK] = { web, originals }
-  ctx.effect(
-    () => () => {
-      for (const [method, original] of Object.entries(originals)) {
-        try {
-          web[method] = original
-        } catch {
-          /* ignore */
-        }
-      }
-      delete globalThis[WEB_SCOPE_MARK]
-    },
-    'workspace-api-key: restore web.search/fetch',
-  )
-  log(`web scope wrapped: ${Object.keys(originals).join(',')}`)
-}
-
 /**
  * 装上 resolve wrapper。装不上也不能影响宿主：任何异常都吞掉并退回原行为。
  */
@@ -1393,8 +1375,9 @@ function installResolver(ctx, state) {
 
       // 搜索 / 抓取通道：官方「新版 Web 搜索 API」用的是独立的一套 key 配置，
       // 语义与聊天不同，因此单独处理（旧 Messages 通道仍走下面的聊天层级）。
-      if (searchScope.getStore() === true) {
-        const web = readWebSettings(ctx)
+      // 分辨方式改成「看 ref」：搜索 provider 解析的一定是搜索自己的 ref，聊天不会解析它。
+      if (isSearchRefFor(ctx, ref)) {
+        const web = currentWeb(ctx)
         if (web.apiChannel) {
           // ① 会话单独设置的 key 永远优先——哪怕官方搜索插件里配了别的 key。
           const sessionKey = sessionOverrideRef(state, sessionId)
@@ -1745,7 +1728,8 @@ async function snapshot(ctx, state) {
   }
 
   // ── 搜索 / 抓取通道总览 ──────────────────────────────────────────────
-  const web = readWebSettings(ctx)
+  // 每次面板刷新都重读一次：开关改过之后，缓存必须跟着变。
+  const web = refreshWebCache(ctx)
   const searchKeyRef = web.searchKeyEnv
   const searchKeyInfo = await describeKey(ctx, searchKeyRef)
   const searchKeyHit = await resolveKey(ctx, searchKeyRef)

package/package.json

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