dsh-workbuddy-connect 0.7.0 → 0.7.2

package/lib/index.js

@@ -1,4 +1,4 @@
-import { A as extractDisplayErrorMessage, B as CN_APP_VERSION_FILENAME, C as WORKBUDDY_VARIANTS, D as WORKBUDDY_UPDATE_PATH, F as prepareInternationalChatBody, G as resolveChatIdentity, H as chatUserAgent, I as regionOf, J as appUserAgent, K as validCliVersion, L as PROBE_EFFORT_CANDIDATES, M as normalizeCredits, N as parseModelCatalog, O as WorkBuddyUpstreamClient, P as prepareChatBody, Q as validAppVersion, R as probeModel, S as CN_VARIANT, U as fallbackChatIdentity, V as FALLBACK_CN_APP_VERSION, W as readCliVersion, X as readBundleVersion, Y as installedAppVersion, Z as resolveAppVersion, _ as desktopAuthCandidatesFor, a as readHostHeartbeat, b as atRestKeyProviderFor, c as WORKBUDDY_CONNECT_VERSION, d as WorkBuddyCatalog, f as WORKBUDDY_AUTH_FILENAME, g as defaultDesktopAuthPath, h as defaultDesktopAuthCandidates, i as processStartTimeMs, j as modelWithCurrentPromotion, k as classifyUpstreamError, l as FALLBACK_WORKBUDDY_AI_MODELS, m as WorkBuddyCredentialStore, n as clearHostHeartbeat, o as workbuddyHostHeartbeatPath, p as WORKBUDDY_AUTH_FILE_ENV, q as WORKBUDDY_APP_VERSION_FILENAME, r as isHeartbeatProcessAlive, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, u as FALLBACK_WORKBUDDY_MODELS, v as parseWorkBuddyAuth, w as variantFor, x as AI_VARIANT, y as workbuddyOwnAuthPath, z as randomSentinel } from "./host-heartbeat-d_lBAk8t.js";
+import { $ as validAppVersion, A as extractDisplayErrorMessage, B as randomSentinel, C as WORKBUDDY_VARIANTS, D as WORKBUDDY_UPDATE_PATH, F as prepareCnChatBody, G as readCliVersion, H as FALLBACK_CN_APP_VERSION, I as prepareInternationalChatBody, J as WORKBUDDY_APP_VERSION_FILENAME, K as resolveChatIdentity, L as regionOf, M as normalizeCredits, N as parseModelCatalog, O as WorkBuddyUpstreamClient, P as prepareChatBody, Q as resolveAppVersion, R as PROBE_EFFORT_CANDIDATES, S as CN_VARIANT, U as chatUserAgent, V as CN_APP_VERSION_FILENAME, W as fallbackChatIdentity, X as installedAppVersion, Y as appUserAgent, Z as readBundleVersion, _ as desktopAuthCandidatesFor, a as readHostHeartbeat, b as atRestKeyProviderFor, c as WORKBUDDY_CONNECT_VERSION, d as WorkBuddyCatalog, f as WORKBUDDY_AUTH_FILENAME, g as defaultDesktopAuthPath, h as defaultDesktopAuthCandidates, i as processStartTimeMs, j as modelWithCurrentPromotion, k as classifyUpstreamError, l as FALLBACK_WORKBUDDY_AI_MODELS, m as WorkBuddyCredentialStore, n as clearHostHeartbeat, o as workbuddyHostHeartbeatPath, p as WORKBUDDY_AUTH_FILE_ENV, q as validCliVersion, r as isHeartbeatProcessAlive, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, u as FALLBACK_WORKBUDDY_MODELS, v as parseWorkBuddyAuth, w as variantFor, x as AI_VARIANT, y as workbuddyOwnAuthPath, z as probeModel } from "./host-heartbeat-DJb8l_4O.js";
 import z from "@deepseek-ai/schemastery";
 import { resolveImageAttachmentAccess, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
 import { dirname, join, resolve } from "node:path";
@@ -10,6 +10,7 @@ import { openAICompletionsApi } from "@earendil-works/pi-ai/api/openai-completio
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
 import { createServer } from "node:http";
 import { Readable } from "node:stream";
+import { fileURLToPath } from "node:url";
 //#region src/catalog-store.ts
 /**
 * The last catalog that actually loaded, kept per variant and per account.
@@ -407,11 +408,21 @@ function withCatalogDisplay(name, info) {
 * It is never probed — disabling thinking is a separate capability, and the
 * per-model acceptance of `off` cannot be inferred from the row's shape.
 *
+* The CN endpoint vetoes `off` further, on models declaring `onlyReasoning`
+* (#87) — see {@link region} below. That rule is deliberately region-scoped:
+* the contradiction it resolves was measured on the CN catalog, and applying
+* it everywhere would have changed which levels the international picker
+* offers, which is outside this issue.
+*
 * 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.
+*
+* @param region - the endpoint this descriptor is for. Decides only whether
+* the `onlyReasoning` veto applies; every other rule is shared. Passed from
+* the variant descriptor, never inferred from a model id or a name.
 */
-function reasoningFields(info, observed) {
+function reasoningFields(info, observed, region = "cn") {
 	const reasoning = info.reasoning;
 	if (reasoning === void 0 || reasoning.supports !== true) return { reasoning: false };
 	const declared = reasoning.supportedEfforts;
@@ -420,7 +431,7 @@ function reasoningFields(info, observed) {
 	return {
 		reasoning: true,
 		thinkingLevelMap: {
-			off: reasoning.canDisableThinking === true && declared !== void 0 && declared.length > 0 ? "off" : null,
+			off: reasoning.canDisableThinking === true && (region !== "cn" || reasoning.onlyReasoning !== true) && declared !== void 0 && declared.length > 0 ? "off" : null,
 			minimal: null,
 			low: efforts.includes("low") ? "low" : null,
 			medium: efforts.includes("medium") ? "medium" : null,
@@ -431,7 +442,7 @@ function reasoningFields(info, observed) {
 	};
 }
 /** Build one pi-ai model descriptor pointing at the loopback shim. */
-function toPiModel(info, baseUrl, observed, providerId = WORKBUDDY_PROVIDER) {
+function toPiModel(info, baseUrl, observed, providerId, region) {
 	return {
 		id: info.id,
 		name: info.name,
@@ -439,7 +450,7 @@ function toPiModel(info, baseUrl, observed, providerId = WORKBUDDY_PROVIDER) {
 		provider: providerId,
 		baseUrl,
 		input: info.supportsImages === true ? ["text", "image"] : ["text"],
-		...reasoningFields(info, observed),
+		...reasoningFields(info, observed, region),
 		cost: NO_COST,
 		contextWindow: info.contextWindow,
 		maxTokens: info.maxTokens,
@@ -462,9 +473,10 @@ function createWorkBuddyAdapter(options) {
 	const { shim, store, catalog, resolveAttachments, resolveImageAccess, observe, hidden } = options;
 	const providerId = options.providerId ?? "workbuddy";
 	const displayName = options.displayName ?? "WorkBuddy";
+	const region = options.region ?? "cn";
 	const buildModels = () => {
 		const baseUrl = `${shim.baseUrl()}/v1`;
-		return catalog.current().map((info) => toPiModel(info, baseUrl, observe?.(info.id), providerId));
+		return catalog.current().map((info) => toPiModel(info, baseUrl, observe?.(info.id), providerId, region));
 	};
 	const provider = {
 		...createProvider({
@@ -1111,6 +1123,7 @@ var WorkBuddyProbeService = class {
 			try {
 				const outcome = await probeModel({
 					send,
+					region: this.options.region,
 					...this.options.sentinel === void 0 ? {} : { sentinel: this.options.sentinel }
 				});
 				if (this.options.account() !== account) return {
@@ -1143,6 +1156,79 @@ var WorkBuddyProbeService = class {
 	}
 };
 //#endregion
+//#region src/pi-ai-guard.ts
+/**
+* Confirm the pi-ai copy this plugin actually loaded is the generation the DSH
+* 0.2.0-rc.2 host was built against.
+*
+* #92's failure mode: a pnpm profile with `nodeLinker: hoisted` and
+* `autoInstallPeers: false` installs no peer for us, so a co-installed
+* plugin's older pi-ai sits at the profile root and wins bare-specifier
+* resolution. The host then adds a system message (pi-ai 0.87's
+* `collapseSystemMessages`) and the older copy answers `estimateMessageTokens`
+* by reading `.length` off a block it does not model — every request dies at
+* `PI_AI_ERROR` before any upstream HTTP. Declaring pi-ai as a regular
+* dependency (package.json) is the fix; this module exists so a future
+* regression reports *what* it loaded instead of that opaque crash.
+*
+* It is deliberately a warning, not a throw. The plugin is mid-load at this
+* point, and a hard failure here would take down a host that may still be able
+* to serve other providers. The message is the product; the operator decides.
+*
+* @module dsh-workbuddy-connect/pi-ai-guard
+*/
+/** The pi-ai generation this plugin is built and tested against. */
+const REQUIRED_PI_AI_VERSION = "0.87.1";
+/**
+* Read the version of the pi-ai copy Node resolves for *this* module.
+*
+* The package's exports map does not open `./package.json`, so the manifest
+* cannot be imported. Instead the module's own specifier is resolved and the
+* resulting file is walked up to the directory whose `package.json` names
+* `@earendil-works/pi-ai`. That reads the copy actually loaded rather than a
+* guess from the install tree.
+*
+* @returns The resolved version, or undefined when it cannot be determined.
+*/
+function resolvedPiAiVersion() {
+	let entry;
+	try {
+		entry = import.meta.resolve("@earendil-works/pi-ai");
+	} catch {
+		return;
+	}
+	let dir = dirname(fileURLToPath(entry));
+	for (let step = 0; step < 5; step += 1) {
+		try {
+			const manifest = JSON.parse(readFileSync(join(dir, "package.json"), "utf8"));
+			if (manifest.name === "@earendil-works/pi-ai" && typeof manifest.version === "string") return manifest.version;
+		} catch {}
+		const parent = dirname(dir);
+		if (parent === dir) break;
+		dir = parent;
+	}
+}
+/**
+* One line describing a pi-ai copy that is not the required generation, or
+* undefined when the resolved version matches or cannot be read.
+*
+* The cause is left open on purpose. A hoisted profile root is the case #92
+* measured, but an updater or installer can just as easily leave the wrong copy
+* in place, and this diagnostic cannot tell them apart from a version string.
+* Naming both versions and the remedy is what the reader can act on; naming only
+* versions and the fix also keeps any filesystem path out of logs and reports.
+*
+* Carries no plugin prefix: callers log it under their own.
+*
+* @param resolved - Version to report on. Read from the live module graph when
+* omitted; pass it explicitly to describe a hypothetical copy.
+*/
+function piAiVersionWarning(resolved) {
+	const version = arguments.length === 0 ? resolvedPiAiVersion() : resolved;
+	if (version === void 0 || version === "0.87.1") return void 0;
+	return `loaded @earendil-works/pi-ai ${version}, but this plugin is built for ${REQUIRED_PI_AI_VERSION}. The wrong copy is being resolved — check the profile's pi-ai install (a pnpm profile with nodeLinker "hoisted" and autoInstallPeers false can expose another package's older copy). Reinstalling the plugin so it installs its own ${REQUIRED_PI_AI_VERSION} copy resolves it`;
+}
+//#endregion
 //#region src/web-status.ts
 /** Redact token-like content before it crosses to the browser. */
 function safeMessage(error) {
@@ -1940,6 +2026,7 @@ function createVariantRuntime(config, variant, current, identityOf, accountOf, k
 			catalog,
 			credentials: store,
 			client,
+			region: variant.id === CN_VARIANT.id ? "cn" : "global",
 			consent: () => current().probeConsent === true,
 			account: () => identityOf(variant.id)
 		}),
@@ -2030,6 +2117,7 @@ async function startVariant(ctx, runtime) {
 		const workbuddy = createWorkBuddyAdapter({
 			providerId: variant.id,
 			displayName: variant.displayName,
+			region: variant.region,
 			shim,
 			store,
 			catalog,
@@ -2074,6 +2162,8 @@ async function startVariant(ctx, runtime) {
 * working without re-registering the provider.
 */
 function apply(ctx, config) {
+	const piAiWarning = piAiVersionWarning();
+	if (piAiWarning !== void 0) ctx.logger.warn(`dsh-workbuddy-connect: ${piAiWarning}`);
 	let current = () => config;
 	/** Timers and in-flight work belonging to this plugin instance. */
 	let stopped = false;
@@ -2435,4 +2525,4 @@ function apply(ctx, config) {
 	});
 }
 //#endregion
-export { AI_VARIANT, CN_APP_VERSION_FILENAME, CN_VARIANT, Config, FALLBACK_CN_APP_VERSION, FALLBACK_WORKBUDDY_AI_MODELS, FALLBACK_WORKBUDDY_MODELS, PROBE_EFFORT_CANDIDATES, WORKBUDDY_AI_SETTINGS_NS, WORKBUDDY_APP_VERSION_FILENAME, WORKBUDDY_AUTH_FILENAME, WORKBUDDY_AUTH_FILE_ENV, WORKBUDDY_CATALOG_FILENAME, WORKBUDDY_HOST_HEARTBEAT_FILENAME, WORKBUDDY_PROBE_FILENAME, WORKBUDDY_PROVIDER, WORKBUDDY_SETTINGS_NS, WORKBUDDY_STREAM_IDLE_TIMEOUT_MS, WORKBUDDY_VARIANTS, WORKBUDDY_VISIBILITY_FILENAME, WorkBuddyCatalog, WorkBuddyCatalogStore, WorkBuddyCredentialStore, WorkBuddyProbeService, WorkBuddyProbeStore, WorkBuddyUpstreamClient, WorkBuddyVisibilityStore, appUserAgent, apply, chatUserAgent, classifyUpstreamError, clearHostHeartbeat, createWorkBuddyAdapter, createWorkBuddyShim, defaultDesktopAuthCandidates, defaultDesktopAuthPath, desktopAuthCandidatesFor, fallbackChatIdentity, fingerprintModel, inject, installedAppVersion, isHeartbeatProcessAlive, modelWithCurrentPromotion, name, normalizeCredits, parseModelCatalog, parseWorkBuddyAuth, prepareChatBody, prepareInternationalChatBody, probeModel, processStartTimeMs, randomSentinel, readBundleVersion, readCliVersion, readHostHeartbeat, regionOf, resolveAppVersion, resolveChatIdentity, validAppVersion, validCliVersion, variantFor, visibilityAccountOf, workbuddyCatalogPath, workbuddyHostHeartbeatPath, workbuddyOwnAuthPath, workbuddyProbePath, workbuddyVisibilityPath };
+export { AI_VARIANT, CN_APP_VERSION_FILENAME, CN_VARIANT, Config, FALLBACK_CN_APP_VERSION, FALLBACK_WORKBUDDY_AI_MODELS, FALLBACK_WORKBUDDY_MODELS, PROBE_EFFORT_CANDIDATES, WORKBUDDY_AI_SETTINGS_NS, WORKBUDDY_APP_VERSION_FILENAME, WORKBUDDY_AUTH_FILENAME, WORKBUDDY_AUTH_FILE_ENV, WORKBUDDY_CATALOG_FILENAME, WORKBUDDY_HOST_HEARTBEAT_FILENAME, WORKBUDDY_PROBE_FILENAME, WORKBUDDY_PROVIDER, WORKBUDDY_SETTINGS_NS, WORKBUDDY_STREAM_IDLE_TIMEOUT_MS, WORKBUDDY_VARIANTS, WORKBUDDY_VISIBILITY_FILENAME, WorkBuddyCatalog, WorkBuddyCatalogStore, WorkBuddyCredentialStore, WorkBuddyProbeService, WorkBuddyProbeStore, WorkBuddyUpstreamClient, WorkBuddyVisibilityStore, appUserAgent, apply, chatUserAgent, classifyUpstreamError, clearHostHeartbeat, createWorkBuddyAdapter, createWorkBuddyShim, defaultDesktopAuthCandidates, defaultDesktopAuthPath, desktopAuthCandidatesFor, fallbackChatIdentity, fingerprintModel, inject, installedAppVersion, isHeartbeatProcessAlive, modelWithCurrentPromotion, name, normalizeCredits, parseModelCatalog, parseWorkBuddyAuth, prepareChatBody, prepareCnChatBody, prepareInternationalChatBody, probeModel, processStartTimeMs, randomSentinel, readBundleVersion, readCliVersion, readHostHeartbeat, regionOf, resolveAppVersion, resolveChatIdentity, validAppVersion, validCliVersion, variantFor, visibilityAccountOf, workbuddyCatalogPath, workbuddyHostHeartbeatPath, workbuddyOwnAuthPath, workbuddyProbePath, workbuddyVisibilityPath };

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-workbuddy-connect",
   "displayName": "DSH WorkBuddy Connect",
   "description": "将 WorkBuddy 桌面 App 包含的模型自动接入 DeepSeek Harness — bring WorkBuddy desktop app models into DeepSeek Harness with zero configuration.",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "author": "corrinehu",
   "keywords": [
     "dsh-plugin",
@@ -66,17 +66,19 @@
       "platform": "web"
     }
   },
+  "dependencies": {
+    "@earendil-works/pi-ai": "0.87.1"
+  },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-atomic-write": "0.2.0-rc.1 || 0.2.0-rc.2",
-    "@deepseek-ai/dsh-attachment": "0.2.0-rc.1 || 0.2.0-rc.2",
-    "@deepseek-ai/dsh-home-paths": "0.2.0-rc.1 || 0.2.0-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "0.2.0-rc.1 || 0.2.0-rc.2",
-    "@deepseek-ai/dsh-llm": "0.2.0-rc.1 || 0.2.0-rc.2",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.2.0-rc.1 || 0.2.0-rc.2",
-    "@deepseek-ai/dsh-settings": "0.2.0-rc.1 || 0.2.0-rc.2",
+    "@deepseek-ai/dsh-atomic-write": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-home-paths": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-settings": "0.2.0-rc.2",
     "@deepseek-ai/schemastery": "^3.18.2",
-    "@earendil-works/pi-ai": "^0.85.1 || ^0.87.1",
     "react": "^18.2.0"
   },
   "devDependencies": {
@@ -100,7 +102,7 @@
     "@deepseek-ai/dsh-llm-pi-ai": "0.2.0-rc.2",
     "@deepseek-ai/dsh-settings": "0.2.0-rc.2",
     "@deepseek-ai/schemastery": "^3.18.2",
-    "@earendil-works/pi-ai": "^0.87.1",
+    "@earendil-works/pi-ai": "0.87.1",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-test-renderer": "^18.3.1",