dsh-workbuddy-connect 0.5.3 → 0.5.4

package/lib/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { E as WorkBuddyUpstreamClient, J as resolveAppVersion, b as WorkBuddyCredentialStore, f as WORKBUDDY_CONNECT_VERSION, g as FALLBACK_WORKBUDDY_MODELS, h as FALLBACK_WORKBUDDY_AI_MODELS, i as variantFor, l as readHostHeartbeat, n as CN_VARIANT, r as WORKBUDDY_VARIANTS, s as isHeartbeatProcessAlive, u as workbuddyHostHeartbeatPath } from "./variants-CdmzOPIT.js";
+import { E as WorkBuddyUpstreamClient, J as resolveAppVersion, b as WorkBuddyCredentialStore, f as WORKBUDDY_CONNECT_VERSION, g as FALLBACK_WORKBUDDY_MODELS, h as FALLBACK_WORKBUDDY_AI_MODELS, i as variantFor, l as readHostHeartbeat, n as CN_VARIANT, r as WORKBUDDY_VARIANTS, s as isHeartbeatProcessAlive, u as workbuddyHostHeartbeatPath } from "./variants-XUStsapF.js";
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 //#region src/bin.ts

package/lib/index.d.ts

@@ -801,12 +801,12 @@ interface WorkBuddyProbeRecord {
    *
    * An effort set is a fact about one account's entitlement as much as about
    * the model: the same model id can accept different levels under a different
-   * subscription. Without this a record outlived the account that produced it,
-   * so signing out and in as someone else inherited the previous account's
-   * detected levels. Records written before this field existed carry no
-   * identity and are therefore never reused.
+   * subscription. Records are stored under this identity and only ever served
+   * back to it, so one account never inherits another's detected levels — and
+   * because the store nests by this identity, switching back finds this
+   * account's own records intact rather than re-probing from scratch.
    */
-  account?: string;
+  account: string;
 }
 /**
  * Plugin-owned probe record path inside the Harness home.
@@ -839,8 +839,9 @@ interface WorkBuddyProbeStoreOptions {
   now?: () => number;
 }
 /**
- * The plugin's probe records: read once, written atomically, never trusted
- * across a fingerprint change or past the TTL.
+ * The plugin's probe records: read once, written atomically, keyed by the
+ * account that produced each observation, and never trusted across a
+ * fingerprint change or past the TTL.
  */
 declare class WorkBuddyProbeStore {
   private readonly path;
@@ -853,24 +854,25 @@ declare class WorkBuddyProbeStore {
   filePath(): string;
   private load;
   /**
-   * The usable record for a model, or `undefined` when there is none, it is
-   * expired, it was taken against a different catalog row, or it belongs to a
-   * different account.
+   * The usable record for one account and model, or `undefined` when there is
+   * none, it is expired, it was taken against a different catalog row, or it
+   * belongs to a different account.
    *
    * @param account - the account in effect, as `uid:enterpriseId`. Records are
    *   only returned for the account that produced them.
    */
   get(modelId: string, fingerprint: string, account: string): WorkBuddyProbeRecord | undefined;
   /**
-   * Store one observation. Only a decisive answer (`validating` /
-   * `non-validating`) replaces an existing decisive record: a transient
-   * `unknown` must not erase knowledge the user already paid for.
+   * Store one observation under the account stamped on it. Only a decisive
+   * answer (`validating` / `non-validating`) replaces an existing decisive
+   * record *of the same account*: a transient `unknown` must not erase
+   * knowledge the user already paid for.
    */
   set(modelId: string, record: WorkBuddyProbeRecord): void;
-  /** Drop every record; used by the card's explicit "clear" action. */
+  /** Drop every record of every account; used by the card's explicit "clear" action. */
   clear(): void;
-  /** Every record currently held, for status display. */
-  all(): Readonly<Record<string, WorkBuddyProbeRecord>>;
+  /** Every record currently held, grouped by account, for status display. */
+  all(): Readonly<Record<string, Readonly<Record<string, WorkBuddyProbeRecord>>>>;
   /** Build a record stamped with this store's clock, version, and account. */
   record(fingerprint: string, validation: WorkBuddyProbeValidation, efforts: readonly WorkBuddyEffort[], account: string): WorkBuddyProbeRecord;
   /**
@@ -1032,8 +1034,8 @@ interface WorkBuddyProbeServiceOptions {
    * Records are read and written against this identity, and it is re-checked
    * after the sweep finishes: an observation produced under account A must not
    * be stored once account B is in effect, however long the probe took. The
-   * caller's `clear()` on an account switch is not sufficient on its own,
-   * because an in-flight probe completes *after* that clear.
+   * store's per-account keying alone cannot catch that, because an in-flight
+   * probe completes *after* the switch has already happened.
    */
   account: () => string | undefined;
   sentinel?: SentinelFactory;

package/lib/index.js

@@ -1,4 +1,4 @@
-import { A as parseModelCatalog, B as fallbackChatIdentity, C as desktopAuthCandidatesFor, D as classifyUpstreamError, E as WorkBuddyUpstreamClient, F as probeModel, G as appUserAgent, H as resolveChatIdentity, I as randomSentinel, J as resolveAppVersion, K as installedAppVersion, L as CN_APP_VERSION_FILENAME, M as prepareInternationalChatBody, N as regionOf, O as modelWithCurrentPromotion, P as PROBE_EFFORT_CANDIDATES, R as FALLBACK_CN_APP_VERSION, S as defaultDesktopAuthPath, T as workbuddyOwnAuthPath, U as validCliVersion, V as readCliVersion, W as WORKBUDDY_APP_VERSION_FILENAME, Y as validAppVersion, _ as WorkBuddyCatalog, a as WORKBUDDY_HOST_HEARTBEAT_FILENAME, b as WorkBuddyCredentialStore, c as processStartTimeMs, d as writeHostHeartbeat, f as WORKBUDDY_CONNECT_VERSION, g as FALLBACK_WORKBUDDY_MODELS, h as FALLBACK_WORKBUDDY_AI_MODELS, i as variantFor, j as prepareChatBody, k as normalizeCredits, l as readHostHeartbeat, n as CN_VARIANT, o as clearHostHeartbeat, q as readBundleVersion, r as WORKBUDDY_VARIANTS, s as isHeartbeatProcessAlive, t as AI_VARIANT, u as workbuddyHostHeartbeatPath, v as WORKBUDDY_AUTH_FILENAME, w as parseWorkBuddyAuth, x as defaultDesktopAuthCandidates, y as WORKBUDDY_AUTH_FILE_ENV, z as chatUserAgent } from "./variants-CdmzOPIT.js";
+import { A as parseModelCatalog, B as fallbackChatIdentity, C as desktopAuthCandidatesFor, D as classifyUpstreamError, E as WorkBuddyUpstreamClient, F as probeModel, G as appUserAgent, H as resolveChatIdentity, I as randomSentinel, J as resolveAppVersion, K as installedAppVersion, L as CN_APP_VERSION_FILENAME, M as prepareInternationalChatBody, N as regionOf, O as modelWithCurrentPromotion, P as PROBE_EFFORT_CANDIDATES, R as FALLBACK_CN_APP_VERSION, S as defaultDesktopAuthPath, T as workbuddyOwnAuthPath, U as validCliVersion, V as readCliVersion, W as WORKBUDDY_APP_VERSION_FILENAME, Y as validAppVersion, _ as WorkBuddyCatalog, a as WORKBUDDY_HOST_HEARTBEAT_FILENAME, b as WorkBuddyCredentialStore, c as processStartTimeMs, d as writeHostHeartbeat, f as WORKBUDDY_CONNECT_VERSION, g as FALLBACK_WORKBUDDY_MODELS, h as FALLBACK_WORKBUDDY_AI_MODELS, i as variantFor, j as prepareChatBody, k as normalizeCredits, l as readHostHeartbeat, n as CN_VARIANT, o as clearHostHeartbeat, q as readBundleVersion, r as WORKBUDDY_VARIANTS, s as isHeartbeatProcessAlive, t as AI_VARIANT, u as workbuddyHostHeartbeatPath, v as WORKBUDDY_AUTH_FILENAME, w as parseWorkBuddyAuth, x as defaultDesktopAuthCandidates, y as WORKBUDDY_AUTH_FILE_ENV, z as chatUserAgent } from "./variants-XUStsapF.js";
 import z from "@deepseek-ai/schemastery";
 import { dirname, join, resolve } from "node:path";
 import { resolveDshHome } from "@deepseek-ai/dsh-home-paths";
@@ -656,8 +656,17 @@ function createWorkBuddyShim(options) {
 */
 /** Basename of the probe record inside the Harness home. */
 const WORKBUDDY_PROBE_FILENAME = ".workbuddy-probe.json";
-/** On-disk format this reader accepts; other versions are discarded. */
-const PROBE_FORMAT_VERSION = 1;
+/**
+* On-disk format this reader accepts; other versions are discarded.
+*
+* Version 2 nested the records under the account that produced them
+* (`records[account][modelId]`), so two accounts no longer overwrite each
+* other's observations for the same model. Version 1 files (flat, one record
+* per model) are deliberately not migrated: they read as empty and the
+* affected models are re-probed on demand, which keeps the reader free of
+* half-understood compatibility paths.
+*/
+const PROBE_FORMAT_VERSION = 2;
 /**
 * How long an observation stays usable. Conservative on purpose: the plan's
 * whole argument is that upstream metadata moves fast, so a result that has
@@ -718,13 +727,15 @@ function isRecord(value) {
 	if (typeof wrapped["fingerprint"] !== "string") return false;
 	if (typeof wrapped["probedAtMs"] !== "number" || !Number.isFinite(wrapped["probedAtMs"])) return false;
 	if (typeof wrapped["pluginVersion"] !== "string") return false;
+	if (typeof wrapped["account"] !== "string" || wrapped["account"] === "") return false;
 	const efforts = wrapped["efforts"];
 	if (!Array.isArray(efforts) || efforts.some((effort) => typeof effort !== "string")) return false;
 	return true;
 }
 /**
-* The plugin's probe records: read once, written atomically, never trusted
-* across a fingerprint change or past the TTL.
+* The plugin's probe records: read once, written atomically, keyed by the
+* account that produced each observation, and never trusted across a
+* fingerprint change or past the TTL.
 */
 var WorkBuddyProbeStore = class {
 	path;
@@ -750,21 +761,26 @@ var WorkBuddyProbeStore = class {
 		if (this.records === void 0) {
 			const document = readDocument(this.path);
 			const records = {};
-			for (const [id, record] of Object.entries(document?.records ?? {})) if (isRecord(record)) records[id] = record;
+			for (const [account, bucket] of Object.entries(document?.records ?? {})) {
+				if (typeof bucket !== "object" || bucket === null || Array.isArray(bucket)) continue;
+				const parsed = {};
+				for (const [modelId, record] of Object.entries(bucket)) if (isRecord(record)) parsed[modelId] = record;
+				records[account] = parsed;
+			}
 			this.records = records;
 		}
 		return this.records;
 	}
 	/**
-	* The usable record for a model, or `undefined` when there is none, it is
-	* expired, it was taken against a different catalog row, or it belongs to a
-	* different account.
+	* The usable record for one account and model, or `undefined` when there is
+	* none, it is expired, it was taken against a different catalog row, or it
+	* belongs to a different account.
 	*
 	* @param account - the account in effect, as `uid:enterpriseId`. Records are
 	*   only returned for the account that produced them.
 	*/
 	get(modelId, fingerprint, account) {
-		const record = this.load()[modelId];
+		const record = this.load()[account]?.[modelId];
 		if (record === void 0) return void 0;
 		if (record.fingerprint !== fingerprint) return void 0;
 		if (record.account !== account) return void 0;
@@ -772,25 +788,28 @@ var WorkBuddyProbeStore = class {
 		return record;
 	}
 	/**
-	* Store one observation. Only a decisive answer (`validating` /
-	* `non-validating`) replaces an existing decisive record: a transient
-	* `unknown` must not erase knowledge the user already paid for.
+	* Store one observation under the account stamped on it. Only a decisive
+	* answer (`validating` / `non-validating`) replaces an existing decisive
+	* record *of the same account*: a transient `unknown` must not erase
+	* knowledge the user already paid for.
 	*/
 	set(modelId, record) {
 		const records = this.load();
-		const existing = records[modelId];
+		const bucket = records[record.account] ?? (records[record.account] = {});
+		const existing = bucket[modelId];
 		if (record.validation === "unknown" && existing !== void 0 && existing.fingerprint === record.fingerprint && existing.validation !== "unknown") return;
-		records[modelId] = record;
+		bucket[modelId] = record;
 		this.persist();
 	}
-	/** Drop every record; used by the card's explicit "clear" action. */
+	/** Drop every record of every account; used by the card's explicit "clear" action. */
 	clear() {
 		this.records = {};
 		this.persist();
 	}
-	/** Every record currently held, for status display. */
+	/** Every record currently held, grouped by account, for status display. */
 	all() {
-		return { ...this.load() };
+		const records = this.load();
+		return Object.fromEntries(Object.entries(records).map(([account, bucket]) => [account, { ...bucket }]));
 	}
 	/** Build a record stamped with this store's clock, version, and account. */
 	record(fingerprint, validation, efforts, account) {
@@ -1552,13 +1571,12 @@ function apply(ctx, config) {
 	* transition bumps {@link VariantRuntime.catalogGeneration}, which is what
 	* makes an in-flight request from before the change refuse to write back.
 	*
-	* Probe observations are dropped whenever the account actually changes —
-	* including sign-out, and including the "signed out, then in as someone else"
-	* sequence that used to look like a first sighting and let the new account
-	* inherit the old one's detected levels. They are deliberately NOT cleared on
-	* a first sign-in: no previous account's data could leak there, and clearing
-	* would delete records this very account owns (written before a restart, or
-	* seeded while all of this is running).
+	* Probe observations are kept across an account change: the store nests them
+	* per account, so the departing account's records simply stop being served
+	* (every read is account-scoped) and are found intact if that account
+	* returns. The "signed out, then in as someone else" sequence that used to
+	* look like a first sighting is still safe — a record only ever answers for
+	* the account stamped on it, so the new account inherits nothing.
 	*
 	* @param identity - the account now in effect, or `undefined` when signed out.
 	*/
@@ -1572,10 +1590,7 @@ function apply(ctx, config) {
 		runtime.catalogGeneration += 1;
 		runtime.inflightFetch?.controller.abort();
 		runtime.inflightFetch = void 0;
-		if (hadCredential && known !== identity) {
-			runtime.probeStore.clear();
-			runtime.invalidate();
-		}
+		if (hadCredential && known !== identity) runtime.invalidate();
 		if (identity === void 0) {
 			if (known !== void 0) runtime.savedCatalogs.delete(known);
 			runtime.catalog.set(runtime.fallback);

package/lib/{variants-CdmzOPIT.js → variants-XUStsapF.js}

@@ -2479,7 +2479,7 @@ 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.5.3";
+const WORKBUDDY_CONNECT_VERSION = "0.5.4";
 //#endregion
 //#region src/host-heartbeat.ts
 /**

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