dsh-workbuddy-xdpool 0.3.0 → 0.4.1

package/lib/index.js

@@ -1,4 +1,4 @@
-import { dirname, join, resolve } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
 import { readFile, readdir } from "node:fs/promises";
@@ -17,7 +17,18 @@ const CN_BILLING_BASE = "https://www.codebuddy.cn";
 /** Global base for `workbuddy.ai` logins. */
 const GLOBAL_BASE = "https://www.workbuddy.ai";
 /** Client UA the desktop CLI uses. */
+/** Client UA the desktop CLI uses — the CN gateway answers this one. */
 const CLIENT_UA = "CLI/2.63.2 CodeBuddy/2.63.2";
+/**
+* Desktop app UA. The global gateway serves its product config only to this
+* client channel: the CLI UA gets a truncated roster (or an HTTP 500), which
+* is why the international catalog must be read with the desktop spelling.
+*/
+const DESKTOP_UA = "WorkBuddy/5.5.2";
+/** CN model catalog. */
+const MODELS_CATALOG_PATH = "/v2/enterprises/personal/models";
+/** Global product config, which carries the international model roster. */
+const GLOBAL_CONFIG_PATH = "/v3/config";
 const JSON_TIMEOUT_MS = 3e4;
 const ERROR_BODY_LIMIT = 4096;
 /** Insufficient-credit markers, ASCII lowercase plus the original Chinese. */
@@ -40,20 +51,47 @@ const HARD_CREDIT_MARKERS = [
 ];
 /** Session-invalidation markers that mean "sign in again in the WorkBuddy app". */
 const SESSION_DEAD_MARKERS = ["Offline user session not found", "12153"];
+/**
+* Hosts the international product answers on, once each has been stripped of a
+* leading label. The WorkBuddy AI desktop app signs in at `workbuddy.ai` (and
+* the desktop client itself lists `workbuddy.cc` alongside it); the CodeBuddy
+* CLI signs the same international account in at `codebuddy.ai`. All are served
+* by one gateway stack, so all are `global` — missing a spelling sends those
+* tokens to the CN gateway, which rejects them at the openresty layer with an
+* HTML 401 instead of a business JSON error.
+*/
+const GLOBAL_HOSTS = [
+	"workbuddy.ai",
+	"workbuddy.cc",
+	"codebuddy.ai"
+];
+/** Region for a login domain; an empty domain means CN (matching upstream tooling). */
 function regionOf(domain) {
 	const lowered = domain.trim().toLowerCase();
-	if (lowered.endsWith(".workbuddy.ai") || lowered.endsWith(".workbuddy.cc")) return "global";
-	if (lowered === "workbuddy.ai" || lowered === "workbuddy.cc") return "global";
+	for (const host of GLOBAL_HOSTS) if (lowered === host || lowered.endsWith(`.${host}`)) return "global";
 	return "cn";
 }
+/**
+* Gateway for a global credential.
+*
+* International accounts are NOT interchangeable across brand domains: a token
+* issued at `codebuddy.ai` is rejected by the `workbuddy.ai` gateway and vice
+* versa, so the base must follow the credential's own domain rather than one
+* hardcoded host. Anything unrecognised falls back to the desktop app's gateway.
+*/
+function globalBase(credential) {
+	const lowered = credential.domain.trim().toLowerCase();
+	if (lowered === "codebuddy.ai" || lowered.endsWith(".codebuddy.ai")) return "https://www.codebuddy.ai";
+	return GLOBAL_BASE;
+}
 function chatBase(credential) {
-	return regionOf(credential.domain) === "global" ? GLOBAL_BASE : CN_CHAT_BASE;
+	return regionOf(credential.domain) === "global" ? globalBase(credential) : CN_CHAT_BASE;
 }
 function billingBase(credential) {
-	return regionOf(credential.domain) === "global" ? GLOBAL_BASE : CN_BILLING_BASE;
+	return regionOf(credential.domain) === "global" ? globalBase(credential) : CN_BILLING_BASE;
 }
 function originReferer(credential) {
-	return regionOf(credential.domain) === "global" ? GLOBAL_BASE : CN_BILLING_BASE;
+	return regionOf(credential.domain) === "global" ? globalBase(credential) : CN_BILLING_BASE;
 }
 /** Headers every upstream request shares. */
 function commonHeaders(credential) {
@@ -102,8 +140,23 @@ function billingHeaders(credential) {
 	if (credential.domain !== "") headers["X-Domain"] = credential.domain;
 	return headers;
 }
+/**
+* Gateway denials that arrive as an HTML page rather than a JSON envelope.
+*
+* openresty / APISIX reject a request before it reaches the product when the
+* credential is one the gateway no longer honours — most often a stale sign-in
+* left in the auth directory. The status alone (401) is not actionable and the
+* HTML body leaks nothing useful, so this turns it into a sentence the user can
+* act on.
+*/
+function isGatewayHtmlRejection(status, text) {
+	if (status !== 401 && status !== 403) return false;
+	const head = text.slice(0, 512).toLowerCase();
+	return head.includes("<html") || head.includes("openresty") || head.includes("apisix");
+}
 async function readEnvelope(response) {
 	const text = await response.text();
+	if (isGatewayHtmlRejection(response.status, text)) throw new Error("the WorkBuddy gateway rejected this credential (http 401). This usually means the account is using a stale sign-in the upstream no longer accepts: sign in again in the WorkBuddy desktop app, then pick the account on the plugin card. Run `dsh-workbuddy-xdpool doctor` to list every credential found.");
 	let parsed;
 	try {
 		parsed = JSON.parse(text);
@@ -162,12 +215,57 @@ function parseCreditMultiplier(value) {
 	return Number.isFinite(parsed) && parsed >= 0 ? parsed : void 0;
 }
 /** Parse the upstream's `reasoning` object; unknown shapes degrade to `{}`. */
+/**
+* The effort ladder the upstream's plural-form payloads declare across both
+* gateways (the live union of every `supportedEfforts` list seen; `minimal` has
+* never appeared). Both gateways also accept every level of it on
+* singular-form models — medium/xhigh fold into high, low/max answer with their
+* own budgets — so a singular `effort` value is a DEFAULT, never the model's
+* only level.
+*/
+const SINGULAR_EFFORT_LADDER = [
+	"low",
+	"medium",
+	"high",
+	"xhigh",
+	"max"
+];
+/**
+* True when `reasoning` arrives in the singular spelling: an `effort` string,
+* with none of the plural-form fields alongside it. Seen on CN
+* `deepseek-v4.1-flash` / `kimi-k3-1` / `glm-5.2` and global
+* `deepseek-v4.1-flash` / `kimi-k3` / `gemini-3.5-flash`.
+*/
+function isSingularEffortForm(raw) {
+	return typeof raw["effort"] === "string" && !Array.isArray(raw["supportedEfforts"]) && typeof raw["defaultEffort"] !== "string" && typeof raw["canDisableThinking"] !== "boolean";
+}
+/**
+* Fold a singular-form `effort` into the plural shape the rest of the plugin
+* already understands. Probes on both gateways show these models answer with
+* distinct `reasoning_content` across the whole ladder — and do not think at
+* all when no `reasoning_effort` is sent — so the fold widens
+* `supportedEfforts` and carries the declared value into `defaultEffort`. An
+* unrecognized `effort` passes through as the lone level.
+*/
+function singularEffortLadder(raw) {
+	const effort = typeof raw["effort"] === "string" ? raw["effort"] : void 0;
+	if (effort === void 0) return void 0;
+	return SINGULAR_EFFORT_LADDER.includes(effort) ? [...SINGULAR_EFFORT_LADDER] : [effort];
+}
+/**
+* Parse the upstream's `reasoning` object; unknown shapes degrade to
+* `undefined`. Both spellings normalize here: the plural form passes through as
+* declared, and the singular `effort` form folds via
+* {@link singularEffortLadder}.
+*/
 function parseReasoning(value) {
 	if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
 	const raw = value;
-	const supportedEfforts = Array.isArray(raw["supportedEfforts"]) ? raw["supportedEfforts"].filter((effort) => typeof effort === "string") : void 0;
-	const defaultEffort = typeof raw["defaultEffort"] === "string" ? raw["defaultEffort"] : void 0;
-	const canDisableThinking = typeof raw["canDisableThinking"] === "boolean" ? raw["canDisableThinking"] : void 0;
+	const singularForm = isSingularEffortForm(raw);
+	const effort = typeof raw["effort"] === "string" ? raw["effort"] : void 0;
+	const supportedEfforts = Array.isArray(raw["supportedEfforts"]) ? raw["supportedEfforts"].filter((entry) => typeof entry === "string") : singularEffortLadder(raw);
+	const defaultEffort = typeof raw["defaultEffort"] === "string" ? raw["defaultEffort"] : effort;
+	const canDisableThinking = typeof raw["canDisableThinking"] === "boolean" ? raw["canDisableThinking"] : singularForm ? true : void 0;
 	if (supportedEfforts === void 0 && defaultEffort === void 0 && canDisableThinking === void 0) return;
 	return {
 		...supportedEfforts === void 0 || supportedEfforts.length === 0 ? {} : { supportedEfforts },
@@ -190,6 +288,7 @@ function parseUpstreamModel(value) {
 	const creditMultiplier = parseCreditMultiplier(raw["credits"]);
 	const reasoning = parseReasoning(raw["reasoning"]);
 	const supportsToolCall = typeof raw["supportsToolCall"] === "boolean" ? raw["supportsToolCall"] : void 0;
+	const supportsImages = typeof raw["supportsImages"] === "boolean" ? raw["supportsImages"] : void 0;
 	return {
 		id,
 		name,
@@ -199,7 +298,8 @@ function parseUpstreamModel(value) {
 		...reasoning === void 0 ? {} : { reasoning },
 		...descriptionZh === void 0 ? {} : { descriptionZh },
 		...descriptionEn === void 0 ? {} : { descriptionEn },
-		...supportsToolCall === void 0 ? {} : { supportsToolCall }
+		...supportsToolCall === void 0 ? {} : { supportsToolCall },
+		...supportsImages === void 0 ? {} : { supportsImages }
 	};
 }
 var WorkBuddyUpstreamClient = class {
@@ -303,16 +403,43 @@ var WorkBuddyUpstreamClient = class {
 		if (typeof data["domain"] === "string" && data["domain"] !== "") outcome.domain = data["domain"];
 		return outcome;
 	}
-	/** GET the personal model catalog, keeping the `cli` agent's models only. */
+	/**
+	* Fetch the model catalog, keeping the `cli` agent's models only.
+	*
+	* The two gateways are read differently, because they answer differently:
+	*
+	* - **CN** serves the roster at `/v2/enterprises/personal/models` and expects
+	*   the CLI client spelling.
+	* - **Global** serves it as part of the product config at `/v3/config`, and
+	*   only to the DESKTOP client channel. Asking the global host with the CLI UA
+	*   yields a truncated roster, and the CN path answers HTTP 500 there — which
+	*   is what left the international provider on its static fallback.
+	*
+	* Both documents share the `{ models, agents }` entry shape, so the parsing
+	* below is common to the two branches.
+	*/
 	async fetchModels(credential, signal) {
-		const response = await this.fetchImpl(`${chatBase(credential)}/console/enterprises/personal/models`, {
-			headers: {
-				"Authorization": `Bearer ${credential.accessToken}`,
-				"Accept": "application/json",
-				"Origin": originReferer(credential),
-				"Referer": `${originReferer(credential)}/`,
-				"User-Agent": CLIENT_UA
-			},
+		const global = regionOf(credential.domain) === "global";
+		const url = global ? `${globalBase(credential)}${GLOBAL_CONFIG_PATH}` : `${chatBase(credential)}${MODELS_CATALOG_PATH}`;
+		const headers = global ? {
+			"Authorization": `Bearer ${credential.accessToken}`,
+			"Accept": "application/json",
+			...credential.uid === void 0 || credential.uid === "" ? {} : { "X-User-Id": credential.uid },
+			...credential.domain === "" ? {} : { "X-Domain": credential.domain },
+			"X-Product": "SaaS",
+			"X-Requested-With": "XMLHttpRequest",
+			"Connection": "close",
+			"User-Agent": DESKTOP_UA
+		} : {
+			"Authorization": `Bearer ${credential.accessToken}`,
+			"Accept": "application/json",
+			"Origin": originReferer(credential),
+			"Referer": `${originReferer(credential)}/`,
+			"User-Agent": CLIENT_UA
+		};
+		if (!global && credential.enterpriseId !== void 0 && credential.enterpriseId !== "") headers["X-Enterprise-Id"] = credential.enterpriseId;
+		const response = await this.fetchImpl(url, {
+			headers,
 			...signal === void 0 ? {} : { signal }
 		});
 		const envelope = await readEnvelope(response);
@@ -482,7 +609,6 @@ var WorkBuddyUpstreamClient = class {
 /** Live auth file name the WorkBuddy desktop app writes. */
 const WORKBUDDY_LIVE_FILENAME = "workbuddy-desktop.info";
 /** Snapshot files left behind by previous logins share this prefix. */
-const SNAPSHOT_PREFIX = "workbuddy-desktop.";
 /** Env override for the auth file or its directory. */
 const WORKBUDDY_AUTH_FILE_ENV = "WORKBUDDY_AUTH_FILE";
 function nonEmptyEnv(value) {
@@ -541,11 +667,13 @@ function parseWorkBuddyAuth(text, sourcePath) {
 	if (accessToken === "") return void 0;
 	const refreshExpiresAtMs = typeof auth["refreshExpiresAt"] === "number" ? expiryToMs(auth["refreshExpiresAt"]) : void 0;
 	if (refreshExpiresAtMs !== void 0 && refreshExpiresAtMs > 0 && refreshExpiresAtMs < Date.now()) return;
+	const lastRefreshAtMs = typeof auth["lastRefreshTime"] === "number" ? expiryToMs(auth["lastRefreshTime"]) : void 0;
 	return {
 		accessToken,
 		refreshToken: typeof auth["refreshToken"] === "string" ? auth["refreshToken"] : "",
 		expiresAtMs: typeof auth["expiresAt"] === "number" ? expiryToMs(auth["expiresAt"]) : 0,
 		...refreshExpiresAtMs === void 0 ? {} : { refreshExpiresAtMs },
+		...lastRefreshAtMs === void 0 ? {} : { lastRefreshAtMs },
 		...optionalString(identity["nickname"]) === void 0 ? {} : { nickname: optionalString(identity["nickname"]) },
 		...optionalString(identity["uin"]) === void 0 ? {} : { uin: optionalString(identity["uin"]) },
 		...optionalString(identity["uid"]) === void 0 ? {} : { uid: optionalString(identity["uid"]) },
@@ -558,6 +686,42 @@ function parseWorkBuddyAuth(text, sourcePath) {
 * Stable account id. `uin` is the billing identity the upstream keys on and
 * survives re-login; `uid` is the fallback.
 */
+/**
+* True when `path` is the desktop app's live sign-in (as opposed to a backup
+* snapshot it left behind). The live file always wins: it is the session the
+* app itself is using.
+*/
+function isLiveAuthFile(path) {
+	return basename(path) === WORKBUDDY_LIVE_FILENAME;
+}
+/**
+* Which of two credentials for the same account the pool should keep.
+*
+* Ordering, highest first:
+*
+* 1. the live file the desktop app is signed in with;
+* 2. the credential the upstream issued most recently (`lastRefreshAtMs`);
+* 3. the longer stored expiry, as a fallback for documents that carry no issue
+*    time (the plugin's own refreshed copy, older builds).
+*
+* The stored expiry alone is NOT a freshness signal: the upstream does not
+* rewrite it when it revokes a token, so a long-dead backup can claim to expire
+* later than the token that actually works. Selecting on it made every upstream
+* call return 401 while a perfectly good credential sat in the same directory.
+*/
+function compareFreshness(a, b) {
+	const aLive = isLiveAuthFile(a.sourcePath) ? 1 : 0;
+	const bLive = isLiveAuthFile(b.sourcePath) ? 1 : 0;
+	if (aLive !== bLive) return bLive - aLive;
+	const aIssued = a.lastRefreshAtMs ?? 0;
+	const bIssued = b.lastRefreshAtMs ?? 0;
+	if (aIssued !== bIssued) return bIssued - aIssued;
+	return b.expiresAtMs - a.expiresAtMs;
+}
+/** True when `candidate` should replace `incumbent` for the same account. */
+function isFresher(candidate, incumbent) {
+	return compareFreshness(candidate, incumbent) < 0;
+}
 function workbuddyAccountId(credential) {
 	const stable = credential.uin ?? credential.uid ?? credential.nickname ?? "unknown";
 	return createHash("sha256").update(`workbuddy\0${stable}`).digest("hex").slice(0, 16);
@@ -569,6 +733,17 @@ function accountLabel(credential) {
 	return discriminator === "" ? name : `${name}#${discriminator}`;
 }
 /** List the auth files in one directory: the live file plus every snapshot. */
+/**
+* Credential files in one auth directory, freshest first.
+*
+* Every `*.info` file counts, not just the timestamped `workbuddy-desktop.*`
+* snapshots: the international client signs in as `workbuddy-desktop-ai.info`
+* (a hyphen, not a dot), so a prefix test silently dropped every global
+* credential and the global provider then saw an empty pool.
+*
+* Filenames are plain strings, and the ordering here is only a first pass —
+* `isFresher` makes the real call once each file has been parsed.
+*/
 async function authFilesIn(dir) {
 	let entries;
 	try {
@@ -576,10 +751,7 @@ async function authFilesIn(dir) {
 	} catch {
 		return [];
 	}
-	const files = entries.filter((name) => {
-		if (name === "workbuddy-desktop.info") return true;
-		return name.startsWith(SNAPSHOT_PREFIX) && name.endsWith(".info");
-	});
+	const files = entries.filter((name) => name.endsWith(".info"));
 	files.sort((a, b) => a < b ? 1 : a > b ? -1 : 0);
 	return files.map((name) => join(dir, name));
 }
@@ -609,6 +781,8 @@ var WorkBuddyAccountPool = class {
 	client;
 	refreshMarginMs;
 	accounts = [];
+	distribution;
+	/** Cursor for round-robin mode; unused under priority distribution. */
 	cursor = 0;
 	lastScanAtMs = 0;
 	preferredId;
@@ -619,6 +793,7 @@ var WorkBuddyAccountPool = class {
 		this.cooldownMs = options.cooldownMs ?? 6e4;
 		this.client = options.client;
 		this.refreshMarginMs = options.refreshMarginMs ?? 3e5;
+		this.distribution = options.distribution ?? "priority";
 	}
 	/**
 	* Re-apply configuration that only affects discovery and cooldown policy,
@@ -628,6 +803,7 @@ var WorkBuddyAccountPool = class {
 	applyConfig(options) {
 		if (options.authDirs !== void 0 && options.authDirs.length > 0) this.authDirs = options.authDirs;
 		if (options.cooldownMs !== void 0 && options.cooldownMs >= 1e3) this.cooldownMs = options.cooldownMs;
+		if (options.distribution !== void 0) this.distribution = options.distribution;
 	}
 	/** Rescan the auth directories and merge newly discovered accounts. */
 	async scan() {
@@ -652,13 +828,15 @@ var WorkBuddyAccountPool = class {
 				});
 				continue;
 			}
-			if ((credential.expiresAtMs ?? 0) > (existing.credential.expiresAtMs ?? 0)) byId.set(id, {
+			if (isFresher(credential, existing.credential)) byId.set(id, {
 				...existing,
 				credential,
 				label: accountLabel(credential)
 			});
 		}
-		this.accounts = [...byId.values()];
+		const ordered = [...byId.values()];
+		ordered.sort((a, b) => compareFreshness(a.credential, b.credential));
+		this.accounts = ordered;
 		this.lastScanAtMs = Date.now();
 		return this.accounts;
 	}
@@ -685,12 +863,24 @@ var WorkBuddyAccountPool = class {
 		});
 	}
 	/**
-	* Pick the next usable account for an optional model. Scans on first use,
-	* and rescans when every known account is cooling down — a fresh desktop
-	* login is the usual way out of an exhausted pool. A preferred
-	* (user-selected) account that is healthy is tried first; otherwise the
-	* cursor round-robins so consecutive requests spread across accounts and a
-	* still-cooling preferred account is skipped.
+	* Pick the account to serve a request.
+	*
+	* Two distributions, chosen by the `distribution` setting:
+	*
+	* - **priority** (default, and what the card ships with): one account serves
+	*   every request until it is rate-limited, then the next in order takes over.
+	*   Credits drain one account at a time, and a cooling account returns to the
+	*   head of the queue the moment its window resets — it was never consumed, so
+	*   it resumes straight away.
+	* - **round-robin**: consecutive requests rotate through the pool so spend
+	*   spreads evenly across every account.
+	*
+	* In both modes an explicit user selection (`prefer`) heads the list, a
+	* cooling account is skipped for that model only, and an unrecognised setting
+	* falls back to priority.
+	*
+	* Scans on first use, and rescans when every known account is cooling down: a
+	* fresh desktop login is the usual way out of an exhausted pool.
 	*/
 	async acquire(modelId, region) {
 		if (this.accounts.length === 0) await this.scan();
@@ -700,21 +890,25 @@ var WorkBuddyAccountPool = class {
 			pool = this.available(Date.now(), modelId, region);
 		}
 		if (pool.length === 0) return void 0;
-		let start = this.cursor % pool.length;
 		if (this.preferredId !== void 0) {
 			const preferredIndex = pool.findIndex((account) => account.id === this.preferredId);
-			if (preferredIndex !== -1) start = preferredIndex;
-		}
-		for (let step = 0; step < pool.length; step += 1) {
-			const account = pool[(start + step) % pool.length];
-			if (account === void 0) continue;
-			await this.ensureFresh(account);
-			this.cursor = (start + step + 1) % pool.length;
-			return account;
+			if (preferredIndex > 0) {
+				const [preferred] = pool.splice(preferredIndex, 1);
+				if (preferred !== void 0) pool = [preferred, ...pool];
+			}
 		}
-		return pool[0];
+		const index = this.distribution === "round-robin" ? this.cursor % pool.length : 0;
+		const account = pool[index];
+		if (account === void 0) return void 0;
+		if (this.distribution === "round-robin") this.cursor = (index + 1) % pool.length;
+		await this.ensureFresh(account);
+		return account;
 	}
 	/** Pin the account the plugin card should prefer; tokens stay out of settings. */
+	/** How the pool currently spreads requests. Shown on the card. */
+	currentDistribution() {
+		return this.distribution;
+	}
 	prefer(accountId) {
 		this.preferredId = accountId;
 	}
@@ -907,7 +1101,7 @@ var WorkBuddyCatalog = class {
 		const budgets = this.selection.contextBudgets;
 		return this.models.filter((model) => allow === void 0 || allow.has(model.id)).map((model) => {
 			const next = { ...model };
-			if (imageSet !== void 0) next.supportsImages = imageSet.has(model.id);
+			if (imageSet !== void 0) next.supportsImages = next.supportsImages || imageSet.has(model.id);
 			const budget = budgets?.[model.id];
 			if (budget !== void 0 && budget > 0 && budget < next.contextWindow) next.contextWindow = budget;
 			return next;
@@ -955,7 +1149,7 @@ function toModelInfo(model) {
 		name: model.name,
 		contextWindow: model.contextWindow,
 		maxOutputTokens: model.maxTokens,
-		supportsImages: model.multimodal ?? false,
+		supportsImages: model.supportsImages ?? false,
 		...model.creditMultiplier === void 0 ? {} : { multiplier: model.creditMultiplier },
 		...model.reasoning?.supportedEfforts === void 0 ? {} : { supportedEfforts: model.reasoning.supportedEfforts }
 	};
@@ -1678,7 +1872,7 @@ function toWebModel(model, selection) {
 async function poolWebStatus(deps, region = "cn") {
 	const accounts = deps.pool.list(region);
 	const regions = ["cn", "global"];
-	const selection = deps.catalog.currentSelection();
+	const selection = deps.catalogs[region].currentSelection();
 	const rows = [];
 	const now = Date.now();
 	for (const account of accounts) {
@@ -1728,7 +1922,7 @@ async function poolWebStatus(deps, region = "cn") {
 		accounts: rows,
 		...firstUsable === void 0 ? {} : { activeAccountId: firstUsable.id },
 		cooling,
-		models: deps.catalog.current().map((model) => toWebModel({
+		models: deps.catalogs[region].current().map((model) => toWebModel({
 			id: model.id,
 			name: model.name,
 			contextWindow: model.contextWindow,
@@ -1741,6 +1935,7 @@ async function poolWebStatus(deps, region = "cn") {
 		}, selection)),
 		selection,
 		region,
+		distribution: deps.pool.currentDistribution(),
 		regions,
 		shim
 	};
@@ -1884,6 +2079,7 @@ const DEFAULT_CONTEXT_BUDGET = 2e5;
 const Config = z.object({
 	authFile: z.string().description("WorkBuddy desktop auth file (defaults to the app own location)"),
 	cooldownMs: z.number().step(1).min(1e3).default(6e4).description("Rate-limit cooldown per account, in milliseconds"),
+	distribution: z.union(["priority", "round-robin"]).default("priority").description("How requests are spread: priority (drain one) or round-robin"),
 	enabledModelIds: z.array(z.string()).default([]).description("Model ids enabled in the picker (empty = all)"),
 	imageModelIds: z.array(z.string()).default([]).description("Model ids accepting image input (empty = follow upstream)"),
 	contextBudgets: z.dict(z.number().step(1).min(1)).default({}).description("Per-model context-window override, keyed by model id")
@@ -1899,6 +2095,14 @@ function setApi(next) {
 	api = next;
 }
 /** Assemble the runtime objects without registering anything. */
+/**
+* Assemble the runtime objects without registering anything.
+*
+* One catalog per region, mirroring the two shims: the CN and global gateways
+* do not advertise the same roster, and a shared catalog meant the picker showed
+* whichever list happened to be fetched first (always the CN one, since the
+* seeding step read `accounts[0]`).
+*/
 function createCore(logger) {
 	const client = new WorkBuddyUpstreamClient();
 	return {
@@ -1906,7 +2110,10 @@ function createCore(logger) {
 			...logger === void 0 ? {} : { logger },
 			client
 		}),
-		catalog: new WorkBuddyCatalog(),
+		catalogs: {
+			cn: new WorkBuddyCatalog(),
+			global: new WorkBuddyCatalog()
+		},
 		client
 	};
 }
@@ -1940,17 +2147,19 @@ function apply(ctx, config = {}) {
 		}
 	};
 	const applyConfigFromSource = () => {
-		const { authFile, cooldownMs, enabledModelIds, imageModelIds, contextBudgets } = current();
+		const { authFile, cooldownMs, distribution, enabledModelIds, imageModelIds, contextBudgets } = current();
 		core.pool.applyConfig({
 			...authFile === void 0 ? {} : { authDirs: [dirname(authFile)] },
-			...cooldownMs === void 0 ? {} : { cooldownMs }
+			...cooldownMs === void 0 ? {} : { cooldownMs },
+			distribution: distribution ?? "priority"
 		});
-		core.catalog.applySelection({
+		const selection = {
 			...enabledModelIds === void 0 ? {} : { enabledModelIds },
 			...imageModelIds === void 0 ? {} : { imageModelIds },
 			...contextBudgets === void 0 ? {} : { contextBudgets }
-		});
-		invalidateCatalog();
+		};
+		core.catalogs.cn.applySelection(selection);
+		core.catalogs.global.applySelection(selection);
 	};
 	const settingsService = ctx.settings;
 	if (typeof settingsService.installSection === "function") settingsService.installSection(ctx, WORKBUDDY_POOL_SETTINGS_NS, Config, config, sectionHooks);
@@ -1974,14 +2183,14 @@ function apply(ctx, config = {}) {
 		cn: createWorkBuddyShim({
 			pool: core.pool,
 			client: core.client,
-			catalog: core.catalog,
+			catalog: core.catalogs.cn,
 			logger: ctx.logger,
 			region: "cn"
 		}),
 		global: createWorkBuddyShim({
 			pool: core.pool,
 			client: core.client,
-			catalog: core.catalog,
+			catalog: core.catalogs.global,
 			logger: ctx.logger,
 			region: "global"
 		})
@@ -2006,7 +2215,7 @@ function apply(ctx, config = {}) {
 	});
 	ctx.inject(["webServer"], (webCtx) => registerPoolStatusRoute(webCtx, {
 		pool: core.pool,
-		catalog: core.catalog,
+		catalogs: core.catalogs,
 		client: core.client,
 		shim: () => shimInfo("cn"),
 		saveSelection: (selection) => {
@@ -2029,7 +2238,7 @@ function apply(ctx, config = {}) {
 		async status(includeCredits = false) {
 			return buildStatus({
 				pool: core.pool,
-				catalog: core.catalog,
+				catalog: core.catalogs.cn,
 				client: core.client,
 				shim: shimInfo("cn"),
 				includeCredits
@@ -2045,13 +2254,13 @@ function apply(ctx, config = {}) {
 			const adaptersByRegion = {
 				cn: createWorkBuddyAdapter({
 					shim: shims.cn,
-					catalog: core.catalog,
+					catalog: core.catalogs.cn,
 					providerId: POOL_PROVIDER_BY_REGION.cn,
 					displayName: POOL_NAME_BY_REGION.cn
 				}),
 				global: createWorkBuddyAdapter({
 					shim: shims.global,
-					catalog: core.catalog,
+					catalog: core.catalogs.global,
 					providerId: POOL_PROVIDER_BY_REGION.global,
 					displayName: POOL_NAME_BY_REGION.global
 				})
@@ -2100,7 +2309,8 @@ function apply(ctx, config = {}) {
 			}
 			ctx.llm.registerModelDiscovery(WORKBUDDY_POOL_SETTINGS_NS, async (request) => {
 				if (request.provider !== "workbuddy-xdpool" && request.provider !== "workbuddy-xdpool-global") return [];
-				return core.catalog.visible().map((model) => ({
+				const region = request.provider === "workbuddy-xdpool-global" ? "global" : "cn";
+				return core.catalogs[region].visible().map((model) => ({
 					id: model.id,
 					name: model.name,
 					contextWindow: model.contextWindow,
@@ -2120,16 +2330,20 @@ function apply(ctx, config = {}) {
 			ctx.logger.warn("dsh-workbuddy-xdpool: account discovery failed", error);
 		});
 		(async () => {
-			try {
-				const credential = (await core.pool.scan())[0]?.credential;
-				if (credential === void 0) return;
+			const accounts = await core.pool.scan();
+			for (const region of ["cn", "global"]) try {
+				const credential = accounts.find((account) => regionOf(account.credential.domain) === region)?.credential;
+				if (credential === void 0) {
+					ctx.logger.info?.(`dsh-workbuddy-xdpool: no ${region} account yet; keeping the static ${region} catalog`);
+					continue;
+				}
 				const models = await core.client.fetchModels(credential);
-				core.catalog.updateFromUpstream(models);
-				invalidateCatalog();
-				ctx.logger.info?.(`dsh-workbuddy-xdpool: live catalog seeded with ${models.length} model(s)`);
+				core.catalogs[region].updateFromUpstream(models);
+				ctx.logger.info?.(`dsh-workbuddy-xdpool: ${region} catalog seeded with ${models.length} model(s)`);
 			} catch (error) {
-				ctx.logger.warn("dsh-workbuddy-xdpool: live model catalog unavailable; using static fallback", error);
+				ctx.logger.warn(`dsh-workbuddy-xdpool: ${region} model catalog unavailable; using static fallback`, error);
 			}
+			invalidateCatalog();
 		})();
 	}, (error) => {
 		ctx.logger.error("dsh-workbuddy-xdpool: shim failed to listen", error);

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-workbuddy-xdpool",
   "displayName": "DSH WorkBuddy XD Pool",
   "description": "Merge every locally signed-in WorkBuddy account into DeepSeek Harness as one auto-failing-over model pool (multi-account rotation, live credits, daily check-in and model catalog).",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "license": "MIT",
   "author": "aosi526",
   "repository": {