dsh-workbuddy-connect 0.7.2 → 0.7.3-rc.1

package/lib/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as WORKBUDDY_VARIANTS, O as WorkBuddyUpstreamClient, Q as resolveAppVersion, S as CN_VARIANT, a as readHostHeartbeat, b as atRestKeyProviderFor, c as WORKBUDDY_CONNECT_VERSION, l as FALLBACK_WORKBUDDY_AI_MODELS, m as WorkBuddyCredentialStore, o as workbuddyHostHeartbeatPath, r as isHeartbeatProcessAlive, u as FALLBACK_WORKBUDDY_MODELS, w as variantFor } from "./host-heartbeat-DJb8l_4O.js";
+import { C as WORKBUDDY_VARIANTS, O as WorkBuddyUpstreamClient, Q as resolveAppVersion, S as CN_VARIANT, a as readHostHeartbeat, b as atRestKeyProviderFor, c as WORKBUDDY_CONNECT_VERSION, l as FALLBACK_WORKBUDDY_AI_MODELS, m as WorkBuddyCredentialStore, o as workbuddyHostHeartbeatPath, r as isHeartbeatProcessAlive, u as FALLBACK_WORKBUDDY_MODELS, w as variantFor } from "./host-heartbeat-6rsz16S-.js";
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 //#region src/bin.ts

package/lib/client.js

@@ -2772,7 +2772,7 @@ window.__ModuleLoader__.load({
 		};
 		//#endregion
 		//#region src/version.ts
-		const WORKBUDDY_CONNECT_VERSION = "0.7.2";
+		const WORKBUDDY_CONNECT_VERSION = "0.7.3-rc.1";
 		//#endregion
 		//#region src/client/WorkBuddyConfigPage.tsx
 		/**

package/lib/{host-heartbeat-DJb8l_4O.js → host-heartbeat-6rsz16S-.js}

@@ -2031,16 +2031,45 @@ const WINDOWS_ELECTRON_VERSION_PATTERN = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$
 * - **Output is JSON.** PowerShell does the escaping, so paths containing
 *   spaces, commas, or quotes no longer depend on column positions, and only
 *   the two values this plugin reads are collected.
+* - **The invocation wraps this script in a call-operator script block.**
+*   Windows PowerShell 5.1 joins every argument after `-Command` into one
+*   command string and parses that string as code, so a script whose text
+*   merely starts with `param` never receives the trailing `-Root` tokens —
+*   they land inside the script text, `$Root` stays empty, and every
+*   fallback query fails as exit 2/3 (#105/#106/#107). See
+*   {@link WINDOWS_POWERSHELL_QUERY_COMMAND}.
 *
 * The root is passed as a `-Root` argument, never interpolated into the
-* command text.
+* command text, and it must pass {@link WINDOWS_REGISTRY_ROOT_PATTERN}
+* before the process starts — `-Command` arguments are re-parsed as code, so
+* only provably inert path characters may ride along.
 */
 const WINDOWS_REGISTRY_RELATIVE_POWERSHELL = "System32\\WindowsPowerShell\\v1.0\\powershell.exe";
 /** Exit code meaning the root key does not exist (a normal, expected outcome). */
 const WINDOWS_POWERSHELL_ROOT_ABSENT = 2;
 /** Exit code meaning the root exists but a part of it could not be read. */
 const WINDOWS_POWERSHELL_ROOT_UNREADABLE = 3;
-const WINDOWS_POWERSHELL_QUERY_SCRIPT = [
+/**
+* The `-Command` value actually handed to `powershell.exe`: the query script
+* wrapped in a call-operator script block.
+*
+* Windows PowerShell 5.1 joins every argument that follows `-Command` into
+* one command string and runs that string as code. A bare `param(...)`
+* script therefore never binds the trailing `-Root <path>` tokens — they end
+* up inside the script text, `$Root` is empty, and the query ends as exit
+* 2/3: discovery incomplete, the app binary is never located, and at-rest
+* key resolution fails as a silent `signed-out` (#105/#106/#107, three
+* independent Windows reports on 0.7.2). The call operator makes the binding
+* explicit: the joined command becomes `& { …script… } -Root <path>`, and
+* `&` applies the named argument to the script block's `param` block — the
+* form #106 verified on a real 5.1 machine.
+*
+* Exported for the Windows-only integration spec, which replays this exact
+* text against a real `powershell.exe` 5.1 and derives the pre-fix 0.7.2
+* argv from it by removing the wrapper. `src/index.ts` does not re-export
+* it, so it is not part of the package's public API.
+*/
+const WINDOWS_POWERSHELL_QUERY_COMMAND = `& { ${[
 	"param([string]$Root)",
 	"[Console]::OutputEncoding=[Text.Encoding]::UTF8;",
 	"$ErrorActionPreference=\"Stop\";",
@@ -2054,9 +2083,53 @@ const WINDOWS_POWERSHELL_QUERY_SCRIPT = [
 	"  if ($null -ne $d -or $null -ne $i) { $out += [pscustomobject]@{ displayName=[string]$d; displayIcon=[string]$i } }",
 	"};",
 	"ConvertTo-Json -InputObject @($out) -Compress -Depth 3"
-].join(" ");
-/** One discovery subprocess's own limits; see {@link WorkBuddyAtRestKeyProviderOptions}. */
+].join(" ")} }`;
+/**
+* The only roots this tool will name on a `-Command` command line.
+*
+* `powershell.exe` re-parses everything after `-Command` as code, so a root
+* is handed over only when it is provably inert in that position: a hive
+* this file actually queries, then subkey components of plain path
+* characters — no spaces, quotes, subexpressions, or any other byte that
+* could change what the joined command does. Production roots are the fixed
+* {@link WINDOWS_REGISTRY_ROOTS}; anything else is refused before any
+* process starts, as "we could not check", never as executable text.
+*/
+const WINDOWS_REGISTRY_ROOT_PATTERN = /^HK(?:LM|CU)(?:\\[A-Za-z0-9._-]+)+$/u;
+/**
+* One discovery subprocess's own limits; see {@link WorkBuddyAtRestKeyProviderOptions}.
+*
+* Governs the macOS discovery tools (Spotlight, plutil). The Windows registry
+* readers have their own, larger limit — {@link WINDOWS_REGISTRY_STEP_TIMEOUT_MS}.
+*/
 const WORKBUDDY_DISCOVERY_STEP_TIMEOUT_MS = 3e3;
+/**
+* One Windows registry subprocess's own limit: `reg.exe` or the PowerShell
+* 5.1 fallback.
+*
+* Why larger than the macOS step limit: `reg query <root> /s` over a
+* software-dense uninstall tree takes seconds, not milliseconds. On GitHub's
+* windows-2022 and windows-2025 runner images (hundreds of installed
+* programs) the plain HKLM uninstall read exceeds 3s while HKCU finishes in
+* ~20ms; on a real user machine the PowerShell fallback itself ran
+* 135–270ms (#106). A 3s cap therefore cuts the HKLM read in half on
+* ordinary developer machines and reports the product absent when it is
+* merely slow to enumerate.
+*
+* Why this is safe to raise without touching the budget: the whole-discovery
+* budget ({@link WORKBUDDY_DISCOVERY_BUDGET_MS}, 10s) still bounds what a
+* user waits for — during a real discovery the budget abort remains the
+* effective ceiling, so this limit only decides whether a root that would
+* have finished inside the budget gets to finish, instead of being cut at 3s
+* mid-enumeration. For direct `queryUninstallRoot` callers (no outer
+* budget), this limit is the cap.
+*
+* Invariant, asserted by tests: never above the discovery budget. The
+* remaining known bound — a machine where every root is both slow *and*
+* non-ASCII, needing more than the budget in total — still ends as a safe
+* "we could not check" rather than a wrong answer.
+*/
+const WINDOWS_REGISTRY_STEP_TIMEOUT_MS = 1e4;
 const MDFIND_MAX_OUTPUT_BYTES = 1048576;
 const PLUTIL_MAX_OUTPUT_BYTES = 65536;
 /**
@@ -2174,7 +2247,7 @@ function workBuddyWindowsDiscoveryTools() {
 			"/s"
 		], {
 			maxBuffer: WINDOWS_REGISTRY_OUTPUT_MAX_BYTES,
-			timeout: WORKBUDDY_DISCOVERY_STEP_TIMEOUT_MS,
+			timeout: WINDOWS_REGISTRY_STEP_TIMEOUT_MS,
 			windowsHide: true,
 			encoding: "buffer"
 		}, (error, stdout, stderr) => {
@@ -2211,6 +2284,10 @@ function workBuddyWindowsDiscoveryTools() {
 	* three roots being absent is normal and must not fail the search.
 	*/
 	const runFallback = (root, signal) => new Promise((resolve, reject) => {
+		if (!WINDOWS_REGISTRY_ROOT_PATTERN.test(root)) {
+			reject(new DiscoveryIncompleteError("the registry root was not a plain HKLM/HKCU path this tool may query"));
+			return;
+		}
 		if (powershellPath === void 0) {
 			reject(new DiscoveryIncompleteError("SystemRoot is not configured"));
 			return;
@@ -2224,12 +2301,12 @@ function workBuddyWindowsDiscoveryTools() {
 			"-NoProfile",
 			"-NonInteractive",
 			"-Command",
-			WINDOWS_POWERSHELL_QUERY_SCRIPT,
+			WINDOWS_POWERSHELL_QUERY_COMMAND,
 			"-Root",
 			root
 		], {
 			maxBuffer: WINDOWS_REGISTRY_OUTPUT_MAX_BYTES,
-			timeout: WORKBUDDY_DISCOVERY_STEP_TIMEOUT_MS,
+			timeout: WINDOWS_REGISTRY_STEP_TIMEOUT_MS,
 			windowsHide: true,
 			encoding: "utf8"
 		}, (error, stdout) => {
@@ -3938,7 +4015,7 @@ var WorkBuddyCatalog = class {
 };
 //#endregion
 //#region src/version.ts
-const WORKBUDDY_CONNECT_VERSION = "0.7.2";
+const WORKBUDDY_CONNECT_VERSION = "0.7.3-rc.1";
 //#endregion
 //#region src/host-heartbeat.ts
 /**

package/lib/index.js

@@ -1,4 +1,4 @@
-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 { $ 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-6rsz16S-.js";
 import z from "@deepseek-ai/schemastery";
 import { resolveImageAttachmentAccess, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
 import { dirname, join, resolve } from "node:path";

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.2",
+  "version": "0.7.3-rc.1",
   "author": "corrinehu",
   "keywords": [
     "dsh-plugin",