dsh-workbuddy-bridge 0.5.0 → 0.5.1

package/README.md

@@ -47,10 +47,11 @@
 
 - **开箱即用** —— 装完启用，模型分组自己出现。
 - **两版隔离** —— 国内版与国际版各自分组，模型、账号、积分互不混用，只跟随各自 App 的登录状态。
-- **推理档位** —— 上游声明了档位的模型直接可选；没声明的可在插件页**手动检测**。
 - **推理档位** —— 上游声明了档位的模型直接可选；没声明的可在插件页**手动检测**。
   灯泡表示能切档位；上游已声明的模型也亮着，只是不需要检测。
   能切档位的模型会带一个**默认档位**（上游声明了就按声明，否则取 `high`），因此选择器里不再出现「Default」这一项。
+  档位里的 **Off 表示「不发送档位参数」**：两个接口都不接受这个字面量，所以插件不会把它发出去；
+  实际是否关闭思考由上游决定，插件不做保证。
 - **积分可见** —— 每条回复下方显示本次消耗，模型选择器旁常驻剩余积分。拿不到数字时不显示。
 - **模型显隐** —— 卡片「模型」标签里勾选哪些模型出现在选择器里，按登录账号分别保存。
 - **图片输入** —— 多数模型可直接粘贴或拖入图片；纯文字模型会明确说明。

package/README_en.md

@@ -54,6 +54,8 @@ models appear directly in the DSH model picker — no separate provider to confi
   on the plugin page. The bulb means "this model can switch levels"; a declared model shows it too, it just
   has nothing to detect. A switchable model also carries a **default level** (the upstream's own declaration
   when it has one, otherwise `high`), so the picker no longer offers "Default".
+  **Off means "send no level parameter"**: neither endpoint accepts that literal, so the plugin never puts it
+  on the wire — whether thinking is then actually disabled is up to the upstream, and the plugin makes no claim.
 - **Credit in view** — each reply shows what it consumed, and remaining credit sits beside the model picker.
   Nothing renders when a figure is unavailable.
 - **Model visibility** — tick which models appear in the picker on the card's "Models" tab, saved per

package/lib/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as variantFor, D as WorkBuddyUpstreamClient, S as WORKBUDDY_VARIANTS, Y as resolveAppVersion, a as readHostHeartbeat, c as WORKBUDDY_BRIDGE_VERSION, l as FALLBACK_WORKBUDDY_AI_MODELS, m as WorkBuddyCredentialStore, o as workbuddyHostHeartbeatPath, r as isHeartbeatProcessAlive, u as FALLBACK_WORKBUDDY_MODELS, x as CN_VARIANT } from "./heartbeat-BpW2mSgI.js";
+import { C as variantFor, D as WorkBuddyUpstreamClient, S as WORKBUDDY_VARIANTS, Y as resolveAppVersion, a as readHostHeartbeat, c as WORKBUDDY_BRIDGE_VERSION, l as FALLBACK_WORKBUDDY_AI_MODELS, m as WorkBuddyCredentialStore, o as workbuddyHostHeartbeatPath, r as isHeartbeatProcessAlive, u as FALLBACK_WORKBUDDY_MODELS, x as CN_VARIANT } from "./heartbeat-DR6QsZ9h.js";
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 //#region src/cli/bin.ts

package/lib/{heartbeat-BpW2mSgI.js → heartbeat-DR6QsZ9h.js}

@@ -828,13 +828,21 @@ function billingHeaders(credential) {
 * Normalize an OpenAI chat-completions body for the WorkBuddy upstream:
 * force `stream: true` (the upstream rejects non-streaming), flatten
 * `tool_choice` (the upstream's field is a string; object forms return 400),
-* and rewrite `developer` messages as `system`.
+* rewrite `developer` messages as `system`, and drop the adapter's own `off`
+* effort spelling (see {@link dropUnsupportedEffort}).
 *
 * The `developer` rewrite is load-bearing: pi-ai emits the system prompt as
 * `role: "developer"` (the OpenAI convention it adopted), but the WorkBuddy
 * upstream rejects that role with HTTP 400 code 11128 ("Illegal API
 * invocation from an unapproved channel"). Rewriting to `system` is the
 * compatible spelling the upstream accepts.
+*
+* Every transformation here is region-agnostic on purpose. The two endpoints
+* differ in what they *add* (the international one also needs a leading system
+* prompt — see {@link prepareInternationalChatBody}), not in what they reject:
+* both refuse the picker's `off` spelling, which is why that strip lives here
+* rather than in the international layer (issue #13 reversed the earlier
+* international-only scope decision, which rested on CN accepting it).
 */
 function prepareChatBody(source) {
 	let body;
@@ -848,6 +856,7 @@ function prepareChatBody(source) {
 	obj["stream"] = true;
 	normalizeDeveloperRole(obj);
 	normalizeToolChoice(obj);
+	dropUnsupportedEffort(obj);
 	return JSON.stringify(obj);
 }
 /** Rewrite `role: "developer"` messages to `role: "system"` (upstream rejects developer). */
@@ -937,7 +946,20 @@ var WorkBuddyUpstreamClient = class {
 		this.resolveAppVersion = options.resolveAppVersion ?? (() => resolveAppVersion());
 		this.resolveChatIdentity = options.resolveChatIdentity ?? ((region) => resolveChatIdentity(region));
 	}
-	/** POST the chat endpoint; a successful answer is the raw SSE response. */
+	/**
+	* POST the chat endpoint; a successful answer is the raw SSE response.
+	*
+	* This is the one place every chat request converges on (the loopback shim,
+	* the host LLM route, and any direct caller all end up here), so it is also
+	* where the body is normalized for the upstream — in *both* regions. The
+	* region only decides which extra requirement applies on top: the
+	* international gateway additionally demands a leading system message. It
+	* used to decide whether the body was normalized at all, which left the CN
+	* path sending the picker's `off` spelling verbatim (issue #13).
+	*
+	* Normalization is idempotent, so a caller that already prepared the body
+	* (the shim does) sees no second change.
+	*/
 	async chatStream(credential, bodyJson, signal) {
 		const region = regionOf(credential.domain);
 		let userAgent;
@@ -946,6 +968,7 @@ var WorkBuddyUpstreamClient = class {
 		} catch {
 			userAgent = chatUserAgent(fallbackChatIdentity(region), region);
 		}
+		const body = region === "global" ? prepareInternationalChatBody(bodyJson) : prepareChatBody(bodyJson);
 		let response;
 		try {
 			response = await fetch(`${chatBase(credential)}/v2/chat/completions`, {
@@ -954,7 +977,7 @@ var WorkBuddyUpstreamClient = class {
 					...chatHeaders(credential, userAgent),
 					Authorization: `Bearer ${credential.accessToken}`
 				},
-				body: region === "global" ? prepareInternationalChatBody(bodyJson) : bodyJson,
+				body,
 				...signal === void 0 ? {} : { signal }
 			});
 		} catch (error) {
@@ -1498,6 +1521,11 @@ function modelWithCurrentPromotion(model, now = Date.now()) {
 * merged: existing messages keep their order and wording. A body that is not a
 * JSON object is returned unchanged, exactly as {@link prepareChatBody} does,
 * so this is safe to run over an already-prepared-or-not body.
+*
+* This layer now carries *only* that requirement. The `reasoning_effort` strip
+* used to live here, scoped to this region; issue #13 showed CN rejects the
+* same spelling, so it moved into the shared {@link prepareChatBody} and this
+* function no longer touches the effort field at all.
 */
 function prepareInternationalChatBody(source) {
 	const prepared = prepareChatBody(source);
@@ -1508,7 +1536,6 @@ function prepareInternationalChatBody(source) {
 		return prepared;
 	}
 	if (!isObject(body)) return prepared;
-	dropUnsupportedEffort(body);
 	const messages = body["messages"];
 	if (!Array.isArray(messages)) return JSON.stringify(body);
 	const first = messages[0];
@@ -1520,25 +1547,35 @@ function prepareInternationalChatBody(source) {
 	return JSON.stringify(body);
 }
 /**
-* Remove the adapter's own `off` effort spelling from the **international** wire.
-*
-* `thinkingLevelMap.off` is pinned to the literal `'off'` for models that
-* declare `canDisableThinking`, so that the level stays selectable. pi-ai
-* sends that value for any request carrying no explicit level, and the
-* international endpoint rejects it on the GPT family with HTTP 400 `11133` /
-* `extError.param === 'reasoning.effort'` (issue #49). Omission is the only
-* form measured good on every such model; a literal `'none'` is *not* a safe
-* substitute — accepted by the GPT-5.6 family and GLM, rejected by
-* `gpt-6-astra`.
-*
-* Consequences, stated honestly: the international picker still offers Off,
-* but selecting it now means "the field is omitted" — the model's actual
-* behaviour is decided upstream and is *not* guaranteed to disable thinking
-* or to match the catalog's `defaultEffort`. Declared spellings
-* (`low`/`medium`/`high`/`xhigh`/`max`) and an explicit `none` pass through
-* untouched. The CN variant is deliberately unaffected: its endpoint has
-* accepted this spelling in every measurement so far, and keeping its wire
-* unchanged is a scope decision, not a claim about that endpoint's future.
+* Remove the adapter's own `off` effort spelling from the wire, in both regions.
+*
+* `thinkingLevelMap.off` is pinned to the literal `'off'` so the level stays
+* selectable in the picker — pi-ai exposes a level only when its entry is a
+* string — but that same entry is also the value pi-ai puts on the wire, both
+* for an explicit Off selection and for *every* request that carries no level
+* at all. `'off'` is a picker name, not an upstream spelling, and both
+* endpoints reject it:
+*
+* - international GPT family: HTTP 400 `11133` / `extError.param ===
+*   'reasoning.effort'` (issue #49);
+* - CN: the same 400 `11133` on every `canDisableThinking` model — measured
+*   on `deepseek-v4.1-flash`, where the author also confirmed `'disabled'`
+*   is rejected and `'none'` answers 200 (issue #13). This is what made the
+*   earlier international-only scope decision obsolete.
+*
+* Omission is the only form measured good on every affected model, so it is
+* the only form this function can produce; a literal `'none'` is *not* a safe
+* substitute (accepted by the GPT-5.6 family and GLM, rejected by
+* `gpt-6-astra`, and silently ignored by `kimi-k2.8-preview`). Declared
+* spellings (`low`/`medium`/`high`/`xhigh`/`max`) and an explicit `none` pass
+* through untouched — the adapter does not decide a user's `none` for them.
+*
+* Consequences, stated honestly: the picker still offers Off in both regions,
+* but selecting it means "the field is omitted". The model's actual behaviour
+* is then decided upstream — *not* guaranteed to disable thinking and not
+* guaranteed to match the catalog's `defaultEffort`. The plugin used to claim
+* more than that on CN, where `'off'` was merely accepted (accepted never
+* meant effective); #13 is why the claim is withdrawn rather than reworded.
 */
 function dropUnsupportedEffort(obj) {
 	if (obj["reasoning_effort"] === "off") delete obj["reasoning_effort"];
@@ -3688,7 +3725,7 @@ var WorkBuddyCatalog = class {
 };
 //#endregion
 //#region src/version.ts
-const WORKBUDDY_BRIDGE_VERSION = "0.5.0";
+const WORKBUDDY_BRIDGE_VERSION = "0.5.1";
 //#endregion
 //#region src/web/heartbeat.ts
 /**

package/lib/index.d.ts

@@ -613,13 +613,21 @@ declare function regionOf(domain: string): WorkBuddyRegion;
  * Normalize an OpenAI chat-completions body for the WorkBuddy upstream:
  * force `stream: true` (the upstream rejects non-streaming), flatten
  * `tool_choice` (the upstream's field is a string; object forms return 400),
- * and rewrite `developer` messages as `system`.
+ * rewrite `developer` messages as `system`, and drop the adapter's own `off`
+ * effort spelling (see {@link dropUnsupportedEffort}).
  *
  * The `developer` rewrite is load-bearing: pi-ai emits the system prompt as
  * `role: "developer"` (the OpenAI convention it adopted), but the WorkBuddy
  * upstream rejects that role with HTTP 400 code 11128 ("Illegal API
  * invocation from an unapproved channel"). Rewriting to `system` is the
  * compatible spelling the upstream accepts.
+ *
+ * Every transformation here is region-agnostic on purpose. The two endpoints
+ * differ in what they *add* (the international one also needs a leading system
+ * prompt — see {@link prepareInternationalChatBody}), not in what they reject:
+ * both refuse the picker's `off` spelling, which is why that strip lives here
+ * rather than in the international layer (issue #13 reversed the earlier
+ * international-only scope decision, which rested on CN accepting it).
  */
 declare function prepareChatBody(source: string): string;
 /** Provenance of one successful catalog fetch, surfaced by the status card. */
@@ -660,7 +668,20 @@ declare class WorkBuddyUpstreamClient {
   /** Provenance of the most recent successful catalog fetch, for the card. */
   lastCatalog: WorkBuddyCatalogFetch | undefined;
   constructor(options?: WorkBuddyUpstreamClientOptions);
-  /** POST the chat endpoint; a successful answer is the raw SSE response. */
+  /**
+   * POST the chat endpoint; a successful answer is the raw SSE response.
+   *
+   * This is the one place every chat request converges on (the loopback shim,
+   * the host LLM route, and any direct caller all end up here), so it is also
+   * where the body is normalized for the upstream — in *both* regions. The
+   * region only decides which extra requirement applies on top: the
+   * international gateway additionally demands a leading system message. It
+   * used to decide whether the body was normalized at all, which left the CN
+   * path sending the picker's `off` spelling verbatim (issue #13).
+   *
+   * Normalization is idempotent, so a caller that already prepared the body
+   * (the shim does) sees no second change.
+   */
   chatStream(credential: WorkBuddyCredential, bodyJson: string, signal?: AbortSignal): Promise<WorkBuddyChatResult>;
   /** POST the token-refresh endpoint; the caller merges the outcome. */
   refreshToken(credential: WorkBuddyCredential): Promise<WorkBuddyRefreshOutcome>;
@@ -833,6 +854,11 @@ declare function modelWithCurrentPromotion(model: WorkBuddyUpstreamModel, now?:
  * merged: existing messages keep their order and wording. A body that is not a
  * JSON object is returned unchanged, exactly as {@link prepareChatBody} does,
  * so this is safe to run over an already-prepared-or-not body.
+ *
+ * This layer now carries *only* that requirement. The `reasoning_effort` strip
+ * used to live here, scoped to this region; issue #13 showed CN rejects the
+ * same spelling, so it moved into the shared {@link prepareChatBody} and this
+ * function no longer touches the effort field at all.
  */
 declare function prepareInternationalChatBody(source: string): string;
 //#endregion

package/lib/index.js

@@ -1,4 +1,4 @@
-import { A as parseModelCatalog, B as chatUserAgent, C as variantFor, D as WorkBuddyUpstreamClient, F as probeModel, G as WORKBUDDY_APP_VERSION_FILENAME, H as readCliVersion, I as randomSentinel, J as readBundleVersion, K as appUserAgent, L as classifyUpstreamError, M as prepareInternationalChatBody, N as regionOf, O as modelWithCurrentPromotion, P as PROBE_EFFORT_CANDIDATES, R as CN_APP_VERSION_FILENAME, S as WORKBUDDY_VARIANTS, U as resolveChatIdentity, V as fallbackChatIdentity, W as validCliVersion, X as validAppVersion, Y as resolveAppVersion, _ as desktopAuthCandidatesFor, a as readHostHeartbeat, b as AI_VARIANT, c as WORKBUDDY_BRIDGE_VERSION, d as WorkBuddyCatalog, f as WORKBUDDY_AUTH_FILENAME, g as defaultDesktopAuthPath, h as defaultDesktopAuthCandidates, i as processStartTimeMs, j as prepareChatBody, k as normalizeCredits, l as FALLBACK_WORKBUDDY_AI_MODELS, m as WorkBuddyCredentialStore, n as clearHostHeartbeat, o as workbuddyHostHeartbeatPath, p as WORKBUDDY_AUTH_FILE_ENV, q as installedAppVersion, r as isHeartbeatProcessAlive, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, u as FALLBACK_WORKBUDDY_MODELS, v as parseWorkBuddyAuth, w as WORKBUDDY_CREDIT_PATH, x as CN_VARIANT, y as workbuddyOwnAuthPath, z as FALLBACK_CN_APP_VERSION } from "./heartbeat-BpW2mSgI.js";
+import { A as parseModelCatalog, B as chatUserAgent, C as variantFor, D as WorkBuddyUpstreamClient, F as probeModel, G as WORKBUDDY_APP_VERSION_FILENAME, H as readCliVersion, I as randomSentinel, J as readBundleVersion, K as appUserAgent, L as classifyUpstreamError, M as prepareInternationalChatBody, N as regionOf, O as modelWithCurrentPromotion, P as PROBE_EFFORT_CANDIDATES, R as CN_APP_VERSION_FILENAME, S as WORKBUDDY_VARIANTS, U as resolveChatIdentity, V as fallbackChatIdentity, W as validCliVersion, X as validAppVersion, Y as resolveAppVersion, _ as desktopAuthCandidatesFor, a as readHostHeartbeat, b as AI_VARIANT, c as WORKBUDDY_BRIDGE_VERSION, d as WorkBuddyCatalog, f as WORKBUDDY_AUTH_FILENAME, g as defaultDesktopAuthPath, h as defaultDesktopAuthCandidates, i as processStartTimeMs, j as prepareChatBody, k as normalizeCredits, l as FALLBACK_WORKBUDDY_AI_MODELS, m as WorkBuddyCredentialStore, n as clearHostHeartbeat, o as workbuddyHostHeartbeatPath, p as WORKBUDDY_AUTH_FILE_ENV, q as installedAppVersion, r as isHeartbeatProcessAlive, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, u as FALLBACK_WORKBUDDY_MODELS, v as parseWorkBuddyAuth, w as WORKBUDDY_CREDIT_PATH, x as CN_VARIANT, y as workbuddyOwnAuthPath, z as FALLBACK_CN_APP_VERSION } from "./heartbeat-DR6QsZ9h.js";
 import z from "@deepseek-ai/schemastery";
 import { dirname, join, resolve } from "node:path";
 import { resolveDshHome } from "@deepseek-ai/dsh-home-paths";
@@ -446,6 +446,13 @@ function withCatalogDisplay(name, info) {
 * The offered set is described internally as "verified accepted", never as
 * "verified effective": acceptance proves the upstream did not reject the
 * spelling, not that it changes what the model does.
+*
+* `off` is a picker name, not a wire spelling. It stays pinned to the literal
+* `'off'` (a `null` here would remove the level from the picker entirely), and
+* the shared preparation in `src/protocol/client.ts` strips that exact value
+* before the request leaves the plugin — in both regions, because both
+* endpoints reject it (issues #49 and #13). Selecting Off therefore means "send
+* no `reasoning_effort`", and what the model then does is upstream's call.
 */
 function reasoningFields(info, observed) {
 	const resolved = resolveEfforts(info, observed);

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-workbuddy-bridge",
   "displayName": "DSH WorkBuddy Bridge",
   "description": "将 WorkBuddy 桌面 App 包含的模型自动接入 DeepSeek Harness — bring WorkBuddy desktop app models into DeepSeek Harness with zero configuration.",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "author": "zlZayn",
   "keywords": [
     "dsh",
@@ -97,7 +97,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "4.0.4",
+    "@deepseek-ai/cordis": "^4.0.4",
     "@deepseek-ai/dsh-api-remotes": "^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.1-rc.1",
     "@deepseek-ai/dsh-atomic-write": "^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.1-rc.1",
     "@deepseek-ai/dsh-attachment": "^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.1-rc.1",
@@ -119,7 +119,7 @@
     "@deepseek-ai/dsh-settings": "^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.1-rc.1",
     "@deepseek-ai/dsh-util-code-language": "^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.1-rc.1",
     "@deepseek-ai/dsh-util-workspace-path": "^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.1-rc.1",
-    "@deepseek-ai/schemastery": "3.18.5",
+    "@deepseek-ai/schemastery": "^3.18.4",
     "@earendil-works/pi-ai": "^1.1.0",
     "@eslint/js": "^10.0.1",
     "@shikijs/langs": "^4.4.3",
@@ -150,7 +150,7 @@
     "micromark-util-symbol": "^2.0.1",
     "prettier": "^3.9.9",
     "react": "^18.2.0",
-    "react-dom": "^18.3.1",
+    "react-dom": "^18.2.0",
     "react-test-renderer": "18.3.1",
     "shiki": "^4.4.3",
     "simple-icons": "^16.32.0",