dsh-workspace-api-key 0.2.10 → 0.2.11

package/README.md

@@ -78,7 +78,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.10`, 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.11`, 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

@@ -78,7 +78,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.10`；直接从仓库装则用 `dsh-workspace-api-key@github:COH2357/dsh-workspace-api-key`（git 来源的插件会在安装时现场构建）。
+锁版本用 `dsh-workspace-api-key@0.2.11`；直接从仓库装则用 `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

@@ -700,6 +700,10 @@ function readWebSettings(ctx) {
   // settings 服务的真实形状是 describe() 返回「按 profile 条目 id 键控」的行（每行带 ns 与活值），
   // 没有 get(ns)：早期版本曾按 get 读取，结果永远拿到 undefined，搜索面板会整个消失。
   let rows = []
+  // 重入保护：describe() 会 interpolate 各条目的配置表达式，若某个表达式又要凭据，
+  // 就会再次走到这里。读不成就算了，绝不能递归。
+  if (readingWebSettings === true) return webDefaults()
+  readingWebSettings = true
   try {
     if (typeof settings?.describe === 'function') {
       rows = settings.describe() ?? []
@@ -710,7 +714,34 @@ function readWebSettings(ctx) {
     }
   } catch {
     rows = []
+  } finally {
+    readingWebSettings = false
   }
+  return webConfigOf(rows)
+}
+
+/** readWebSettings 期间的重入标记。 */
+let readingWebSettings = false
+
+/** 读不到官方设置时的默认形状：旧 Messages 通道、默认 ref。 */
+function webDefaults() {
+  return {
+    apiKeyEnv: DEFAULT_API_KEY_REF,
+    legacyKeyEnv: DEFAULT_API_KEY_REF,
+    apiLiteralKey: undefined,
+    legacyLiteralKey: undefined,
+    baseURL: FALLBACK_SEARCH_BASE_URL,
+    searchProvider: FALLBACK_SEARCH_PROVIDER,
+    fetchProvider: FALLBACK_FETCH_PROVIDER,
+    count: 10,
+    apiChannel: false,
+    searchKeyEnv: DEFAULT_API_KEY_REF,
+    searchLiteralKey: undefined,
+  }
+}
+
+/** 把 describe() 的行投影成本插件关心的字段。 */
+function webConfigOf(rows) {
   const read = (ns) => {
     const value = rows.find((row) => row?.ns === ns)?.value
     return typeof value === 'object' && value !== null ? value : {}

package/package.json

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