dsh-workbuddy-connect 0.2.1 → 0.2.2

package/lib/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { _ as WorkBuddyCredentialStore, a as readHostHeartbeat, b as workbuddyOwnAuthPath, c as WORKBUDDY_CONNECT_VERSION, l as WorkBuddyUpstreamClient, o as workbuddyHostHeartbeatPath, p as FALLBACK_WORKBUDDY_MODELS, r as isHeartbeatProcessAlive } from "./host-heartbeat-DehQgrb9.js";
+import { _ as WorkBuddyCredentialStore, a as readHostHeartbeat, c as WORKBUDDY_CONNECT_VERSION, l as WorkBuddyUpstreamClient, o as workbuddyHostHeartbeatPath, p as FALLBACK_WORKBUDDY_MODELS, r as isHeartbeatProcessAlive, x as workbuddyOwnAuthPath } from "./host-heartbeat-CYxNM1p2.js";
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 //#region src/bin.ts

package/lib/{host-heartbeat-DehQgrb9.js → host-heartbeat-CYxNM1p2.js}

@@ -24,12 +24,22 @@ const OWN_FORMAT_VERSION = 1;
 function workbuddyOwnAuthPath() {
 	return join(resolveDshHome(), WORKBUDDY_AUTH_FILENAME);
 }
-/** Platform default for the WorkBuddy desktop app's auth file. */
-function defaultDesktopAuthPath() {
+/**
+* Platform-default candidates for the WorkBuddy desktop app's auth file, in
+* probe order. Windows probes both AppData roots: current builds write under
+* `%LOCALAPPDATA%` (Local), older ones under `%APPDATA%` (Roaming). macOS and
+* Linux have a single well-known location.
+*/
+function defaultDesktopAuthCandidates() {
 	const home = homedir();
-	if (process.platform === "darwin") return join(home, "Library", "Application Support", "CodeBuddyExtension", "Data", "Public", "auth", "workbuddy-desktop.info");
-	if (process.platform === "win32") return join(home, "AppData", "Roaming", "CodeBuddyExtension", "Data", "Public", "auth", "workbuddy-desktop.info");
-	if (process.platform === "linux") return join(home, ".config", "CodeBuddyExtension", "Data", "Public", "auth", "workbuddy-desktop.info");
+	if (process.platform === "darwin") return [join(home, "Library", "Application Support", "CodeBuddyExtension", "Data", "Public", "auth", "workbuddy-desktop.info")];
+	if (process.platform === "win32") return [join(home, "AppData", "Local", "CodeBuddyExtension", "Data", "Public", "auth", "workbuddy-desktop.info"), join(home, "AppData", "Roaming", "CodeBuddyExtension", "Data", "Public", "auth", "workbuddy-desktop.info")];
+	if (process.platform === "linux") return [join(home, ".config", "CodeBuddyExtension", "Data", "Public", "auth", "workbuddy-desktop.info")];
+	return [];
+}
+/** First platform-default candidate; see {@link defaultDesktopAuthCandidates}. */
+function defaultDesktopAuthPath() {
+	return defaultDesktopAuthCandidates()[0];
 }
 /** Normalize an expiry that may arrive in seconds or milliseconds. */
 function expiryToMs(value) {
@@ -133,11 +143,17 @@ var WorkBuddyCredentialStore = class {
 	}
 	/**
 	* Configuration precedence for the desktop file: the plugin's configured
-	* path, then the environment variable, then the platform default.
+	* path, then the environment variable, then the platform defaults. An
+	* explicit path is used verbatim; the defaults are a probe order.
 	*/
-	resolveDesktopPath() {
+	resolveDesktopCandidates() {
 		const fromEnv = process.env[WORKBUDDY_AUTH_FILE_ENV];
-		return this.desktopPathOverride ?? (fromEnv !== void 0 && fromEnv.trim() !== "" ? fromEnv : void 0) ?? defaultDesktopAuthPath();
+		const explicit = this.desktopPathOverride ?? (fromEnv !== void 0 && fromEnv.trim() !== "" ? fromEnv : void 0);
+		if (explicit !== void 0) return [explicit];
+		return defaultDesktopAuthCandidates();
+	}
+	resolveDesktopPath() {
+		return this.resolveDesktopCandidates()[0];
 	}
 	/**
 	* Repoint the desktop file; a settings change applies on the next read.
@@ -167,7 +183,8 @@ var WorkBuddyCredentialStore = class {
 	async resolve() {
 		const credential = await this.current();
 		if (credential === void 0) {
-			const desktop = this.resolveDesktopPath() ?? "(no desktop path on this platform)";
+			const candidates = this.resolveDesktopCandidates();
+			const desktop = candidates.length > 0 ? candidates.join(" or ") : "(no desktop path on this platform)";
 			throw new Error(`workbuddy: no signed-in WorkBuddy account found; sign in once in the WorkBuddy desktop app (expected ${desktop} or WORKBUDDY_AUTH_FILE), or refresh an existing session`);
 		}
 		if (!this.needsRefresh(credential)) return credential;
@@ -232,14 +249,17 @@ var WorkBuddyCredentialStore = class {
 			});
 		});
 	}
+	/**
+	* Read the first desktop candidate that exists. Only an absent file
+	* (ENOENT) falls through to the next candidate; a file that is present
+	* but unparsable is authoritative for its slot, so a stale older-version
+	* file never silently wins over a broken newer one.
+	*/
 	async readDesktop() {
-		const desktopPath = this.resolveDesktopPath();
-		if (desktopPath === void 0) return void 0;
-		try {
+		for (const desktopPath of this.resolveDesktopCandidates()) try {
 			return parseWorkBuddyAuth(await readFile(desktopPath, "utf8"));
 		} catch (error) {
-			if (isENOENT(error)) return void 0;
-			throw error;
+			if (!isENOENT(error)) throw error;
 		}
 	}
 	async readOwn() {
@@ -250,15 +270,12 @@ var WorkBuddyCredentialStore = class {
 			return;
 		}
 	}
-	/** Whether the desktop file exists and is a regular file; diagnostics only. */
+	/** Whether any desktop-file candidate exists as a regular file; diagnostics only. */
 	async desktopFilePresent() {
-		const desktopPath = this.resolveDesktopPath();
-		if (desktopPath === void 0) return false;
-		try {
-			return (await stat(desktopPath)).isFile();
-		} catch {
-			return false;
-		}
+		for (const desktopPath of this.resolveDesktopCandidates()) try {
+			if ((await stat(desktopPath)).isFile()) return true;
+		} catch {}
+		return false;
 	}
 };
 //#endregion
@@ -827,4 +844,4 @@ function isHeartbeatProcessAlive(heartbeat) {
 	return startAtMs <= heartbeat.registeredAt;
 }
 //#endregion
-export { WorkBuddyCredentialStore as _, readHostHeartbeat as a, workbuddyOwnAuthPath as b, WORKBUDDY_CONNECT_VERSION as c, prepareChatBody as d, regionOf as f, WORKBUDDY_AUTH_FILE_ENV as g, WORKBUDDY_AUTH_FILENAME as h, processStartTimeMs as i, WorkBuddyUpstreamClient as l, WorkBuddyCatalog as m, clearHostHeartbeat as n, workbuddyHostHeartbeatPath as o, FALLBACK_WORKBUDDY_MODELS as p, isHeartbeatProcessAlive as r, writeHostHeartbeat as s, WORKBUDDY_HOST_HEARTBEAT_FILENAME as t, classifyUpstreamError as u, defaultDesktopAuthPath as v, parseWorkBuddyAuth as y };
+export { WorkBuddyCredentialStore as _, readHostHeartbeat as a, parseWorkBuddyAuth as b, WORKBUDDY_CONNECT_VERSION as c, prepareChatBody as d, regionOf as f, WORKBUDDY_AUTH_FILE_ENV as g, WORKBUDDY_AUTH_FILENAME as h, processStartTimeMs as i, WorkBuddyUpstreamClient as l, WorkBuddyCatalog as m, clearHostHeartbeat as n, workbuddyHostHeartbeatPath as o, FALLBACK_WORKBUDDY_MODELS as p, isHeartbeatProcessAlive as r, writeHostHeartbeat as s, WORKBUDDY_HOST_HEARTBEAT_FILENAME as t, classifyUpstreamError as u, defaultDesktopAuthCandidates as v, workbuddyOwnAuthPath as x, defaultDesktopAuthPath as y };

package/lib/index.d.ts

@@ -107,7 +107,14 @@ declare const WORKBUDDY_AUTH_FILENAME = ".workbuddy-auth.json";
 declare const WORKBUDDY_AUTH_FILE_ENV = "WORKBUDDY_AUTH_FILE";
 /** Plugin-owned copy path inside the Harness home. */
 declare function workbuddyOwnAuthPath(): string;
-/** Platform default for the WorkBuddy desktop app's auth file. */
+/**
+ * Platform-default candidates for the WorkBuddy desktop app's auth file, in
+ * probe order. Windows probes both AppData roots: current builds write under
+ * `%LOCALAPPDATA%` (Local), older ones under `%APPDATA%` (Roaming). macOS and
+ * Linux have a single well-known location.
+ */
+declare function defaultDesktopAuthCandidates(): string[];
+/** First platform-default candidate; see {@link defaultDesktopAuthCandidates}. */
 declare function defaultDesktopAuthPath(): string | undefined;
 /**
  * Parse a WorkBuddy auth document in either on-disk shape: the plugin OAuth
@@ -133,8 +140,10 @@ declare class WorkBuddyCredentialStore {
   constructor(options: WorkBuddyStoreOptions);
   /**
    * Configuration precedence for the desktop file: the plugin's configured
-   * path, then the environment variable, then the platform default.
+   * path, then the environment variable, then the platform defaults. An
+   * explicit path is used verbatim; the defaults are a probe order.
    */
+  private resolveDesktopCandidates;
   private resolveDesktopPath;
   /**
    * Repoint the desktop file; a settings change applies on the next read.
@@ -158,9 +167,15 @@ declare class WorkBuddyCredentialStore {
   private needsRefresh;
   private refreshNow;
   private saveOwn;
+  /**
+   * Read the first desktop candidate that exists. Only an absent file
+   * (ENOENT) falls through to the next candidate; a file that is present
+   * but unparsable is authoritative for its slot, so a stale older-version
+   * file never silently wins over a broken newer one.
+   */
   private readDesktop;
   private readOwn;
-  /** Whether the desktop file exists and is a regular file; diagnostics only. */
+  /** Whether any desktop-file candidate exists as a regular file; diagnostics only. */
   desktopFilePresent(): Promise<boolean>;
 }
 //#endregion
@@ -329,4 +344,4 @@ declare const Config: z<Config>;
  */
 declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { Config, FALLBACK_WORKBUDDY_MODELS, type UpstreamErrorKind, WORKBUDDY_AUTH_FILENAME, WORKBUDDY_AUTH_FILE_ENV, WORKBUDDY_HOST_HEARTBEAT_FILENAME, WORKBUDDY_PROVIDER, WORKBUDDY_SETTINGS_NS, WORKBUDDY_STREAM_IDLE_TIMEOUT_MS, type WorkBuddyAdapter, type WorkBuddyAuthStatus, WorkBuddyCatalog, type WorkBuddyChatResult, type WorkBuddyCredential, WorkBuddyCredentialStore, type WorkBuddyCredits, type WorkBuddyHostHeartbeat, type WorkBuddyModelInfo, type WorkBuddyRefreshOutcome, type WorkBuddyShim, WorkBuddyUpstreamClient, type WorkBuddyUpstreamModel, apply, classifyUpstreamError, clearHostHeartbeat, createWorkBuddyAdapter, createWorkBuddyShim, defaultDesktopAuthPath, inject, isHeartbeatProcessAlive, name, parseWorkBuddyAuth, prepareChatBody, processStartTimeMs, readHostHeartbeat, regionOf, workbuddyHostHeartbeatPath, workbuddyOwnAuthPath };
+export { Config, FALLBACK_WORKBUDDY_MODELS, type UpstreamErrorKind, WORKBUDDY_AUTH_FILENAME, WORKBUDDY_AUTH_FILE_ENV, WORKBUDDY_HOST_HEARTBEAT_FILENAME, WORKBUDDY_PROVIDER, WORKBUDDY_SETTINGS_NS, WORKBUDDY_STREAM_IDLE_TIMEOUT_MS, type WorkBuddyAdapter, type WorkBuddyAuthStatus, WorkBuddyCatalog, type WorkBuddyChatResult, type WorkBuddyCredential, WorkBuddyCredentialStore, type WorkBuddyCredits, type WorkBuddyHostHeartbeat, type WorkBuddyModelInfo, type WorkBuddyRefreshOutcome, type WorkBuddyShim, WorkBuddyUpstreamClient, type WorkBuddyUpstreamModel, apply, classifyUpstreamError, clearHostHeartbeat, createWorkBuddyAdapter, createWorkBuddyShim, defaultDesktopAuthCandidates, defaultDesktopAuthPath, inject, isHeartbeatProcessAlive, name, parseWorkBuddyAuth, prepareChatBody, processStartTimeMs, readHostHeartbeat, regionOf, workbuddyHostHeartbeatPath, workbuddyOwnAuthPath };

package/lib/index.js

@@ -1,4 +1,4 @@
-import { _ as WorkBuddyCredentialStore, a as readHostHeartbeat, b as workbuddyOwnAuthPath, d as prepareChatBody, f as regionOf, g as WORKBUDDY_AUTH_FILE_ENV, h as WORKBUDDY_AUTH_FILENAME, i as processStartTimeMs, l as WorkBuddyUpstreamClient, m as WorkBuddyCatalog, n as clearHostHeartbeat, o as workbuddyHostHeartbeatPath, p as FALLBACK_WORKBUDDY_MODELS, r as isHeartbeatProcessAlive, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, u as classifyUpstreamError, v as defaultDesktopAuthPath, y as parseWorkBuddyAuth } from "./host-heartbeat-DehQgrb9.js";
+import { _ as WorkBuddyCredentialStore, a as readHostHeartbeat, b as parseWorkBuddyAuth, d as prepareChatBody, f as regionOf, g as WORKBUDDY_AUTH_FILE_ENV, h as WORKBUDDY_AUTH_FILENAME, i as processStartTimeMs, l as WorkBuddyUpstreamClient, m as WorkBuddyCatalog, n as clearHostHeartbeat, o as workbuddyHostHeartbeatPath, p as FALLBACK_WORKBUDDY_MODELS, r as isHeartbeatProcessAlive, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, u as classifyUpstreamError, v as defaultDesktopAuthCandidates, x as workbuddyOwnAuthPath, y as defaultDesktopAuthPath } from "./host-heartbeat-CYxNM1p2.js";
 import z from "@deepseek-ai/schemastery";
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import { createProvider } from "@earendil-works/pi-ai";
@@ -553,4 +553,4 @@ function apply(ctx, config) {
 	});
 }
 //#endregion
-export { Config, FALLBACK_WORKBUDDY_MODELS, WORKBUDDY_AUTH_FILENAME, WORKBUDDY_AUTH_FILE_ENV, WORKBUDDY_HOST_HEARTBEAT_FILENAME, WORKBUDDY_PROVIDER, WORKBUDDY_SETTINGS_NS, WORKBUDDY_STREAM_IDLE_TIMEOUT_MS, WorkBuddyCatalog, WorkBuddyCredentialStore, WorkBuddyUpstreamClient, apply, classifyUpstreamError, clearHostHeartbeat, createWorkBuddyAdapter, createWorkBuddyShim, defaultDesktopAuthPath, inject, isHeartbeatProcessAlive, name, parseWorkBuddyAuth, prepareChatBody, processStartTimeMs, readHostHeartbeat, regionOf, workbuddyHostHeartbeatPath, workbuddyOwnAuthPath };
+export { Config, FALLBACK_WORKBUDDY_MODELS, WORKBUDDY_AUTH_FILENAME, WORKBUDDY_AUTH_FILE_ENV, WORKBUDDY_HOST_HEARTBEAT_FILENAME, WORKBUDDY_PROVIDER, WORKBUDDY_SETTINGS_NS, WORKBUDDY_STREAM_IDLE_TIMEOUT_MS, WorkBuddyCatalog, WorkBuddyCredentialStore, WorkBuddyUpstreamClient, apply, classifyUpstreamError, clearHostHeartbeat, createWorkBuddyAdapter, createWorkBuddyShim, defaultDesktopAuthCandidates, defaultDesktopAuthPath, inject, isHeartbeatProcessAlive, name, parseWorkBuddyAuth, prepareChatBody, processStartTimeMs, readHostHeartbeat, regionOf, workbuddyHostHeartbeatPath, workbuddyOwnAuthPath };

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.2.1",
+  "version": "0.2.2",
   "author": "corrinehu",
   "keywords": [
     "dsh-plugin",