dsh-workbuddy-xdpool 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -4,6 +4,39 @@
 
 版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
 
+## 0.4.1 (2026-09-19)
+
+这次主要修了三个毛病。
+
+### 一、国际版账号终于能被识别了
+
+之前国际版账号一直检测不到。原因是筛选登录文件时只认「点号」拼出来的文件名，而国际版客户端登录后生成的文件是 `workbuddy-desktop-ai.info`（中间是连字符），于是被整个跳过了。
+
+现在改成只看文件后缀，不管文件名长什么样都能收进来。实测国内版 4 个、国际版 1 个账号都能正常识别。
+
+### 二、国内版和国际版不再共用同一份模型列表
+
+之前两个版本共用同一份模型清单，而且这份清单只从国内版账号拉取 —— 换句话说，国际版看到的其实一直是国内版的模型。
+
+现在两个版本各查各的：
+
+- 国内版：16 个模型
+- 国际版：21 个模型（之前只有凑数的 10 个，而且内容还是国内版的）
+
+国际版独有的 Auto / Fast / Balanced 这些模型现在也能正常显示。
+
+顺带修了国际版读取模型的方式：它的接口地址和客户端标识跟国内版都不一样，之前照搬国内版的写法，国际版那边会直接报错，所以才一直退回那份凑数的清单。
+
+### 三、模型选择器里同一个供应商不再被拆成两组
+
+之前模型选择器里「WorkBuddy XD Pool（国内版）」「（国际版）」会各出现两次，免费模型和付费模型被分到不同的组，中间还夹着别的插件，看着像重复注册了。
+
+根因是插件把每个模型都上报成「不支持图片」。宿主上如果装了图片增强类插件，它会给这些模型再补一条**名字一模一样**的条目，于是同一个名字就出现了两遍。
+
+现在按上游真实的能力上报，分组就合并回来了。
+
+另外卡片里的「图片输入」勾选也改了语义：勾选只表示**额外**支持图片，不会再反过来把没勾选的模型降级成「不支持」。
+
 ## 0.4.0 (2026-09-16)
 
 本次更新来自两条用户反馈与一次上游兼容性对齐：账号现在可以**按顺序逐个用尽**（不再平均分摊），积分包**逐条显示具体到期时刻**，并修掉了一处会让所有接口返回 401 的凭据选择缺陷。

package/lib/bin.js

@@ -15,7 +15,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. */
@@ -261,6 +272,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,
@@ -270,7 +282,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 {
@@ -374,16 +387,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);
@@ -553,7 +593,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) {
@@ -678,6 +717,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 {
@@ -685,10 +735,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));
 }
@@ -1038,7 +1085,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;
@@ -1086,7 +1133,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 }
 	};
@@ -1116,6 +1163,14 @@ z.object({
 	contextBudgets: z.dict(z.number().step(1).min(1)).default({}).description("Per-model context-window override, keyed by model id")
 });
 /** 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 {
@@ -1123,7 +1178,10 @@ function createCore(logger) {
 			...logger === void 0 ? {} : { logger },
 			client
 		}),
-		catalog: new WorkBuddyCatalog(),
+		catalogs: {
+			cn: new WorkBuddyCatalog(),
+			global: new WorkBuddyCatalog()
+		},
 		client
 	};
 }
@@ -1212,7 +1270,7 @@ async function commandStatus(args) {
 			};
 		}),
 		cooling: accounts.filter((account) => account.cooldownUntilMs > Date.now()).length,
-		models: core.catalog.current().map((model) => ({
+		models: core.catalogs.cn.current().map((model) => ({
 			id: model.id,
 			name: model.name,
 			multiplier: model.multiplier

package/lib/index.d.ts

@@ -20,7 +20,12 @@ interface WorkBuddyUpstreamModel {
   contextWindow: number;
   maxTokens: number;
   creditMultiplier?: number;
-  multimodal?: boolean;
+  /** Upstream image-input flag. Both gateways spell it `supportsImages`; some entries
+   * also carry `disabledMultimodal`, the negative spelling. Reading anything else
+   * reported every model as text-only, which made a vision shim register a second
+   * route under the same display name and split the model picker group.
+   */
+  supportsImages?: boolean;
   reasoning?: {
     supportedEfforts?: readonly string[];
     defaultEffort?: string;
@@ -112,7 +117,21 @@ export declare class WorkBuddyUpstreamClient {
   chatStream(credential: WorkBuddyCredential, prepared: string, signal?: AbortSignal): Promise<ChatStreamResult>;
   /** POST the token-refresh endpoint; the caller merges the outcome. */
   refreshToken(credential: WorkBuddyCredential): Promise<WorkBuddyRefreshOutcome>;
-  /** 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.
+   */
   fetchModels(credential: WorkBuddyCredential, signal?: AbortSignal): Promise<readonly WorkBuddyUpstreamModel[]>;
   /** Read-only credits query, aggregated by package. Does not consume credits. */
   fetchCredits(credential: WorkBuddyCredential): Promise<WorkBuddyCredits>;
@@ -142,6 +161,7 @@ interface TokenRefresher {
 }
 /** Live auth file name the WorkBuddy desktop app writes. */
 export declare const WORKBUDDY_LIVE_FILENAME = "workbuddy-desktop.info";
+/** Snapshot files left behind by previous logins share this prefix. */
 /** Env override for the auth file or its directory. */
 export declare const WORKBUDDY_AUTH_FILE_ENV = "WORKBUDDY_AUTH_FILE";
 /** One parsed WorkBuddy credential. */
@@ -488,6 +508,7 @@ interface WorkBuddyStatus {
 }
 interface StatusOptions {
   pool: WorkBuddyAccountPool;
+  /** The catalog to report. Regional callers pass their own region's. */
   catalog: WorkBuddyCatalog;
   client: WorkBuddyUpstreamClient;
   shim?: {
@@ -737,7 +758,8 @@ export declare const Config: z<Config>;
 /** Everything the CLI needs from a live plugin instance. */
 export interface WorkBuddyPoolApi {
   pool: WorkBuddyAccountPool;
-  catalog: WorkBuddyCatalog;
+  /** One catalog per region, matching the two registered providers. */
+  catalogs: Readonly<Record<WorkBuddyRegion, WorkBuddyCatalog>>;
   client: WorkBuddyUpstreamClient;
   shim: WorkBuddyShim;
   adapter: WorkBuddyAdapter | undefined;
@@ -750,11 +772,22 @@ export declare function currentApi(): WorkBuddyPoolApi | undefined;
 /** Test seam: install an API instance without booting cordis. */
 export declare function setApi(next: WorkBuddyPoolApi | undefined): void;
 /** 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]`).
+ */
 export declare function createCore(logger?: {
   warn(...args: unknown[]): void;
 }): {
   pool: WorkBuddyAccountPool;
-  catalog: WorkBuddyCatalog;
+  catalogs: {
+    readonly cn: WorkBuddyCatalog;
+    readonly global: WorkBuddyCatalog;
+  };
   client: WorkBuddyUpstreamClient;
 };
 /**

package/lib/index.js

@@ -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. */
@@ -277,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,
@@ -286,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 {
@@ -390,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);
@@ -569,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) {
@@ -694,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 {
@@ -701,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));
 }
@@ -1054,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;
@@ -1102,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 }
 	};
@@ -1825,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) {
@@ -1875,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,
@@ -2048,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 {
@@ -2055,7 +2110,10 @@ function createCore(logger) {
 			...logger === void 0 ? {} : { logger },
 			client
 		}),
-		catalog: new WorkBuddyCatalog(),
+		catalogs: {
+			cn: new WorkBuddyCatalog(),
+			global: new WorkBuddyCatalog()
+		},
 		client
 	};
 }
@@ -2095,12 +2153,13 @@ function apply(ctx, config = {}) {
 			...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);
@@ -2124,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"
 		})
@@ -2156,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) => {
@@ -2179,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
@@ -2195,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
 				})
@@ -2250,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,
@@ -2270,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.4.0",
+  "version": "0.4.1",
   "license": "MIT",
   "author": "aosi526",
   "repository": {