dsh-workbuddy-connect 0.6.3 → 0.6.4

package/lib/{variants-D_oxWP_K.js → host-heartbeat-D9DvyLWz.js}

@@ -629,6 +629,7 @@ const SESSION_DEAD_MARKERS = ["Offline user session not found", "12153"];
 /** Classify an upstream failure from its HTTP status and body excerpt. */
 function classifyUpstreamError(status, body) {
 	if (status === 402) return "hard_credit";
+	if (status === 401) return "session_dead";
 	const lower = body.toLowerCase();
 	for (const marker of HARD_CREDIT_MARKERS) if (lower.includes(marker.toLowerCase()) || body.includes(marker)) return "hard_credit";
 	for (const marker of SESSION_DEAD_MARKERS) if (body.includes(marker)) return "session_dead";
@@ -638,6 +639,26 @@ function classifyUpstreamError(status, body) {
 	if (status >= 400) return "client";
 	return "client";
 }
+/**
+* Extract a user-facing error message from an upstream JSON response body.
+* Prefers WorkBuddy's localized `displayMsg.zh` / `displayMsg.en`, falling back to `msg`.
+*/
+function extractDisplayErrorMessage(body) {
+	const trimmed = body.trim();
+	if (!trimmed.startsWith("{")) return void 0;
+	try {
+		const parsed = JSON.parse(trimmed);
+		if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return void 0;
+		const obj = parsed;
+		const displayMsg = obj["displayMsg"];
+		if (typeof displayMsg === "object" && displayMsg !== null && !Array.isArray(displayMsg)) {
+			const localized = displayMsg;
+			if (typeof localized["zh"] === "string" && localized["zh"].trim() !== "") return localized["zh"].trim();
+			if (typeof localized["en"] === "string" && localized["en"].trim() !== "") return localized["en"].trim();
+		}
+		if (typeof obj["msg"] === "string" && obj["msg"].trim() !== "") return obj["msg"].trim();
+	} catch {}
+}
 /** Region for a login domain; an empty domain means CN (matching upstream tooling). */
 function regionOf(domain) {
 	const lowered = domain.trim().toLowerCase();
@@ -1453,15 +1474,143 @@ const INTERNATIONAL_SYSTEM_PROMPT = "You are a helpful assistant.";
 */
 const INTERNATIONAL_PROBE_MAX_TOKENS = 16;
 //#endregion
+//#region src/status-paths.ts
+/** Node-free constants and types shared by the Host and browser halves. */
+/** Plugin-owned status endpoint consumed by its browser half. */
+const WORKBUDDY_STATUS_PATH = "/plugins/dsh-workbuddy-connect/status";
+/**
+* Plugin-owned probe control endpoint.
+*
+* Separate from the status route because it accepts writes: the status route's
+* loopback Host/Origin guard protects against a DNS-rebinding *page*, which is
+* not the same as authorizing a state-changing action. This route therefore
+* also requires the in-process key the browser half receives with the status
+* document.
+*/
+const WORKBUDDY_PROBE_PATH = "/plugins/dsh-workbuddy-connect/probe";
+/**
+* The international (WorkBuddy AI) variant's own pair of routes.
+*
+* Kept as separate constants rather than a computed suffix so both halves
+* reference literal strings: the browser bundle and the host bundle are built
+* independently, and a shared expression is one build-config drift away from
+* the desk asking a route the host never mounted.
+*/
+const WORKBUDDY_AI_STATUS_PATH = "/plugins/dsh-workbuddy-connect/ai/status";
+const WORKBUDDY_AI_PROBE_PATH = "/plugins/dsh-workbuddy-connect/ai/probe";
+/**
+* Same-origin route backing the browser's update reminder.
+*
+* Read-only like the status route, so the same loopback Host/Origin gate
+* applies; it answers public npm/GitHub metadata only and never token
+* material.
+*/
+const WORKBUDDY_UPDATE_PATH = "/plugins/dsh-workbuddy-connect/update";
+//#endregion
+//#region src/variants.ts
+/**
+* The two WorkBuddy desktop apps this one plugin serves.
+*
+* Both products are the same client framework in different regions, and both
+* write their sign-in into the *same* shared `CodeBuddyExtension` auth
+* directory — they differ by file basename, base URL, catalog endpoint, and
+* display identity. Everything that varies between them is collected here as
+* one descriptor, so no module has to carry its own `if (international)`
+* branch and a third variant would be a data change rather than a refactor.
+*
+* This module is host-side (it names files and env vars). The browser half
+* takes the same ids and routes from the Node-free `status-paths.ts`, which
+* stays the single source shared by both halves.
+*
+* @module dsh-workbuddy-connect/variants
+*/
+/** CN WorkBuddy first: the existing provider keeps its id, paths, and copy. */
+const WORKBUDDY_VARIANTS = [{
+	id: "workbuddy",
+	displayName: "WorkBuddy",
+	appName: "WorkBuddy",
+	region: "cn",
+	env: "WORKBUDDY_AUTH_FILE",
+	electron: {
+		productName: "WorkBuddy",
+		envVar: "WORKBUDDY_ELECTRON_BIN",
+		macOS: {
+			bundleId: "com.tencent.workbuddy.mac",
+			defaultPath: "/Applications/WorkBuddy.app/Contents/MacOS/Electron"
+		},
+		windows: {
+			displayNamePattern: /^WorkBuddy(?:\s+\d+(?:\.\d+)+(?:[-+][0-9A-Za-z.-]+)?)?$/u,
+			exeBasename: "workbuddy.exe",
+			defaultPathSegments: [
+				"Programs",
+				"WorkBuddy",
+				"WorkBuddy.exe"
+			]
+		}
+	},
+	desktopFilename: "workbuddy-desktop.info",
+	ownFilename: ".workbuddy-auth.json",
+	probeFilename: ".workbuddy-probe.json",
+	catalogFilename: ".workbuddy-catalog.json",
+	visibilityFilename: ".workbuddy-model-visibility.json",
+	statusPath: WORKBUDDY_STATUS_PATH,
+	probePath: WORKBUDDY_PROBE_PATH
+}, {
+	id: "workbuddy-ai",
+	displayName: "WorkBuddy AI",
+	appName: "WorkBuddy AI",
+	region: "global",
+	env: "WORKBUDDY_AI_AUTH_FILE",
+	electron: {
+		productName: "WorkBuddy AI",
+		envVar: "WORKBUDDY_AI_ELECTRON_BIN",
+		macOS: {
+			bundleId: "com.workbuddy.workbuddy-ai",
+			defaultPath: "/Applications/WorkBuddy AI.app/Contents/MacOS/Electron"
+		},
+		windows: {
+			displayNamePattern: /^WorkBuddy AI(?:\s+\d+(?:\.\d+)+(?:[-+][0-9A-Za-z.-]+)?)?$/u,
+			exeBasename: "workbuddyai.exe"
+		}
+	},
+	desktopFilename: "workbuddy-desktop-ai.info",
+	ownFilename: ".workbuddy-ai-auth.json",
+	probeFilename: ".workbuddy-ai-probe.json",
+	catalogFilename: ".workbuddy-ai-catalog.json",
+	visibilityFilename: ".workbuddy-ai-model-visibility.json",
+	statusPath: WORKBUDDY_AI_STATUS_PATH,
+	probePath: WORKBUDDY_AI_PROBE_PATH
+}];
+/** The CN variant; the plugin's long-standing default and compatibility anchor. */
+const CN_VARIANT = WORKBUDDY_VARIANTS[0];
+/** The international variant. */
+const AI_VARIANT = WORKBUDDY_VARIANTS[1];
+/** Look up a variant by provider id. */
+function variantFor(id) {
+	return WORKBUDDY_VARIANTS.find((variant) => variant.id === id);
+}
+/**
+* The Electron profile a variant resolves with.
+*
+* Callers inside the plugin pass their known-complete variants; descriptors
+* assembled outside (the type is public and predates the profile) fall back
+* by variant id, so an id-less or unknown custom variant stays on the CN
+* product — the same default the store's other legacy fields assume.
+*/
+function electronProfileFor(variant) {
+	return variant?.electron ?? (variant?.id === AI_VARIANT.id ? AI_VARIANT : CN_VARIANT).electron;
+}
+//#endregion
 //#region src/desktop-credential-protection.ts
 /**
 * WorkBuddy 5.6.x at-rest credential protection: classification, key
-* resolution, and field decryption for the desktop app's encrypted auth file.
+* resolution, and field decryption for the desktop apps' encrypted auth files.
 *
-* Since WorkBuddy 5.6 the desktop app encrypts `auth.accessToken` and
-* `auth.refreshToken` at rest (`buildPolicy: "fields"`, on by default), so the
-* plugin reads `{$wbEncrypted:1, envelope}` wrappers instead of token strings
-* (issues #39/#40). Everything needed to open them lives on the same machine:
+* Since WorkBuddy 5.6 both desktop apps (CN and international, which followed
+* in 5.6.2) encrypt `auth.accessToken` and `auth.refreshToken` at rest
+* (`buildPolicy: "fields"`, on by default), so the plugin reads
+* `{$wbEncrypted:1, envelope}` wrappers instead of token strings (issues
+* #39/#40, #59/#60). Everything needed to open them lives on the same machine:
 *
 * - the sealed payload (`{version:1, atRestSecretKey}`) comes from the
 *   WorkBuddy-modified Electron's private `workbuddyStorage` binding, reached
@@ -1479,21 +1628,17 @@ const INTERNATIONAL_PROBE_MAX_TOKENS = 16;
 *
 * @module dsh-workbuddy-connect/desktop-credential-protection
 */
-/** Env variable that overrides the WorkBuddy Electron binary used as the key helper. */
-const WORKBUDDY_ELECTRON_BIN_ENV = "WORKBUDDY_ELECTRON_BIN";
-/** Platform-default Electron binaries confirmed for the CN app (5.6.2). */
-const MACOS_ELECTRON_PATH = "/Applications/WorkBuddy.app/Contents/MacOS/Electron";
 /**
-* The Electron binary the helper would spawn on this platform, or `undefined`
-* where no default has been verified. Windows requires `LOCALAPPDATA` to be
-* present; platforms without a verified layout must set
-* {@link WORKBUDDY_ELECTRON_BIN_ENV} explicitly.
+* The platform-default Electron binary for one product, or `undefined` where
+* none is verified. macOS defaults come from each product's measured layout;
+* the Windows default needs `LOCALAPPDATA`, and the international app has no
+* verified default location at all — registry discovery only, never a guess.
 */
-function defaultWorkBuddyElectronPath(platform = process.platform) {
-	if (platform === "darwin") return MACOS_ELECTRON_PATH;
-	if (platform !== "win32") return void 0;
+function defaultWorkBuddyElectronPath(product, platform = process.platform) {
+	if (platform === "darwin") return product.macOS.defaultPath;
+	if (platform !== "win32" || product.windows.defaultPathSegments === void 0) return void 0;
 	const localAppData = process.env.LOCALAPPDATA?.trim();
-	return localAppData === void 0 || localAppData === "" ? void 0 : join(localAppData, "Programs", "WorkBuddy", "WorkBuddy.exe");
+	return localAppData === void 0 || localAppData === "" ? void 0 : join(localAppData, ...product.windows.defaultPathSegments);
 }
 /** Distinct key ids across the wrapped fields, in field order. */
 function keyIdsOf(fields) {
@@ -1674,15 +1819,27 @@ function parseAtRestPayload(text) {
 function deriveProtectorKey(secret) {
 	return createHash("sha256").update(secret, "utf8").digest();
 }
-/** Select discovery from product and platform at the composition root. */
-function electronDiscoveryFor(variant, platform = process.platform) {
-	if (variant.region !== "cn") return "none";
+/**
+* Select discovery by platform. Both products have verified layouts on macOS
+* and Windows (the international app is registry-only there), so discovery no
+* longer gates on region; Linux and others stay `none`.
+*/
+function electronDiscoveryFor(platform = process.platform) {
 	if (platform === "darwin") return "macos-workbuddy";
 	if (platform === "win32") return "windows-workbuddy";
 	return "none";
 }
-/** The CN app's bundle id; the only one this round resolves by discovery. */
-const WORKBUDDY_CN_BUNDLE_ID = "com.tencent.workbuddy.mac";
+/**
+* The at-rest key provider one variant's store should use. Shared by the
+* plugin host and the CLI entry so the browser card and `doctor`/`status` can
+* never disagree about which binary a variant resolves.
+*/
+function atRestKeyProviderFor(variant) {
+	return new WorkBuddyAtRestKeyProvider({
+		product: electronProfileFor(variant),
+		discovery: electronDiscoveryFor()
+	});
+}
 /** Absolute tool paths: never resolved through PATH, which a user can change. */
 const MDFIND_BIN = "/usr/bin/mdfind";
 const PLUTIL_BIN = "/usr/bin/plutil";
@@ -1693,7 +1850,6 @@ const WINDOWS_REGISTRY_ROOTS = [
 ];
 const WINDOWS_REGISTRY_OUTPUT_MAX_BYTES = 1048576;
 const WINDOWS_ELECTRON_VERSION_PATTERN = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/u;
-const WINDOWS_WORKBUDDY_DISPLAY_NAME_PATTERN = /^WorkBuddy(?:\s+\d+(?:\.\d+)+(?:[-+][0-9A-Za-z.-]+)?)?$/u;
 /** One discovery subprocess's own limits; see {@link WorkBuddyAtRestKeyProviderOptions}. */
 const WORKBUDDY_DISCOVERY_STEP_TIMEOUT_MS = 3e3;
 const MDFIND_MAX_OUTPUT_BYTES = 1048576;
@@ -1710,8 +1866,12 @@ var DiscoveryIncompleteError = class extends Error {};
 * identity. Every failure that means "we could not tell" — a missing tool, a
 * timeout, an oversized answer — is raised as {@link DiscoveryIncompleteError}
 * so it can never be silently read as "no such app".
+*
+* `bundleId` is the product being searched for; the Spotlight query and the
+* caller's identity comparison both use it, so the two can never disagree
+* about which app they are looking for.
 */
-function workBuddyDiscoveryTools() {
+function workBuddyDiscoveryTools(bundleId) {
 	const runTool = (bin, args, maxBytes, signal) => new Promise((resolve, reject) => {
 		if (signal.aborted) {
 			reject(new DiscoveryIncompleteError(`${bin} was not started: the discovery budget was already spent`));
@@ -1743,7 +1903,7 @@ function workBuddyDiscoveryTools() {
 	});
 	return {
 		findApps: async (signal) => {
-			return (await runTool(MDFIND_BIN, [`kMDItemCFBundleIdentifier == '${WORKBUDDY_CN_BUNDLE_ID}'`], MDFIND_MAX_OUTPUT_BYTES, signal)).split("\n").map((line) => line.trim()).filter((line) => line.endsWith(".app"));
+			return (await runTool(MDFIND_BIN, [`kMDItemCFBundleIdentifier == '${bundleId}'`], MDFIND_MAX_OUTPUT_BYTES, signal)).split("\n").map((line) => line.trim()).filter((line) => line.endsWith(".app"));
 		},
 		bundleIdentifier: async (bundlePath, signal) => {
 			try {
@@ -1840,6 +2000,7 @@ function workBuddyWindowsDiscoveryTools() {
 	* a different app.
 	*/
 	explicitPath;
+	product;
 	defaultPath;
 	discovery;
 	tools;
@@ -1857,14 +2018,15 @@ function workBuddyWindowsDiscoveryTools() {
 	discoveredPath;
 	cache;
 	inflight;
-	constructor(options = {}) {
-		const fromEnv = process.env[WORKBUDDY_ELECTRON_BIN_ENV]?.trim();
+	constructor(options) {
+		this.product = options.product;
+		const fromEnv = process.env[options.product.envVar]?.trim();
 		const envPath = fromEnv === void 0 || fromEnv === "" ? void 0 : fromEnv;
 		this.explicitPath = options.electronPath ?? envPath;
 		this.discovery = options.discovery ?? "none";
 		this.platform = options.platform ?? process.platform;
-		this.defaultPath = this.discovery === "none" ? void 0 : options.defaultElectronPath === void 0 ? defaultWorkBuddyElectronPath(this.platform) : options.defaultElectronPath ?? void 0;
-		this.tools = options.tools ?? workBuddyDiscoveryTools();
+		this.defaultPath = this.discovery === "none" ? void 0 : options.defaultElectronPath === void 0 ? defaultWorkBuddyElectronPath(options.product, this.platform) : options.defaultElectronPath ?? void 0;
+		this.tools = options.tools ?? workBuddyDiscoveryTools(options.product.macOS.bundleId);
 		this.windowsTools = options.windowsTools ?? workBuddyWindowsDiscoveryTools();
 		this.discoveryBudgetMs = options.discoveryBudgetMs ?? 1e4;
 		this.timeoutMs = options.timeoutMs ?? 1e4;
@@ -1923,10 +2085,10 @@ function workBuddyWindowsDiscoveryTools() {
 	*/
 	async resolveElectronPath() {
 		if (this.explicitPath !== void 0) {
-			if (!isExecutable(this.explicitPath)) throw new WorkBuddyElectronPathError("electron-path-invalid", `the configured WorkBuddy Electron binary is not available at ${this.explicitPath}; check ${WORKBUDDY_ELECTRON_BIN_ENV} or unset it to let the plugin look for the app itself`);
+			if (!isExecutable(this.explicitPath)) throw new WorkBuddyElectronPathError("electron-path-invalid", `the configured ${this.product.productName} Electron binary is not available at ${this.explicitPath}; check ${this.product.envVar} or unset it to let the plugin look for the app itself`);
 			return this.explicitPath;
 		}
-		if (this.discovery === "none") throw new WorkBuddyElectronPathError("electron-binary-unavailable", `no WorkBuddy Electron binary is configured for this platform; set ${WORKBUDDY_ELECTRON_BIN_ENV} to the app's Electron binary`);
+		if (this.discovery === "none") throw new WorkBuddyElectronPathError("electron-binary-unavailable", `no ${this.product.productName} Electron binary is configured for this platform; set ${this.product.envVar} to the app's Electron binary`);
 		if (this.defaultPath !== void 0 && isExecutable(this.defaultPath)) return this.defaultPath;
 		if (this.discoveredPath !== void 0) {
 			if (isExecutable(this.discoveredPath)) return this.discoveredPath;
@@ -1937,15 +2099,15 @@ function workBuddyWindowsDiscoveryTools() {
 		return found;
 	}
 	/**
-	* Resolve the CN app through Spotlight, then prove each candidate's identity
-	* before it can be executed.
+	* Resolve this product's app through Spotlight, then prove each candidate's
+	* identity before it can be executed.
 	*
 	* The whole flow shares one budget: a hang in one candidate must not extend
 	* the wait for the others, and running out of budget is reported as an
 	* unfinished check rather than an absent app.
 	*/
 	async discoverMacosApp() {
-		if (this.platform !== "darwin") throw new WorkBuddyElectronPathError("electron-binary-unavailable", `no WorkBuddy Electron binary is configured for this platform; set ${WORKBUDDY_ELECTRON_BIN_ENV} to the app's Electron binary`);
+		if (this.platform !== "darwin") throw new WorkBuddyElectronPathError("electron-binary-unavailable", `no ${this.product.productName} Electron binary is configured for this platform; set ${this.product.envVar} to the app's Electron binary`);
 		const controller = new AbortController();
 		const timer = setTimeout(() => controller.abort(), this.discoveryBudgetMs);
 		try {
@@ -1953,7 +2115,7 @@ function workBuddyWindowsDiscoveryTools() {
 			try {
 				candidates = await this.tools.findApps(controller.signal);
 			} catch {
-				throw discoveryIncomplete("the app search did not complete");
+				throw discoveryIncomplete(this.product.productName, "the app search did not complete");
 			}
 			const seen = /* @__PURE__ */ new Map();
 			let unresolved = false;
@@ -1976,7 +2138,7 @@ function workBuddyWindowsDiscoveryTools() {
 					unresolved = true;
 					continue;
 				}
-				if (bundleIdentifier !== "com.tencent.workbuddy.mac") continue;
+				if (bundleIdentifier !== this.product.macOS.bundleId) continue;
 				const electronPath = join(candidate, "Contents", "MacOS", "Electron");
 				if (!isExecutable(electronPath)) continue;
 				let identity;
@@ -1998,9 +2160,12 @@ function workBuddyWindowsDiscoveryTools() {
 					...version === void 0 ? {} : { version }
 				});
 			}
-			if (seen.size > 1) throw new WorkBuddyElectronPathError("electron-binary-ambiguous", `more than one WorkBuddy application was found, so none was chosen:\n${[...seen.values()].map((app) => `  - ${app.bundlePath}${app.version === void 0 ? "" : ` (${app.version})`}`).join("\n")}\n set ${WORKBUDDY_ELECTRON_BIN_ENV} to the one to use`);
-			if (unresolved) throw discoveryIncomplete("some candidates could not be checked");
-			if (seen.size === 0) throw new WorkBuddyElectronPathError("electron-binary-not-found", "no WorkBuddy application was found in the default location or the system index; if WorkBuddy is installed elsewhere, it may not be indexed yet");
+			if (seen.size > 1) {
+				const listed = [...seen.values()].map((app) => `  - ${app.bundlePath}${app.version === void 0 ? "" : ` (${app.version})`}`).join("\n");
+				throw new WorkBuddyElectronPathError("electron-binary-ambiguous", `more than one ${this.product.productName} application was found, so none was chosen:\n${listed}\n set ${this.product.envVar} to the one to use`);
+			}
+			if (unresolved) throw discoveryIncomplete(this.product.productName, "some candidates could not be checked");
+			if (seen.size === 0) throw new WorkBuddyElectronPathError("electron-binary-not-found", `no ${this.product.productName} application was found in the default location or the system index; if it is installed elsewhere, it may not be indexed yet; set ${this.product.envVar} to the app's Electron binary`);
 			return [...seen.values()][0].electronPath;
 		} finally {
 			clearTimeout(timer);
@@ -2008,12 +2173,13 @@ function workBuddyWindowsDiscoveryTools() {
 		}
 	}
 	/**
-	* Resolve the CN app through Windows uninstall records. Registry entries
-	* provide hints, not trust: every DisplayIcon candidate must still be a
-	* WorkBuddy Electron binary with the known Electron layout before execution.
+	* Resolve this product's app through Windows uninstall records. Registry
+	* entries provide hints, not trust: every DisplayIcon candidate must still
+	* be the product's Electron binary with the known Electron layout before
+	* execution.
 	*/
 	async discoverWindowsApp() {
-		if (this.platform !== "win32") throw new WorkBuddyElectronPathError("electron-binary-unavailable", `no WorkBuddy Electron binary is configured for this platform; set ${WORKBUDDY_ELECTRON_BIN_ENV} to the app's Electron binary`);
+		if (this.platform !== "win32") throw new WorkBuddyElectronPathError("electron-binary-unavailable", `no ${this.product.productName} Electron binary is configured for this platform; set ${this.product.envVar} to the app's Electron binary`);
 		const controller = new AbortController();
 		const timer = setTimeout(() => controller.abort(), this.discoveryBudgetMs);
 		try {
@@ -2027,13 +2193,13 @@ function workBuddyWindowsDiscoveryTools() {
 					unresolved = true;
 					continue;
 				}
-				const parsed = parseWindowsRegistryOutput(output);
+				const parsed = parseWindowsRegistryOutput(output, this.product.windows.displayNamePattern);
 				candidates.push(...parsed.candidates);
 				unresolved ||= parsed.incomplete;
 			}
 			const seen = /* @__PURE__ */ new Map();
 			for (const candidate of new Set(candidates)) {
-				const inspection = inspectWindowsElectronCandidate(candidate, this.platform);
+				const inspection = inspectWindowsElectronCandidate(candidate, this.platform, this.product.windows.exeBasename);
 				if (inspection === "unresolved") {
 					unresolved = true;
 					continue;
@@ -2041,9 +2207,12 @@ function workBuddyWindowsDiscoveryTools() {
 				if (inspection === void 0) continue;
 				seen.set(inspection.identity, inspection.electronPath);
 			}
-			if (unresolved) throw discoveryIncomplete("some registry entries or candidates could not be checked");
-			if (seen.size > 1) throw new WorkBuddyElectronPathError("electron-binary-ambiguous", `more than one WorkBuddy application was found, so none was chosen:\n${[...seen.values()].map((path) => `  - ${path}`).join("\n")}\n set ${WORKBUDDY_ELECTRON_BIN_ENV} to the one to use`);
-			if (seen.size === 0) throw new WorkBuddyElectronPathError("electron-binary-not-found", "no usable WorkBuddy Electron binary was found in the default location or Windows uninstall records");
+			if (unresolved) throw discoveryIncomplete(this.product.productName, "some registry entries or candidates could not be checked");
+			if (seen.size > 1) {
+				const listed = [...seen.values()].map((path) => `  - ${path}`).join("\n");
+				throw new WorkBuddyElectronPathError("electron-binary-ambiguous", `more than one ${this.product.productName} application was found, so none was chosen:\n${listed}\n set ${this.product.envVar} to the one to use`);
+			}
+			if (seen.size === 0) throw new WorkBuddyElectronPathError("electron-binary-not-found", `no usable ${this.product.productName} Electron binary was found in the default location or Windows uninstall records; set ${this.product.envVar} to the app's Electron binary`);
 			return [...seen.values()][0];
 		} finally {
 			clearTimeout(timer);
@@ -2083,8 +2252,15 @@ function windowsRegistryKeyMissing(stderr) {
 	const detail = stderr.trim();
 	return /^ERROR:\s*The system was unable to find the specified registry key or value\.?$/iu.test(detail) || /^错误[:：]\s*系统找不到指定的注册表项或值[。.]?$/u.test(detail);
 }
-/** Parse the value columns emitted by `reg query ... /s`. */
-function parseWindowsRegistryOutput(output) {
+/**
+* Parse the value columns emitted by `reg query ... /s`.
+*
+* Entries are filtered by the product's DisplayName pattern *before* the
+* DisplayIcon is judged, so another product's records — however broken — are
+* excluded as decisively not ours and can never mark this product's search
+* incomplete.
+*/
+function parseWindowsRegistryOutput(output, displayNamePattern) {
 	const entries = /* @__PURE__ */ new Map();
 	let currentKey;
 	for (const line of output.split(/\r?\n/u)) {
@@ -2107,7 +2283,7 @@ function parseWindowsRegistryOutput(output) {
 	let incomplete = false;
 	for (const entry of entries.values()) {
 		if (entry.displayName === void 0) continue;
-		if (!WINDOWS_WORKBUDDY_DISPLAY_NAME_PATTERN.test(entry.displayName.trim())) continue;
+		if (!displayNamePattern.test(entry.displayName.trim())) continue;
 		const displayIcon = entry.displayIcon === void 0 ? void 0 : parseWindowsDisplayIcon(entry.displayIcon);
 		if (displayIcon === void 0) incomplete = true;
 		else candidates.push(displayIcon);
@@ -2136,11 +2312,12 @@ function parseWindowsDisplayIcon(value) {
 	return /\.exe$/iu.test(path) ? path : void 0;
 }
 /**
-* Validate the known WorkBuddy Windows layout. `undefined` is a decidable
-* exclusion; `unresolved` is reserved for errors that prevent checking.
+* Validate the known Windows layout for the product's exe. `undefined` is a
+* decidable exclusion; `unresolved` is reserved for errors that prevent
+* checking.
 */
-function inspectWindowsElectronCandidate(electronPath, platform) {
-	if (platform !== "win32" || basename(electronPath).toLowerCase() !== "workbuddy.exe") return void 0;
+function inspectWindowsElectronCandidate(electronPath, platform, exeBasename) {
+	if (platform !== "win32" || basename(electronPath).toLowerCase() !== exeBasename) return void 0;
 	let binaryStat;
 	try {
 		binaryStat = statSync(electronPath);
@@ -2209,8 +2386,8 @@ function reasonCodeOf(error) {
 function isENOENT$1(error) {
 	return error?.code === "ENOENT";
 }
-function discoveryIncomplete(detail) {
-	return new WorkBuddyElectronPathError("electron-discovery-incomplete", `the WorkBuddy application search did not finish (${detail}); this is not proof that the app is missing`);
+function discoveryIncomplete(productName, detail) {
+	return new WorkBuddyElectronPathError("electron-discovery-incomplete", `the ${productName} application search did not finish (${detail}); this is not proof that the app is missing`);
 }
 /**
 * The helper: run inside WorkBuddy's Electron as plain Node, where the
@@ -2427,7 +2604,7 @@ var WorkBuddyCredentialStore = class {
 		this.refresh = options.refresh;
 		this.refreshMarginMs = options.refreshMarginMs ?? 3e5;
 		this.ownPath = options.ownPath ?? (options.variant ? join(resolveDshHome(), options.variant.ownFilename) : workbuddyOwnAuthPath());
-		this.keyProvider = options.keyProvider ?? new WorkBuddyAtRestKeyProvider();
+		this.keyProvider = options.keyProvider ?? new WorkBuddyAtRestKeyProvider({ product: electronProfileFor(options.variant) });
 		this.desktopPathOverride = options.desktopPath;
 	}
 	/**
@@ -3431,33 +3608,8 @@ var WorkBuddyCatalog = class {
 	}
 };
 //#endregion
-//#region src/status-paths.ts
-/** Node-free constants and types shared by the Host and browser halves. */
-/** Plugin-owned status endpoint consumed by its browser half. */
-const WORKBUDDY_STATUS_PATH = "/plugins/dsh-workbuddy-connect/status";
-/**
-* Plugin-owned probe control endpoint.
-*
-* Separate from the status route because it accepts writes: the status route's
-* loopback Host/Origin guard protects against a DNS-rebinding *page*, which is
-* not the same as authorizing a state-changing action. This route therefore
-* also requires the in-process key the browser half receives with the status
-* document.
-*/
-const WORKBUDDY_PROBE_PATH = "/plugins/dsh-workbuddy-connect/probe";
-/**
-* The international (WorkBuddy AI) variant's own pair of routes.
-*
-* Kept as separate constants rather than a computed suffix so both halves
-* reference literal strings: the browser bundle and the host bundle are built
-* independently, and a shared expression is one build-config drift away from
-* the desk asking a route the host never mounted.
-*/
-const WORKBUDDY_AI_STATUS_PATH = "/plugins/dsh-workbuddy-connect/ai/status";
-const WORKBUDDY_AI_PROBE_PATH = "/plugins/dsh-workbuddy-connect/ai/probe";
-//#endregion
 //#region src/version.ts
-const WORKBUDDY_CONNECT_VERSION = "0.6.3";
+const WORKBUDDY_CONNECT_VERSION = "0.6.4";
 //#endregion
 //#region src/host-heartbeat.ts
 /**
@@ -3628,58 +3780,4 @@ function isHeartbeatProcessAlive(heartbeat) {
 	return startAtMs <= heartbeat.registeredAt;
 }
 //#endregion
-//#region src/variants.ts
-/**
-* The two WorkBuddy desktop apps this one plugin serves.
-*
-* Both products are the same client framework in different regions, and both
-* write their sign-in into the *same* shared `CodeBuddyExtension` auth
-* directory — they differ by file basename, base URL, catalog endpoint, and
-* display identity. Everything that varies between them is collected here as
-* one descriptor, so no module has to carry its own `if (international)`
-* branch and a third variant would be a data change rather than a refactor.
-*
-* This module is host-side (it names files and env vars). The browser half
-* takes the same ids and routes from the Node-free `status-paths.ts`, which
-* stays the single source shared by both halves.
-*
-* @module dsh-workbuddy-connect/variants
-*/
-/** CN WorkBuddy first: the existing provider keeps its id, paths, and copy. */
-const WORKBUDDY_VARIANTS = [{
-	id: "workbuddy",
-	displayName: "WorkBuddy",
-	appName: "WorkBuddy",
-	region: "cn",
-	env: "WORKBUDDY_AUTH_FILE",
-	desktopFilename: "workbuddy-desktop.info",
-	ownFilename: ".workbuddy-auth.json",
-	probeFilename: ".workbuddy-probe.json",
-	catalogFilename: ".workbuddy-catalog.json",
-	visibilityFilename: ".workbuddy-model-visibility.json",
-	statusPath: WORKBUDDY_STATUS_PATH,
-	probePath: WORKBUDDY_PROBE_PATH
-}, {
-	id: "workbuddy-ai",
-	displayName: "WorkBuddy AI",
-	appName: "WorkBuddy AI",
-	region: "global",
-	env: "WORKBUDDY_AI_AUTH_FILE",
-	desktopFilename: "workbuddy-desktop-ai.info",
-	ownFilename: ".workbuddy-ai-auth.json",
-	probeFilename: ".workbuddy-ai-probe.json",
-	catalogFilename: ".workbuddy-ai-catalog.json",
-	visibilityFilename: ".workbuddy-ai-model-visibility.json",
-	statusPath: WORKBUDDY_AI_STATUS_PATH,
-	probePath: WORKBUDDY_AI_PROBE_PATH
-}];
-/** The CN variant; the plugin's long-standing default and compatibility anchor. */
-const CN_VARIANT = WORKBUDDY_VARIANTS[0];
-/** The international variant. */
-const AI_VARIANT = WORKBUDDY_VARIANTS[1];
-/** Look up a variant by provider id. */
-function variantFor(id) {
-	return WORKBUDDY_VARIANTS.find((variant) => variant.id === id);
-}
-//#endregion
-export { modelWithCurrentPromotion as A, FALLBACK_CN_APP_VERSION as B, desktopAuthCandidatesFor as C, electronDiscoveryFor as D, WorkBuddyAtRestKeyProvider as E, regionOf as F, validCliVersion as G, fallbackChatIdentity as H, PROBE_EFFORT_CANDIDATES as I, installedAppVersion as J, WORKBUDDY_APP_VERSION_FILENAME as K, probeModel as L, parseModelCatalog as M, prepareChatBody as N, WorkBuddyUpstreamClient as O, prepareInternationalChatBody as P, randomSentinel as R, defaultDesktopAuthPath as S, workbuddyOwnAuthPath as T, readCliVersion as U, chatUserAgent as V, resolveChatIdentity as W, resolveAppVersion as X, readBundleVersion as Y, validAppVersion as Z, WorkBuddyCatalog as _, WORKBUDDY_HOST_HEARTBEAT_FILENAME as a, WorkBuddyCredentialStore as b, processStartTimeMs as c, writeHostHeartbeat as d, WORKBUDDY_CONNECT_VERSION as f, FALLBACK_WORKBUDDY_MODELS as g, FALLBACK_WORKBUDDY_AI_MODELS as h, variantFor as i, normalizeCredits as j, classifyUpstreamError as k, readHostHeartbeat as l, WORKBUDDY_STATUS_PATH as m, CN_VARIANT as n, clearHostHeartbeat as o, WORKBUDDY_PROBE_PATH as p, appUserAgent as q, WORKBUDDY_VARIANTS as r, isHeartbeatProcessAlive as s, AI_VARIANT as t, workbuddyHostHeartbeatPath as u, WORKBUDDY_AUTH_FILENAME as v, parseWorkBuddyAuth as w, defaultDesktopAuthCandidates as x, WORKBUDDY_AUTH_FILE_ENV as y, CN_APP_VERSION_FILENAME as z };
+export { extractDisplayErrorMessage as A, CN_APP_VERSION_FILENAME as B, WORKBUDDY_VARIANTS as C, WORKBUDDY_UPDATE_PATH as D, WORKBUDDY_STATUS_PATH as E, prepareInternationalChatBody as F, resolveChatIdentity as G, chatUserAgent as H, regionOf as I, appUserAgent as J, validCliVersion as K, PROBE_EFFORT_CANDIDATES as L, normalizeCredits as M, parseModelCatalog as N, WorkBuddyUpstreamClient as O, prepareChatBody as P, validAppVersion as Q, probeModel as R, CN_VARIANT as S, WORKBUDDY_PROBE_PATH as T, fallbackChatIdentity as U, FALLBACK_CN_APP_VERSION as V, readCliVersion as W, readBundleVersion as X, installedAppVersion as Y, resolveAppVersion as Z, desktopAuthCandidatesFor as _, readHostHeartbeat as a, atRestKeyProviderFor as b, WORKBUDDY_CONNECT_VERSION as c, WorkBuddyCatalog as d, WORKBUDDY_AUTH_FILENAME as f, defaultDesktopAuthPath as g, defaultDesktopAuthCandidates as h, processStartTimeMs as i, modelWithCurrentPromotion as j, classifyUpstreamError as k, FALLBACK_WORKBUDDY_AI_MODELS as l, WorkBuddyCredentialStore as m, clearHostHeartbeat as n, workbuddyHostHeartbeatPath as o, WORKBUDDY_AUTH_FILE_ENV as p, WORKBUDDY_APP_VERSION_FILENAME as q, isHeartbeatProcessAlive as r, writeHostHeartbeat as s, WORKBUDDY_HOST_HEARTBEAT_FILENAME as t, FALLBACK_WORKBUDDY_MODELS as u, parseWorkBuddyAuth as v, variantFor as w, AI_VARIANT as x, workbuddyOwnAuthPath as y, randomSentinel as z };