dsh-connect-workbuddy 4.3.0 → 4.3.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 4.3.1 (2026-10-11)
+
+### Fixes
+
+- **对话框积分读数现在关得掉：设置命名空间改为「跟随宿主」而非「猜名字」。**（issue #46）
+  - **现象**：设置卡片里取消勾选「在对话框显示 WBCN 积分」，勾选框随即显示为已关闭、`cordis.patch.yml` 里也确实落了 `regions.cn.showCreditsInMainUi: false`——**写入侧正常**——但切到该 provider 的会话，输入框左侧**仍然渲染** `WB CN · <余额>`。
+  - **根因（两段）**：① `src/client/index.tsx` 的命名空间解析只跑一次，且恰逢 describe 镜像未就绪（镜像由异步 `ctx.remote.settings.describe()` 填充）。旧代码把「镜像为空」当成「声明的名字一定对」，绑定 `forms.get('workbuddy')` 且此后永不复查；而 0.2.0 的设置命名空间**就是 Loader entry id**（`dsh-connect-workbuddy`），`ConfigFormController.derive()` 又是**精确匹配**，于是这个猜出来的表单永久停在 `{status:"unavailable", value:undefined}`。② `regionCreditsShownOf` 是 opt-out（`!== false` 即「显示」），`undefined` 于是被判为显示，读数照常渲染。**卡片本身显示正确**，因为 `WorkBuddyCard` 的 `creditsShownOn` 是 Host 优先——4.0.0 新增的读数 gate 没有继承这条规则。
+  - **修法一（治本）**：改用宿主现成范式 `configForms.whileServed([...])`（内部 `mirror.subscribe` + 立即 `sync`），把命名空间候选表 `WORKBUDDY_SETTINGS_NAMESPACE_CANDIDATES` 按**真实 entry id 优先、声明名最后**排序，并从 `served` 集合里现场挑选。**晚绑定必须重新注册**：渲染器按 entry 的**对象身份**永久缓存 inject 结果（`rootInjectCache` / `cachedRootInject` 里的 `if (!props) { props = runInject(...) }`），已注册 entry 不会再求值——所以旧注册被 dispose、新注册被创建。副作用是宿主不再服务该命名空间时绑定会被自动撤回。
+  - **修法二（治复发）**：让 gate 与卡片同源。Host 的 usage 载荷本就带 `showCreditsInMainUi`，现在它**压过**设置 scope（`composerCreditsRegionOf` 新增 `hostValue` 参数，`ComposerCredits` 在拿到文档后按它隐藏，并停掉 5 分钟轮询）。非布尔值（含 `error` 变体与旧文档）一律视为「宿主没说」，仍由 scope 定夺——这样镜像陈旧或未绑定时都不会再让读数复活。
+  - 回归测试 `tests/issue46-namespace-binding.spec.tsx` 14 条，覆盖：镜像后到时的重绑（原缺陷）、候选表顺序、`include:` 包裹的 entry id、声明名绝不被绑定、宿主停服时撤回、只开一个 watch；并钉住「死 scope 读作显示」这一现象本身与 Host 优先级。渲染层新增三条（Host 报关闭则隐藏、Host 报开启则显示、无该字段则沿用 scope）。**变异验证**：去掉 Host 优先级判断 → 1 红；把声明名排到候选表首位 → 3 红。
+
 ## 4.3.0 (2026-10-11)
 
 > **升级前请读这一条（行为变更）**：账号列表里的「删除」在 4.3.0 起是**「暂时隐藏」**——删掉后立即从列表消失，也不会被自动轮询带回来，但它是**可找回**的：点「重新检测账号」会把**所有**隐藏的账号一次性全部找回（不是只找回你刚删的那个），重新登录或导入同一账号也会清除该账号的隐藏记录。如果你的习惯是「删掉就永远不再看到它」，请在升级前确认这一语义可以接受。桌面 App 自身的登录**始终不被改动**——删除只是「本插件不再列出它」。上一版（4.2.0）不存在隐藏记录，因此**没有历史状态需要迁移**。

package/lib/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as defaultDesktopAuthDirs, F as WorkBuddyUpstreamClient, G as WORKBUDDY_APP_EXECUTABLE_ENV, O as legacyWorkbuddyOwnAuthPath, S as defaultDesktopAuthCandidates, Z as findWorkbuddyAppExecutableWithSource, a as readHostHeartbeat, c as WORKBUDDY_CONNECT_VERSION, d as FALLBACK_WORKBUDDY_MODELS_GLOBAL, j as workbuddyOwnAuthPath, l as piAiRuntimeInfo, o as workbuddyHostHeartbeatPath, r as isHeartbeatProcessAlive, u as FALLBACK_WORKBUDDY_MODELS, v as WORKBUDDY_AUTH_FILE_ENV, y as WorkBuddyCredentialStore } from "./host-heartbeat-jNlsUMZO.js";
+import { C as defaultDesktopAuthDirs, F as WorkBuddyUpstreamClient, G as WORKBUDDY_APP_EXECUTABLE_ENV, O as legacyWorkbuddyOwnAuthPath, S as defaultDesktopAuthCandidates, Z as findWorkbuddyAppExecutableWithSource, a as readHostHeartbeat, c as WORKBUDDY_CONNECT_VERSION, d as FALLBACK_WORKBUDDY_MODELS_GLOBAL, j as workbuddyOwnAuthPath, l as piAiRuntimeInfo, o as workbuddyHostHeartbeatPath, r as isHeartbeatProcessAlive, u as FALLBACK_WORKBUDDY_MODELS, v as WORKBUDDY_AUTH_FILE_ENV, y as WorkBuddyCredentialStore } from "./host-heartbeat-BQkmibKu.js";
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 //#region src/bin.ts

package/lib/client.js

@@ -309,6 +309,23 @@ window.__ModuleLoader__.load({
 		* fallback and must not import Node-only host code.
 		*/
 		const WORKBUDDY_SETTINGS_NS = "workbuddy";
+		/**
+		* Every namespace spelling the browser half follows when looking for the
+		* settings form the Host actually serves, in preference order.
+		*
+		* `describe()` keys a form by its Loader entry id, and the profile patch picks
+		* that id — so the plugin must ASK rather than assume. The observed spellings
+		* are the bare package name, the `include:`-wrapped id the live Desktop host
+		* uses, and the declared name as the last resort. `configForms.whileServed`
+		* follows all of them and re-runs when the mirror arrives, which is what keeps
+		* the binding correct on a host whose mirror populates after `apply` (the
+		* 4.3.0 readout defect, issue #46).
+		*/
+		const WORKBUDDY_SETTINGS_NAMESPACE_CANDIDATES = [
+			"dsh-connect-workbuddy",
+			"include:dsh-connect-workbuddy",
+			WORKBUDDY_SETTINGS_NS
+		];
 		//#endregion
 		//#region src/client/account-selection.ts
 		/**
@@ -4563,6 +4580,17 @@ window.__ModuleLoader__.load({
 			if (usage.status !== "signed-in") return void 0;
 			return usage.credits?.total;
 		}
+		/**
+		* The Host's per-region readout switch off a usage document, when it carries one.
+		*
+		* The `error` variant has no data at all, so it can only ever answer `undefined`
+		* — "the Host did not say", which leaves the settings scope in charge.
+		*/
+		function hostCreditsShownOf(usage) {
+			if (usage === void 0 || usage.status === "error") return void 0;
+			const value = usage.showCreditsInMainUi;
+			return typeof value === "boolean" ? value : void 0;
+		}
 		/** Group the digits so a four-figure balance stays readable in a narrow row. */
 		function formatCredits(value) {
 			return value.toLocaleString("en-US", { maximumFractionDigits: 0 });
@@ -4649,8 +4677,9 @@ window.__ModuleLoader__.load({
 					if (Array.isArray(data.accounts)) setAccountCredits(data.accounts);
 				} catch {}
 			}, [activeRegion]);
+			const hostHidden = hostCreditsShownOf(usage) === false;
 			(0, react.useEffect)(() => {
-				if (owned === void 0) return void 0;
+				if (owned === void 0 || hostHidden) return void 0;
 				let cancelled = false;
 				let timer;
 				const controller = new AbortController();
@@ -4665,7 +4694,11 @@ window.__ModuleLoader__.load({
 					if (timer !== void 0) window.clearInterval(timer);
 					controller.abort();
 				};
-			}, [owned, fetchUsage]);
+			}, [
+				owned,
+				hostHidden,
+				fetchUsage
+			]);
 			(0, react.useEffect)(() => {
 				if (!open || activeRegion === void 0) return void 0;
 				const controller = new AbortController();
@@ -4714,6 +4747,22 @@ window.__ModuleLoader__.load({
 				}
 			};
 			if (owned === void 0) return null;
+			/**
+			* The Host's own answer for this region, when the document carries one.
+			*
+			* The Host is the AUTHORITY on whether this readout is wanted, exactly as the
+			* card's `creditsShownOn` treats it — and here it is also the fix for a defect
+			* shipped in 4.3.0 (issue #46): the gate's decision rests on the settings
+			* scope, which on a host whose describe mirror lands late was bound to a
+			* namespace nothing serves. Every read of that scope is then `undefined`, and
+			* the opt-out rule (`!== false`) reads "shown" forever — so unticking the
+			* checkbox wrote correctly and changed nothing on screen.
+			*
+			* Checked AFTER the fetch rather than before it because the answer only
+			* arrives with the document. The cost is one usage read for a readout the user
+			* may have hidden, against a persistent wrong number on screen.
+			*/
+			if (hostCreditsShownOf(usage) === false) return null;
 			const signedIn = usage?.status === "signed-in" ? usage : void 0;
 			const total = signedIn === void 0 ? void 0 : creditsOf(signedIn);
 			const signedOut = usage !== void 0 && usage.status === "signed-out";
@@ -4900,11 +4949,22 @@ window.__ModuleLoader__.load({
 		* The region's own switches are applied HERE rather than inside the component,
 		* so a region that is switched off (or whose provider is off) starts no fetch
 		* loop at all.
+		*
+		* `hostValue` is the Host's own `showCreditsInMainUi` answer for this region,
+		* when a usage document carrying it is already in hand. It OUTRANKS the settings
+		* scope, exactly as the card's `creditsShownOn` does and for the same measured
+		* reason: the browser's settings mirror is documented as stale for this
+		* namespace on the affected deployments, and — the shipped 4.3.0 defect (issue
+		* #46) — the scope can be bound to a namespace nothing serves, where every read
+		* is `undefined` and the opt-out rule then reads "shown" forever. The Host is
+		* the authority; the scope is the fallback for a Host line that predates the
+		* field.
 		*/
-		function composerCreditsRegionOf(projection, scope) {
+		function composerCreditsRegionOf(projection, scope, hostValue) {
 			const provider = selectedProviderOf(projection);
 			const region = provider === void 0 ? void 0 : WORKBUDDY_COMPOSER_PROVIDERS[provider];
 			if (region === void 0) return void 0;
+			if (typeof hostValue === "boolean") return hostValue ? region : void 0;
 			const value = scope === void 0 ? void 0 : unwrapVolatileDeep(scope.getSnapshot().value);
 			if (!regionCreditsShownOf(value, region)) return void 0;
 			if (!regionEnabledOf(value, region)) return void 0;
@@ -5510,17 +5570,10 @@ window.__ModuleLoader__.load({
 				const softGet = (name) => ctx.get(name);
 				let settingsScope;
 				const forms = softGet("configForms");
-				if (forms !== void 0) {
-					let ns = WORKBUDDY_SETTINGS_NS;
-					try {
-						const served = (forms.describe().getSnapshot().view?.namespaces ?? []).find((entry) => entry.ns === "workbuddy" || /workbuddy/i.test(entry.ns));
-						if (served !== void 0) ns = served.ns;
-					} catch {}
-					settingsScope = forms.get(ns);
-				}
+				/** Register one card slot; returns its disposer, or undefined if it failed. */
 				const registerCard = (slotName, key) => {
 					try {
-						ctx.slots.inject(slotName, () => ctx.slots.register({
+						return ctx.slots.inject(slotName, () => ctx.slots.register({
 							name: slotName,
 							key,
 							priority: 30,
@@ -5531,10 +5584,9 @@ window.__ModuleLoader__.load({
 						}, WorkBuddyCard));
 					} catch (error) {
 						console.error(`[dsh-connect-workbuddy] card slot "${slotName}" failed to register (host provider unaffected):`, error);
+						return;
 					}
 				};
-				registerCard("plugins.bundle.config", "dsh-connect-workbuddy");
-				registerCard("plugins.row.config", "dsh-connect-workbuddy#dsh-connect-workbuddy");
 				/**
 				* Credit readout in the composer tool row (`conversation.input.left`, a
 				* session-scope list slot).
@@ -5555,7 +5607,7 @@ window.__ModuleLoader__.load({
 				*/
 				const registerComposerCredits = () => {
 					try {
-						ctx.slots.inject("conversation.input.left", () => ctx.slots.register({
+						return ctx.slots.inject("conversation.input.left", () => ctx.slots.register({
 							name: "conversation.input.left",
 							id: "dsh-connect-workbuddy-composer-credits",
 							order: 4,
@@ -5567,9 +5619,84 @@ window.__ModuleLoader__.load({
 						}, ComposerCreditsGate));
 					} catch (error) {
 						console.error("[dsh-connect-workbuddy] composer credits slot failed to register (host provider unaffected):", error);
+						return;
+					}
+				};
+				/**
+				* Every slot this plugin contributes, and how to (re)create them.
+				*
+				* Kept as one list because the binding of `settingsScope` and the slot
+				* registrations must move TOGETHER: see {@link bindSettingsScope} for why a
+				* late-arriving namespace has to produce fresh registrations rather than a
+				* mutated closure.
+				*/
+				/**
+				* Disposers of the slots registered for the CURRENT namespace binding.
+				*
+				* Declared before {@link bindSettingsScope} because that function closes
+				* over it and reassigns it; the binding is only armed at the end of `apply`,
+				* so this is initialised by then either way — hoisting it keeps that
+				* ordering a non-requirement rather than a trap.
+				*/
+				let liveDisposers = [];
+				const registerAllSlots = () => [
+					registerCard("plugins.bundle.config", "dsh-connect-workbuddy"),
+					registerCard("plugins.row.config", "dsh-connect-workbuddy#dsh-connect-workbuddy"),
+					registerComposerCredits()
+				].filter((disposer) => disposer !== void 0);
+				/**
+				* Bind `settingsScope` to whichever namespace the Host really serves, and
+				* RE-REGISTER every slot when that answer changes.
+				*
+				* Why this is not a one-shot read at startup — the shipped 4.3.0 defect
+				* (issue #46): the mirror is filled by an async `remote.settings.describe()`,
+				* so at `apply` time `view` is usually still absent. The old code read that
+				* absence as "the declared name must be right", bound
+				* `forms.get('workbuddy')`, and never looked again. `ConfigFormController.
+				* derive()` matches the namespace EXACTLY, so the guessed form stayed
+				* `unavailable` forever; the composer gate — reading only that scope —
+				* judged the opt-out switch `undefined !== false` and kept rendering the
+				* readout. Unticking the box wrote `false` correctly and changed nothing on
+				* screen.
+				*
+				* `whileServed` is the Host's own idiom for this (`mirror.subscribe` plus an
+				* immediate sync). It is strictly better than re-reading the snapshot by
+				* hand because it ALSO withdraws the binding if the Host stops serving our
+				* namespace, and it hands `register` the set of namespaces actually served
+				* — so the choice is made from live data instead of a captured guess.
+				*
+				* `register` runs on the unserved→served EDGE, not on every mirror update
+				* (see the service's `sync`), so the disposal below is not a churn loop: it
+				* clears whatever a previous edge left registered. That replacement is NOT
+				* optional, because the renderer caches each entry's inject result by object
+				* identity (`rootInjectCache` / `cachedRootInject` in
+				* `dsh-client-ui-renderer`: `if (!props) { props = runInject(...) }`), so an
+				* entry registered before the mirror landed is never re-evaluated. Late
+				* binding can therefore only work if the OLD registrations are disposed and
+				* NEW ones created — which is what this callback does.
+				*/
+				const bindSettingsScope = () => {
+					if (forms === void 0 || typeof forms.whileServed !== "function") {
+						settingsScope = forms?.get(WORKBUDDY_SETTINGS_NS);
+						liveDisposers = registerAllSlots();
+						return;
 					}
+					ctx.effect(() => forms.whileServed(WORKBUDDY_SETTINGS_NAMESPACE_CANDIDATES, (served) => {
+						const ns = WORKBUDDY_SETTINGS_NAMESPACE_CANDIDATES.find((candidate) => served.has(candidate)) ?? [...served].find((entry) => /workbuddy/i.test(entry));
+						settingsScope = ns === void 0 ? void 0 : forms.get(ns);
+						for (const dispose of liveDisposers) try {
+							dispose();
+						} catch {}
+						liveDisposers = registerAllSlots();
+						return () => {
+							for (const dispose of liveDisposers) try {
+								dispose();
+							} catch {}
+							liveDisposers = [];
+						};
+					}), "dsh-connect-workbuddy: settings namespace binding");
 				};
-				registerComposerCredits();
+				bindSettingsScope();
 			} catch (error) {
 				console.error("[dsh-connect-workbuddy] client card failed to load (host provider unaffected):", error);
 			}

package/lib/{host-heartbeat-jNlsUMZO.js → host-heartbeat-BQkmibKu.js}

@@ -3439,7 +3439,7 @@ function generationOf(version) {
 //#endregion
 //#region src/version.ts
 /** The npm package version this build was produced from. */
-const WORKBUDDY_CONNECT_VERSION = "4.3.0";
+const WORKBUDDY_CONNECT_VERSION = "4.3.1";
 //#endregion
 //#region src/host-heartbeat.ts
 /**

package/lib/index.js

@@ -1,4 +1,4 @@
-import { $ as isWorkbuddyBundle, A as workbuddyAccountId, B as parseCreditMultiplier, C as defaultDesktopAuthDirs, D as isVaultAccountId, E as isEncryptedCredentialError, F as WorkBuddyUpstreamClient, G as WORKBUDDY_APP_EXECUTABLE_ENV, H as parseUpstreamModel, I as classifyUpstreamError, J as deriveAtRestKeyId, K as clearAtRestKeyCache, L as declaredTools, M as CREDENTIAL_REJECTED_CODE, N as WORKBUDDY_FALLBACK_SYSTEM_PROMPT, O as legacyWorkbuddyOwnAuthPath, P as WorkBuddyCredentialRejectedError, Q as isEncryptedFieldWrapper, R as isCredentialRejectedError, S as defaultDesktopAuthCandidates, T as hasEncryptedCredentialFields, U as prepareChatBody, V as parseReasoning, W as regionOf, X as findWorkbuddyAppExecutable, Y as fetchAtRestKeyPayload, _ as WORKBUDDY_AUTH_FILENAME, a as readHostHeartbeat, b as WorkBuddyEncryptedCredentialError, c as WORKBUDDY_CONNECT_VERSION, d as FALLBACK_WORKBUDDY_MODELS_GLOBAL, et as macosBundleExecutable, f as WorkBuddyCatalog, g as ENCRYPTED_CREDENTIAL_CODE, h as fallbackModelsFor, i as processStartTimeMs, it as workbuddyAppExecutableCandidates, j as workbuddyOwnAuthPath, k as parseWorkBuddyAuth, l as piAiRuntimeInfo, m as deriveCatalog, n as clearHostHeartbeat, nt as openEncryptedField, o as workbuddyHostHeartbeatPath, p as applyContextBudgets, q as deriveAtRestKey, r as isHeartbeatProcessAlive, rt as readAtRestKey, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, tt as macosNestedAppBundles, u as FALLBACK_WORKBUDDY_MODELS, v as WORKBUDDY_AUTH_FILE_ENV, w as defaultDesktopAuthPath, x as authFileName, y as WorkBuddyCredentialStore, z as knownRegionOf } from "./host-heartbeat-jNlsUMZO.js";
+import { $ as isWorkbuddyBundle, A as workbuddyAccountId, B as parseCreditMultiplier, C as defaultDesktopAuthDirs, D as isVaultAccountId, E as isEncryptedCredentialError, F as WorkBuddyUpstreamClient, G as WORKBUDDY_APP_EXECUTABLE_ENV, H as parseUpstreamModel, I as classifyUpstreamError, J as deriveAtRestKeyId, K as clearAtRestKeyCache, L as declaredTools, M as CREDENTIAL_REJECTED_CODE, N as WORKBUDDY_FALLBACK_SYSTEM_PROMPT, O as legacyWorkbuddyOwnAuthPath, P as WorkBuddyCredentialRejectedError, Q as isEncryptedFieldWrapper, R as isCredentialRejectedError, S as defaultDesktopAuthCandidates, T as hasEncryptedCredentialFields, U as prepareChatBody, V as parseReasoning, W as regionOf, X as findWorkbuddyAppExecutable, Y as fetchAtRestKeyPayload, _ as WORKBUDDY_AUTH_FILENAME, a as readHostHeartbeat, b as WorkBuddyEncryptedCredentialError, c as WORKBUDDY_CONNECT_VERSION, d as FALLBACK_WORKBUDDY_MODELS_GLOBAL, et as macosBundleExecutable, f as WorkBuddyCatalog, g as ENCRYPTED_CREDENTIAL_CODE, h as fallbackModelsFor, i as processStartTimeMs, it as workbuddyAppExecutableCandidates, j as workbuddyOwnAuthPath, k as parseWorkBuddyAuth, l as piAiRuntimeInfo, m as deriveCatalog, n as clearHostHeartbeat, nt as openEncryptedField, o as workbuddyHostHeartbeatPath, p as applyContextBudgets, q as deriveAtRestKey, r as isHeartbeatProcessAlive, rt as readAtRestKey, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, tt as macosNestedAppBundles, u as FALLBACK_WORKBUDDY_MODELS, v as WORKBUDDY_AUTH_FILE_ENV, w as defaultDesktopAuthPath, x as authFileName, y as WorkBuddyCredentialStore, z as knownRegionOf } from "./host-heartbeat-BQkmibKu.js";
 import z from "@deepseek-ai/schemastery";
 import { readFile } from "node:fs/promises";
 import { randomBytes, randomUUID, timingSafeEqual } from "node:crypto";

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-connect-workbuddy",
   "displayName": "DSH Connect WorkBuddy",
   "description": "把本机登录的 WorkBuddy 模型接入 DeepSeek Harness，并提供只读的积分概览与模型管理。",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "author": "dingminhua",
   "copyright": "Copyright (c) 2026 LaoDing",
   "license": "MIT",