dsh-xdpool 2.5.1 → 2.6.1

package/lib/index.js

@@ -3,7 +3,7 @@ import { basename, dirname, join, resolve } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import crypto, { createDecipheriv, createHash, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
 import { appendFileSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, truncateSync, writeFileSync } from "node:fs";
-import { mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
+import { chmod, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { execFile, execFileSync } from "node:child_process";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -168,24 +168,53 @@ function isAbortError(error) {
 }
 /** Cap on the reassembled compaction reply, guarding against a runaway stream. */
 const COMPLETION_TEXT_LIMIT = 65536;
-/** Insufficient-credit markers, ASCII lowercase plus the original Chinese. */
+/**
+* Insufficient-credit markers, ASCII lowercase plus the original Chinese.
+*
+* The PLURAL forms are listed separately on purpose: this table is matched with
+* `includes`, so `'credits exhausted'.includes('credit exhausted')` is false.
+* The gateway's own 14018 message is `Credits exhausted.` — plural — which
+* therefore matched nothing, fell through to `soft_rate`, and cooled the account
+* and rotated instead of parking it. A rate-limit cooldown on a drained account
+* means every model on it keeps being retried and keeps failing (#from the
+* connect-workbuddy cross-check).
+*/
 const HARD_CREDIT_MARKERS = [
 	"insufficient credit",
+	"insufficient credits",
 	"no credit",
+	"no credits",
 	"credit exhausted",
+	"credits exhausted",
+	"credit exhausted.",
 	"out of credit",
+	"out of credits",
 	"quota exceeded",
 	"quota exhaust",
+	"quota exhausted",
 	"payment required",
 	"credit not enough",
+	"credits not enough",
 	"not enough credit",
+	"not enough credits",
 	"积分不足",
 	"额度不足",
 	"余额不足",
 	"积分用完",
 	"额度用尽",
-	"没有积分"
+	"没有积分",
+	"额度耗尽",
+	"积分耗尽"
 ];
+/**
+* Business codes that mean "this account cannot pay", independent of wording.
+*
+* `14018` is the gateway's credits-exhausted code; the number survived several
+* rewordings of the sentence around it, so matching it is steadier than matching
+* prose. Read from the body rather than from the HTTP status because the gateway
+* answers these inside a 200 or a 4xx envelope.
+*/
+const HARD_CREDIT_CODES = ["14018", "14003"];
 /** Session-invalidation markers that mean "this credential is dead; use another".
 *  Kept alongside the HTTP-status rule in `classifyUpstreamError`: the status is
 *  enough for a direct 401/403, but some failures arrive wrapped in a 200
@@ -430,7 +459,10 @@ const CHAT_IDENTITY_HEADERS = Object.freeze({
 const BANNED_SYSTEM_PHRASES = Object.freeze([
 	[/powered by DeepSeek Harness/gi, "running on DeepSeek Harness"],
 	[/DeepSeek Harness Web GUI/gi, "DeepSeek Harness web interface"],
-	[/Relative paths resolve from the workspace root/gi, "Relative paths are resolved against the workspace root"]
+	[/Relative paths resolve from the workspace root/gi, "Relative paths are resolved against the workspace root"],
+	[/You are a coding agent running in the Codex CLI, a terminal-based coding assistant/gi, "You are a coding agent running in this environment, a terminal-based coding assistant"],
+	[/You are a coding agent running in the Codex CLI/gi, "You are a coding agent running in this environment"],
+	[/Codex CLI is an open source project led by OpenAI/gi, "This coding agent is an open source project"]
 ]);
 /**
 * Rewrite fingerprinted system/assistant content, leaving everything else
@@ -740,6 +772,7 @@ function classifyUpstreamError(status, body) {
 	if (status === 402) return "hard_credit";
 	if (status === 401 || status === 403) return "session_dead";
 	const lower = body.toLowerCase();
+	for (const code of HARD_CREDIT_CODES) if (body.includes(`"code":${code}`) || body.includes(`"code": ${code}`) || body.includes(`"code":"${code}"`)) return "hard_credit";
 	for (const marker of HARD_CREDIT_MARKERS) if (lower.includes(marker.toLowerCase()) || body.includes(marker)) return "hard_credit";
 	for (const marker of SESSION_DEAD_MARKERS) if (body.includes(marker)) return "session_dead";
 	if (status === 429) return "soft_rate";
@@ -1524,14 +1557,17 @@ var WorkBuddyUpstreamClient = class {
 			if (typeof raw !== "object" || raw === null) continue;
 			const account = raw;
 			const num = (key) => typeof account[key] === "number" ? account[key] : 0;
-			const monthly = num("CapacityType") === 4;
-			const size = monthly ? num("CycleCapacitySize") : num("CapacitySize");
-			const remain = monthly ? num("CycleCapacityRemain") : num("CapacityRemain");
+			const capacityType = num("CapacityType");
+			const monthly = capacityType === 4;
+			const periodic = monthly || capacityType === 2;
+			const size = periodic ? num("CycleCapacitySize") : num("CapacitySize");
+			const remain = periodic ? num("CycleCapacityRemain") : num("CapacityRemain");
 			const capped = remain < 0 ? 0 : remain;
 			const cycleEndMs = parseDate(account["CycleEndTime"]);
-			const expiresAtMs = monthly ? void 0 : parseDate(account["ExpiredTime"]) ?? cycleEndMs;
+			const expiresAtMs = monthly ? void 0 : capacityType === 2 ? parseDate(account["DeductionEndTime"]) : parseDate(account["ExpiredTime"]) ?? cycleEndMs;
 			const refreshAtMs = monthly ? cycleEndMs === void 0 ? void 0 : cycleEndMs + 1e3 : void 0;
-			if (!monthly && (capped <= 0 || expiresAtMs !== void 0 && expiresAtMs <= Date.now())) continue;
+			if (expiresAtMs !== void 0 && expiresAtMs <= Date.now()) continue;
+			if (!periodic && capped <= 0) continue;
 			total += capped;
 			if (expiresAtMs !== void 0) {
 				if (nearestExpiryMs === void 0 || expiresAtMs < nearestExpiryMs) nearestExpiryMs = expiresAtMs;
@@ -2262,6 +2298,92 @@ var WorkBuddyUpstreamClient = class {
 	}
 };
 //#endregion
+//#region src/file-perms.ts
+/**
+* Write a file that holds credentials, without leaving it world-readable.
+*
+* Every credential this plugin keeps on disk — the durable account list, the
+* ignore list, any mirrored balance — travelled through a plain `writeFile` with
+* the process umask as the only protection. On a POSIX host that typically means
+* `0644`: readable by every other user on the machine, and these files carry
+* `accessToken` / `refreshToken` verbatim.
+*
+* Two rules, and the order matters:
+*
+* 1. **Create, don't patch.** `mode` on `writeFile` only applies when the file is
+*    created. The atomic-write pattern already writes a fresh temp file and
+*    renames it over the target, so the temp is created with `0600` and the
+*    rename carries that permission to the destination. Chmod'ing afterwards
+*    would also work but leaves a window where the file exists with the old
+*    mode.
+* 2. **Still chmod best-effort.** A file written by an older version already
+*    exists with `0644`; the rename replaces the inode, so rule 1 covers it —
+*    but a host that keeps the target in place (or a future caller that writes
+*    directly) would not be covered, and `chmod` is cheap.
+*
+* WINDOWS: `mode` is ignored by Node on win32, and there is no ACL equivalent in
+* the standard library. The honest statement is what actually protects these
+* files there: they live under the user's own profile (%USERPROFILE%, %LOCALAPPDATA%),
+* whose inherited ACL excludes other standard users by default. Calling `icacls`
+* per write would spawn a process on every balance update to re-apply a
+* protection the parent directory already provides, so this module does not. A
+* profile relocated to a shared directory is outside what this code can detect —
+* the README says where the files live so the user can check.
+*
+* @module dsh-xdpool/file-perms
+*/
+/** Owner-only, for a file that holds a secret. */
+const SECRET_FILE_MODE = 384;
+/** Owner-only, for the directory that holds them. */
+const SECRET_DIR_MODE = 448;
+/**
+* True on a platform where POSIX modes are meaningful.
+*
+* Computed through a `typeof process` guard rather than read straight off the
+* global: this module is host-only in intent, but `store.ts` imports it and the
+* browser bundle imports `store.ts` for its row types, so the module body DOES
+* get bundled for the browser. A bare `process.platform` there throws
+* `ReferenceError: process is not defined` at first render — and it is the kind
+* of failure that only shows up in the packaged app.
+*/
+const POSIX = typeof process === "undefined" ? false : process.platform !== "win32";
+/**
+* Create the directory a secret lives in, owner-only.
+*
+* `recursive` so a fresh install works, and the mode applies to every directory
+* this call creates. An existing directory keeps its mode — `mkdir` does not
+* change what is already there — so `chmod` runs too, best-effort: tightening a
+* directory that a previous version created permissively is exactly the case
+* worth fixing, and a failure is not worth aborting a save over.
+*/
+async function ensureSecretDir(dir) {
+	await mkdir(dir, {
+		recursive: true,
+		...POSIX ? { mode: SECRET_DIR_MODE } : {}
+	});
+	if (!POSIX) return;
+	try {
+		await chmod(dir, SECRET_DIR_MODE);
+	} catch {}
+}
+/**
+* Write `contents` to `path` with owner-only permissions.
+*
+* Not atomic on its own — callers that need the crash-safe temp+rename dance keep
+* doing it and just route the temp write through here, which is why the mode is
+* applied at creation: the rename then carries it to the final file.
+*/
+async function writeSecretFile(path, contents) {
+	await writeFile(path, contents, POSIX ? {
+		encoding: "utf8",
+		mode: SECRET_FILE_MODE
+	} : "utf8");
+	if (!POSIX) return;
+	try {
+		await chmod(path, SECRET_FILE_MODE);
+	} catch {}
+}
+//#endregion
 //#region src/ignored.ts
 /**
 * The permanent ignore list: accounts the user has thrown out of the pool.
@@ -2378,9 +2500,9 @@ async function writeIgnoredAccounts(accounts, path = ignoredIdsPath()) {
 		version: 1,
 		accounts
 	}, null, 2);
-	await mkdir(dirname(path), { recursive: true });
+	await ensureSecretDir(dirname(path));
 	const temp = `${path}.tmp`;
-	await writeFile(temp, `${payload}\n`, "utf8");
+	await writeSecretFile(temp, `${payload}\n`);
 	await rename(temp, path);
 }
 /**
@@ -2506,9 +2628,9 @@ async function saveStoredAccounts(path, accounts) {
 		version: 1,
 		accounts: stored
 	}, null, 2) + "\n";
-	await mkdir(join(path, ".."), { recursive: true });
+	await ensureSecretDir(join(path, ".."));
 	const tmp = `${path}.tmp`;
-	await writeFile(tmp, document, "utf8");
+	await writeSecretFile(tmp, document);
 	await rename(tmp, path);
 }
 //#endregion
@@ -3272,16 +3394,20 @@ function parseWorkBuddyAuth(text, sourcePath, decrypt) {
 	const refreshExpiresAtMs = typeof auth["refreshExpiresAt"] === "number" ? expiryToMs$1(auth["refreshExpiresAt"]) : void 0;
 	if (refreshExpiresAtMs !== void 0 && refreshExpiresAtMs > 0 && refreshExpiresAtMs < Date.now()) return;
 	const lastRefreshAtMs = typeof auth["lastRefreshTime"] === "number" ? expiryToMs$1(auth["lastRefreshTime"]) : void 0;
+	const nickname = optionalString(decryptableString(identity["nickname"], decrypt).value);
+	const uin = optionalString(identity["uin"]);
+	const uid = optionalString(identity["uid"]);
+	const enterpriseId = optionalString(identity["enterpriseId"]);
 	return {
 		accessToken,
 		refreshToken: decryptableString(auth["refreshToken"], decrypt).value,
 		expiresAtMs: typeof auth["expiresAt"] === "number" ? expiryToMs$1(auth["expiresAt"]) : 0,
 		...refreshExpiresAtMs === void 0 ? {} : { refreshExpiresAtMs },
 		...lastRefreshAtMs === void 0 ? {} : { lastRefreshAtMs },
-		...optionalString(decryptableString(identity["nickname"], decrypt).value) === void 0 ? {} : { nickname: optionalString(decryptableString(identity["nickname"], decrypt).value) },
-		...optionalString(identity["uin"]) === void 0 ? {} : { uin: optionalString(identity["uin"]) },
-		...optionalString(identity["uid"]) === void 0 ? {} : { uid: optionalString(identity["uid"]) },
-		...optionalString(identity["enterpriseId"]) === void 0 ? {} : { enterpriseId: optionalString(identity["enterpriseId"]) },
+		...nickname === void 0 ? {} : { nickname },
+		...uin === void 0 ? {} : { uin },
+		...uid === void 0 ? {} : { uid },
+		...enterpriseId === void 0 ? {} : { enterpriseId },
 		domain: typeof auth["domain"] === "string" ? auth["domain"] : "",
 		sourcePath
 	};
@@ -3626,6 +3752,16 @@ var WorkBuddyAccountPool = class {
 	*/
 	disabledIds = /* @__PURE__ */ new Set();
 	/**
+	* The account ids the store held after the last successful write.
+	*
+	* Read back on the next scan to say WHICH accounts left, not just how many.
+	* The list is written wholesale, so a scan that does not find an account
+	* deletes it — and that account's credential is then unrecoverable without a
+	* fresh sign-in (#117). `undefined` until the first write, so the first scan
+	* never reports every account as "leave".
+	*/
+	lastPersistedIds;
+	/**
 	* Account ids the user threw out of the pool for good.
 	*
 	* Enforced BEFORE the credential is parsed: `scan()` skips a file whose
@@ -3702,6 +3838,11 @@ var WorkBuddyAccountPool = class {
 	* A function rather than a list because that pool is mounted asynchronously
 	* and can be re-read on demand; `undefined` means "no such source", which is
 	* the state every test and every pre-mount startup is in.
+	*
+	* The `| undefined` is explicit because `applyExternalSource` CLEARS the field by
+	* assigning `undefined` — under `exactOptionalPropertyTypes` a bare `?:` means
+	* "may be absent, never undefined", which made that documented clearing action
+	* a type error.
 	*/
 	externalSource;
 	constructor(options = {}) {
@@ -3807,9 +3948,10 @@ var WorkBuddyAccountPool = class {
 		}
 		const byId = /* @__PURE__ */ new Map();
 		for (const account of this.accounts) byId.set(account.id, account);
-		if (this.persistent && this.accounts.length === 0) {
+		if (this.persistent) {
 			const stored = await loadStoredAccounts(this.storePath);
 			for (const entry of stored) {
+				if (this.ignoredIds.size > 0 && this.ignoredIds.has(entry.id)) continue;
 				if (byId.has(entry.id)) continue;
 				byId.set(entry.id, {
 					id: entry.id,
@@ -3859,7 +4001,10 @@ var WorkBuddyAccountPool = class {
 		this.accounts = ordered;
 		this.lastScanAtMs = Date.now();
 		if (this.persistent) try {
+			const leaving = this.lastPersistedIds === void 0 ? [] : [...this.lastPersistedIds].filter((id) => !this.accounts.some((account) => account.id === id));
+			if (leaving.length > 0) this.logger?.warn?.(`dsh-xdpool: ${String(leaving.length)} account(s) are no longer in the pool after a rescan and were removed from the store: ${leaving.join(", ")}. Their credentials are gone unless they are signed in again.`);
 			await saveStoredAccounts(this.storePath, this.accounts);
+			this.lastPersistedIds = new Set(this.accounts.map((account) => account.id));
 		} catch (error) {
 			this.logger?.warn?.("dsh-xdpool: could not persist the account store", error);
 		}
@@ -4375,6 +4520,43 @@ var WorkBuddyAccountPool = class {
 		return this.accounts.filter((account) => (account.credentialDeadUntilMs ?? 0) > now);
 	}
 	/**
+	* Try to bring benched accounts back WITHOUT waiting out the cooldown.
+	*
+	* The cooldown is a guess about how long a problem lasts, and the guess is
+	* usually wrong in one direction or the other: a token revoked by a password
+	* change stays dead for the full window even after the user signs in again in
+	* some other client, and a transient upstream hiccup benches a perfectly good
+	* account for half an hour.
+	*
+	* So instead of only waiting, ask. For each benched account, one cheap
+	* authenticated read: if it answers, the credential works and the account goes
+	* back into rotation immediately. Nothing about the failure is trusted — only a
+	* successful call clears it — and a probe that fails keeps the original
+	* cooldown untouched (probing must never EXTEND a bench, or a broken endpoint
+	* would keep every account locked out for as long as it stayed broken).
+	*
+	* `probe` is injected rather than imported so this class stays free of the
+	* upstream client: the pool knows about accounts, not about HTTP.
+	*
+	* Returns the accounts it revived, for logging and for the run summary.
+	*/
+	async reviveBenched(probe) {
+		const benched = this.deadCredentials();
+		if (benched.length === 0) return [];
+		const revived = [];
+		for (const account of benched) {
+			try {
+				await probe(account.credential);
+			} catch {
+				continue;
+			}
+			this.clearCredentialDead(account.id);
+			revived.push(account);
+			this.logger?.info?.(`dsh-xdpool: ${account.label} answered a probe; back in rotation without waiting out the cooldown`);
+		}
+		return revived;
+	}
+	/**
 	* Refresh the account's access token when it is within the margin (or already
 	* expired), in-flight de-duped per account. A failed refresh keeps the
 	* existing token when it has not yet expired, so an unreachable refresh
@@ -4521,8 +4703,23 @@ ${new Date(until).toISOString()}
 * (`kimi-k3-1`). A stale fallback is worse than a short one — it looks
 * authoritative while being wrong.
 *
-* `multiplier: 0` is the gateways' own spelling of "free" (`credits: "x0.00"`),
-* which is what turns on the free badge.
+* NO PRICES AND NO PROMO BADGES HERE. This table is what the picker shows when
+* the startup fetch fails, and a multiplier captured months ago is a price the
+* user will budget against while it is quietly wrong. Two specific harms:
+*
+*   - `multiplier: 0` renders the "free" badge, so a model that was free at
+*     capture time keeps claiming to be free after the promotion ends;
+*   - a non-zero multiplier renders next to the model, so a stale figure reads
+*     as the current rate.
+*
+* `undefined` is the honest state: the card prints no rate and no badge, which
+* is exactly true — this build does not know the price. The live fetch fills
+* both in within a second of a working startup, and `catalogSource` already
+* tells the card to say the list is the built-in one.
+*
+* Windows, output ceilings and the `craft` capability tag stay: those are
+* properties of the model, not of a campaign, and they are what makes the list
+* usable offline at all.
 */
 const FALLBACK_WORKBUDDY_MODELS = [
 	{
@@ -4539,8 +4736,7 @@ const FALLBACK_WORKBUDDY_MODELS = [
 		contextWindow: 96e4,
 		maxOutputTokens: 64e3,
 		supportsImages: true,
-		multiplier: .29,
-		tags: ["craft", "badge:夜间免费:#FF0000"]
+		tags: ["craft"]
 	},
 	{
 		id: "hy3",
@@ -4548,40 +4744,35 @@ const FALLBACK_WORKBUDDY_MODELS = [
 		contextWindow: 192e3,
 		maxOutputTokens: 64e3,
 		supportsImages: true,
-		multiplier: 0,
-		tags: ["craft", "badge:限时免费:#FF0000"]
+		tags: ["craft"]
 	},
 	{
 		id: "hy3-x",
 		name: "Hy3",
 		contextWindow: 192e3,
 		maxOutputTokens: 64e3,
-		supportsImages: true,
-		multiplier: .05
+		supportsImages: true
 	},
 	{
 		id: "space-bunny",
 		name: "Space-Bunny",
 		contextWindow: 1e6,
 		maxOutputTokens: 64e3,
-		supportsImages: true,
-		multiplier: .08
+		supportsImages: true
 	},
 	{
 		id: "deepseek-v4.1-flash",
 		name: "Deepseek-V4.1-Flash",
 		contextWindow: 1e6,
 		maxOutputTokens: 128e3,
-		supportsImages: true,
-		multiplier: .11
+		supportsImages: true
 	},
 	{
 		id: "deepseek-v4-pro",
 		name: "Deepseek-V4-Pro",
 		contextWindow: 1e6,
 		maxOutputTokens: 128e3,
-		supportsImages: true,
-		multiplier: .51
+		supportsImages: true
 	},
 	{
 		id: "deepseek-v4-flash",
@@ -4595,16 +4786,14 @@ const FALLBACK_WORKBUDDY_MODELS = [
 		name: "GLM-5.3",
 		contextWindow: 1e6,
 		maxOutputTokens: 64e3,
-		supportsImages: true,
-		multiplier: .79
+		supportsImages: true
 	},
 	{
 		id: "glm-5.3-flash",
 		name: "GLM-5.3-Flash",
 		contextWindow: 1e6,
 		maxOutputTokens: 131072,
-		supportsImages: true,
-		multiplier: .06
+		supportsImages: true
 	},
 	{
 		id: "glm-5.2",
@@ -4612,64 +4801,56 @@ const FALLBACK_WORKBUDDY_MODELS = [
 		contextWindow: 1e6,
 		maxOutputTokens: 64e3,
 		supportsImages: true,
-		multiplier: .79,
-		tags: ["craft", "badge:夜间折扣:#1E90FF"]
+		tags: ["craft"]
 	},
 	{
 		id: "glm-5.1",
 		name: "GLM-5.1",
 		contextWindow: 2e5,
 		maxOutputTokens: 48e3,
-		supportsImages: false,
-		multiplier: .79
+		supportsImages: false
 	},
 	{
 		id: "glm-5v-turbo",
 		name: "GLM-5v-Turbo",
 		contextWindow: 2e5,
 		maxOutputTokens: 64e3,
-		supportsImages: true,
-		multiplier: .71
+		supportsImages: true
 	},
 	{
 		id: "kimi-k3-1",
 		name: "Kimi-K3",
 		contextWindow: 1e6,
 		maxOutputTokens: 32e3,
-		supportsImages: true,
-		multiplier: 1.62
+		supportsImages: true
 	},
 	{
 		id: "kimi-k2.8-preview",
 		name: "Kimi-K2.8-Preview",
 		contextWindow: 1e6,
 		maxOutputTokens: 64e3,
-		supportsImages: true,
-		multiplier: .77
+		supportsImages: true
 	},
 	{
 		id: "kimi-k2.7",
 		name: "Kimi-K2.7-Code",
 		contextWindow: 256e3,
 		maxOutputTokens: 32e3,
-		supportsImages: true,
-		multiplier: .57
+		supportsImages: true
 	},
 	{
 		id: "kimi-k2.6",
 		name: "Kimi-K2.6",
 		contextWindow: 256e3,
 		maxOutputTokens: 32e3,
-		supportsImages: true,
-		multiplier: .52
+		supportsImages: true
 	},
 	{
 		id: "minimax-m3",
 		name: "MiniMax-M3",
 		contextWindow: 512e3,
 		maxOutputTokens: 64e3,
-		supportsImages: true,
-		multiplier: .25
+		supportsImages: true
 	}
 ];
 /**
@@ -4742,11 +4923,24 @@ var WorkBuddyCatalog = class {
 	}
 	/**
 	* The models DSH should actually offer, after applying the user's selection:
-	* disabled models are dropped, an explicit image list overrides the upstream
-	* capability flag, and a per-model budget caps the advertised window.
+	* disabled models are dropped, an explicit image list decides image support,
+	* and a per-model budget caps the advertised window.
 	*
 	* An absent `enabledModelIds` means "everything" — a fresh install with no
 	* saved selection must not present an empty picker.
+	*
+	* IMAGE SUPPORT IS THE USER'S SET, NOT AN OR. The upstream flag is `true` for
+	* essentially every model of this vendor (measured: 15 of 16 on CN, 23 of 23
+	* on international), so `supportsImages || imageSet.has(id)` could only ever
+	* turn the flag ON — un-ticking the box in the card changed nothing, and the
+	* adapter kept advertising `['text','image']`. The checkbox existed and did
+	* not work, which is worse than not offering it.
+	*
+	* So when the user HAS saved an image selection, that set is the answer, in
+	* both directions. When they have not (undefined — a fresh install, or a
+	* config written before this fix), the upstream capability stands: silently
+	* disabling image input for everyone who never touched the switch would be a
+	* regression, and the absent case is exactly "no opinion".
 	*/
 	visible() {
 		const enabled = this.selection.enabledModelIds;
@@ -4756,7 +4950,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 = next.supportsImages || imageSet.has(model.id);
+			if (imageSet !== void 0) 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;
@@ -5044,6 +5238,18 @@ const POOL_RELAY_PATH = "/plugins/dsh-xdpool/relay";
 * instead of a second one that could quietly drift.
 */
 const POOL_USAGE_PATH = "/plugins/dsh-xdpool/usage";
+/** The five strategies, as a value, so a request body can be validated against it. */
+const POOL_DISTRIBUTIONS = Object.freeze([
+	"priority",
+	"round-robin",
+	"balanced",
+	"sticky",
+	"expiry"
+]);
+/** True when `value` names one of the five documented strategies. */
+function isDistributionStrategy(value) {
+	return POOL_DISTRIBUTIONS.includes(value);
+}
 /**
 * The schedule every automation job falls back to.
 *
@@ -10300,6 +10506,24 @@ const PROVIDERS = Object.freeze([
 		"website": "https://openai.com/",
 		"local": false,
 		"source": "fcc"
+	},
+	{
+		"id": "custom_openai",
+		"name": "Custom OpenAI-compatible",
+		"category": "apikey",
+		"auth": {
+			"kind": "apiKey",
+			"env": "CUSTOM_OPENAI_API_KEY",
+			"url": null
+		},
+		"baseUrl": "",
+		"format": "openai-chat",
+		"models": [],
+		"notes": "Any OpenAI-compatible endpoint — vLLM, LiteLLM, one-api, LM Studio, a self-hosted gateway. Paste the base URL (ending in /v1) and the key on this card, then press Fetch models.",
+		"website": null,
+		"local": false,
+		"baseUrlOverrideEnv": "CUSTOM_OPENAI_BASE_URL",
+		"custom": true
 	}
 ].map((entry) => Object.freeze({
 	...entry,
@@ -10412,6 +10636,71 @@ const COMBO_PREFIX = "combo:";
 const COMBO_CHANNEL = "combo";
 /** Chain strategies. Anything else on disk falls back to `fallback`. */
 const COMBO_STRATEGIES = ["fallback", "round-robin"];
+/** The owner id the pool lane uses in a platform group. */
+const POOL_OWNER = "workbuddy";
+/**
+* Flatten platform groups into the member ids the router walks.
+*
+* Platform order first, then model order inside each platform — the documented
+* semantics ("same platform: try the next model; platform exhausted: the next
+* platform"). A pool model is its bare id; anything else carries its owner as the
+* `provider/` prefix, the same composite id the aggregate catalog and the picker
+* use.
+*
+* Duplicates are dropped: the same pair twice would spend two attempts on one
+* endpoint and report a fallback that never happened.
+*/
+function flattenPlatforms(platforms) {
+	const out = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const platform of platforms) {
+		const owner = text$6(platform.owner);
+		if (owner === "") continue;
+		for (const raw of platform.models) {
+			const model = text$6(raw);
+			if (model === "" || isComboId(model)) continue;
+			const id = owner === "workbuddy" ? model : `${owner}/${model}`;
+			if (seen.has(id)) continue;
+			seen.add(id);
+			out.push(id);
+		}
+	}
+	return out;
+}
+/**
+* Group a flat member list back into platforms.
+*
+* For a chain saved flat, so the two-level editor can still open it: each id's
+* owner is read from its shape (`workbuddy` for a bare id, the prefix otherwise)
+* and groups come out in first-seen order — which is the order the members were
+* in, so re-flattening reproduces exactly what was stored.
+*/
+function splitPlatforms(models) {
+	const groups = /* @__PURE__ */ new Map();
+	const order = [];
+	for (const raw of models) {
+		const id = text$6(raw);
+		if (id === "") continue;
+		const parsed = parseProviderModelId(id);
+		const owner = parsed === null ? POOL_OWNER : parsed.providerId;
+		const model = parsed === null ? id : parsed.modelId;
+		let bucket = groups.get(owner);
+		if (bucket === void 0) {
+			bucket = [];
+			groups.set(owner, bucket);
+			order.push(owner);
+		}
+		if (!bucket.includes(model)) bucket.push(model);
+	}
+	return order.map((owner) => ({
+		owner,
+		models: groups.get(owner) ?? []
+	}));
+}
+/** Windows assumed when nothing on the chain declares one. */
+const COMBO_DEFAULT_CONTEXT_WINDOW = 131072;
+/** Output ceiling assumed when nothing on the chain declares one. */
+const COMBO_DEFAULT_MAX_OUTPUT = 32768;
 /** A trimmed non-empty string, or ''. */
 function text$6(value) {
 	return typeof value === "string" ? value.trim() : "";
@@ -10481,7 +10770,8 @@ function normalizeCombos(raw) {
 		const name = text$6(value.name) || text$6(value.id);
 		if (name === "") continue;
 		const id = text$6(value.id);
-		const models = stringList$2(value.models).filter((model) => model !== id && !isComboId(model));
+		const platforms = Array.isArray(value.platforms) ? normalizePlatforms(value.platforms) : void 0;
+		const models = platforms === void 0 ? stringList$2(value.models).filter((model) => model !== id && !isComboId(model)) : flattenPlatforms(platforms);
 		if (models.length === 0) continue;
 		const chainId = isComboId(id) ? id : comboId(name);
 		if (chainId === "" || seen.has(chainId)) continue;
@@ -10492,6 +10782,7 @@ function normalizeCombos(raw) {
 			id: chainId,
 			name,
 			models,
+			...platforms === void 0 ? {} : { platforms },
 			strategy,
 			stickyLimit: limit > 0 ? limit : 1,
 			enabled: value.enabled !== false
@@ -10500,6 +10791,30 @@ function normalizeCombos(raw) {
 	return out;
 }
 /**
+* Normalise the `platforms` array from an untrusted document.
+*
+* Drops a group with no owner or no models rather than keeping it: an empty group
+* renders as a platform card the user cannot act on, and it contributes no members,
+* so keeping it would make the editor disagree with the router about what the chain
+* contains.
+*/
+function normalizePlatforms(raw) {
+	const out = [];
+	for (const entry of raw) {
+		if (entry === null || typeof entry !== "object" || Array.isArray(entry)) continue;
+		const value = entry;
+		const owner = text$6(value.owner);
+		if (owner === "") continue;
+		const models = stringList$2(value.models).filter((model) => !isComboId(model));
+		if (models.length === 0) continue;
+		out.push({
+			owner,
+			models
+		});
+	}
+	return out;
+}
+/**
 * Classify one member id against both catalogs.
 *
 * `combo:` ids are rejected outright: a chain pointing at another chain would
@@ -10522,6 +10837,31 @@ function resolveComboMember(modelId, sources) {
 			supportsImages: aggregateRow.supportsImages
 		};
 	}
+	/**
+	* A 扫码登录 channel row, checked BEFORE the pool.
+	*
+	* Channel ids are `<channel>:<model>`, and the channel set is closed (it comes
+	* from the pack's own registered list), so a match here is unambiguous. Order
+	* still matters: a pool model id is bare and can never contain `:`, so trying the
+	* channel first cannot shadow one — and doing it first keeps a channel named after
+	* a pool id from being swallowed.
+	*
+	* The window and image flag are not known for a channel row (the host's listing
+	* publishes neither), so the chain's intersection falls back to the documented
+	* defaults. That is the honest answer: an unknown window must not be treated as a
+	* large one, or the host would size a compaction against a limit nobody promised.
+	*/
+	const hostRow = sources.host?.find((row) => row.id === id);
+	if (hostRow !== void 0) return {
+		modelId: id,
+		aggregate: false,
+		host: true,
+		channel: hostRow.channel,
+		name: hostRow.name,
+		contextWindow: COMBO_DEFAULT_CONTEXT_WINDOW,
+		maxOutputTokens: COMBO_DEFAULT_MAX_OUTPUT,
+		supportsImages: false
+	};
 	const poolRow = sources.pool.find((row) => row.id === id);
 	if (poolRow === void 0) return void 0;
 	return {
@@ -10534,6 +10874,54 @@ function resolveComboMember(modelId, sources) {
 	};
 }
 /**
+* The same model served by more than one lane, in the order to try them.
+*
+* This is the "same model, different route" tier: when a lane rate-limits, the
+* answer is usually to reach the SAME model through another provider, not to
+* fall back to a different model. Switching models changes context window, tool
+* calling, structured-output shape and writing style — a cross-model fallback is
+* a last resort, not a first one.
+*
+* The registry carries 86 model ids under two or more providers (kimi-k2.5 sits
+* under eight), so the tier is real and not theoretical. What was missing is
+* that a user had to spell it out: three separate chain members naming the same
+* model three times, in the right order, and re-edit the chain whenever a
+* provider was added.
+*
+* Derivation, not configuration: for one model id, every aggregate row sharing
+* `modelName` (or the bare id when the registry names no shared display name) is
+* a route to it. Pool rows are excluded — `buddy:`/`workbuddy:` are the pool's
+* own lanes and naming them here would silently spend the user's WorkBuddy
+* credits as a "fallback".
+*
+* The requested provider, when given, comes FIRST: the user chose that lane, so
+* it stays the primary and the others are the alternates.
+*/
+function siblingRoutes(modelId, sources, preferredProvider) {
+	const id = text$6(modelId);
+	if (id === "") return [];
+	const target = sources.aggregate.find((row) => row.id === id);
+	if (target === void 0) return [id];
+	const name = text$6(target.name);
+	const bare = bareModelIdOf(target);
+	const out = [id];
+	for (const row of sources.aggregate) {
+		if (row.id === id) continue;
+		if (row.providerId === target.providerId) continue;
+		const sameName = name !== "" && text$6(row.name) === name;
+		const sameBare = bare !== "" && bareModelIdOf(row) === bare;
+		if (!sameName && !sameBare) continue;
+		if (!out.includes(row.id)) out.push(row.id);
+	}
+	if (preferredProvider === void 0 || out.length <= 1) return out;
+	return [...out.filter((candidate) => candidate.startsWith(`${preferredProvider}/`)), ...out.filter((candidate) => !candidate.startsWith(`${preferredProvider}/`))];
+}
+/** The model id without its provider prefix, for cross-vendor comparison. */
+function bareModelIdOf(row) {
+	const parsed = parseProviderModelId(row.id);
+	return parsed === null ? text$6(row.modelId) : parsed.modelId;
+}
+/**
 * Every combo row that can currently answer, given the catalogs.
 *
 * Disabled chains are skipped, as are chains whose members have all gone away:
@@ -10657,6 +11045,13 @@ function normalizeSetting(raw) {
 	if (typeof value.enabled === "boolean") setting.enabled = value.enabled;
 	const key = text$5(value.apiKey);
 	if (key !== "") setting.apiKey = key;
+	if (Array.isArray(value.apiKeys)) {
+		const keys = stringList$1(value.apiKeys);
+		const [only] = keys;
+		if (keys.length > 1) setting.apiKeys = keys;
+		else if (only !== void 0 && setting.apiKey === void 0) setting.apiKey = only;
+	}
+	if (typeof value.distribution === "string" && isDistributionStrategy(value.distribution.trim())) setting.distribution = value.distribution.trim();
 	const baseUrl = text$5(value.baseUrl);
 	if (baseUrl !== "") setting.baseUrl = baseUrl.replace(/\/+$/, "");
 	if (Array.isArray(value.models)) {
@@ -10777,12 +11172,12 @@ function normalizeRelayModels(raw) {
 async function writeAggregateSettings(settings) {
 	const path = aggregateSettingsPath();
 	if (path === void 0) throw new Error("no home directory to store the aggregate settings in");
-	await mkdir(dirname(path), { recursive: true });
+	await ensureSecretDir(dirname(path));
 	const file = {
 		version: STORE_VERSION,
 		...settings
 	};
-	await writeFile(`${path}.tmp`, `${JSON.stringify(file, null, 2)}\n`, "utf8");
+	await writeSecretFile(`${path}.tmp`, `${JSON.stringify(file, null, 2)}\n`);
 	await rename(`${path}.tmp`, path);
 }
 /**
@@ -10804,16 +11199,42 @@ async function updateProviderSetting(providerId, patch) {
 		if (baseUrl === "") delete after.baseUrl;
 		else after.baseUrl = baseUrl;
 	}
-	if (patch.apiKey !== void 0) {
-		const key = text$5(patch.apiKey);
-		if (key === "") delete after.apiKey;
-		else after.apiKey = key;
+	if (patch.appendApiKey !== void 0) {
+		const added = text$5(patch.appendApiKey);
+		if (added !== "") {
+			const existing = [.../* @__PURE__ */ new Set([...providerApiKeys(after)])];
+			if (!existing.includes(added)) existing.push(added);
+			const first = existing[0];
+			if (first !== void 0) {
+				after.apiKey = first;
+				if (existing.length > 1) after.apiKeys = existing;
+				else delete after.apiKeys;
+			}
+		}
+	}
+	if (patch.apiKeys !== void 0 || patch.apiKey !== void 0) {
+		const incoming = patch.apiKeys !== void 0 ? patch.apiKeys : [patch.apiKey ?? ""];
+		const keys = [...new Set(incoming.map((entry) => text$5(entry)).filter((key) => key !== ""))];
+		const first = keys[0];
+		if (first === void 0) {
+			delete after.apiKey;
+			delete after.apiKeys;
+		} else {
+			after.apiKey = first;
+			if (keys.length > 1) after.apiKeys = keys;
+			else delete after.apiKeys;
+		}
 	}
 	if (patch.models !== void 0) {
 		const models = stringList$1(patch.models);
 		if (models.length === 0) delete after.models;
 		else after.models = models;
 	}
+	if (patch.distribution !== void 0) {
+		const strategy = text$5(patch.distribution);
+		if (strategy === "") delete after.distribution;
+		else after.distribution = strategy;
+	}
 	if (patch.discovered !== void 0) {
 		const discovered = stringList$1(patch.discovered);
 		if (discovered.length === 0) delete after.discovered;
@@ -10912,6 +11333,62 @@ function providerSettingOf(store, providerId) {
 	return store.providers?.[providerId] ?? {};
 }
 /**
+* Every usable key a provider holds, preferred first.
+*
+* One reader for two spellings. A config written before multi-key support has
+* only `apiKey`; one written by the multi-key card has `apiKeys` with a mirrored
+* `apiKey`. Both must answer the same list, deduplicated, with blanks dropped — a
+* blank entry is a request guaranteed to 401 and, worse, would make the card
+* believe the provider is configured.
+*
+* Order is meaningful: entry 0 is the preferred key, the rest are alternates.
+*/
+function providerApiKeys(setting) {
+	const list = Array.isArray(setting.apiKeys) ? setting.apiKeys : [];
+	const out = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const raw of [...list, setting.apiKey]) {
+		const key = text$5(raw);
+		if (key === "" || seen.has(key)) continue;
+		seen.add(key);
+		out.push(key);
+	}
+	return out;
+}
+/**
+* The order to TRY this provider's keys in, per the chosen strategy.
+*
+* `priority` (the default) is the stored order, which is also what the retry loop
+* walks: the preferred key first, then the alternates. The other four strategies
+* reorder the FIRST attempt only — the alternates behind it still follow in
+* stored order, because the point of a fallback is to reach a working key quickly,
+* not to shuffle the whole list on every attempt.
+*
+* Deliberately a pure function of `(keys, strategy, picker)`: the pool lane's
+* strategies depend on live account state, which keys do not have. `picker`
+* returns a float in [0,1) so a test can drive the random branches.
+*/
+function orderApiKeys(keys, strategy, picker = Math.random) {
+	if (keys.length <= 1) return keys;
+	const [first, ...rest] = keys;
+	if (first === void 0) return keys;
+	switch (strategy) {
+		case "round-robin": {
+			const at = Math.floor(picker() * keys.length);
+			const index = at < 0 || at >= keys.length ? 0 : at;
+			return [...keys.slice(index), ...keys.slice(0, index)];
+		}
+		case "balanced": {
+			const at = Math.floor(picker() * keys.length);
+			const index = at < 0 || at >= keys.length ? 0 : at;
+			return [...keys.slice(index), ...keys.slice(0, index)];
+		}
+		case "expiry": return keys;
+		case "sticky": return keys;
+		default: return keys;
+	}
+}
+/**
 * Whether a provider could serve a model right now.
 *
 * Keyless and local providers are usable with nothing configured; `oauth` and
@@ -10921,7 +11398,7 @@ function providerSettingOf(store, providerId) {
 */
 function providerAuthUsable(provider, setting) {
 	if (provider.auth.kind === "oauth" || provider.auth.kind === "adc") return false;
-	if (provider.auth.kind === "apiKey") return text$5(setting.apiKey) !== "";
+	if (provider.auth.kind === "apiKey") return providerApiKeys(setting).length > 0;
 	return true;
 }
 /**
@@ -10966,298 +11443,676 @@ function configuredProviderIds(store) {
 	return out;
 }
 //#endregion
-//#region src/aggregate.ts
+//#region src/stats.ts
 /**
-* Aggregate lane: the 76 declared upstream providers, resolved per request and
-* forwarded to with the user's own key.
-*
-* WHY A SECOND LANE BESIDE THE POOL
-*
-* The pool serves exactly one family of gateways — WorkBuddy, CN and
-* international — from accounts the user already signed in on the desktop app.
-* This module serves the orthogonal case: a provider the user holds a key for,
-* reached at that provider's own endpoint, with no account rotation because
-* there is no account to rotate. Same card, same model picker, different wire.
-*
-* WHAT IT DELIBERATELY DOES NOT DO
-*
-* It does not invent endpoints. Every URL here comes from the registry record or
-* from a base-URL override the user typed; a provider whose endpoint cannot be
-* composed is reported as such rather than being probed at a guessed URL, because
-* "no listing" and "provider is down" must not read the same to the user.
-*
-* It also does not decide whether a provider is USABLE — that is the settings
-* layer's call (`providerAuthUsable`). This module resolves what a request
-* needs, and refuses with a message naming what is missing.
-*
-* KEYS
-*
-* Every string that can reach a message — a failure, a body snippet, a probe's
-* answer — passes through {@link redactAggregateSecret} first. Providers echo
-* rejected credentials back (a 401 body routinely repeats the key), and this
-* text is folded into messages the host writes to its durable session log.
-*
-* @module dsh-xdpool/aggregate
+* Retained calls. Bounded on purpose: a busy week is thousands of calls, and a
+* dashboard that grows without limit turns into a memory leak with a chart.
 */
-const WIRE_BY_FORMAT = Object.freeze({
-	"openai-chat": "chat",
-	"openai-responses": "responses",
-	"anthropic-messages": "messages"
-});
+const USAGE_MAX_SAMPLES = 2e3;
 /**
-* Wire suffixes, needed only for the one record the registry gives no base URL
-* to (Azure names its endpoint per deployment, so `chatEndpoint` is null there
-* and there is no registry endpoint to read the suffix off).
+* Minimum total decoding time before a throughput figure is published.
+*
+* A one-token answer that arrives in 20ms would otherwise report a tps two
+* orders of magnitude above anything a real turn reaches, and the panel would
+* rank models by that artefact instead of by speed.
 */
-const CHAT_SUFFIX = Object.freeze({
-	"openai-chat": "/chat/completions",
-	"openai-responses": "/responses",
-	"anthropic-messages": "/messages"
-});
+const MIN_DECODE_MS = 120;
 /**
-* Capacities for a row the registry describes only by id.
+* A reported token count, or null when the key is absent / not a finite
+* number.
 *
-* Deliberately conservative, and the reason is visible in the number: most
-* registry rows publish no context window at all. Publishing a plausible one
-* would put a fabricated field in front of the user — and unlike a display
-* label, a wrong window is a wrong capability, so DSH would hand the provider a
-* prompt it cannot accept.
+* Zero is ACCEPTED: an empty turn really can cost nothing, and reporting that
+* as "the gateway said nothing" would make the panel lie in the other
+* direction.
 */
-const DEFAULT_CONTEXT_WINDOW = 131072;
-const DEFAULT_MAX_OUTPUT = 32768;
-/** Listing round budget. Generous for a small JSON document, short for a UI. */
-const LISTING_TIMEOUT_MS = 15e3;
-/** One turn's budget, matching the pool shim's idle ceiling. */
-const TURN_TIMEOUT_MS = 3e5;
-/** Sent when the registry does not declare one (kimchi, and most of the roster). */
-const USER_AGENT = "dsh-xdpool/2.1";
-/** How much of an upstream body is quoted back in a failure message. */
-const BODY_SNIPPET_CHARS = 400;
-/** A trimmed non-empty string, or ''. */
-function text$4(value) {
-	return typeof value === "string" && value.trim() !== "" ? value.trim() : "";
+function count(value) {
+	return typeof value === "number" && Number.isFinite(value) && value >= 0 ? Math.floor(value) : null;
 }
-/** A positive finite number, or undefined. */
-function number(value) {
-	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.trunc(value) : void 0;
+function zero(value) {
+	return count(value) ?? 0;
 }
-function isRecord$3(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value);
+function detailOf(value, key) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return 0;
+	return zero(value[key]);
 }
 /**
-* One aggregate-lane failure, carrying the class the caller maps onto HTTP.
+* Read a gateway `usage` object, accepting both spellings OpenAI-compatible
+* gateways use (`prompt_tokens` / `input_tokens`).
 *
-* `kind` reuses the pool's vocabulary (`UpstreamErrorKind` in `upstream.ts`) so
-* the shim's existing error→status table serves both lanes: a third-party 429
-* is a `soft_rate`, a 401 is a `session_dead`, and neither needs a second table
-* that could drift from the first.
+* Returns undefined when the document is not a usage report at all, so callers
+* can tell "the gateway sent zeroes" from "there was nothing here".
 */
-var AggregateError = class extends Error {
-	kind;
-	status;
-	constructor(kind, message, status = 0) {
-		super(message);
-		this.name = "AggregateError";
-		this.kind = kind;
-		this.status = status;
-	}
-};
-/** Remove a credential from anything that may reach a message. */
-function redactAggregateSecret(value, apiKey) {
-	let source = typeof value === "string" ? value : String(value ?? "");
-	const key = text$4(apiKey);
-	if (key === "") return source;
-	const escaped = JSON.stringify(key).slice(1, -1);
-	for (const needle of escaped === key ? [key] : [key, escaped]) if (source.includes(needle)) source = source.split(needle).join("[redacted]");
-	return source;
-}
-/** A base URL a request can actually be sent to. */
-function hasPlaceholder(baseUrl) {
-	return /\{[^}]*\}/.test(baseUrl);
-}
-/** The user's `baseUrl` override when present, else the registry's own. */
-function effectiveBaseUrl(provider, setting) {
-	const override = text$4(setting.baseUrl);
-	return (override !== "" ? override : text$4(provider.baseUrl)).replace(/\/+$/, "");
-}
-/**
-* The provider's listing URL, moved by a `baseUrl` override when — and only
-* when — the declared listing actually lives under the registry base.
-*
-* Three providers (cohere, deepinfra, ollama_cloud) publish their listing on
-* another path. Rewriting a URL that never pointed at the override would invent
-* one, and a guessed listing is worse than none.
-*/
-function effectiveModelsUrl(provider, setting) {
-	const declared = modelsEndpoint(provider);
-	if (declared === null) return null;
-	const override = text$4(setting.baseUrl).replace(/\/+$/, "");
-	const registryBase = text$4(provider.baseUrl).replace(/\/+$/, "");
-	if (override === "" || registryBase === "" || !declared.startsWith(registryBase)) return declared;
-	return `${override}${declared.slice(registryBase.length)}`;
-}
-/**
-* The full URL a turn is posted to; null when the provider has no dialable
-* endpoint (Azure without a user base URL, or a base still carrying the
-* registry's `{account_id}`-style placeholder).
-*/
-function effectiveChatUrl(provider, setting) {
-	const override = text$4(setting.baseUrl).replace(/\/+$/, "");
-	const declared = chatEndpoint(provider);
-	if (declared !== null) {
-		const registryBase = text$4(provider.baseUrl).replace(/\/+$/, "");
-		const url = override === "" || registryBase === "" ? declared : `${override}${declared.slice(registryBase.length)}`;
-		return hasPlaceholder(url) ? null : url;
-	}
-	const suffix = CHAT_SUFFIX[provider.format];
-	if (override === "" || suffix === void 0 || hasPlaceholder(override)) return null;
-	return `${override}${suffix}`;
-}
-/** The per-provider settings object, or `{}` when the store names none. */
-function settingFor(store, providerId) {
-	return store.providers?.[providerId] ?? {};
-}
-/**
-* Resolve one provider's effective settings.
-*
-* Throws {@link AggregateError} with a `client` kind for every state the user
-* fixes in the settings page — an unknown id, a missing key, a placeholder base
-* URL. A `client` kind is deliberate: none of these is a transport fault, so
-* none of them should be retried against a different provider.
-*
-* `options.requireEnabled` exists for the DISCOVERY calls. Fetching a provider's
-* model list publishes nothing: it asks "does this endpoint answer, and with
-* what", and writing the answer back is a separate step the user also takes.
-* Gating it on the enable switch made a read-only button report
-* `"OpenCode Free" is not enabled in the aggregate settings` — a failure to
-* LOOK, dressed up as a failure to connect, on rows that carry no key field and
-* so offered no way to answer it. Discovery therefore does not require the
-* switch; publishing still does, in {@link buildAggregateCatalog} and
-* {@link resolveAggregateProvider} as called by the serving paths.
-*/
-function resolveAggregateProvider(store, providerId, options = {}) {
-	const id = text$4(providerId);
-	const provider = id === "" ? null : getProvider(id);
-	if (provider === null) throw new AggregateError("client", `the aggregate lane has no provider "${id === "" ? String(providerId) : id}"`);
-	const setting = settingFor(store, provider.id);
-	if (setting.enabled === false) throw new AggregateError("client", `"${provider.name}" is switched off in the aggregate settings`);
-	if (!providerAuthUsable(provider, setting)) {
-		if (provider.auth.kind === "oauth" || provider.auth.kind === "adc") throw new AggregateError("session_dead", `"${provider.name}" signs in with ${provider.auth.kind}, not with an API key, so the aggregate lane does not serve it`);
-		const where = text$4(provider.auth.url) === "" ? "" : ` (the provider issues keys at ${provider.auth.url})`;
-		throw new AggregateError("client", `"${provider.name}" needs an API key: paste one in the aggregate settings${where}`);
-	}
-	if (options.requireEnabled !== false && !providerEnabled(provider, setting)) throw new AggregateError("client", `"${provider.name}" is not enabled in the aggregate settings`);
-	const baseUrl = effectiveBaseUrl(provider, setting);
-	if (baseUrl === "") throw new AggregateError("client", `"${provider.name}" has no base URL of its own — set one in the aggregate settings`);
-	if (hasPlaceholder(baseUrl)) throw new AggregateError("client", `"${provider.name}"'s base URL still carries a registry placeholder — set the real URL in the aggregate settings`);
-	const chatUrl = effectiveChatUrl(provider, setting);
-	if (chatUrl === null) throw new AggregateError("client", `"${provider.name}" has no usable ${provider.format} endpoint`);
-	const apiKey = text$4(setting.apiKey);
-	const headers = defaultHeaders(provider, apiKey);
-	if (headers["user-agent"] === void 0) headers["user-agent"] = USER_AGENT;
-	return {
-		providerId: provider.id,
-		providerName: provider.name,
-		apiKey,
-		baseUrl,
-		format: provider.format,
-		wire: WIRE_BY_FORMAT[provider.format],
-		chatUrl,
-		modelsUrl: effectiveModelsUrl(provider, setting),
-		headers
-	};
-}
-/**
-* The ids a provider should be served with, and where that list came from.
-*
-* `discovered` is the roster a fetch returned, `models` is the subset the user
-* kept, and the choice is applied LAST so it wins over both — otherwise pressing
-* "Fetch models" would silently undo the narrowing the card just saved.
-*/
-function modelIdsFor(provider, setting) {
-	const universe = modelChoicesFor(provider, setting);
-	const source = rosterIsDiscovered(provider, setting) ? "discovered" : "static";
-	const override = stringList(setting.models);
-	if (override.length === 0) return {
-		ids: universe,
-		source
-	};
-	const available = new Set(universe);
+function parseUsage(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
+	const obj = value;
+	const input = count(obj["prompt_tokens"]) ?? count(obj["input_tokens"]);
+	const output = count(obj["completion_tokens"]) ?? count(obj["output_tokens"]);
+	if (input === null && output === null) return void 0;
 	return {
-		ids: override.filter((id) => available.has(id)),
-		source
+		inputTokens: input ?? 0,
+		outputTokens: output ?? 0,
+		reasoningTokens: detailOf(obj["completion_tokens_details"], "reasoning_tokens"),
+		cachedTokens: detailOf(obj["prompt_tokens_details"], "cached_tokens")
 	};
 }
 /**
-* Whether the roster came from a live fetch rather than the registry.
+* True for the trailer frame a gateway sends to report usage.
 *
-* A pre-split install has `models` and no `discovered`, because until the
-* chooser existed the only writer of `models` WAS the fetch button. Those ids
-* are a roster, not a choice, and treating them as one would shrink the vendor
-* to whatever handful the registry happens to declare.
+* It is recognised by an EMPTY `choices` array beside a `usage` field. A frame
+* that also carries content is a normal chunk that happens to mention usage,
+* and dropping it would delete the user's answer - which is why the strip step
+* downstream is allowed to remove exactly these and nothing else.
 */
-function rosterIsDiscovered(provider, setting) {
-	if ((setting.discovered?.length ?? 0) > 0) return true;
-	return stringList(setting.models).length > provider.models.length;
-}
-/** Every id a provider could offer: its roster, for the card's chooser. */
-function modelChoicesFor(provider, setting) {
-	const discovered = stringList(setting.discovered);
-	if (discovered.length === 0 && rosterIsDiscovered(provider, setting)) return stringList(setting.models);
-	return discovered.length > 0 ? discovered : provider.models.map((model) => model.id);
+function isUsageOnlyFrame(parsed) {
+	if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return false;
+	const obj = parsed;
+	if (obj["usage"] === void 0 || obj["usage"] === null) return false;
+	const choices = obj["choices"];
+	return Array.isArray(choices) && choices.length === 0;
 }
-/** A de-duplicated list of non-empty trimmed strings from an untrusted array. */
-function stringList(value) {
-	if (!Array.isArray(value)) return [];
-	const seen = /* @__PURE__ */ new Set();
-	const ids = [];
-	for (const raw of value) {
-		const id = text$4(raw);
-		if (id === "" || seen.has(id)) continue;
-		seen.add(id);
-		ids.push(id);
-	}
-	return ids;
+/** Local calendar day of an instant, as `YYYY-MM-DD`. */
+function usageDayKey(at) {
+	const d = new Date(at);
+	const month = String(d.getMonth() + 1).padStart(2, "0");
+	const day = String(d.getDate()).padStart(2, "0");
+	return `${d.getFullYear()}-${month}-${day}`;
 }
 /**
-* One catalog row.
+* Timing and usage captured while one stream is forwarded.
 *
-* Capacities come from the registry's model row where it has them, and fall back
-* to this module's own defaults where it does not (most rows carry no context
-* window, and none carries an output ceiling — the registry records ids and
-* published capacities, not a serving contract).
+* Kept free of Node stream types so it can be unit tested with plain numbers;
+* the shim owns the Transform that feeds it chunks.
 */
-function rowOf(provider, modelId, source) {
-	const declared = provider.models.find((model) => model.id === modelId);
-	const contextWindow = number(declared?.contextWindow) ?? DEFAULT_CONTEXT_WINDOW;
-	const label = text$4(declared?.name) !== "" ? text$4(declared?.name) : modelId;
-	return {
-		id: providerModelId(provider.id, modelId),
-		name: `${provider.name} ${label}`,
-		providerId: provider.id,
-		modelId,
-		contextWindow,
-		maxOutputTokens: Math.min(DEFAULT_MAX_OUTPUT, contextWindow),
-		supportsImages: declared?.vision === true,
-		wire: WIRE_BY_FORMAT[provider.format],
-		source
-	};
-}
+var StreamTracker = class {
+	/** Milliseconds from request start to the first byte, once seen. */
+	ttftMs;
+	/** Milliseconds from first byte to the end of the stream, once finished. */
+	decodeMs;
+	/** Usage seen in any frame, if the gateway sent any. */
+	usage;
+	firstAt;
+	startedAt;
+	constructor(startedAt = Date.now()) {
+		this.startedAt = startedAt;
+	}
+	/** Record the first byte. Repeated calls keep the earliest. */
+	markFirstByte(at = Date.now()) {
+		if (this.firstAt !== void 0) return;
+		this.firstAt = at;
+		const ttft = at - this.startedAt;
+		if (ttft >= 0) this.ttftMs = ttft;
+	}
+	/** Record stream completion. Repeated calls keep the earliest. */
+	finish(at = Date.now()) {
+		if (this.decodeMs !== void 0) return;
+		if (this.firstAt === void 0) return;
+		const decode = at - this.firstAt;
+		if (decode >= 0) this.decodeMs = decode;
+	}
+	/** Fold a parsed frame's usage in; later frames overwrite, as the gateway intends. */
+	observe(parsed) {
+		if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return;
+		const usage = parseUsage(parsed["usage"]);
+		if (usage !== void 0) this.usage = usage;
+	}
+};
 /**
-* Every model row the lane should offer, given the stored settings.
+* A bounded window of recent calls, summarised on demand.
 *
-* A provider is skipped when it is switched off, when its credential flow this
-* lane cannot drive, or when its endpoint cannot be composed — a picker row that
-* can never answer is worse than no row, because it reads as "this provider is
-* broken" rather than "not set up yet".
+* In-memory by design: this is a live panel, and persisting every prompt's
+* token counts would turn a convenience into a record of what the user asked.
+* A restart therefore starts the chart again, which the panel states rather
+* than hides.
 */
-function buildAggregateCatalog(store) {
-	if (store.enabled === false) return [];
-	const rows = [];
-	for (const [providerId, setting] of Object.entries(store.providers ?? {})) {
-		if (setting === void 0 || setting === null) continue;
-		const provider = getProvider(providerId);
-		if (provider === null) continue;
+var UsageRecorder = class {
+	samples = [];
+	limit;
+	constructor(limit = USAGE_MAX_SAMPLES) {
+		this.limit = limit > 0 ? limit : 1;
+	}
+	/** Retain one call, dropping the oldest once the window is full. */
+	record(call) {
+		this.samples.push(call);
+		while (this.samples.length > this.limit) this.samples.shift();
+	}
+	/** Samples currently retained. */
+	size() {
+		return this.samples.length;
+	}
+	/** Forget every retained call. */
+	reset() {
+		this.samples = [];
+	}
+	/** Aggregate the retained window. */
+	summary() {
+		const rows = /* @__PURE__ */ new Map();
+		const turns = /* @__PURE__ */ new Map();
+		let calls = 0;
+		let usageReported = false;
+		for (const call of this.samples) {
+			calls += 1;
+			if (call.usage !== void 0) usageReported = true;
+			const bucket = turns.get(call.turnId) ?? {
+				calls: 0,
+				succeeded: 0,
+				failed: 0
+			};
+			bucket.calls += 1;
+			if (call.ok) bucket.succeeded += 1;
+			else bucket.failed += 1;
+			turns.set(call.turnId, bucket);
+			const key = `${call.channel}\u0000${call.region}\u0000${call.model}`;
+			let acc = rows.get(key);
+			if (acc === void 0) {
+				acc = {
+					row: {
+						channel: call.channel,
+						region: call.region,
+						model: call.model,
+						calls: 0,
+						turns: 0,
+						failed: 0,
+						recovered: 0,
+						inputTokens: 0,
+						outputTokens: 0,
+						reasoningTokens: 0,
+						cachedTokens: 0,
+						tps: null,
+						avgTtftMs: null,
+						lastUsedAt: 0
+					},
+					turnIds: /* @__PURE__ */ new Set(),
+					decodeMs: 0,
+					ttftTotal: 0,
+					ttftCount: 0
+				};
+				rows.set(key, acc);
+			}
+			acc.row.calls += 1;
+			acc.turnIds.add(call.turnId);
+			if (!call.ok) acc.row.failed += 1;
+			if (call.at > acc.row.lastUsedAt) acc.row.lastUsedAt = call.at;
+			if (call.ttftMs !== void 0) {
+				acc.ttftTotal += call.ttftMs;
+				acc.ttftCount += 1;
+			}
+			if (call.decodeMs !== void 0) acc.decodeMs += call.decodeMs;
+			if (call.usage !== void 0) {
+				acc.row.inputTokens += call.usage.inputTokens;
+				acc.row.outputTokens += call.usage.outputTokens;
+				acc.row.reasoningTokens += call.usage.reasoningTokens;
+				acc.row.cachedTokens += call.usage.cachedTokens;
+			}
+		}
+		const failedTurnIds = /* @__PURE__ */ new Set();
+		let recoveredTurns = 0;
+		for (const [turnId, bucket] of turns) if (bucket.failed > 0 && bucket.succeeded === 0) failedTurnIds.add(turnId);
+		else if (bucket.failed > 0) recoveredTurns += 1;
+		const out = [];
+		for (const acc of rows.values()) {
+			let recovered = 0;
+			for (const turnId of acc.turnIds) {
+				const bucket = turns.get(turnId);
+				if (bucket !== void 0 && bucket.failed > 0 && bucket.succeeded > 0) recovered += 1;
+			}
+			out.push({
+				...acc.row,
+				turns: acc.turnIds.size,
+				recovered,
+				tps: acc.decodeMs >= MIN_DECODE_MS ? Math.round(acc.row.outputTokens / (acc.decodeMs / 1e3)) : null,
+				avgTtftMs: acc.ttftCount > 0 ? Math.round(acc.ttftTotal / acc.ttftCount) : null
+			});
+		}
+		out.sort((a, b) => b.calls - a.calls || b.lastUsedAt - a.lastUsedAt || a.model.localeCompare(b.model));
+		return {
+			samples: this.samples.length,
+			turns: turns.size,
+			failedTurns: failedTurnIds.size,
+			recoveredTurns,
+			calls,
+			usageReported,
+			entries: this.samples.slice().reverse(),
+			rows: out,
+			accounts: this.accountRows(),
+			days: this.days(failedTurnIds)
+		};
+	}
+	/**
+	* One row per account, busiest first.
+	*
+	* Samples that never named an account are grouped under an empty label
+	* rather than dropped: `account` is optional on `UsageCall`, so a caller that
+	* files a sample without one - a failure raised before any account was ever
+	* picked, say - would otherwise vanish from this view, and the account table
+	* would add up to less than the call total with nothing on screen to explain
+	* the gap. Every shim record site names its account; this branch exists so
+	* that a future one cannot quietly break the totals.
+	*
+	* `topModels` keeps the two most-used ids rather than every one: this column
+	* answers "what does this account usually run", and a list of nine ids is not
+	* an answer to that question, it is just the other table again.
+	*/
+	accountRows() {
+		const buckets = /* @__PURE__ */ new Map();
+		for (const call of this.samples) {
+			const label = call.account ?? "";
+			const key = `${call.channel}\u0000${call.region}\u0000${label}`;
+			let acc = buckets.get(key);
+			if (acc === void 0) {
+				acc = {
+					row: {
+						account: label,
+						channel: call.channel,
+						region: call.region,
+						calls: 0,
+						turns: 0,
+						failed: 0,
+						inputTokens: 0,
+						outputTokens: 0,
+						cachedTokens: 0,
+						lastUsedAt: 0,
+						topModels: []
+					},
+					turnIds: /* @__PURE__ */ new Set(),
+					modelCalls: /* @__PURE__ */ new Map()
+				};
+				buckets.set(key, acc);
+			}
+			acc.row.calls += 1;
+			acc.turnIds.add(call.turnId);
+			if (!call.ok) acc.row.failed += 1;
+			if (call.at > acc.row.lastUsedAt) acc.row.lastUsedAt = call.at;
+			acc.modelCalls.set(call.model, (acc.modelCalls.get(call.model) ?? 0) + 1);
+			if (call.usage !== void 0) {
+				acc.row.inputTokens += call.usage.inputTokens;
+				acc.row.outputTokens += call.usage.outputTokens;
+				acc.row.cachedTokens += call.usage.cachedTokens;
+			}
+		}
+		const out = [];
+		for (const acc of buckets.values()) {
+			const topModels = [...acc.modelCalls.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, 2).map(([model]) => model);
+			out.push({
+				...acc.row,
+				turns: acc.turnIds.size,
+				topModels
+			});
+		}
+		out.sort((a, b) => b.calls - a.calls || b.lastUsedAt - a.lastUsedAt || a.account.localeCompare(b.account));
+		return out;
+	}
+	/**
+	* The daily series, oldest first, limited to the most recent days.
+	*
+	* Sorted by key rather than insertion order because a retained window can
+	* straddle a month boundary, and a chart whose axis jumps backwards reads as
+	* corrupted data rather than as history.
+	*
+	* `failedTurns` is counted by DISTINCT turn id, not by summing per-call
+	* failures: a turn that rotated three accounts and failed on all three is
+	* still one failed turn, and the whole reason this module keeps turns and
+	* calls apart is so that number stays honest in every place it appears.
+	*/
+	days(failedTurnIds) {
+		const buckets = /* @__PURE__ */ new Map();
+		for (const call of this.samples) {
+			const key = usageDayKey(call.at);
+			let acc = buckets.get(key);
+			if (acc === void 0) {
+				acc = {
+					day: key,
+					calls: 0,
+					inputTokens: 0,
+					outputTokens: 0,
+					failedTurnIds: /* @__PURE__ */ new Set()
+				};
+				buckets.set(key, acc);
+			}
+			acc.calls += 1;
+			acc.inputTokens += call.usage?.inputTokens ?? 0;
+			acc.outputTokens += call.usage?.outputTokens ?? 0;
+			if (failedTurnIds.has(call.turnId)) acc.failedTurnIds.add(call.turnId);
+		}
+		return [...buckets.values()].sort((a, b) => a.day.localeCompare(b.day)).slice(-14).map((acc) => ({
+			day: acc.day,
+			calls: acc.calls,
+			failedTurns: acc.failedTurnIds.size,
+			inputTokens: acc.inputTokens,
+			outputTokens: acc.outputTokens
+		}));
+	}
+};
+/**
+* Inspect one SSE frame's content, without its trailing separator.
+*
+* Returns undefined when no `data:` line parsed, which covers the `[DONE]`
+* sentinel, keep-alive comments and truncated JSON alike - a frame the forwarder
+* has no opinion about must come back untouched rather than guessed at.
+*/
+function inspectSseFrame(frame) {
+	for (const line of frame.split("\n")) {
+		const trimmed = line.trim();
+		if (!trimmed.startsWith("data:")) continue;
+		const payload = trimmed.slice(5).trim();
+		if (payload === "" || payload === "[DONE]") continue;
+		let parsed;
+		try {
+			parsed = JSON.parse(payload);
+		} catch {
+			continue;
+		}
+		if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) continue;
+		const usage = parsed["usage"];
+		if (usage === void 0 || usage === null) continue;
+		return {
+			parsed,
+			usageOnly: isUsageOnlyFrame(parsed)
+		};
+	}
+}
+//#endregion
+//#region src/aggregate.ts
+/**
+* Aggregate lane: the 76 declared upstream providers, resolved per request and
+* forwarded to with the user's own key.
+*
+* WHY A SECOND LANE BESIDE THE POOL
+*
+* The pool serves exactly one family of gateways — WorkBuddy, CN and
+* international — from accounts the user already signed in on the desktop app.
+* This module serves the orthogonal case: a provider the user holds a key for,
+* reached at that provider's own endpoint, with no account rotation because
+* there is no account to rotate. Same card, same model picker, different wire.
+*
+* WHAT IT DELIBERATELY DOES NOT DO
+*
+* It does not invent endpoints. Every URL here comes from the registry record or
+* from a base-URL override the user typed; a provider whose endpoint cannot be
+* composed is reported as such rather than being probed at a guessed URL, because
+* "no listing" and "provider is down" must not read the same to the user.
+*
+* It also does not decide whether a provider is USABLE — that is the settings
+* layer's call (`providerAuthUsable`). This module resolves what a request
+* needs, and refuses with a message naming what is missing.
+*
+* KEYS
+*
+* Every string that can reach a message — a failure, a body snippet, a probe's
+* answer — passes through {@link redactAggregateSecret} first. Providers echo
+* rejected credentials back (a 401 body routinely repeats the key), and this
+* text is folded into messages the host writes to its durable session log.
+*
+* @module dsh-xdpool/aggregate
+*/
+const WIRE_BY_FORMAT = Object.freeze({
+	"openai-chat": "chat",
+	"openai-responses": "responses",
+	"anthropic-messages": "messages"
+});
+/**
+* Wire suffixes, needed only for the one record the registry gives no base URL
+* to (Azure names its endpoint per deployment, so `chatEndpoint` is null there
+* and there is no registry endpoint to read the suffix off).
+*/
+const CHAT_SUFFIX = Object.freeze({
+	"openai-chat": "/chat/completions",
+	"openai-responses": "/responses",
+	"anthropic-messages": "/messages"
+});
+/**
+* Capacities for a row the registry describes only by id.
+*
+* Deliberately conservative, and the reason is visible in the number: most
+* registry rows publish no context window at all. Publishing a plausible one
+* would put a fabricated field in front of the user — and unlike a display
+* label, a wrong window is a wrong capability, so DSH would hand the provider a
+* prompt it cannot accept.
+*/
+const DEFAULT_CONTEXT_WINDOW = 131072;
+const DEFAULT_MAX_OUTPUT = 32768;
+/** Listing round budget. Generous for a small JSON document, short for a UI. */
+const LISTING_TIMEOUT_MS = 15e3;
+/** One turn's budget, matching the pool shim's idle ceiling. */
+const TURN_TIMEOUT_MS = 3e5;
+/** Sent when the registry does not declare one (kimchi, and most of the roster). */
+const USER_AGENT = "dsh-xdpool/2.1";
+/** How much of an upstream body is quoted back in a failure message. */
+const BODY_SNIPPET_CHARS = 400;
+/** A trimmed non-empty string, or ''. */
+function text$4(value) {
+	return typeof value === "string" && value.trim() !== "" ? value.trim() : "";
+}
+/** A positive finite number, or undefined. */
+function number(value) {
+	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.trunc(value) : void 0;
+}
+function isRecord$3(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+/**
+* One aggregate-lane failure, carrying the class the caller maps onto HTTP.
+*
+* `kind` reuses the pool's vocabulary (`UpstreamErrorKind` in `upstream.ts`) so
+* the shim's existing error→status table serves both lanes: a third-party 429
+* is a `soft_rate`, a 401 is a `session_dead`, and neither needs a second table
+* that could drift from the first.
+*/
+var AggregateError = class extends Error {
+	kind;
+	status;
+	constructor(kind, message, status = 0) {
+		super(message);
+		this.name = "AggregateError";
+		this.kind = kind;
+		this.status = status;
+	}
+};
+/** Remove a credential from anything that may reach a message. */
+function redactAggregateSecret(value, apiKey) {
+	let source = typeof value === "string" ? value : String(value ?? "");
+	const key = text$4(apiKey);
+	if (key === "") return source;
+	const escaped = JSON.stringify(key).slice(1, -1);
+	for (const needle of escaped === key ? [key] : [key, escaped]) if (source.includes(needle)) source = source.split(needle).join("[redacted]");
+	return source;
+}
+/** A base URL a request can actually be sent to. */
+function hasPlaceholder(baseUrl) {
+	return /\{[^}]*\}/.test(baseUrl);
+}
+/** The user's `baseUrl` override when present, else the registry's own. */
+function effectiveBaseUrl(provider, setting) {
+	const override = text$4(setting.baseUrl);
+	return (override !== "" ? override : text$4(provider.baseUrl)).replace(/\/+$/, "");
+}
+/**
+* The provider's listing URL, moved by a `baseUrl` override when — and only
+* when — the declared listing actually lives under the registry base.
+*
+* Three providers (cohere, deepinfra, ollama_cloud) publish their listing on
+* another path. Rewriting a URL that never pointed at the override would invent
+* one, and a guessed listing is worse than none.
+*/
+function effectiveModelsUrl(provider, setting) {
+	const declared = modelsEndpoint(provider);
+	if (declared === null) return null;
+	const override = text$4(setting.baseUrl).replace(/\/+$/, "");
+	const registryBase = text$4(provider.baseUrl).replace(/\/+$/, "");
+	if (override === "" || registryBase === "" || !declared.startsWith(registryBase)) return declared;
+	return `${override}${declared.slice(registryBase.length)}`;
+}
+/**
+* The full URL a turn is posted to; null when the provider has no dialable
+* endpoint (Azure without a user base URL, or a base still carrying the
+* registry's `{account_id}`-style placeholder).
+*/
+function effectiveChatUrl(provider, setting) {
+	const override = text$4(setting.baseUrl).replace(/\/+$/, "");
+	const declared = chatEndpoint(provider);
+	if (declared !== null) {
+		const registryBase = text$4(provider.baseUrl).replace(/\/+$/, "");
+		const url = override === "" || registryBase === "" ? declared : `${override}${declared.slice(registryBase.length)}`;
+		return hasPlaceholder(url) ? null : url;
+	}
+	const suffix = CHAT_SUFFIX[provider.format];
+	if (override === "" || suffix === void 0 || hasPlaceholder(override)) return null;
+	return `${override}${suffix}`;
+}
+/** The per-provider settings object, or `{}` when the store names none. */
+function settingFor(store, providerId) {
+	return store.providers?.[providerId] ?? {};
+}
+/**
+* Resolve one provider's effective settings.
+*
+* Throws {@link AggregateError} with a `client` kind for every state the user
+* fixes in the settings page — an unknown id, a missing key, a placeholder base
+* URL. A `client` kind is deliberate: none of these is a transport fault, so
+* none of them should be retried against a different provider.
+*
+* `options.requireEnabled` exists for the DISCOVERY calls. Fetching a provider's
+* model list publishes nothing: it asks "does this endpoint answer, and with
+* what", and writing the answer back is a separate step the user also takes.
+* Gating it on the enable switch made a read-only button report
+* `"OpenCode Free" is not enabled in the aggregate settings` — a failure to
+* LOOK, dressed up as a failure to connect, on rows that carry no key field and
+* so offered no way to answer it. Discovery therefore does not require the
+* switch; publishing still does, in {@link buildAggregateCatalog} and
+* {@link resolveAggregateProvider} as called by the serving paths.
+*/
+function resolveAggregateProvider(store, providerId, options = {}) {
+	const id = text$4(providerId);
+	const provider = id === "" ? null : getProvider(id);
+	if (provider === null) throw new AggregateError("client", `the aggregate lane has no provider "${id === "" ? String(providerId) : id}"`);
+	const setting = settingFor(store, provider.id);
+	if (setting.enabled === false) throw new AggregateError("client", `"${provider.name}" is switched off in the aggregate settings`);
+	if (!providerAuthUsable(provider, setting)) {
+		if (provider.auth.kind === "oauth" || provider.auth.kind === "adc") throw new AggregateError("session_dead", `"${provider.name}" signs in with ${provider.auth.kind}, not with an API key, so the aggregate lane does not serve it`);
+		const where = text$4(provider.auth.url) === "" ? "" : ` (the provider issues keys at ${provider.auth.url})`;
+		throw new AggregateError("client", `"${provider.name}" needs an API key: paste one in the aggregate settings${where}`);
+	}
+	if (options.requireEnabled !== false && !providerEnabled(provider, setting)) throw new AggregateError("client", `"${provider.name}" is not enabled in the aggregate settings`);
+	const baseUrl = effectiveBaseUrl(provider, setting);
+	if (baseUrl === "") throw new AggregateError("client", `"${provider.name}" has no base URL of its own — set one in the aggregate settings`);
+	if (hasPlaceholder(baseUrl)) throw new AggregateError("client", `"${provider.name}"'s base URL still carries a registry placeholder — set the real URL in the aggregate settings`);
+	const chatUrl = effectiveChatUrl(provider, setting);
+	if (chatUrl === null) throw new AggregateError("client", `"${provider.name}" has no usable ${provider.format} endpoint`);
+	const apiKeys = orderApiKeys(providerApiKeys(setting), setting.distribution);
+	const apiKey = apiKeys[0] ?? "";
+	const headers = defaultHeaders(provider, apiKey);
+	if (headers["user-agent"] === void 0) headers["user-agent"] = USER_AGENT;
+	return {
+		providerId: provider.id,
+		providerName: provider.name,
+		apiKey,
+		/**
+		* Every key, preferred first — what rotation reads.
+		*
+		* `apiKey` above stays entry 0 because the redaction helper and every existing
+		* caller want one string. This is the field that makes several pasted keys
+		* mean something: a key the vendor rate-limits is swapped for the next one
+		* instead of failing the request.
+		*/
+		apiKeys,
+		baseUrl,
+		format: provider.format,
+		wire: WIRE_BY_FORMAT[provider.format],
+		chatUrl,
+		modelsUrl: effectiveModelsUrl(provider, setting),
+		headers
+	};
+}
+/**
+* The ids a provider should be served with, and where that list came from.
+*
+* `discovered` is the roster a fetch returned, `models` is the subset the user
+* kept, and the choice is applied LAST so it wins over both — otherwise pressing
+* "Fetch models" would silently undo the narrowing the card just saved.
+*/
+function modelIdsFor(provider, setting) {
+	const universe = modelChoicesFor(provider, setting);
+	const source = rosterIsDiscovered(provider, setting) ? "discovered" : "static";
+	const override = stringList(setting.models);
+	if (override.length === 0) return {
+		ids: universe,
+		source
+	};
+	const available = new Set(universe);
+	return {
+		ids: override.filter((id) => available.has(id)),
+		source
+	};
+}
+/**
+* Whether the roster came from a live fetch rather than the registry.
+*
+* A pre-split install has `models` and no `discovered`, because until the
+* chooser existed the only writer of `models` WAS the fetch button. Those ids
+* are a roster, not a choice, and treating them as one would shrink the vendor
+* to whatever handful the registry happens to declare.
+*/
+function rosterIsDiscovered(provider, setting) {
+	if ((setting.discovered?.length ?? 0) > 0) return true;
+	return stringList(setting.models).length > provider.models.length;
+}
+/** Every id a provider could offer: its roster, for the card's chooser. */
+function modelChoicesFor(provider, setting) {
+	const discovered = stringList(setting.discovered);
+	if (discovered.length === 0 && rosterIsDiscovered(provider, setting)) return stringList(setting.models);
+	return discovered.length > 0 ? discovered : provider.models.map((model) => model.id);
+}
+/** A de-duplicated list of non-empty trimmed strings from an untrusted array. */
+function stringList(value) {
+	if (!Array.isArray(value)) return [];
+	const seen = /* @__PURE__ */ new Set();
+	const ids = [];
+	for (const raw of value) {
+		const id = text$4(raw);
+		if (id === "" || seen.has(id)) continue;
+		seen.add(id);
+		ids.push(id);
+	}
+	return ids;
+}
+/**
+* One catalog row.
+*
+* Capacities come from the registry's model row where it has them, and fall back
+* to this module's own defaults where it does not (most rows carry no context
+* window, and none carries an output ceiling — the registry records ids and
+* published capacities, not a serving contract).
+*/
+function rowOf(provider, modelId, source) {
+	const declared = provider.models.find((model) => model.id === modelId);
+	const contextWindow = number(declared?.contextWindow) ?? DEFAULT_CONTEXT_WINDOW;
+	const label = text$4(declared?.name) !== "" ? text$4(declared?.name) : modelId;
+	return {
+		id: providerModelId(provider.id, modelId),
+		name: `${provider.name} ${label}`,
+		providerId: provider.id,
+		modelId,
+		contextWindow,
+		maxOutputTokens: Math.min(DEFAULT_MAX_OUTPUT, contextWindow),
+		supportsImages: declared?.vision === true,
+		wire: WIRE_BY_FORMAT[provider.format],
+		source
+	};
+}
+/**
+* Every model row the lane should offer, given the stored settings.
+*
+* A provider is skipped when it is switched off, when its credential flow this
+* lane cannot drive, or when its endpoint cannot be composed — a picker row that
+* can never answer is worse than no row, because it reads as "this provider is
+* broken" rather than "not set up yet".
+*/
+function buildAggregateCatalog(store) {
+	if (store.enabled === false) return [];
+	const rows = [];
+	for (const [providerId, setting] of Object.entries(store.providers ?? {})) {
+		if (setting === void 0 || setting === null) continue;
+		const provider = getProvider(providerId);
+		if (provider === null) continue;
 		if (!providerAuthUsable(provider, setting)) continue;
 		if (!providerEnabled(provider, setting)) continue;
 		if (effectiveChatUrl(provider, setting) === null) continue;
@@ -11538,30 +12393,80 @@ async function forwardAggregateStreamed(resolved, modelId, body, options) {
 		stream: true
 	});
 	const controller = new AbortController();
+	/**
+	* Every payload goes through here first, so the tracker sees the first byte and
+	* any usage frame without the transport caring.
+	*
+	* Wrapped rather than instrumented at each `onData` call site: this function has
+	* four of them, and one missed would silently under-report the turn's tokens.
+	*/
+	const emit = (payload) => {
+		tracker.markFirstByte();
+		try {
+			tracker.observe(JSON.parse(payload));
+		} catch {}
+		options.onData(payload);
+	};
+	/**
+	* Measures this physical attempt for the ledger.
+	*
+	* Created before the request so `markFirstByte` reports from the moment the
+	* caller asked, and kept in the outer scope so the `finally` can file the call
+	* whether it succeeded or threw — a broken stream is a failed call from the
+	* user's side of the wire, and the panel must count it rather than show nothing.
+	*/
+	const tracker = new StreamTracker();
+	let delivered = false;
 	const timeoutMs = options.timeoutMs ?? TURN_TIMEOUT_MS;
 	const onCallerAbort = () => controller.abort();
 	options.signal?.addEventListener("abort", onCallerAbort, { once: true });
 	try {
-		const response = await fetch(resolved.chatUrl, {
-			method: "POST",
-			headers: {
-				...resolved.headers,
-				accept: "text/event-stream"
-			},
-			body: bodyText,
-			redirect: "error",
-			signal: controller.signal
-		});
-		const retryAfter = retryAfterMs(response);
-		if (!response.ok) {
+		/**
+		* POST, rotating the key when the vendor refuses the one we used.
+		*
+		* A provider holding several keys is a user who already knows a single key
+		* gets rate-limited. Failing the turn on a 429/401 from key #1 wastes the very
+		* thing they set up: the alternates. So a REFUSAL that looks like "this key,
+		* not this request" retries with the next key.
+		*
+		* Only the request-credential classes retry — `soft_rate` (429) and
+		* `session_dead` (401). A `client` (400), `not_found` (404), `hard_credit`
+		* (402) or `server` (5xx) failure is about the request or the account balance
+		* and would fail identically on every key, so retrying would only multiply the
+		* wait. Keys are tried in order and each at most once, so the attempt count is
+		* bounded by how many the user pasted.
+		*/
+		const keys = resolved.apiKeys.length === 0 ? [""] : resolved.apiKeys;
+		let response;
+		let usedKey = resolved.apiKey;
+		for (const [index, key] of keys.entries()) {
+			usedKey = key;
+			const headers = {
+				...resolved.headers,
+				accept: "text/event-stream"
+			};
+			if (resolved.apiKey !== "") {
+				for (const [name, value] of Object.entries(headers)) if (value === resolved.apiKey) headers[name] = key;
+			}
+			response = await fetch(resolved.chatUrl, {
+				method: "POST",
+				headers,
+				body: bodyText,
+				redirect: "error",
+				signal: controller.signal
+			});
+			if (response.ok) break;
+			const retryAfter = retryAfterMs(response);
 			const refusal = await response.text().catch(() => "");
-			throw classifyUpstream(response.status, refusal, retryAfter, resolved.apiKey);
+			const failure = classifyUpstream(response.status, refusal, retryAfter, key);
+			if (!(failure.kind === "soft_rate" || failure.kind === "session_dead") || index === keys.length - 1) throw failure;
 		}
 		if (response.body === null) throw new AggregateError("server", "the provider returned no body", response.status);
 		const head = await readSseHead(response.body, controller.signal, timeoutMs);
 		if (head.shape === "empty") throw new AggregateError("server", "the provider returned no body", response.status);
 		if (head.shape === "sse") {
-			for (const payload of head.payloads) options.onData(payload);
+			for (const payload of head.payloads) emit(payload);
+			delivered = true;
 			return { status: response.status };
 		}
 		let raw = head.text;
@@ -11583,8 +12488,9 @@ async function forwardAggregateStreamed(resolved, modelId, body, options) {
 			if (/^\s*<(!doctype|html[\s>])/i.test(raw)) throw new AggregateError("client", `the provider's front proxy answered HTTP ${response.status} with an HTML error page`, response.status);
 			throw new AggregateError("server", `unexpected non-stream response: ${redactAggregateSecret(raw, resolved.apiKey).slice(0, 200)}`, response.status);
 		}
-		if (isRecord$3(payload) && (payload.error !== void 0 || payload.type === "error")) throw classifyUpstream(response.status, raw, retryAfter, resolved.apiKey);
-		for (const frame of synthesisedFrames(resolved.wire, payload, model)) options.onData(frame);
+		if (isRecord$3(payload) && (payload.error !== void 0 || payload.type === "error")) throw classifyUpstream(response.status, raw, retryAfterMs(response), usedKey);
+		for (const frame of synthesisedFrames(resolved.wire, payload, model)) emit(frame);
+		delivered = true;
 		return { status: response.status };
 	} catch (error) {
 		if (error instanceof AggregateError) throw error;
@@ -11594,6 +12500,18 @@ async function forwardAggregateStreamed(resolved, modelId, body, options) {
 		throw new AggregateError("server", `the request to ${resolved.providerName} failed: ${redactAggregateSecret(cause, resolved.apiKey)}`);
 	} finally {
 		options.signal?.removeEventListener("abort", onCallerAbort);
+		tracker.finish(Date.now());
+		options.usage?.recorder.record({
+			channel: resolved.providerId,
+			region: "",
+			model,
+			turnId: options.usage.turnId,
+			at: Date.now(),
+			ok: delivered,
+			...tracker.ttftMs === void 0 ? {} : { ttftMs: tracker.ttftMs },
+			...tracker.decodeMs === void 0 ? {} : { decodeMs: tracker.decodeMs },
+			...tracker.usage === void 0 ? {} : { usage: tracker.usage }
+		});
 	}
 }
 /**
@@ -12305,6 +13223,7 @@ function packCredentialToWorkBuddy(entry, document) {
 	const expiresAtMs = expiryToMs(document.expires_at) || expiryToMs(entry.expiresAt);
 	const nickname = text$3(document.nickname) ?? text$3(entry.nickname);
 	const uid = text$3(document.user_id);
+	const enterpriseId = text$3(document.enterprise_id);
 	return {
 		accessToken,
 		refreshToken: text$3(document.refresh_token) ?? "",
@@ -12312,7 +13231,7 @@ function packCredentialToWorkBuddy(entry, document) {
 		...expiryToMs(document.refresh_expires_at) > 0 ? { refreshExpiresAtMs: expiryToMs(document.refresh_expires_at) } : {},
 		...nickname === void 0 ? {} : { nickname },
 		...uid === void 0 ? {} : { uid },
-		...text$3(document.enterprise_id) === void 0 ? {} : { enterpriseId: text$3(document.enterprise_id) },
+		...enterpriseId === void 0 ? {} : { enterpriseId },
 		domain,
 		sourcePath: `channel-pack:${provider}:${refName}`
 	};
@@ -12456,23 +13375,115 @@ function imageUrlOf(block, resolveImage, warnings) {
 	if (direct.startsWith("http://") || direct.startsWith("https://")) return direct;
 	warnings.push("image-dropped");
 }
-/** Every tool result a message carries, in order. */
+/**
+* Drop tool calls nobody answered, and tool results nobody called.
+*
+* Every wire spells tool traffic as a PAIR: an assistant `tool_calls` entry with
+* an id, and a `role: 'tool'` message answering that same id. Upstream rejects a
+* conversation that breaks the pairing — and it rejects it EVERY TURN from then
+* on, because the offending messages stay in the history. A single interrupted
+* turn therefore makes a session permanently unusable, which is exactly what
+* users report as "this conversation broke and won't come back".
+*
+* Three shapes are repaired, all by DROPPING rather than inventing:
+*
+*   1. a `tool_calls` entry with no answer — the model called a tool, the turn
+*      was interrupted, and the result never arrived. Keeping the call and
+*      fabricating an answer would teach the model a lie; dropping the call
+*      leaves the assistant text intact and the conversation legible.
+*   2. a `tool` message whose id answers no call — the call was pruned in an
+*      earlier turn, or the result outlived its call.
+*   3. a `tool_calls` entry with an EMPTY name — it is "answered" by any result
+*      but cannot be replayed: upstream validates the name. Responding side is
+*      already safe (an unknown name is held back rather than streamed), but the
+*      HISTORY would otherwise keep shipping it.
+*
+* Dropping is safe here only because the alternative is a hard 400 that kills
+* every subsequent turn. It is reported through `warnings` so the drop is not
+* silent — the same channel the request body already uses for other repairs.
+*/
+function repairToolPairing(messages, warnings) {
+	const called = /* @__PURE__ */ new Set();
+	const answered = /* @__PURE__ */ new Set();
+	for (const message of messages) {
+		for (const call of toolCallsOf(message)) if (call.id !== "" && call.name !== "") called.add(call.id);
+		for (const result of toolResultsOf(message)) if (result.callId !== "") answered.add(result.callId);
+	}
+	let droppedCalls = 0;
+	let droppedResults = 0;
+	const out = [];
+	for (const message of messages) {
+		if (message.role === "tool") {
+			const id = text$2(message.tool_call_id ?? message.toolCallId ?? message.id);
+			if (id !== "" && !called.has(id)) {
+				droppedResults += 1;
+				continue;
+			}
+			out.push(message);
+			continue;
+		}
+		const calls = toolCallsOf(message);
+		if (calls.length === 0) {
+			out.push(message);
+			continue;
+		}
+		const kept = calls.filter((call) => call.id !== "" && call.name !== "" && answered.has(call.id));
+		if (kept.length === calls.length) {
+			out.push(message);
+			continue;
+		}
+		droppedCalls += calls.length - kept.length;
+		if (kept.length === 0) {
+			if (textOf(blocksOf(message.content)) === "") continue;
+			const stripped = { ...message };
+			delete stripped.tool_calls;
+			delete stripped.toolCalls;
+			out.push(stripped);
+			continue;
+		}
+		out.push({
+			...message,
+			tool_calls: kept
+		});
+	}
+	if (droppedCalls > 0) warnings.push(`${String(droppedCalls)} unanswered tool call(s) were dropped so the conversation can continue`);
+	if (droppedResults > 0) warnings.push(`${String(droppedResults)} orphaned tool result(s) were dropped so the conversation can continue`);
+	return out;
+}
+/**
+* Every tool result a message carries, in order.
+*
+* The `role: 'tool'` case is the one that was silent and expensive: DSH's own
+* tool messages carry the RESULT as their content — there is no `tool-result`
+* block wrapper to find. Filtering for that wrapper therefore returned `[]`, and
+* the call sites skip a tool message with no results (`continue`), so the whole
+* result vanished from all three wires. The model then saw a conversation in
+* which it had called a tool and never learned the outcome, and re-issued the
+* same call forever — reported as "the tool returned no result" (#113).
+*
+* So: a tool message's content IS the result. Only a non-tool message is
+* searched for the wrapper blocks (that is the Anthropic-shaped spelling, where
+* a `user` turn can carry `tool-result` blocks).
+*/
 function toolResultsOf(message) {
-	if (message.role !== "tool") {
-		const blocks = blocksOf(message.content).filter((block) => block.type === "tool-result");
-		if (blocks.length === 0) return [];
+	if (message.role === "tool") {
+		const callId = text$2(message.tool_call_id ?? message.toolCallId ?? message.id);
+		const blocks = blocksOf(message.content);
 		return [{
-			callId: text$2(message.tool_call_id ?? message.toolCallId ?? message.id),
-			content: blocks
+			callId,
+			content: blocks.length > 0 ? blocks : [{
+				type: "text",
+				text: typeof message.content === "string" ? message.content : ""
+			}],
+			...message.is_error === true || message.isError === true ? { failed: true } : {}
 		}];
 	}
-	const out = [];
 	const blocks = blocksOf(message.content).filter((block) => block.type === "tool-result");
-	for (const block of blocks) out.push({
-		callId: text$2(block.tool_use_id ?? block.toolCallId ?? message.tool_call_id ?? message.id),
-		content: [block]
-	});
-	return out;
+	if (blocks.length === 0) return [];
+	return [{
+		callId: text$2(message.tool_call_id ?? message.toolCallId ?? message.id),
+		content: blocks
+	}];
 }
 /** The tool call a message's `tool_calls` array holds, when it holds one. */
 function toolCallsOf(message) {
@@ -12537,7 +13548,7 @@ function toolDefsFor(tools, wire) {
 */
 function requestBodyFor(wire, body, options) {
 	const { modelId, resolveImage, warnings } = options;
-	const messages = Array.isArray(body.messages) ? body.messages.filter(isRecord$2) : [];
+	const messages = repairToolPairing(Array.isArray(body.messages) ? body.messages.filter(isRecord$2) : [], warnings);
 	const stream = body.stream === true;
 	const reasoningEffort = text$2(body.reasoning_effort);
 	const out = {
@@ -12713,7 +13724,8 @@ function claudeTurns(messages, resolveImage, warnings) {
 				content: [{
 					type: "tool_result",
 					tool_use_id: result.callId,
-					content: body !== "" ? body : content.length > 0 ? content : "(no output)"
+					content: body !== "" ? body : content.length > 0 ? content : "(no output)",
+					...result.failed === true ? { is_error: true } : {}
 				}]
 			});
 		}
@@ -13838,7 +14850,7 @@ async function postFreeStreamed({ modelId, body, session, requestId, hooks, plan
 		result.usage = usage;
 	}
 	result.suppressedOnly = tools.suppressed();
-	result.finishReason = finish;
+	if (finish !== void 0) result.finishReason = finish;
 	return result;
 }
 /**
@@ -14124,464 +15136,135 @@ async function fetchFreeListing(options = {}) {
 		const text = await response.text();
 		if (!response.ok) throw new Error(`the free lane answered HTTP ${response.status}: ${text.slice(0, 200)}`);
 		return JSON.parse(text);
-	} catch (error) {
-		if (callerAborted || options.signal?.aborted === true) throw new Error("request aborted");
-		if (error instanceof Error && error.name === "AbortError") throw new Error(`the free lane's listing did not answer within ${String(options.timeoutMs ?? 15e3)}ms`);
-		throw error instanceof Error ? error : new Error(String(error));
-	} finally {
-		clearTimeout(timer);
-		options.signal?.removeEventListener("abort", onCallerAbort);
-	}
-}
-/**
-* The static roster, used until the first listing lands and again whenever one
-* fails.
-*
-* An empty picker is the one outcome a user reads as "the plugin broke", so the
-* lane ships with rows it can serve without ever having reached the network.
-* These are the ids the gateway is known to serve免密 today; a row that later
-* disappears costs one dead model entry, while an empty lane costs everything.
-*/
-const FALLBACK_FREE_MODEL_IDS = Object.freeze([
-	"muse-spark-1.3-contributor-free",
-	"muse-spark-1.2-contributor-free",
-	"union-alpha",
-	"space-bunny-free",
-	"nemotron-3-ultra-free",
-	"deepseek-v4-flash-free",
-	"mimo-v2.6-flash-free",
-	"mimo-v2.5-free",
-	"jev-1.13-free"
-]);
-/** Live free roster with a static fallback behind it. */
-var FreeCatalog = class {
-	rows;
-	listeners = /* @__PURE__ */ new Set();
-	lastError;
-	lastUpdatedAt;
-	constructor(fallback = FALLBACK_FREE_MODEL_IDS) {
-		this.rows = Object.freeze(buildFreeCatalog(fallback));
-	}
-	current() {
-		return this.rows;
-	}
-	/** Why the last refresh failed, for display. Never a substitute for rows. */
-	error() {
-		return this.lastError;
-	}
-	/** When the live list last landed. */
-	updatedAt() {
-		return this.lastUpdatedAt;
-	}
-	/** The row behind a published id, or undefined. */
-	find(modelId) {
-		return this.rows.find((row) => row.modelId === modelId || row.id === modelId);
-	}
-	/** Whether anything is being served right now. */
-	hasRows() {
-		return this.rows.length > 0;
-	}
-	onChange(listener) {
-		this.listeners.add(listener);
-		return () => {
-			this.listeners.delete(listener);
-		};
-	}
-	/**
-	* Re-read the listing and notify when the roster actually changed.
-	*
-	* A failed refresh KEEPS the current rows and records the error. Dropping to
-	* empty here would make a network hiccup look like the models were deleted.
-	*/
-	async refresh(options = {}) {
-		let next;
-		try {
-			next = Object.freeze(buildFreeCatalog(parseListing(await fetchFreeListing(options))));
-		} catch (error) {
-			this.lastError = error instanceof Error ? error.message : String(error);
-			if (this.rows.length === 0) this.rows = Object.freeze(buildFreeCatalog(FALLBACK_FREE_MODEL_IDS));
-			for (const listener of this.listeners) listener();
-			return this.rows;
-		}
-		if (next.length === 0) {
-			this.lastError = "the gateway listing held no免密 models";
-			for (const listener of this.listeners) listener();
-			return this.rows;
-		}
-		this.lastError = void 0;
-		this.lastUpdatedAt = (/* @__PURE__ */ new Date()).toISOString();
-		if (next.length === this.rows.length && next.every((row, index) => row.modelId === this.rows[index]?.modelId)) return this.rows;
-		this.rows = next;
-		for (const listener of this.listeners) listener();
-		return this.rows;
-	}
-};
-//#endregion
-//#region src/stats.ts
-/**
-* Retained calls. Bounded on purpose: a busy week is thousands of calls, and a
-* dashboard that grows without limit turns into a memory leak with a chart.
-*/
-const USAGE_MAX_SAMPLES = 2e3;
-/**
-* Minimum total decoding time before a throughput figure is published.
-*
-* A one-token answer that arrives in 20ms would otherwise report a tps two
-* orders of magnitude above anything a real turn reaches, and the panel would
-* rank models by that artefact instead of by speed.
-*/
-const MIN_DECODE_MS = 120;
-/**
-* A reported token count, or null when the key is absent / not a finite
-* number.
-*
-* Zero is ACCEPTED: an empty turn really can cost nothing, and reporting that
-* as "the gateway said nothing" would make the panel lie in the other
-* direction.
-*/
-function count(value) {
-	return typeof value === "number" && Number.isFinite(value) && value >= 0 ? Math.floor(value) : null;
-}
-function zero(value) {
-	return count(value) ?? 0;
-}
-function detailOf(value, key) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return 0;
-	return zero(value[key]);
-}
-/**
-* Read a gateway `usage` object, accepting both spellings OpenAI-compatible
-* gateways use (`prompt_tokens` / `input_tokens`).
-*
-* Returns undefined when the document is not a usage report at all, so callers
-* can tell "the gateway sent zeroes" from "there was nothing here".
-*/
-function parseUsage(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
-	const obj = value;
-	const input = count(obj["prompt_tokens"]) ?? count(obj["input_tokens"]);
-	const output = count(obj["completion_tokens"]) ?? count(obj["output_tokens"]);
-	if (input === null && output === null) return void 0;
-	return {
-		inputTokens: input ?? 0,
-		outputTokens: output ?? 0,
-		reasoningTokens: detailOf(obj["completion_tokens_details"], "reasoning_tokens"),
-		cachedTokens: detailOf(obj["prompt_tokens_details"], "cached_tokens")
-	};
-}
-/**
-* True for the trailer frame a gateway sends to report usage.
-*
-* It is recognised by an EMPTY `choices` array beside a `usage` field. A frame
-* that also carries content is a normal chunk that happens to mention usage,
-* and dropping it would delete the user's answer - which is why the strip step
-* downstream is allowed to remove exactly these and nothing else.
-*/
-function isUsageOnlyFrame(parsed) {
-	if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return false;
-	const obj = parsed;
-	if (obj["usage"] === void 0 || obj["usage"] === null) return false;
-	const choices = obj["choices"];
-	return Array.isArray(choices) && choices.length === 0;
-}
-/** Local calendar day of an instant, as `YYYY-MM-DD`. */
-function usageDayKey(at) {
-	const d = new Date(at);
-	const month = String(d.getMonth() + 1).padStart(2, "0");
-	const day = String(d.getDate()).padStart(2, "0");
-	return `${d.getFullYear()}-${month}-${day}`;
-}
-/**
-* Timing and usage captured while one stream is forwarded.
-*
-* Kept free of Node stream types so it can be unit tested with plain numbers;
-* the shim owns the Transform that feeds it chunks.
-*/
-var StreamTracker = class {
-	/** Milliseconds from request start to the first byte, once seen. */
-	ttftMs;
-	/** Milliseconds from first byte to the end of the stream, once finished. */
-	decodeMs;
-	/** Usage seen in any frame, if the gateway sent any. */
-	usage;
-	firstAt;
-	startedAt;
-	constructor(startedAt = Date.now()) {
-		this.startedAt = startedAt;
-	}
-	/** Record the first byte. Repeated calls keep the earliest. */
-	markFirstByte(at = Date.now()) {
-		if (this.firstAt !== void 0) return;
-		this.firstAt = at;
-		const ttft = at - this.startedAt;
-		if (ttft >= 0) this.ttftMs = ttft;
-	}
-	/** Record stream completion. Repeated calls keep the earliest. */
-	finish(at = Date.now()) {
-		if (this.decodeMs !== void 0) return;
-		if (this.firstAt === void 0) return;
-		const decode = at - this.firstAt;
-		if (decode >= 0) this.decodeMs = decode;
-	}
-	/** Fold a parsed frame's usage in; later frames overwrite, as the gateway intends. */
-	observe(parsed) {
-		if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return;
-		const usage = parseUsage(parsed["usage"]);
-		if (usage !== void 0) this.usage = usage;
+	} catch (error) {
+		if (callerAborted || options.signal?.aborted === true) throw new Error("request aborted");
+		if (error instanceof Error && error.name === "AbortError") throw new Error(`the free lane's listing did not answer within ${String(options.timeoutMs ?? 15e3)}ms`);
+		throw error instanceof Error ? error : new Error(String(error));
+	} finally {
+		clearTimeout(timer);
+		options.signal?.removeEventListener("abort", onCallerAbort);
 	}
-};
+}
 /**
-* A bounded window of recent calls, summarised on demand.
+* The static roster, used until the first listing lands and again whenever one
+* fails.
 *
-* In-memory by design: this is a live panel, and persisting every prompt's
-* token counts would turn a convenience into a record of what the user asked.
-* A restart therefore starts the chart again, which the panel states rather
-* than hides.
+* An empty picker is the one outcome a user reads as "the plugin broke", so the
+* lane ships with rows it can serve without ever having reached the network.
+* These are the ids the gateway is known to serve免密 today; a row that later
+* disappears costs one dead model entry, while an empty lane costs everything.
 */
-var UsageRecorder = class {
-	samples = [];
-	limit;
-	constructor(limit = USAGE_MAX_SAMPLES) {
-		this.limit = limit > 0 ? limit : 1;
-	}
-	/** Retain one call, dropping the oldest once the window is full. */
-	record(call) {
-		this.samples.push(call);
-		while (this.samples.length > this.limit) this.samples.shift();
-	}
-	/** Samples currently retained. */
-	size() {
-		return this.samples.length;
-	}
-	/** Forget every retained call. */
-	reset() {
-		this.samples = [];
-	}
-	/** Aggregate the retained window. */
-	summary() {
-		const rows = /* @__PURE__ */ new Map();
-		const turns = /* @__PURE__ */ new Map();
-		let calls = 0;
-		let usageReported = false;
-		for (const call of this.samples) {
-			calls += 1;
-			if (call.usage !== void 0) usageReported = true;
-			const bucket = turns.get(call.turnId) ?? {
-				calls: 0,
-				succeeded: 0,
-				failed: 0
-			};
-			bucket.calls += 1;
-			if (call.ok) bucket.succeeded += 1;
-			else bucket.failed += 1;
-			turns.set(call.turnId, bucket);
-			const key = `${call.region}\u0000${call.model}`;
-			let acc = rows.get(key);
-			if (acc === void 0) {
-				acc = {
-					row: {
-						region: call.region,
-						model: call.model,
-						calls: 0,
-						turns: 0,
-						failed: 0,
-						recovered: 0,
-						inputTokens: 0,
-						outputTokens: 0,
-						reasoningTokens: 0,
-						cachedTokens: 0,
-						tps: null,
-						avgTtftMs: null,
-						lastUsedAt: 0
-					},
-					turnIds: /* @__PURE__ */ new Set(),
-					decodeMs: 0,
-					ttftTotal: 0,
-					ttftCount: 0
-				};
-				rows.set(key, acc);
-			}
-			acc.row.calls += 1;
-			acc.turnIds.add(call.turnId);
-			if (!call.ok) acc.row.failed += 1;
-			if (call.at > acc.row.lastUsedAt) acc.row.lastUsedAt = call.at;
-			if (call.ttftMs !== void 0) {
-				acc.ttftTotal += call.ttftMs;
-				acc.ttftCount += 1;
-			}
-			if (call.decodeMs !== void 0) acc.decodeMs += call.decodeMs;
-			if (call.usage !== void 0) {
-				acc.row.inputTokens += call.usage.inputTokens;
-				acc.row.outputTokens += call.usage.outputTokens;
-				acc.row.reasoningTokens += call.usage.reasoningTokens;
-				acc.row.cachedTokens += call.usage.cachedTokens;
-			}
-		}
-		const failedTurnIds = /* @__PURE__ */ new Set();
-		let recoveredTurns = 0;
-		for (const [turnId, bucket] of turns) if (bucket.failed > 0 && bucket.succeeded === 0) failedTurnIds.add(turnId);
-		else if (bucket.failed > 0) recoveredTurns += 1;
-		const out = [];
-		for (const acc of rows.values()) {
-			let recovered = 0;
-			for (const turnId of acc.turnIds) {
-				const bucket = turns.get(turnId);
-				if (bucket !== void 0 && bucket.failed > 0 && bucket.succeeded > 0) recovered += 1;
-			}
-			out.push({
-				...acc.row,
-				turns: acc.turnIds.size,
-				recovered,
-				tps: acc.decodeMs >= MIN_DECODE_MS ? Math.round(acc.row.outputTokens / (acc.decodeMs / 1e3)) : null,
-				avgTtftMs: acc.ttftCount > 0 ? Math.round(acc.ttftTotal / acc.ttftCount) : null
-			});
-		}
-		out.sort((a, b) => b.calls - a.calls || b.lastUsedAt - a.lastUsedAt || a.model.localeCompare(b.model));
-		return {
-			samples: this.samples.length,
-			turns: turns.size,
-			failedTurns: failedTurnIds.size,
-			recoveredTurns,
-			calls,
-			usageReported,
-			entries: this.samples.slice().reverse(),
-			rows: out,
-			accounts: this.accountRows(),
-			days: this.days(failedTurnIds)
-		};
-	}
+const FALLBACK_FREE_MODEL_IDS = Object.freeze([
+	"muse-spark-1.3-contributor-free",
+	"muse-spark-1.2-contributor-free",
+	"union-alpha",
+	"space-bunny-free",
+	"nemotron-3-ultra-free",
+	"deepseek-v4-flash-free",
+	"mimo-v2.6-flash-free",
+	"mimo-v2.5-free",
+	"jev-1.13-free"
+]);
+/** Live free roster with a static fallback behind it. */
+var FreeCatalog = class {
+	rows;
+	listeners = /* @__PURE__ */ new Set();
+	lastError;
+	lastUpdatedAt;
 	/**
-	* One row per account, busiest first.
+	* Whether this lane contributes models at all.
 	*
-	* Samples that never named an account are grouped under an empty label
-	* rather than dropped: `account` is optional on `UsageCall`, so a caller that
-	* files a sample without one - a failure raised before any account was ever
-	* picked, say - would otherwise vanish from this view, and the account table
-	* would add up to less than the call total with nothing on screen to explain
-	* the gap. Every shim record site names its account; this branch exists so
-	* that a future one cannot quietly break the totals.
+	* OFF unless the user turns it on, which is the opposite of every other lane
+	* here and deliberate: the 免密 lane is a shared third-party endpoint with no
+	* credential of its own, so it cannot be "configured" — it is either silently
+	* present or absent. Left on by default it dropped a group into the model
+	* picker that the user never asked for and could not remove: the aggregate
+	* switch does not govern it (it is not an aggregate provider), so the only
+	* way out was editing the file. Reported as "关不掉，应该默认是关闭的".
 	*
-	* `topModels` keeps the two most-used ids rather than every one: this column
-	* answers "what does this account usually run", and a list of nine ids is not
-	* an answer to that question, it is just the other table again.
+	* An explicit `true` is what enables it — `undefined` (a config written before
+	* this switch existed, or a fresh install) stays off.
 	*/
-	accountRows() {
-		const buckets = /* @__PURE__ */ new Map();
-		for (const call of this.samples) {
-			const label = call.account ?? "";
-			const key = `${call.region}\u0000${label}`;
-			let acc = buckets.get(key);
-			if (acc === void 0) {
-				acc = {
-					row: {
-						account: label,
-						region: call.region,
-						calls: 0,
-						turns: 0,
-						failed: 0,
-						inputTokens: 0,
-						outputTokens: 0,
-						cachedTokens: 0,
-						lastUsedAt: 0,
-						topModels: []
-					},
-					turnIds: /* @__PURE__ */ new Set(),
-					modelCalls: /* @__PURE__ */ new Map()
-				};
-				buckets.set(key, acc);
-			}
-			acc.row.calls += 1;
-			acc.turnIds.add(call.turnId);
-			if (!call.ok) acc.row.failed += 1;
-			if (call.at > acc.row.lastUsedAt) acc.row.lastUsedAt = call.at;
-			acc.modelCalls.set(call.model, (acc.modelCalls.get(call.model) ?? 0) + 1);
-			if (call.usage !== void 0) {
-				acc.row.inputTokens += call.usage.inputTokens;
-				acc.row.outputTokens += call.usage.outputTokens;
-				acc.row.cachedTokens += call.usage.cachedTokens;
-			}
-		}
-		const out = [];
-		for (const acc of buckets.values()) {
-			const topModels = [...acc.modelCalls.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, 2).map(([model]) => model);
-			out.push({
-				...acc.row,
-				turns: acc.turnIds.size,
-				topModels
-			});
-		}
-		out.sort((a, b) => b.calls - a.calls || b.lastUsedAt - a.lastUsedAt || a.account.localeCompare(b.account));
-		return out;
+	laneEnabled = false;
+	constructor(fallback = FALLBACK_FREE_MODEL_IDS) {
+		this.rows = Object.freeze(buildFreeCatalog(fallback));
+	}
+	/** Turn the lane on or off; the roster readers all consult this. */
+	setEnabled(enabled) {
+		if (this.laneEnabled === enabled) return;
+		this.laneEnabled = enabled;
+		for (const listener of this.listeners) listener();
+	}
+	/** Whether the lane is contributing models right now. */
+	enabled() {
+		return this.laneEnabled;
 	}
 	/**
-	* The daily series, oldest first, limited to the most recent days.
-	*
-	* Sorted by key rather than insertion order because a retained window can
-	* straddle a month boundary, and a chart whose axis jumps backwards reads as
-	* corrupted data rather than as history.
+	* The rows that may be OFFERED.
 	*
-	* `failedTurns` is counted by DISTINCT turn id, not by summing per-call
-	* failures: a turn that rotated three accounts and failed on all three is
-	* still one failed turn, and the whole reason this module keeps turns and
-	* calls apart is so that number stays honest in every place it appears.
+	* Empty when the lane is off. Callers that need the roster regardless (the
+	* aggregate page's "free" filter, which lists what the lane COULD serve) use
+	* {@link allRows} instead — so switching the lane off hides it from the model
+	* picker without erasing it from the page that explains it.
 	*/
-	days(failedTurnIds) {
-		const buckets = /* @__PURE__ */ new Map();
-		for (const call of this.samples) {
-			const key = usageDayKey(call.at);
-			let acc = buckets.get(key);
-			if (acc === void 0) {
-				acc = {
-					day: key,
-					calls: 0,
-					inputTokens: 0,
-					outputTokens: 0,
-					failedTurnIds: /* @__PURE__ */ new Set()
-				};
-				buckets.set(key, acc);
-			}
-			acc.calls += 1;
-			acc.inputTokens += call.usage?.inputTokens ?? 0;
-			acc.outputTokens += call.usage?.outputTokens ?? 0;
-			if (failedTurnIds.has(call.turnId)) acc.failedTurnIds.add(call.turnId);
-		}
-		return [...buckets.values()].sort((a, b) => a.day.localeCompare(b.day)).slice(-14).map((acc) => ({
-			day: acc.day,
-			calls: acc.calls,
-			failedTurns: acc.failedTurnIds.size,
-			inputTokens: acc.inputTokens,
-			outputTokens: acc.outputTokens
-		}));
+	current() {
+		return this.laneEnabled ? this.rows : [];
+	}
+	/** Every row the lane knows about, offered or not. */
+	allRows() {
+		return this.rows;
+	}
+	/** Why the last refresh failed, for display. Never a substitute for rows. */
+	error() {
+		return this.lastError;
+	}
+	/** When the live list last landed. */
+	updatedAt() {
+		return this.lastUpdatedAt;
 	}
-};
-/**
-* Inspect one SSE frame's content, without its trailing separator.
-*
-* Returns undefined when no `data:` line parsed, which covers the `[DONE]`
-* sentinel, keep-alive comments and truncated JSON alike - a frame the forwarder
-* has no opinion about must come back untouched rather than guessed at.
-*/
-function inspectSseFrame(frame) {
-	for (const line of frame.split("\n")) {
-		const trimmed = line.trim();
-		if (!trimmed.startsWith("data:")) continue;
-		const payload = trimmed.slice(5).trim();
-		if (payload === "" || payload === "[DONE]") continue;
-		let parsed;
+	/** The row behind a published id, or undefined. */
+	find(modelId) {
+		return this.rows.find((row) => row.modelId === modelId || row.id === modelId);
+	}
+	/** Whether anything is being served right now. */
+	hasRows() {
+		return this.rows.length > 0;
+	}
+	onChange(listener) {
+		this.listeners.add(listener);
+		return () => {
+			this.listeners.delete(listener);
+		};
+	}
+	/**
+	* Re-read the listing and notify when the roster actually changed.
+	*
+	* A failed refresh KEEPS the current rows and records the error. Dropping to
+	* empty here would make a network hiccup look like the models were deleted.
+	*/
+	async refresh(options = {}) {
+		let next;
 		try {
-			parsed = JSON.parse(payload);
-		} catch {
-			continue;
+			next = Object.freeze(buildFreeCatalog(parseListing(await fetchFreeListing(options))));
+		} catch (error) {
+			this.lastError = error instanceof Error ? error.message : String(error);
+			if (this.rows.length === 0) this.rows = Object.freeze(buildFreeCatalog(FALLBACK_FREE_MODEL_IDS));
+			for (const listener of this.listeners) listener();
+			return this.rows;
 		}
-		if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) continue;
-		const usage = parsed["usage"];
-		if (usage === void 0 || usage === null) continue;
-		return {
-			parsed,
-			usageOnly: isUsageOnlyFrame(parsed)
-		};
+		if (next.length === 0) {
+			this.lastError = "the gateway listing held no免密 models";
+			for (const listener of this.listeners) listener();
+			return this.rows;
+		}
+		this.lastError = void 0;
+		this.lastUpdatedAt = (/* @__PURE__ */ new Date()).toISOString();
+		if (next.length === this.rows.length && next.every((row, index) => row.modelId === this.rows[index]?.modelId)) return this.rows;
+		this.rows = next;
+		for (const listener of this.listeners) listener();
+		return this.rows;
 	}
-}
+};
 //#endregion
 //#region src/free-lane.ts
 /**
@@ -14692,6 +15375,7 @@ function createFreeLaneSource(catalog, logger, usageRecorder) {
 			} finally {
 				tracker.finish(Date.now());
 				usageRecorder?.record({
+					channel: "free",
 					region: "free",
 					model: modelId,
 					account: "free",
@@ -15366,10 +16050,35 @@ function isFireHour(now, hours) {
 	const { hour } = zonedParts(now);
 	return hours.includes(Number(hour));
 }
-/** Whether this account may be used: not switched off, not cooling. */
-function eligible(account, now) {
+/**
+* Which account classes each job may touch.
+*
+* This replaced a single `global → false`, which was right about the growth
+* system and wrong as a blanket: it excluded a global account from EVERY job,
+* including the ones that are idempotent, cheap, and pay credits regardless of
+* region. The blanket also made the rule unfalsifiable — "global does nothing"
+* cannot be checked, whereas "the checkin job tries global accounts and here is
+* what came back" can.
+*
+* So the scope is per job, and the default for a job that is not named is `cn`:
+* a new job must opt in explicitly rather than inherit an accident.
+*/
+const JOB_REGION_SCOPE = {
+	report: ["cn"],
+	tasks: ["cn"],
+	streak: ["cn"],
+	travel: ["cn"],
+	compensation: ["cn"],
+	checkin: ["cn", "global"]
+};
+/** Whether `job` may run against `region`; unnamed jobs stay CN. */
+function jobAllowsRegion(job, region) {
+	return (JOB_REGION_SCOPE[job] ?? ["cn"]).includes(region);
+}
+/** Whether this account may be used for a job: not cooling, and right region. */
+function eligible(account, now, job) {
 	if (account.cooldownUntilMs > now) return false;
-	if (regionOf(account.credential.domain) === "global") return false;
+	if (job !== void 0 && !jobAllowsRegion(job, regionOf(account.credential.domain))) return false;
 	return true;
 }
 const sleep$1 = (ms) => new Promise((resolve) => {
@@ -15836,8 +16545,22 @@ var WorkBuddyScheduler = class {
 		let energy = 0;
 		let claimed = 0;
 		const detail = [];
+		/**
+		* Every item this run considered, with a status attached.
+		*
+		* `detail` stays as the human-readable log line; this is the same work in a
+		* shape the card can GROUP and COUNT, so "3 tasks unclaimed — locked" is
+		* distinguishable from "0 tasks, everything already collected".
+		*/
+		const items = [];
 		let progressNote;
-		const accounts = this.accountsInOrder();
+		try {
+			const revived = await this.pool.reviveBenched((credential) => this.client.fetchCredits(credential));
+			for (const account of revived) detail.push(`复活 ${account.label}`);
+		} catch (error) {
+			this.logger.warn?.("automation: could not probe benched accounts:", error);
+		}
+		const accounts = this.accountsInOrder(kind);
 		if (kind === "tasks") await this.sendEventChains(accounts);
 		for (let index = 0; index < accounts.length; index++) {
 			if (this.stopped) break;
@@ -15845,12 +16568,22 @@ var WorkBuddyScheduler = class {
 			if (account === void 0) continue;
 			try {
 				switch (kind) {
-					case "checkin":
+					case "checkin": {
+						let alreadyDone = false;
+						try {
+							alreadyDone = (await this.client.fetchCheckinStatus(account.credential)).todayCheckedIn === true;
+						} catch (error) {
+							this.logger.warn?.(`automation checkin ${account.label}: status read failed, claiming anyway:`, error);
+						}
+						if (alreadyDone) {
+							this.logger.info?.(`automation checkin ${account.label}: already done today (read, not claimed)`);
+							break;
+						}
 						try {
 							const claim = await this.client.claimDailyCheckin(account.credential);
 							this.recordEarnings(account.id, today, { checkinCredit: claim.credit });
 							if (claim.credit > 0) {
-								if (claim.credit > 0) detail.push(`签到 +${claim.credit}`);
+								detail.push(`签到 +${claim.credit}`);
 								this.logger.info?.(`automation checkin ${account.label}: +${claim.credit} credit`);
 							}
 						} catch (error) {
@@ -15858,6 +16591,7 @@ var WorkBuddyScheduler = class {
 							this.logger.info?.(`automation checkin ${account.label}: already done today`);
 						}
 						break;
+					}
 					case "report": {
 						const days = await this.reportOne(account);
 						this.logger.info?.(`automation report ${account.label}: streak days=${days}`);
@@ -15869,6 +16603,7 @@ var WorkBuddyScheduler = class {
 						energy += result.energy;
 						claimed += result.claimed;
 						detail.push(...result.titles);
+						items.push(...result.items);
 						this.claimableSeen += result.claimableCount;
 						this.recordEarnings(account.id, today, {
 							credit: result.credit,
@@ -15916,7 +16651,9 @@ var WorkBuddyScheduler = class {
 		state.claimed = claimed;
 		state.message = this.summarise(kind, ok, failed, claimed, credit, energy);
 		state.detail = detail;
-		state.progress = progressNote;
+		state.items = items;
+		if (progressNote === void 0) delete state.progress;
+		else state.progress = progressNote;
 		this.logger.info?.(`automation ${accountWord}: ${state.message}`);
 		if (kind === "tasks" || kind === "checkin" || kind === "streak" || kind === "travel" || kind === "compensation") await this.flushEarnings();
 	}
@@ -15930,12 +16667,16 @@ var WorkBuddyScheduler = class {
 	*
 	* Disabled accounts are excluded here rather than filtered by the caller so a
 	* card switch takes effect on the next pass without any event plumbing.
+	*
+	* `job` narrows the set by region scope: the growth jobs are CN-only while
+	* check-in runs on both gateways, so eligibility cannot be decided without
+	* knowing which job is about to run.
 	*/
-	accountsInOrder() {
+	accountsInOrder(job) {
 		const now = Date.now();
 		return this.pool.list().filter((account) => {
 			if (this.pool.isDisabled(account.id)) return false;
-			return eligible(account, now);
+			return eligible(account, now, job);
 		});
 	}
 	/**
@@ -16061,10 +16802,55 @@ var WorkBuddyScheduler = class {
 	* logs "could not be built" only for exceptions, and a task shape this code
 	* does not understand is information, not a fault.
 	*/
+	/**
+	* Find the expert a task is about, by matching its title against the
+	* marketplace.
+	*
+	* The marketplace listing is ~500 entries across `agent` and `team`, and this
+	* only runs for a task whose deeplink carried no id — at most a handful per
+	* run — so the cost is acceptable. It is not cached because a freshly
+	* published expert must become findable without a restart.
+	*
+	* Matching rules, all of them strict on purpose:
+	*   - the task's title must appear IN the expert's name or profession, or the
+	*     expert's display name must appear in the title (both directions, since
+	*     the board and the marketplace word things differently);
+	*   - comparison ignores case, whitespace and the punctuation vendors sprinkle
+	*     through names;
+	*   - several matches means NO answer. Summoning the wrong agent scores 0, so a
+	*     guess costs an upstream call and still fails — worse than declining.
+	*/
+	async expertIdByKeyword(credential, task) {
+		const normalise = (value) => value.toLowerCase().replace(/[\s_\-·:：,，.。()（）【】[\]「」]/gu, "");
+		const wanted = normalise(task.title);
+		if (wanted === "") return void 0;
+		let candidates;
+		try {
+			const [agents, teams] = await Promise.all([this.client.marketExpertList(credential, "agent"), this.client.marketExpertList(credential, "team")]);
+			candidates = [...agents, ...teams];
+		} catch (error) {
+			this.logger.warn?.(`automation events ${task.taskCode}: marketplace lookup failed:`, error);
+			return;
+		}
+		const matches = candidates.filter((candidate) => {
+			const name = normalise(candidate.displayName ?? "");
+			const profession = normalise(candidate.profession ?? "");
+			if (name === "" && profession === "") return false;
+			return name !== "" && (name.includes(wanted) || wanted.includes(name)) || profession !== "" && (profession.includes(wanted) || wanted.includes(profession));
+		});
+		if (matches.length !== 1) {
+			if (matches.length > 1) this.logger.info?.(`automation events ${task.taskCode}: ${String(matches.length)} marketplace experts match "${task.title}", not guessing`);
+			return;
+		}
+		const found = matches[0];
+		if (found === void 0) return void 0;
+		this.logger.info?.(`automation events ${task.taskCode}: resolved expertId ${found.expertId} by keyword "${task.title}"`);
+		return found.expertId;
+	}
 	async taskExpertChains(credential, task) {
-		const expertId = expertIdFromJumpUrl(task.jumpUrl);
+		const expertId = expertIdFromJumpUrl(task.jumpUrl) ?? await this.expertIdByKeyword(credential, task);
 		if (expertId === void 0) {
-			this.logger.warn?.(`automation events ${task.taskCode}: no expertId in jump_url, skipping`);
+			this.logger.warn?.(`automation events ${task.taskCode}: no expertId in jump_url and no marketplace match, skipping`);
 			return [];
 		}
 		const expert = expertFromTask(expertId, task.title);
@@ -16149,21 +16935,41 @@ var WorkBuddyScheduler = class {
 		const credential = account.credential;
 		const open = (await this.client.listTasks(credential)).filter((task) => task.acceptStatus === "not_accepted" && !task.locked).map((task) => task.taskCode);
 		if (open.length > 0) await this.client.acceptTasks(credential, open);
-		const claimable = (await this.client.listTasks(credential)).filter((task) => task.claimable && !task.locked);
+		const refreshed = await this.client.listTasks(credential);
+		const claimable = refreshed.filter((task) => task.claimable && !task.locked);
 		let credit = 0;
 		let energy = 0;
 		let claimed = 0;
 		const titles = [];
+		const items = [];
+		for (const task of refreshed) if (task.locked === true || task.claimable !== true) items.push({
+			title: task.title === "" ? task.taskCode : task.title,
+			status: "skipped",
+			note: task.locked === true ? "locked" : task.acceptStatus === "not_accepted" ? "not accepted" : "not scored yet"
+		});
 		for (const task of claimable) {
 			if (this.stopped) break;
 			const reward = await this.client.claimTaskReward(credential, task.taskCode);
 			credit += reward.credit;
 			energy += reward.energy;
+			const label = task.title === "" ? task.taskCode : task.title;
 			if (reward.credit > 0 || reward.energy > 0) {
 				claimed++;
 				titles.push(task.title);
+				items.push({
+					title: label,
+					status: "claimed",
+					...reward.credit > 0 ? { credit: reward.credit } : {},
+					...reward.energy > 0 ? { energy: reward.energy } : {}
+				});
 				this.logger.info?.(`automation claim ${account.label}: ${task.title} +${reward.credit}c +${reward.energy}e`);
-			} else this.logger.info?.(`automation claim ${account.label}: ${task.taskCode} already claimed`);
+			} else {
+				items.push({
+					title: label,
+					status: "already"
+				});
+				this.logger.info?.(`automation claim ${account.label}: ${task.taskCode} already claimed`);
+			}
 			if (this.delayMs > 0 && !this.stopped) await sleep$1(this.delayMs);
 		}
 		return {
@@ -16171,7 +16977,8 @@ var WorkBuddyScheduler = class {
 			credit,
 			energy,
 			claimableCount: claimable.length,
-			titles
+			titles,
+			items
 		};
 	}
 	/**
@@ -16340,6 +17147,7 @@ const PROVIDER_NOTES_ZH = Object.freeze({
 	"kimi_code": "Kimi Code 订阅，模型 id 取自 9router 的 kimi 注册表",
 	"lightning": "Lightning AI 的 Model APIs 网关",
 	"llamacpp": "本地服务器，模型列表取决于用户已加载的模型",
+	"custom_openai": "自定义 OpenAI 兼容端点：vLLM / LiteLLM / one-api / 自建网关，填 base URL 和 key 后拉取模型",
 	"llm7": "default/fast/pro 别名被固定，只留流式工具模型",
 	"lmstudio": "本地服务器，模型列表取决于用户已加载的模型",
 	"minimax": "推理内容从正文流中单独拆出，语音与图像 id 已剔除",
@@ -16699,6 +17507,24 @@ function parseAggregatePatch(body) {
 	};
 	if (typeof body["enabled"] === "boolean") patch.enabled = body["enabled"];
 	if (typeof body["apiKey"] === "string") patch.apiKey = body["apiKey"];
+	if (Array.isArray(body["apiKeys"])) {
+		const seen = /* @__PURE__ */ new Set();
+		const apiKeys = [];
+		for (const raw of body["apiKeys"]) {
+			if (typeof raw !== "string") continue;
+			const key = raw.trim();
+			if (key === "" || seen.has(key)) continue;
+			seen.add(key);
+			apiKeys.push(key);
+		}
+		patch.apiKeys = apiKeys;
+	}
+	if (typeof body["distribution"] === "string") {
+		const strategy = body["distribution"].trim();
+		if (!isDistributionStrategy(strategy)) return void 0;
+		patch.distribution = strategy;
+	}
+	if (typeof body["appendApiKey"] === "string") patch.appendApiKey = body["appendApiKey"];
 	if (typeof body["baseUrl"] === "string") patch.baseUrl = body["baseUrl"];
 	if (Array.isArray(body["models"])) {
 		const seen = /* @__PURE__ */ new Set();
@@ -16760,7 +17586,9 @@ function aggregateStatusOf(store, models) {
 			models: exposed,
 			availableModels: universe,
 			discovered: (setting.discovered?.length ?? 0) > 0,
-			...setting.addedAt === void 0 ? {} : { addedAt: setting.addedAt }
+			...setting.addedAt === void 0 ? {} : { addedAt: setting.addedAt },
+			keyCount: providerApiKeys(setting).length,
+			...setting.distribution === void 0 ? {} : { distribution: setting.distribution }
 		});
 	}
 	return {
@@ -16928,7 +17756,10 @@ async function poolWebStatus(deps, region = "cn") {
 		creditReserves: deps.pool.creditReservesInOrder(),
 		ignored: deps.ignoredAccounts?.() ?? [],
 		catalogSource: deps.catalogs[region].currentSource(),
-		...deps.catalogs[region].catalogUpdatedAt() === void 0 ? {} : { catalogUpdatedAt: deps.catalogs[region].catalogUpdatedAt() },
+		...(() => {
+			const updatedAt = deps.catalogs[region].catalogUpdatedAt();
+			return updatedAt === void 0 ? {} : { catalogUpdatedAt: updatedAt };
+		})(),
 		...deps.catalogs[region].lastFetchError() === void 0 ? {} : { catalogError: safeMessage(deps.catalogs[region].lastFetchError()) },
 		...deps.pool.skippedFilesInOrder().length === 0 ? {} : { skippedFiles: deps.pool.skippedFilesInOrder().map((entry) => ({
 			file: basename(entry.path),
@@ -17427,12 +18258,12 @@ function registerPoolStatusRoute(ctx, deps) {
 		const disposeCombos = ctx.webServer.register({
 			kind: "exact",
 			path: POOL_COMBOS_PATH,
-			handler: (req, res) => {
+			handler: async (req, res) => {
 				if (req.method !== "GET") return json(res, 405, { error: "method not allowed" });
 				if (!loopbackOrigin(req)) return json(res, 403, { error: "origin-not-trusted" });
 				if (deps.combosDocument === void 0) return json(res, 503, { error: "the routing chains are not available in this build" });
 				try {
-					json(res, 200, deps.combosDocument());
+					json(res, 200, await deps.combosDocument());
 				} catch (error) {
 					json(res, 500, { error: safeMessage(error) });
 				}
@@ -17453,8 +18284,10 @@ function registerPoolStatusRoute(ctx, deps) {
 				if (!loopbackOrigin(req)) return json(res, 403, { error: "origin-not-trusted" });
 				if (deps.saveCombos === void 0) return json(res, 503, { error: "the routing chains are not available in this build" });
 				try {
-					const raw = (await readJsonBody(req))["combos"];
-					json(res, 200, await deps.saveCombos(Array.isArray(raw) ? raw : []));
+					const body = await readJsonBody(req);
+					const raw = Array.isArray(body) ? body : body["combos"];
+					if (!Array.isArray(raw)) return json(res, 400, { error: "expected {combos: [...]} (or a bare array from older clients); refusing to replace the chain table with an empty one" });
+					json(res, 200, await deps.saveCombos(raw));
 				} catch (error) {
 					json(res, 500, { error: safeMessage(error) });
 				}
@@ -17579,6 +18412,46 @@ function recordStartupNote(line) {
 	} catch {}
 	return text;
 }
+//#endregion
+//#region src/model-switch-bridge.ts
+/**
+* The lane id the host's picker uses for each region.
+*
+* The same two ids `POOL_OWNED_PROVIDERS` exempts inside the pack, and the same
+* two `REGION_CHANNEL_BY_REGION` maps in the card. Kept here as a literal
+* because this module is imported by the host half only, which must not pull in
+* the browser bundle's constants.
+*/
+const LANE_BY_REGION = {
+	cn: "buddy",
+	global: "workbuddy"
+};
+/**
+* Replace the selection and mirror it where the pack can see it.
+*
+* The mirror is `globalThis.__xdpoolLaneSelection`, which `pack.js` reads in its
+* `[xdpool-local] laneAllowedIds` helper. A global rather than a getter on the
+* account pool because the pack's adapters receive `accountPool` — this
+* plugin's own object — and nothing else that this module could hang a function
+* on without editing ten constructors.
+*/
+function applyLaneSelection(next) {
+	globalThis.__xdpoolLaneSelection = next;
+}
+/**
+* Derive the lane keyed selection from the two settings documents.
+*
+* Split out from the caller so the mapping is testable without a host: the one
+* thing worth asserting is that an ABSENT setting becomes `undefined` (no
+* restriction) while an explicitly EMPTY `enabledModelIds` stays an empty array
+* (nothing allowed).
+*/
+function laneSelectionFrom(cn, global) {
+	return {
+		[LANE_BY_REGION.cn]: cn,
+		[LANE_BY_REGION.global]: global
+	};
+}
 /** Hard ceiling on the whole probe, so a hung upstream cannot wedge the card. */
 const PROBE_TIMEOUT_MS = 3e4;
 /**
@@ -17901,9 +18774,7 @@ async function compactWithSummary(messages, options, deps, signal) {
 	const first = compactMessages(messages, options);
 	if (!first.changed) return {
 		messages: first.messages,
-		tokens: first.tokens,
-		summary: void 0,
-		skipped: void 0
+		tokens: first.tokens
 	};
 	const summaryBudget = Math.max(256, Math.floor(options.budget / 4));
 	let toSummarize = first.dropped;
@@ -17932,8 +18803,8 @@ async function compactWithSummary(messages, options, deps, signal) {
 	}
 	if (summary === void 0) return {
 		messages: first.messages,
-		skipped,
-		tokens: first.tokens
+		tokens: first.tokens,
+		...skipped === void 0 ? {} : { skipped }
 	};
 	const withSummary = injectSummary(first.messages, summary);
 	if (estimateMessagesTokens(withSummary) > options.budget) {
@@ -18353,6 +19224,19 @@ const LOOPBACK_HOSTS = /* @__PURE__ */ new Set([
 	"localhost",
 	"[::1]"
 ]);
+/**
+* How long one chain member may hold the request before it is given up on.
+*
+* The caller's own signal covers "the user cancelled", not "this provider decided
+* to keep the socket open". Without a per-member deadline a single non-answering
+* upstream blocks the request forever, and the chain's whole purpose — try the
+* next member — never runs.
+*
+* 180s is the value the reference router settled on: long enough for a slow
+* reasoning model to emit its first token, short enough to give up inside one
+* turn rather than leaving the user staring at a spinner.
+*/
+const MEMBER_TIMEOUT_MS = 18e4;
 /** HTTP status each upstream failure class surfaces as. */
 const KIND_STATUS = {
 	hard_credit: 402,
@@ -18362,6 +19246,27 @@ const KIND_STATUS = {
 	server: 502,
 	client: 400
 };
+/**
+* HTTP status for each "no account available" reason.
+*
+* The reason is already a complete diagnosis — `unavailableReason` separates
+* cooling from a drained reserve from a switched-off account from an empty pool
+* — and each of those needs a different user action. Flattening them into one
+* status throws that away: 401 universally reads as "invalid API key", so a
+* reserve or a disabled account sent the reader to re-authenticate over a
+* setting they had chosen themselves (#115).
+*
+* A reason this table does not know falls back to 503 at the call site rather
+* than 401: "this lane cannot serve you right now" is a true statement about an
+* unfamiliar state, while "bad key" is a specific and probably false one.
+*/
+const REASON_STATUS = {
+	cooling: 429,
+	session_dead: 401,
+	reserve: 402,
+	disabled: 403,
+	empty: 503
+};
 function hostnameOfHost(host) {
 	let hostname = host.trim().toLowerCase();
 	if (hostname.startsWith("[")) {
@@ -18839,10 +19744,22 @@ function createWorkBuddyShim(options) {
 		}
 		const body = withBareModelId(raw, parsed.modelId);
 		const frames = [];
+		/**
+		* One id per user request, so a retry across keys counts as ONE turn.
+		*
+		* The key-rotation loop inside the forwarder files each physical attempt, and
+		* they must share this id or the panel would report "3 turns" for one question
+		* that happened to trip a rate limit. Same spelling the pool lane uses.
+		*/
+		const aggregateTurnId = randomBytes(8).toString("hex");
 		try {
 			await forwardAggregateStreamed(resolved, parsed.modelId, body, {
 				signal,
-				onData: (payload) => frames.push(payload)
+				onData: (payload) => frames.push(payload),
+				...usageRecorder === void 0 ? {} : { usage: {
+					recorder: usageRecorder,
+					turnId: aggregateTurnId
+				} }
 			});
 		} catch (error) {
 			if (res.headersSent) {
@@ -19043,102 +19960,249 @@ function createWorkBuddyShim(options) {
 		}
 		const attempts = [];
 		let last;
+		/**
+		* Why the chain moved on from each member, in order.
+		*
+		* A chain hides its own machinery: the user sees one answer from an
+		* unspecified member, and when the answer is worse/different/slower than
+		* expected there is nothing on screen to explain it. The whole point of
+		* reading a fallback trace is answering "why did it switch, and where did it
+		* land" — so every skip records the member, the failure class and the wire
+		* status, and the finished turn logs the sequence once.
+		*
+		* Logged, not returned: the caller asked for a completion, and a response
+		* shape invented for diagnostics would break every client that parses it.
+		*/
+		const switches = [];
+		const noteSwitch = (member, kind, status) => {
+			switches.push(`${member} → ${kind} (${String(status)})`);
+			logger?.warn?.(`dsh-xdpool: chain ${row.id} skipped ${member}: ${kind} (${String(status)}); trying next`);
+		};
 		const conversationKey = conversationKeyOf(raw);
 		for (const member of members) {
 			if (signal.aborted) return;
 			attempts.push(member.modelId);
-			if (!member.aggregate) {
-				const { account, reserveExempt } = await acquireForRequest(member.modelId, conversationKey, signal);
-				if (account === void 0) {
-					const why = pool.unavailableReason(member.modelId, region, reserveExempt);
+			const memberController = new AbortController();
+			const memberSignal = memberController.signal;
+			const relayAbort = () => {
+				memberController.abort();
+			};
+			if (signal.aborted) relayAbort();
+			else signal.addEventListener("abort", relayAbort, { once: true });
+			const memberTimer = setTimeout(() => {
+				memberController.abort();
+			}, MEMBER_TIMEOUT_MS);
+			memberTimer.unref?.();
+			/** Release this member's timer and listener. Every exit path calls it. */
+			const releaseMember = () => {
+				clearTimeout(memberTimer);
+				signal.removeEventListener("abort", relayAbort);
+			};
+			try {
+				/**
+				* A 扫码登录 channel member, served by the HOST's adapter registry.
+				*
+				* This is the branch that makes a chain able to name TRAE / Qoder /
+				* CodeBuddy at all. It goes through `channels.turn`, the same seam the
+				* single-model path uses, so the credential, endpoint and wire dialect are
+				* the host's problem rather than ours — and the model a chain reaches is
+				* literally the one the picker shows.
+				*
+				* Frames are BUFFERED like every other member (`frames.push`, written only on
+				* success): "retry only before any visible content" is what the chain
+				* promises, and streaming straight to the socket here would leave two models'
+				* text spliced together on screen when a later member answered.
+				*/
+				if (member.host === true) {
+					if (channels === void 0) {
+						last = {
+							kind: "combo_config",
+							status: 503,
+							message: `member ${member.modelId} needs the login-channel lane, which this build does not mount`
+						};
+						noteSwitch(member.modelId, "combo_config", 503);
+						continue;
+					}
+					const channelTarget = channels.resolve(member.modelId);
+					if (channelTarget === void 0) {
+						last = {
+							kind: "combo_config",
+							status: 400,
+							message: `member ${member.modelId} is not a resolvable channel model id`
+						};
+						noteSwitch(member.modelId, "combo_config", 400);
+						continue;
+					}
+					const memberCreated = Math.floor(Date.now() / 1e3);
+					const memberCompletionId = `chatcmpl-xdpool-${randomBytes(6).toString("base64url")}`;
+					const hostFrames = [];
+					const frameOf = (delta, reason) => JSON.stringify({
+						id: memberCompletionId,
+						object: "chat.completion.chunk",
+						created: memberCreated,
+						model: channelTarget.modelId,
+						choices: [{
+							index: 0,
+							delta,
+							finish_reason: reason
+						}],
+						usage: null
+					});
+					try {
+						let finishReason = "stop";
+						for await (const event of channels.turn({
+							channel: channelTarget.channel,
+							modelId: channelTarget.modelId,
+							body: JSON.parse(withBareModelId(raw, channelTarget.modelId)),
+							signal: memberSignal
+						})) if (event.kind === "usage") {} else if (event.kind === "done") {
+							if (typeof event.finishReason === "string" && event.finishReason !== "") finishReason = event.finishReason;
+						} else {
+							const delta = event.delta;
+							if (delta["content"] !== void 0 || delta["reasoning_content"] !== void 0 || Array.isArray(delta["tool_calls"])) {}
+							hostFrames.push(frameOf(delta, null));
+						}
+						/**
+						* An empty answer is still an ANSWER.
+						*
+						* The reference router settled this and it is right: a model that replied
+						* with nothing visible has responded, so falling through to the next
+						* member would silently substitute a different model over a legitimate
+						* (if unhelpful) result. The terminal frame is therefore always emitted,
+						* whether or not anything preceded it.
+						*/
+						hostFrames.push(frameOf({}, finishReason));
+					} catch (error) {
+						const message = error instanceof Error ? error.message : String(error);
+						const kind = error instanceof ChannelRequestError ? "client" : "server";
+						last = {
+							kind,
+							status: kind === "client" ? 400 : 502,
+							message: `channel ${channelTarget.channel}: ${message}`
+						};
+						noteSwitch(member.modelId, kind, last.status);
+						continue;
+					}
+					res.writeHead(200, {
+						"Content-Type": "text/event-stream",
+						"Cache-Control": "no-cache",
+						"Connection": "keep-alive",
+						"X-Accel-Buffering": "no"
+					});
+					for (const payload of hostFrames) res.write(`data: ${payload}\n\n`);
+					res.write("data: [DONE]\n\n");
+					res.end();
+					return;
+				}
+				if (!member.aggregate) {
+					const { account, reserveExempt } = await acquireForRequest(member.modelId, conversationKey, memberSignal);
+					if (account === void 0) {
+						const why = pool.unavailableReason(member.modelId, region, reserveExempt);
+						last = {
+							kind: why.reason,
+							status: REASON_STATUS[why.reason] ?? 503,
+							message: `member ${member.modelId} has no usable WorkBuddy account (${why.reason})`
+						};
+						noteSwitch(member.modelId, why.reason, last.status);
+						continue;
+					}
+					const memberRaw = JSON.stringify({
+						...JSON.parse(raw),
+						model: member.modelId
+					});
+					const prepared = client.prepareChatBodyFor(memberRaw, region ?? "cn");
+					const result = await client.chatStream(account.credential, prepared, memberSignal, conversationKey);
+					if (result.ok) {
+						const turnId = randomBytes(8).toString("hex");
+						await serveSuccessfulStream(res, account, result, logger, refreshBalance, pool, usageRecorder === void 0 ? void 0 : {
+							recorder: usageRecorder,
+							region: region ?? "cn",
+							model: member.modelId,
+							turnId
+						});
+						return;
+					}
 					last = {
-						kind: why.reason,
-						status: why.reason === "cooling" ? 429 : 401,
-						message: `member ${member.modelId} has no usable WorkBuddy account (${why.reason})`
+						kind: result.kind,
+						status: result.status,
+						message: result.message
 					};
+					if (result.kind === "soft_rate") pool.penalize(account.id, parseRateLimitReset(result.message), member.modelId);
+					else if (result.kind === "session_dead") pool.penalizeCredentialDead(account.id);
+					else if (result.kind === "hard_credit") pool.penalizeExhausted(account.id);
+					noteSwitch(member.modelId, result.kind, result.status);
 					continue;
 				}
-				const memberRaw = JSON.stringify({
-					...JSON.parse(raw),
-					model: member.modelId
-				});
-				const prepared = client.prepareChatBodyFor(memberRaw, region ?? "cn");
-				const result = await client.chatStream(account.credential, prepared, signal, conversationKey);
-				if (result.ok) {
-					const turnId = randomBytes(8).toString("hex");
-					await serveSuccessfulStream(res, account, result, logger, refreshBalance, pool, usageRecorder === void 0 ? void 0 : {
-						recorder: usageRecorder,
-						region: region ?? "cn",
-						model: member.modelId,
-						turnId
+				if (store === void 0 || aggregate === void 0) {
+					last = {
+						kind: "combo_config",
+						status: 503,
+						message: "the aggregate lane is not available on this profile"
+					};
+					noteSwitch(member.modelId, "combo_config", 503);
+					continue;
+				}
+				const parsed = parseProviderModelId(member.modelId);
+				if (parsed === null) {
+					last = {
+						kind: "combo_config",
+						status: 400,
+						message: `member ${member.modelId} is not a valid provider model id`
+					};
+					noteSwitch(member.modelId, "combo_config", 400);
+					continue;
+				}
+				let resolved;
+				try {
+					resolved = resolveAggregateProvider(store, parsed.providerId);
+				} catch (error) {
+					last = {
+						kind: "combo_config",
+						status: 400,
+						message: error instanceof Error ? error.message : String(error)
+					};
+					noteSwitch(member.modelId, "combo_config", 400);
+					continue;
+				}
+				const frames = [];
+				try {
+					await forwardAggregateStreamed(resolved, parsed.modelId, withBareModelId(raw, parsed.modelId), {
+						signal: memberSignal,
+						onData: (payload) => frames.push(payload),
+						...usageRecorder === void 0 ? {} : { usage: {
+							recorder: usageRecorder,
+							turnId: conversationKey ?? randomBytes(8).toString("hex")
+						} }
 					});
-					return;
+				} catch (error) {
+					const kind = error instanceof AggregateError ? error.kind : "server";
+					last = {
+						kind,
+						status: error instanceof AggregateError ? KIND_STATUS[error.kind] : 502,
+						message: error instanceof Error ? error.message : String(error)
+					};
+					noteSwitch(member.modelId, kind, last.status);
+					continue;
 				}
-				last = {
-					kind: result.kind,
-					status: result.status,
-					message: result.message
-				};
-				if (result.kind === "soft_rate") pool.penalize(account.id, parseRateLimitReset(result.message), member.modelId);
-				else if (result.kind === "session_dead") pool.penalizeCredentialDead(account.id);
-				else if (result.kind === "hard_credit") pool.penalizeExhausted(account.id);
-				continue;
-			}
-			if (store === void 0 || aggregate === void 0) {
-				last = {
-					kind: "combo_config",
-					status: 503,
-					message: "the aggregate lane is not available on this profile"
-				};
-				continue;
-			}
-			const parsed = parseProviderModelId(member.modelId);
-			if (parsed === null) {
-				last = {
-					kind: "combo_config",
-					status: 400,
-					message: `member ${member.modelId} is not a valid provider model id`
-				};
-				continue;
-			}
-			let resolved;
-			try {
-				resolved = resolveAggregateProvider(store, parsed.providerId);
-			} catch (error) {
-				last = {
-					kind: "combo_config",
-					status: 400,
-					message: error instanceof Error ? error.message : String(error)
-				};
-				continue;
-			}
-			const frames = [];
-			try {
-				await forwardAggregateStreamed(resolved, parsed.modelId, withBareModelId(raw, parsed.modelId), {
-					signal,
-					onData: (payload) => frames.push(payload)
+				if (switches.length > 0) logger?.info?.(`dsh-xdpool: chain ${row.id} served by ${member.modelId} after skipping ${String(switches.length)}/${String(members.length)}: ${switches.join("; ")}`);
+				res.writeHead(200, {
+					"Content-Type": "text/event-stream",
+					"Cache-Control": "no-cache",
+					"Connection": "keep-alive",
+					"X-Accel-Buffering": "no"
 				});
-			} catch (error) {
-				last = {
-					kind: error instanceof AggregateError ? error.kind : "server",
-					status: error instanceof AggregateError ? KIND_STATUS[error.kind] : 502,
-					message: error instanceof Error ? error.message : String(error)
-				};
-				continue;
+				for (const payload of frames) res.write(`data: ${payload}\n\n`);
+				res.write("data: [DONE]\n\n");
+				res.end();
+				return;
+			} finally {
+				releaseMember();
 			}
-			res.writeHead(200, {
-				"Content-Type": "text/event-stream",
-				"Cache-Control": "no-cache",
-				"Connection": "keep-alive",
-				"X-Accel-Buffering": "no"
-			});
-			for (const payload of frames) res.write(`data: ${payload}\n\n`);
-			res.write("data: [DONE]\n\n");
-			res.end();
-			return;
 		}
 		const kind = last?.kind ?? "combo_empty";
-		writeOpenAIError(res, last?.status ?? 503, `combo_${kind}`, `chain ${row.id}: no member answered after ${attempts.length} [${attempts.join(" → ")}]: ${(last?.message ?? "no member was reachable").slice(0, 300)}`);
+		const status = last?.status ?? 503;
+		const trace = switches.length === 0 ? "" : ` [${switches.join("; ")}]`;
+		writeOpenAIError(res, status, `combo_${kind}`, `chain ${row.id}: no member answered after ${attempts.length} [${attempts.join(" → ")}]: ${(last?.message ?? "no member was reachable").slice(0, 300)}${trace}`);
 	}
 	/**
 	* Serve one chat completion, rotating accounts on rate limits.
@@ -19217,6 +20281,7 @@ function createWorkBuddyShim(options) {
 		const conversationKey = conversationKeyOf(poolRaw);
 		const tried = [];
 		let last;
+		const refreshedThisRequest = /* @__PURE__ */ new Set();
 		const turnId = randomBytes(8).toString("hex");
 		const usageContext = usageRecorder === void 0 ? void 0 : {
 			recorder: usageRecorder,
@@ -19258,6 +20323,7 @@ function createWorkBuddyShim(options) {
 				return;
 			}
 			usageRecorder?.record({
+				channel: "workbuddy",
 				region: region ?? "cn",
 				model: modelId ?? "(none)",
 				account: account.label,
@@ -19271,6 +20337,12 @@ function createWorkBuddyShim(options) {
 				message: result.message
 			};
 			if (result.kind === "session_dead") {
+				if (refreshedThisRequest.has(account.id)) {
+					pool.penalizeCredentialDead(account.id);
+					logger?.warn(`dsh-xdpool: ${account.label} still refused after a token refresh (attempt ${attempt + 1}/${maxAttempts}); rotating`);
+					continue;
+				}
+				refreshedThisRequest.add(account.id);
 				logger?.warn(`dsh-xdpool: ${account.label} session dead; refreshing token and retrying`);
 				const before = account.credential.accessToken;
 				if (!await pool.refreshAccount(account.id, { force: true }) || account.credential.accessToken === before) {
@@ -19304,8 +20376,11 @@ function createWorkBuddyShim(options) {
 				pool,
 				maxAttempts,
 				acquireAccount: async () => (await acquireForRequest(modelId, conversationKey, controller.signal)).account,
-				usage: usageContext,
-				contextWindow: modelId === void 0 ? void 0 : catalog.current().find((m) => m.id === modelId)?.contextWindow
+				...usageContext === void 0 ? {} : { usage: usageContext },
+				...(() => {
+					const window = modelId === void 0 ? void 0 : catalog.current().find((m) => m.id === modelId)?.contextWindow;
+					return window === void 0 ? {} : { contextWindow: window };
+				})()
 			});
 			if (recovered.ok) {
 				await serveSuccessfulStream(res, recovered.account, recovered.result, logger, refreshBalance, pool, usageContext);
@@ -19412,6 +20487,7 @@ async function serveSuccessfulStream(res, account, result, logger, refreshBalanc
 		recorded = true;
 		if (usage?.recorder === void 0) return;
 		usage.recorder.record({
+			channel: "workbuddy",
 			region: usage.region,
 			model: usage.model,
 			account: account.label,
@@ -19529,6 +20605,7 @@ async function recoverFromContextOverrun(options) {
 	};
 	const retryBody = client.buildChatBody(parsed, compacted, region ?? "cn");
 	const tried = [];
+	const refreshedThisRequest = /* @__PURE__ */ new Set();
 	for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
 		if (controller.signal.aborted) return {
 			ok: false,
@@ -19542,6 +20619,7 @@ async function recoverFromContextOverrun(options) {
 		tried.push(account.label);
 		const result = await client.chatStream(account.credential, retryBody, controller.signal, conversationKeyOf(raw));
 		if (!result.ok) usage?.recorder.record({
+			channel: "workbuddy",
 			region: usage.region,
 			model: usage.model,
 			account: account.label,
@@ -19562,6 +20640,11 @@ async function recoverFromContextOverrun(options) {
 			detail: "prompt still exceeded the window after compaction"
 		};
 		if (result.kind === "session_dead") {
+			if (refreshedThisRequest.has(account.id)) {
+				pool.penalizeCredentialDead(account.id);
+				continue;
+			}
+			refreshedThisRequest.add(account.id);
 			const before = account.credential.accessToken;
 			if (!await pool.refreshAccount(account.id, { force: true }) || account.credential.accessToken === before) pool.penalizeCredentialDead(account.id);
 			continue;
@@ -20331,7 +21414,7 @@ function readPreferredIdSync(path = preferredIdPath()) {
 * free of documents that describe the absence of a decision.
 */
 async function writePreferredId(accountId, path = preferredIdPath()) {
-	await mkdir(dirname(path), { recursive: true });
+	await ensureSecretDir(dirname(path));
 	if (accountId === void 0) {
 		await rm(path, { force: true });
 		return;
@@ -20341,7 +21424,7 @@ async function writePreferredId(accountId, path = preferredIdPath()) {
 		accountId: accountId.trim()
 	}, null, 2);
 	const temp = `${path}.tmp`;
-	await writeFile(temp, `${payload}\n`, "utf8");
+	await writeSecretFile(temp, `${payload}\n`);
 	await rename(temp, path);
 }
 //#endregion
@@ -20400,40 +21483,59 @@ function relaySettingsOf(store) {
 * itself looks like it obeyed, and the user is the only one who can tell that a
 * member they paid for is now a fallback to something free.
 */
-function combosStatusOf(store, catalog, poolRows) {
+function combosStatusOf(store, catalog, poolRows, hostRows = []) {
 	const chains = combosOf(store);
 	const providerRows = catalog.providerRows();
 	const settings = new Map(configuredProviderIds(store).map((providerId) => [providerId, providerSettingOf(store, providerId)]));
-	const candidates = [...poolRows.map((row) => ({
-		id: row.id,
-		name: row.name,
-		owner: "workbuddy",
-		usable: true,
-		contextWindow: row.contextWindow,
-		supportsImages: row.supportsImages
-	})), ...providerRows.map((row) => {
-		const setting = settings.get(row.providerId);
-		const provider = getProvider(row.providerId);
-		return {
+	const candidates = [
+		...poolRows.map((row) => ({
 			id: row.id,
 			name: row.name,
-			owner: row.providerId,
-			usable: provider === null || setting === void 0 ? false : providerAuthUsable(provider, setting),
+			owner: "workbuddy",
+			usable: true,
 			contextWindow: row.contextWindow,
-			supportsImages: row.supportsImages
-		};
-	})];
+			supportsImages: row.supportsImages,
+			siblings: []
+		})),
+		...providerRows.map((row) => {
+			const setting = settings.get(row.providerId);
+			const provider = getProvider(row.providerId);
+			return {
+				id: row.id,
+				name: row.name,
+				owner: row.providerId,
+				usable: provider === null || setting === void 0 ? false : providerAuthUsable(provider, setting),
+				contextWindow: row.contextWindow,
+				supportsImages: row.supportsImages,
+				siblings: siblingRoutes(row.id, {
+					pool: poolRows,
+					aggregate: providerRows
+				}, row.providerId).filter((candidate) => candidate !== row.id)
+			};
+		}),
+		...hostRows.map((row) => ({
+			id: row.id,
+			name: row.name,
+			owner: row.channel,
+			usable: true,
+			contextWindow: COMBO_DEFAULT_CONTEXT_WINDOW,
+			supportsImages: false,
+			siblings: []
+		}))
+	];
 	const known = new Set(candidates.map((candidate) => candidate.id));
 	return {
 		combos: chains.map((chain) => {
 			const resolved = buildComboCatalog([chain], {
 				pool: poolRows,
-				aggregate: providerRows
+				aggregate: providerRows,
+				host: hostRows
 			})[0];
 			return {
 				id: resolved?.id ?? comboId(chain.name),
 				name: chain.name,
 				models: resolved?.models ?? [],
+				platforms: splitPlatforms(resolved?.models ?? []),
 				missing: chain.models.filter((modelId) => !known.has(modelId)),
 				strategy: resolved?.strategy ?? chain.strategy ?? "fallback",
 				stickyLimit: resolved?.stickyLimit ?? chain.stickyLimit ?? 1,
@@ -20621,7 +21723,19 @@ const Config = z.object({
 	modelSelectionCn: asVolatile(modelSelectionSchema.description("Model selection for the domestic gateway")),
 	modelSelectionGlobal: asVolatile(modelSelectionSchema.description("Model selection for the international gateway")),
 	automation: asVolatile(automationSchema.description("Daily points automation (activity report, task claiming, check-in)")),
-	automationEarnings: asVolatile(z.any().description("Automation earnings ledger (written by the scheduler)"))
+	automationEarnings: asVolatile(z.any().description("Automation earnings ledger (written by the scheduler)")),
+	sidebarRow: asVolatile(z.boolean().default(true).description("Show the XD Pool entry in the left sidebar (the Settings page keeps working either way)")),
+	/**
+	* The 免密 free lane (`free:` models).
+	*
+	* OFF unless set, and it is the only lane that works that way. It is a shared
+	* third-party endpoint with no credential of its own, so there is nothing for
+	* a user to "configure" — it simply appears in the picker or does not. On by
+	* default it added a group nobody asked for that the aggregate switch does not
+	* govern (it is not an aggregate provider), leaving no way to remove it
+	* without editing a file. Reported as "关不掉，应该默认是关闭的".
+	*/
+	freeLane: asVolatile(z.boolean().default(false).description("Offer the shared 免密 free models (the \"XD Pool · 免费模型\" group). Off by default: it is a third-party endpoint with no key of your own."))
 });
 /** Live API, published for the CLI. */
 let api;
@@ -20678,6 +21792,16 @@ function warnOnPiAiGenerationMismatch(ctx) {
 	} catch {}
 }
 /**
+* Late-bound switch for the 免密 lane, set once the catalog exists.
+*
+* `applyConfigFromSource` is defined before the catalog is built and can be
+* called at any point after, so it cannot close over the object directly without
+* a declaration-order dance. A one-line indirection states the ordering instead
+* of leaving it to be inferred: before the catalog exists this is a no-op, and
+* the catalog applies the current value itself the moment it is built.
+*/
+let freeLaneSwitch = () => {};
+/**
 * Start the loopback endpoint, register the `xdpool` provider, and
 * discover accounts. The provider registers only after `shim.ready` resolves,
 * because its models read the shim origin at construction time.
@@ -20780,7 +21904,8 @@ function apply(ctx, config = {}) {
 		}
 	};
 	const applyConfigFromSource = () => {
-		const { authFile, cooldownMs, distribution, disabledAccountIds, creditReserves, enabledModelIds, imageModelIds, contextBudgets, modelSelectionCn, modelSelectionGlobal, automation } = current();
+		const { authFile, cooldownMs, distribution, disabledAccountIds, creditReserves, enabledModelIds, imageModelIds, contextBudgets, modelSelectionCn, modelSelectionGlobal, automation, freeLane: freeLaneEnabled } = current();
+		freeLaneSwitch(freeLaneEnabled === true);
 		core.pool.applyConfig({
 			...authFile === void 0 ? {} : { authDirs: [dirname(authFile)] },
 			...cooldownMs === void 0 ? {} : { cooldownMs },
@@ -20799,6 +21924,7 @@ function apply(ctx, config = {}) {
 		};
 		core.catalogs.cn.applySelection(modelSelectionCn ?? fallbackSelection("cn"));
 		core.catalogs.global.applySelection(modelSelectionGlobal ?? fallbackSelection("global"));
+		applyLaneSelection(laneSelectionFrom(core.catalogs.cn.currentSelection().enabledModelIds, core.catalogs.global.currentSelection().enabledModelIds));
 		core.scheduler.applyConfig(automationOptions(automation));
 	};
 	const settingsService = ctx.settings;
@@ -20884,6 +22010,10 @@ function apply(ctx, config = {}) {
 	const aggregateCatalog = new AggregateCatalog(() => readAggregateSettingsSync(), () => core.catalogs.cn.current());
 	aggregateCatalog.refresh();
 	const freeCatalog = new FreeCatalog();
+	freeLaneSwitch = (enabled) => {
+		freeCatalog.setEnabled(enabled);
+	};
+	freeLaneSwitch(current().freeLane === true);
 	const freeLane = createFreeLaneSource(freeCatalog, ctx.logger, usageRecorder);
 	/**
 	* The login channels, for the LAN gateway.
@@ -20914,6 +22044,33 @@ function apply(ctx, config = {}) {
 	* object has no reason to carry a list it never consults.
 	*/
 	const lanModelsOf = () => readAggregateSettingsSync().relay?.models;
+	/**
+	* The login channels' models, as the route editor needs them.
+	*
+	* `channelLane.rows()` already caches per channel (60s TTL) and de-duplicates
+	* concurrent requests, so calling it per routing-document request is cheap — but
+	* it is ASYNC, and the chain table is built synchronously. Hence this helper: the
+	* callers that can await do, and a failed listing degrades to the previous answer
+	* rather than emptying the platform list (a channel that cannot be listed right
+	* now must not make its models disappear from every chain).
+	*
+	* The two pool-owned channels are excluded by `channelLane` itself, so the same
+	* model cannot appear once as a pool row and again as a channel row.
+	*/
+	let hostRosterCache = [];
+	const hostRoster = async () => {
+		try {
+			hostRosterCache = (await channelLane.rows()).map((row) => ({
+				id: row.id,
+				channel: row.channel,
+				modelId: row.modelId,
+				name: row.name
+			}));
+		} catch (error) {
+			ctx.logger?.warn?.("dsh-xdpool: could not list login-channel models:", error);
+		}
+		return hostRosterCache;
+	};
 	const shims = {
 		cn: createWorkBuddyShim({
 			pool: core.pool,
@@ -21041,6 +22198,9 @@ function apply(ctx, config = {}) {
 			else await updateProviderSetting(patch.providerId, {
 				...patch.enabled === void 0 ? {} : { enabled: patch.enabled },
 				...patch.apiKey === void 0 ? {} : { apiKey: patch.apiKey },
+				...patch.apiKeys === void 0 ? {} : { apiKeys: patch.apiKeys },
+				...patch.appendApiKey === void 0 ? {} : { appendApiKey: patch.appendApiKey },
+				...patch.distribution === void 0 ? {} : { distribution: patch.distribution },
 				...patch.baseUrl === void 0 ? {} : { baseUrl: patch.baseUrl },
 				...patch.models === void 0 ? {} : { models: patch.models }
 			});
@@ -21178,11 +22338,11 @@ function apply(ctx, config = {}) {
 				}))
 			};
 		},
-		combosDocument: () => combosStatusOf(readAggregateSettingsSync(), aggregateCatalog, core.catalogs.cn.current()),
+		combosDocument: async () => combosStatusOf(readAggregateSettingsSync(), aggregateCatalog, core.catalogs.cn.current(), await hostRoster()),
 		saveCombos: async (raw) => {
 			await saveCombos(raw);
 			await aggregateCatalog.refresh();
-			return combosStatusOf(readAggregateSettingsSync(), aggregateCatalog, core.catalogs.cn.current());
+			return combosStatusOf(readAggregateSettingsSync(), aggregateCatalog, core.catalogs.cn.current(), await hostRoster());
 		},
 		/**
 		* Relay state plus the gateway's model picker.
@@ -21258,7 +22418,7 @@ function apply(ctx, config = {}) {
 			}) };
 		}).finally(() => {
 			if (stopped) return;
-			adoptChannelPackAccounts(ctx, core.pool, ctx.logger);
+			adoptChannelPackAccounts(scoped, core.pool, ctx.logger);
 		});
 	});
 	Promise.all([shims.cn.ready, shims.global.ready]).then(async () => {