dsh-agy-link 0.4.70 → 0.4.74

package/dist/index.js

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 import { execFile, execFileSync, spawn } from "node:child_process";
-import path, { delimiter, dirname, extname, isAbsolute, join, relative, resolve } from "node:path";
+import path, { basename, delimiter, dirname, extname, isAbsolute, join, relative, resolve } from "node:path";
 import { accessSync, chmodSync, constants, copyFileSync, createReadStream, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, utimesSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import * as dshLlm from "@deepseek-ai/dsh-llm";
@@ -130,6 +130,8 @@ function defaultConfig() {
 		mediaMaxBytes: 10485760,
 		mediaMaxImages: 8,
 		mcpBridge: false,
+		mcpConfigScope: "global",
+		mcpConfigPath: "",
 		mcpToolAllowlist: "",
 		rateLimitPerMinute: 0,
 		autoFallbackModel: false,
@@ -138,7 +140,9 @@ function defaultConfig() {
 		quotaPollIntervalMs: 36e5,
 		quotaViaCli: true,
 		proxyUrl: "",
-		suppressAgyAutoUpdate: process.platform === "win32"
+		suppressAgyAutoUpdate: process.platform === "win32",
+		autoWarmup: false,
+		warmupModels: ["gemini-3.8-flash", "claude-sonnet-4-6"]
 	};
 }
 /**
@@ -438,6 +442,10 @@ function readOverrides(file = overridesPath()) {
 function asString(v) {
 	return typeof v === "string" ? v : void 0;
 }
+/** `mcpConfigScope` is a closed enum: unknown values fall back to the default. */
+function asMcpConfigScope(v) {
+	return v === "global" || v === "workspace" || v === "both" ? v : void 0;
+}
 function asBool(v) {
 	if (typeof v === "boolean") return v;
 	if (typeof v === "string") return v === "true" || v === "1";
@@ -506,6 +514,8 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 		mediaMaxBytes: asNum(get("mediaMaxBytes")) ?? base.mediaMaxBytes,
 		mediaMaxImages: asNum(get("mediaMaxImages")) ?? base.mediaMaxImages,
 		mcpBridge: asBool(get("mcpBridge")) ?? base.mcpBridge,
+		mcpConfigScope: asMcpConfigScope(get("mcpConfigScope")) ?? base.mcpConfigScope,
+		mcpConfigPath: asString(get("mcpConfigPath")) ?? base.mcpConfigPath,
 		mcpToolAllowlist: asString(get("mcpToolAllowlist")) ?? base.mcpToolAllowlist,
 		rateLimitPerMinute: asNum(get("rateLimitPerMinute")) ?? base.rateLimitPerMinute,
 		autoFallbackModel: asBool(get("autoFallbackModel")) ?? base.autoFallbackModel,
@@ -514,7 +524,9 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 		quotaPollIntervalMs: asNum(get("quotaPollIntervalMs")) ?? base.quotaPollIntervalMs,
 		quotaViaCli: asBool(get("quotaViaCli")) ?? base.quotaViaCli,
 		proxyUrl: asString(get("proxyUrl")) ?? base.proxyUrl,
-		suppressAgyAutoUpdate: asBool(get("suppressAgyAutoUpdate")) ?? base.suppressAgyAutoUpdate
+		suppressAgyAutoUpdate: asBool(get("suppressAgyAutoUpdate")) ?? base.suppressAgyAutoUpdate,
+		autoWarmup: asBool(get("autoWarmup")) ?? base.autoWarmup,
+		warmupModels: asStringArray(get("warmupModels")) ?? base.warmupModels
 	};
 	if (env.DSH_AGY_ENABLED !== void 0) cfg.enabled = asBool(env.DSH_AGY_ENABLED) ?? cfg.enabled;
 	if (env.DSH_AGY_BIN) cfg.agyBin = env.DSH_AGY_BIN;
@@ -552,6 +564,11 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 		if (b !== void 0) cfg.mcpBridge = b;
 	}
 	if (env.DSH_AGY_MCP_TOOL_ALLOWLIST) cfg.mcpToolAllowlist = env.DSH_AGY_MCP_TOOL_ALLOWLIST;
+	if (env.DSH_AGY_MCP_CONFIG_PATH) cfg.mcpConfigPath = env.DSH_AGY_MCP_CONFIG_PATH;
+	if (env.DSH_AGY_MCP_CONFIG_SCOPE !== void 0) {
+		const scope = asMcpConfigScope(env.DSH_AGY_MCP_CONFIG_SCOPE);
+		if (scope !== void 0) cfg.mcpConfigScope = scope;
+	}
 	if (env.DSH_AGY_RATE_LIMIT_PER_MINUTE) {
 		const r = asNum(env.DSH_AGY_RATE_LIMIT_PER_MINUTE);
 		if (r !== void 0 && r >= 0) cfg.rateLimitPerMinute = r;
@@ -581,6 +598,14 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 		const sa = asBool(env.DSH_AGY_SUPPRESS_AUTOUPDATE);
 		if (sa !== void 0) cfg.suppressAgyAutoUpdate = sa;
 	}
+	if (env.DSH_AGY_AUTO_WARMUP !== void 0) {
+		const aw = asBool(env.DSH_AGY_AUTO_WARMUP);
+		if (aw !== void 0) cfg.autoWarmup = aw;
+	}
+	if (env.DSH_AGY_WARMUP_MODELS) {
+		const wm = asStringArray(env.DSH_AGY_WARMUP_MODELS.split(","));
+		if (wm) cfg.warmupModels = wm;
+	}
 	return cfg;
 }
 //#endregion
@@ -2330,7 +2355,6 @@ var ModelCatalog = class ModelCatalog {
 	}
 	async forceRefresh(accountId) {
 		await this.refresh(accountId);
-		this.onUpdate?.();
 		return this.get(accountId);
 	}
 	async refresh(accountId) {
@@ -3138,12 +3162,6 @@ function ensureIsolatedKeychain(dir, platform = process.platform, run = (file, a
 			kc
 		], env);
 		run("security", ["set-keychain-settings", kc], env);
-		run("security", [
-			"unlock-keychain",
-			"-p",
-			"",
-			kc
-		], env);
 		return true;
 	} catch {
 		return false;
@@ -3154,8 +3172,9 @@ function ensureIsolatedKeychain(dir, platform = process.platform, run = (file, a
 * Keychains from older versions (v0.4.41-v0.4.44) were provisioned with
 * ephemeral random passwords that cannot be unlocked with an empty password,
 * causing repeated modal password dialogs from macOS SecurityAgent.
-* If unlocking with `-p ""` fails, the file and its registration in securityd
-* are purged so that ensureIsolatedKeychain can cleanly re-provision it.
+* We test whether the keychain settings can be updated silently without prompt.
+* If setting settings fails, the file is un-unlockable or corrupted, so it is
+* unregistered and purged so ensureIsolatedKeychain can cleanly re-provision it.
 */
 function purgeStaleIsolatedKeychain(dir, platform = process.platform, run = (file, args, env) => execFileSync(file, args, {
 	stdio: "ignore",
@@ -3171,12 +3190,7 @@ function purgeStaleIsolatedKeychain(dir, platform = process.platform, run = (fil
 		HOME: dir
 	};
 	try {
-		run("security", [
-			"unlock-keychain",
-			"-p",
-			"",
-			kc
-		], env);
+		run("security", ["set-keychain-settings", kc], env);
 		return false;
 	} catch {
 		try {
@@ -3269,6 +3283,7 @@ function repairMacSystemKeychain(userHome = homedir(), platform = process.platfo
 function openAccountTerminal(accDir, platform = process.platform, run = (file, args, opts) => execFile(file, [...args], { windowsHide: opts?.windowsHide }, () => {})) {
 	if (!accDir) return false;
 	if (platform === "darwin") {
+		ensureIsolatedKeychain(accDir, platform);
 		const script = `tell application "Terminal" to activate\ntell application "Terminal" to do script "export HOME='${accDir}'; agy"`;
 		try {
 			run("osascript", ["-e", script]);
@@ -4214,6 +4229,7 @@ var AccountPoolManager = class {
 			cooldowns: {},
 			quotas: {}
 		};
+		if (process.platform === "darwin" && newAccount.dir) ensureIsolatedKeychain(newAccount.dir);
 		this.data.accounts.push(newAccount);
 		this.knownIds.add(newAccount.id);
 		this.persist();
@@ -4281,6 +4297,7 @@ var AccountPoolManager = class {
 		const id = `acc_${Date.now()}_${Math.random().toString(36).slice(2, 7)}`;
 		const dir = join(this.baseDir, id);
 		mkdirSync(join(dir, ".gemini", "antigravity-cli"), { recursive: true });
+		if (process.platform === "darwin") ensureIsolatedKeychain(dir);
 		const count = this.data.accounts.length + 1;
 		const newAccount = {
 			id,
@@ -4612,6 +4629,19 @@ var AccountPoolManager = class {
 		this.persist();
 	}
 	/**
+	* Drop one family's quota row.
+	*
+	* Used when stored numbers provably cannot be attributed to this account —
+	* `updateAccountQuotas` only merges, so an untrustworthy row would otherwise
+	* survive every refresh.
+	*/
+	clearQuotaFamily(id, family) {
+		const acc = this.getAccount(id);
+		if (!acc?.quotas || acc.quotas[family] === void 0) return;
+		delete acc.quotas[family];
+		this.persist();
+	}
+	/**
 	* Records a rate-limit / 429 error and sets cooldown for the requested model family.
 	*/
 	recordFailure(id, family, reason, serverResetTime) {
@@ -28562,7 +28592,7 @@ function credentialFingerprint(raw) {
 * back into an account file, re-asserting the primary), so "cannot prove it"
 * must mean "not the same".
 */
-function sameCredentialGrant(a, b) {
+function sameCredentialGrant$1(a, b) {
 	const docA = parseCredentialDoc(a);
 	const docB = parseCredentialDoc(b);
 	if (!docA?.refreshToken || !docB?.refreshToken) return false;
@@ -28637,8 +28667,8 @@ var AsyncMutex = class {
 	async acquire(opts = {}) {
 		const signal = opts.signal;
 		if (signal?.aborted) throw new AbortedWaitError("aborted before mutex acquisition");
-		if (this.holders < 1) {
-			this.holders += 1;
+		if (this.holders < 1 && this.queue.length === 0) {
+			this.holders = 1;
 			return () => this.releaseOne();
 		}
 		const pollMs = opts.pollMs ?? 0;
@@ -28664,15 +28694,12 @@ var AsyncMutex = class {
 					pollTimer = null;
 				}
 			};
-			const take = () => {
-				this.holders += 1;
-				return () => this.releaseOne();
-			};
 			const grant = () => {
 				if (settled) return;
 				settled = true;
 				cleanup();
-				resolve(take());
+				entry = null;
+				resolve(() => this.releaseOne());
 			};
 			const fail = (err) => {
 				if (settled) return;
@@ -28681,6 +28708,7 @@ var AsyncMutex = class {
 				if (entry !== null) {
 					const idx = this.queue.indexOf(entry);
 					if (idx >= 0) this.queue.splice(idx, 1);
+					else this.releaseOne();
 					entry = null;
 				} else if (takenDirectly) this.releaseOne();
 				reject(err);
@@ -28703,6 +28731,7 @@ var AsyncMutex = class {
 						if (idx >= 0) this.queue.splice(idx, 1);
 						entry = null;
 						takenDirectly = true;
+						this.holders = 1;
 						grant();
 					}
 				}, pollMs);
@@ -28711,12 +28740,9 @@ var AsyncMutex = class {
 		});
 	}
 	releaseOne() {
-		this.holders -= 1;
-		this.wakeNext();
-	}
-	wakeNext() {
 		const next = this.queue.shift();
 		if (next) queueMicrotask(next);
+		else this.holders = Math.max(0, this.holders - 1);
 	}
 };
 /** The caller's abort signal fired while queued on the mutex. */
@@ -29107,7 +29133,7 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 	const isPrimarySlot = Boolean(account.systemHome) || !account.dir;
 	if (parallel && isPrimarySlot && !isSlotSwitchPending() && !options.signal?.aborted) {
 		const stored = readPrimaryCredential(baseDir);
-		if (stored && sameCredentialGrant(io.readSlot(), stored.raw)) {
+		if (stored && sameCredentialGrant$1(io.readSlot(), stored.raw)) {
 			primaryFastRuns += 1;
 			log("[agy-link] same-account fast path: slot already holds the primary credential — running without exclusivity");
 			return {
@@ -29116,7 +29142,7 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 					primaryFastRuns = Math.max(0, primaryFastRuns - 1);
 					try {
 						const afterRaw = io.readSlot();
-						if (afterRaw && afterRaw !== stored.raw && sameCredentialGrant(afterRaw, stored.raw)) writePrimaryCredential({
+						if (afterRaw && afterRaw !== stored.raw && sameCredentialGrant$1(afterRaw, stored.raw)) writePrimaryCredential({
 							raw: afterRaw,
 							email: stored.email,
 							savedAt: Date.now()
@@ -29136,7 +29162,7 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 		const state = installedIdentity;
 		if (state === null || state.fingerprint !== requestedFingerprint) return null;
 		for (const key of pendingSwitchTargets.keys()) if (key !== switchKey) return null;
-		if (!sameCredentialGrant(io.readSlot(), requestedRaw)) return null;
+		if (!sameCredentialGrant$1(io.readSlot(), requestedRaw)) return null;
 		state.holders += 1;
 		return {
 			identity: account.email,
@@ -29257,7 +29283,7 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 			throw new SlotUnavailableError("Cannot verify the primary Antigravity credential, so the Windows credential slot cannot be handed over safely. Sign the primary account in again, then retry.");
 		}
 		if (isPrimarySlot) {
-			if (!sameCredentialGrant(io.readSlot(), primary.raw)) {
+			if (!sameCredentialGrant$1(io.readSlot(), primary.raw)) {
 				log("[agy-link] re-asserting the primary credential into the Windows credential slot");
 				installSlotOrThrow(io, primary.raw, log, "primary");
 			}
@@ -29269,7 +29295,7 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 				release: () => {
 					try {
 						const afterRaw = io.readSlot();
-						if (sameCredentialGrant(afterRaw, primary.raw)) {
+						if (sameCredentialGrant$1(afterRaw, primary.raw)) {
 							if (afterRaw && afterRaw !== primary.raw) writePrimaryCredential({
 								raw: afterRaw,
 								email: primary.email,
@@ -29304,7 +29330,7 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 			done();
 			throw new SlotUnavailableError(`Account ${account.alias || account.id} has an unreadable credential file. Sign it in again.`);
 		}
-		if (sameCredentialGrant(accountRaw, primary.raw)) {
+		if (sameCredentialGrant$1(accountRaw, primary.raw)) {
 			done();
 			throw new SlotUnavailableError(`Account ${account.alias || account.id} holds the SAME credential as the primary account — its login was overwritten. Sign this account in again to restore its own token.`);
 		}
@@ -29317,7 +29343,7 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 				try {
 					const afterRaw = io.readSlot();
 					const afterFingerprint = credentialFingerprint(afterRaw);
-					if (sameCredentialGrant(afterRaw, accountRaw)) {
+					if (sameCredentialGrant$1(afterRaw, accountRaw)) {
 						if (afterRaw && afterRaw !== accountRaw) writeFileAtomic(accountFile, afterRaw);
 					} else if (afterFingerprint !== null) log(`[agy-link] credential slot was replaced during ${account.alias || account.id}'s run — refusing to write a foreign credential into the account file`);
 				} finally {
@@ -30248,13 +30274,13 @@ function buildDigest(messages, fromIdx, maxChars) {
 		otherLines.push(digestLabel(m) + text);
 	}
 	let budget = maxChars;
-	const kept = [];
+	let taskPart = "";
 	if (taskLine !== "") {
 		if (taskLine.length > budget) {
-			kept.push(taskLine.slice(0, Math.max(0, budget)));
+			taskPart = taskLine.slice(0, Math.max(0, budget));
 			budget = 0;
 		} else {
-			kept.push(taskLine);
+			taskPart = taskLine;
 			budget -= taskLine.length;
 		}
 	}
@@ -30268,7 +30294,8 @@ function buildDigest(messages, fromIdx, maxChars) {
 		keptOther.unshift(line);
 		budget -= line.length;
 	}
-	kept.push(...keptOther);
+	const kept = [...keptOther];
+	if (taskPart !== "") kept.push(taskPart);
 	if (kept.length === 0) return "";
 	return "[conversation so far]\n" + kept.join("\n\n") + "\n[end of conversation so far]\n\n";
 }
@@ -30899,9 +30926,13 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 			if (sessionAccountKey !== "") this.deps.store.delete(sessionAccountKey);
 			binding = void 0;
 		}
-		if (!isAux && binding !== void 0 && messages.length < binding.lastMessageCount) {
+		const isCompacted = binding !== void 0 && (messages.length <= 4 && binding.lastMessageCount >= 5 || binding.lastMessageCount > 10 && messages.length < Math.floor(binding.lastMessageCount * .8) || binding.lastMessageCount <= 10 && messages.length < binding.lastMessageCount - 2);
+		if (!isAux && binding !== void 0 && isCompacted) {
 			if (sessionAccountKey !== "") this.deps.store.delete(sessionAccountKey);
 			binding = void 0;
+		} else if (binding !== void 0 && messages.length < binding.lastMessageCount) {
+			binding.lastMessageCount = messages.length;
+			if (sessionAccountKey !== "") this.deps.store.set(sessionAccountKey, binding);
 		}
 		let prompt = "";
 		if (isAux && options.purpose === "compaction") {
@@ -31235,6 +31266,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 		const effectiveProxy = account?.proxyUrl || cfg.proxyUrl || detectSystemProxy() || void 0;
 		const env = {
 			...process.env,
+			...sessionKey === "" ? {} : { DSH_MCP_SESSION: sessionKey },
 			...cfg.disableTelemetry ? {
 				DO_NOT_TRACK: "1",
 				DISABLE_TELEMETRY: "1",
@@ -33282,9 +33314,34 @@ function isStale5hBucket(remainingFraction, resetTime, now = Date.now()) {
 	const resetMs = Date.parse(resetTime) - now;
 	return resetMs > 162e5 && resetMs < 1872e4;
 }
+/**
+* True only when two token snapshots belong to the SAME OAuth grant.
+*
+* Used to decide whether the machine credential slot really holds the account
+* we are about to poll through the `agy` CLI. A refresh token identifies a
+* grant; an access token rotates, so it is only consulted when neither side
+* carries a refresh token. Mismatched shapes count as "not proven" — the
+* caller then takes the safe path instead of misattributing a quota row.
+*/
+function sameCredentialGrant(a, b) {
+	const fingerprint = (token) => {
+		if (token?.refreshToken) return "r:" + token.refreshToken;
+		if (token?.accessToken) return "a:" + token.accessToken;
+		return null;
+	};
+	const fa = fingerprint(a);
+	return fa !== null && fa === fingerprint(b);
+}
 /** How close two ISO reset stamps must be to name the SAME quota window. */
 const QUOTA_WINDOW_MATCH_TOLERANCE_MS = 3e5;
 /**
+* Organic stagger delay with randomized jitter for multi-account sequential polling.
+* Prevents rigid periodic cadence against Google Cloud Code endpoints (default: 2000~3500ms).
+*/
+function staggerJitterMs(baseMs = 2e3, maxJitterMs = 1500) {
+	return baseMs + Math.floor(Math.random() * maxJitterMs);
+}
+/**
 * True when two reset stamps point at the same quota window.
 *
 * `fetchAvailableModels` returns a per-model `quotaInfo` with NO window label:
@@ -33482,13 +33539,27 @@ var QuotaService = class {
 		this.cliDeps = cliDeps;
 	}
 	/**
-	* One `agy -p /usage` spawn under this account's own home/proxy, mapped onto
-	* pool families. Returns null when the CLI is missing, fails or reports
-	* nothing — the caller then falls back to REST-derived quotas.
+	* One `agy -p /usage` spawn, mapped onto pool families.
+	*
+	* SCOPE: only the account that owns the OS credential store. `agy` resolves
+	* its credential from the platform keystore (Windows Credential Manager,
+	* macOS Keychain, Linux Secret Service) BEFORE the per-HOME token file, and
+	* that store is a single per-user entry — so the CLI can only ever answer for
+	* one identity no matter which HOME we hand it. Isolated pool accounts never
+	* own it, so polling them through the CLI filed the owner's numbers under
+	* their rows (2026-10-26: four pool rows showing one account's quota with
+	* identical reset instants).
+	*
+	* That single-owner rule keeps the CLI usage check strictly attributed to the
+	* slot owner: isolated accounts fall back to the REST path, which signs with
+	* each account's own token and reports authentic quotas (including the dedicated
+	* Gemini 4 Argon group for Pro/Ultra plans via the agy User-Agent).
 	*/
 	async readCliUsageFamilies(account) {
 		const bin = this.cliDeps.bin?.();
 		if (!bin) return null;
+		if (account.dir && !account.systemHome) return null;
+		if (!await this.cliSlotHoldsAccount(account)) return null;
 		const groups = await readAgyUsage({
 			bin,
 			env: {
@@ -33501,6 +33572,19 @@ var QuotaService = class {
 		});
 		return groups === null ? null : usageGroupsToFamilies(groups);
 	}
+	/**
+	* True when the machine credential slot provably holds this account's grant.
+	*
+	* This gates the CLI quota read, which can only ever see the slot owner.
+	* Conservative by design: when the two snapshots cannot be shown to be the
+	* same grant, the caller falls back to REST rather than risk attributing one
+	* account's quota to another.
+	*/
+	async cliSlotHoldsAccount(account) {
+		const slot = await this.readSystemKeychainToken();
+		if (slot === null) return false;
+		return sameCredentialGrant(slot, await this.getStoredToken(account));
+	}
 	/** Dedicated account proxy wins, then the global config proxy, then detected system proxy. */
 	proxyFor(account) {
 		return account.proxyUrl || this.globalProxy() || detectSystemProxy() || void 0;
@@ -33797,6 +33881,11 @@ var QuotaService = class {
 			if (cliFamilies !== null && Object.keys(cliFamilies).length > 0) {
 				if (account.authRequired) this.pool.clearAuthRequired(account.id);
 				if (cliFamilies.argon) this.pool.noteDedicatedGroup(account.id, "argon");
+				else {
+					this.pool.clearQuotaFamily(account.id, "argon");
+					this.pool.forgetDedicatedGroup(account.id, "argon");
+					this.pool.clearCooldown(account.id, "argon");
+				}
 				this.pool.updateAccountQuotas(account.id, cliFamilies, email);
 				return cliFamilies;
 			}
@@ -33946,15 +34035,18 @@ var QuotaService = class {
 			if (familyQuotas[fam]) familyQuotas[fam].models = list;
 		}
 		if (summaryGroups.length > 0) {
-			if (summaryHasArgonGroup(summaryGroups)) this.pool.noteDedicatedGroup(account.id, "argon");
-			else if (shouldReleaseOrphanedCooldown({
-				summaryAuthoritative: true,
-				groupPresent: false,
-				groupSeenBefore: this.pool.hasDedicatedGroup(account.id, "argon"),
-				hasCooldown: account.cooldowns?.argon !== void 0
-			})) {
-				this.pool.forgetDedicatedGroup(account.id, "argon");
-				this.pool.clearCooldown(account.id, "argon");
+			if (summaryHasArgonGroup(summaryGroups) || familyQuotas.argon) this.pool.noteDedicatedGroup(account.id, "argon");
+			else {
+				this.pool.clearQuotaFamily(account.id, "argon");
+				if (shouldReleaseOrphanedCooldown({
+					summaryAuthoritative: true,
+					groupPresent: false,
+					groupSeenBefore: this.pool.hasDedicatedGroup(account.id, "argon"),
+					hasCooldown: account.cooldowns?.argon !== void 0
+				})) {
+					this.pool.forgetDedicatedGroup(account.id, "argon");
+					this.pool.clearCooldown(account.id, "argon");
+				}
 			}
 		}
 		this.pool.updateAccountQuotas(account.id, familyQuotas, email);
@@ -33997,7 +34089,7 @@ var QuotaService = class {
 			for (let i = 0; i < accounts.length; i++) {
 				const acc = accounts[i];
 				await this.refreshAccountQuota(acc, false).catch(() => null);
-				if (i < accounts.length - 1) await new Promise((resolve) => setTimeout(resolve, 2e3));
+				if (i < accounts.length - 1) await new Promise((resolve) => setTimeout(resolve, staggerJitterMs()));
 			}
 			return;
 		}
@@ -34005,6 +34097,443 @@ var QuotaService = class {
 	}
 };
 //#endregion
+//#region src/host/warmup.ts
+/** Canonical model route resolution for upstream Google Cloud Code PA endpoints. */
+function toCanonicalWarmupModel(model) {
+	const clean = model.trim().toLowerCase();
+	if (clean === "gemini-3-flash") return "gemini-3.8-flash-tiered";
+	if (/^gemini-3\.\d+-flash$/.test(clean)) return clean + "-tiered";
+	if (clean.includes("argon")) return "gemini-4-argon";
+	return model.trim();
+}
+/** Select target model for a given family honoring user monitored_models preferences. */
+function pickWarmupModelForFamily(family, monitoredModels = []) {
+	if (family === "anthropic") return monitoredModels.find((m) => m.toLowerCase().includes("claude")) ?? "claude-sonnet-4-6";
+	if (family === "openai") return monitoredModels.find((m) => m.toLowerCase().includes("gpt")) ?? "gpt-oss-120b-medium";
+	if (family === "argon") return "gemini-4-argon";
+	return monitoredModels.find((m) => m.toLowerCase().includes("gemini") && !m.toLowerCase().includes("argon")) ?? "gemini-3.8-flash";
+}
+/**
+* `loadCodeAssist` returns `cloudaicompanionProject` either as a bare string or
+* as an object `{ id }` (the official clients and this repo's own OAuth fixture
+* both show the object form). Normalize both; an unresolved project must stay
+* empty instead of falling back to a shared project id — the backend rejects
+* foreign project ids with 403 "Caller does not have required permission".
+*/
+function extractWarmupProjectId(data) {
+	const project = data?.cloudaicompanionProject;
+	if (typeof project === "string" && project.trim() !== "") return project.trim();
+	const id = project?.id;
+	if (typeof id === "string" && id.trim() !== "") return id.trim();
+	return "";
+}
+const SIX_DAYS_MS = 5184e5;
+const FOUR_HOURS_MS = 144e5;
+const THIRTY_DAYS_MS = 2592e6;
+/**
+* A failed probe (429/403/network) must not be retried by the 5-minute
+* scheduler; otherwise one restricted account turns into an endless WAF
+* hammer. Back off for 30 minutes before the next scheduled attempt.
+*/
+const FAILURE_BACKOFF_MS = 18e5;
+/** 1.5–3s randomized gap: a metronomic interval is itself a WAF signal. */
+function warmupDelayMs() {
+	return 1500 + Math.floor(Math.random() * 1500);
+}
+/** Project ID resolver endpoints */
+const LOAD_PROJECT_ENDPOINTS = [
+	"https://daily-cloudcode-pa.googleapis.com/v1internal:loadCodeAssist",
+	"https://daily-cloudcode-pa.sandbox.googleapis.com/v1internal:loadCodeAssist",
+	"https://cloudcode-pa.googleapis.com/v1internal:loadCodeAssist"
+];
+var WarmupHistoryStore = class {
+	history = /* @__PURE__ */ new Map();
+	filePath;
+	constructor(filePath) {
+		this.filePath = filePath ?? join(stateDir(), "warmup-history.json");
+		this.load();
+	}
+	load() {
+		try {
+			if (existsSync(this.filePath)) {
+				const raw = readFileSync(this.filePath, "utf8");
+				const data = JSON.parse(raw);
+				if (data && typeof data === "object") {
+					const next = /* @__PURE__ */ new Map();
+					for (const [key, value] of Object.entries(data)) if (typeof value === "number" && Number.isFinite(value)) next.set(key, value);
+					this.history = next;
+				}
+			}
+		} catch {}
+	}
+	save() {
+		try {
+			this.pruneOldEntries();
+			const obj = Object.fromEntries(this.history.entries());
+			const tmp = `${this.filePath}.${process.pid}.tmp`;
+			writeFileSync(tmp, JSON.stringify(obj, null, 2), "utf8");
+			renameSync(tmp, this.filePath);
+		} catch {}
+	}
+	checkCooldown(key, cooldownMs, now = Date.now()) {
+		this.load();
+		const last = this.history.get(key);
+		if (last === void 0) return false;
+		return now - last < cooldownMs;
+	}
+	record(key, now = Date.now()) {
+		this.history.set(key, now);
+		this.save();
+	}
+	pruneOldEntries(now = Date.now()) {
+		const cutoff = now - THIRTY_DAYS_MS;
+		for (const [k, ts] of this.history.entries()) if (ts < cutoff) this.history.delete(k);
+	}
+	clear() {
+		this.history.clear();
+		this.save();
+	}
+};
+var WarmupService = class {
+	pool;
+	quota;
+	globalProxy;
+	agyVersion;
+	config;
+	log;
+	history;
+	constructor(pool, quota, globalProxy = () => "", agyVersion = () => null, config = () => ({}), log = () => void 0, historyStore) {
+		this.pool = pool;
+		this.quota = quota;
+		this.globalProxy = globalProxy;
+		this.agyVersion = agyVersion;
+		this.config = config;
+		this.log = log;
+		this.history = historyStore ?? new WarmupHistoryStore();
+	}
+	proxyFor(account) {
+		return account.proxyUrl?.trim() || this.globalProxy() || void 0;
+	}
+	/**
+	* Fetch cloudaicompanionProject via loadCodeAssist (official Antigravity project resolution).
+	*/
+	async fetchProjectId(accessToken, proxyUrl) {
+		const reqBody = JSON.stringify({ metadata: { ideType: "ANTIGRAVITY" } });
+		const userAgent = agyUserAgent(this.agyVersion());
+		for (const url of LOAD_PROJECT_ENDPOINTS) try {
+			const res = await agyFetch(url, {
+				method: "POST",
+				headers: {
+					Authorization: `Bearer ${accessToken}`,
+					"Content-Type": "application/json",
+					"User-Agent": userAgent,
+					"Client-Metadata": "{\"ideType\":\"ANTIGRAVITY\"}"
+				},
+				body: reqBody
+			}, proxyUrl);
+			if (res.ok) {
+				const projectId = extractWarmupProjectId(await res.json());
+				if (projectId !== "") return projectId;
+			}
+		} catch {}
+		return "";
+	}
+	/**
+	* Send a minimal probe to upstream v1internal:streamGenerateContent (fallback: generateContent).
+	*/
+	async warmupModelDirectly(account, modelName) {
+		const start = Date.now();
+		const accessToken = await this.quota.getValidAccessToken(account);
+		if (!accessToken) return {
+			ok: false,
+			error: "Could not obtain valid access token",
+			durationMs: Date.now() - start
+		};
+		const proxy = this.proxyFor(account);
+		const projectId = await this.fetchProjectId(accessToken, proxy);
+		if (projectId === "") return {
+			ok: false,
+			error: "Could not resolve cloudaicompanionProject (loadCodeAssist failed); refusing to probe a foreign project",
+			durationMs: Date.now() - start
+		};
+		const mappedModel = toCanonicalWarmupModel(modelName);
+		const isClaude = mappedModel.toLowerCase().includes("claude");
+		const sessionId = `warmup_${Date.now()}_${randomBytes(4).toString("hex")}`;
+		const reqBody = JSON.stringify({
+			...projectId !== "" ? { project: projectId } : {},
+			model: mappedModel,
+			requestId: `agent/${randomUUID()}`,
+			request: {
+				contents: [{
+					role: "user",
+					parts: [{ text: isClaude ? "ping" : "Say hi" }]
+				}],
+				generationConfig: {
+					temperature: 0,
+					maxOutputTokens: 1,
+					...isClaude ? {} : { responseModalities: ["TEXT"] }
+				},
+				sessionId
+			}
+		});
+		const headers = {
+			Authorization: `Bearer ${accessToken}`,
+			"Content-Type": "application/json",
+			"User-Agent": agyUserAgent(this.agyVersion()),
+			"Client-Metadata": "{\"ideType\":\"ANTIGRAVITY\"}"
+		};
+		if (isClaude) headers["anthropic-beta"] = "claude-code-20250219";
+		const endpoints = AGY_ENDPOINTS;
+		const attempts = [{
+			method: "streamGenerateContent",
+			query: "?alt=sse"
+		}, {
+			method: "generateContent",
+			query: ""
+		}];
+		let lastStatus = 0;
+		let lastError = "";
+		for (const attempt of attempts) for (const ep of endpoints) try {
+			const res = await agyFetch(`${ep}/v1internal:${attempt.method}${attempt.query}`, {
+				method: "POST",
+				headers,
+				body: reqBody
+			}, proxy);
+			lastStatus = res.status;
+			if (res.ok) {
+				const bodyText = await res.text().catch(() => "");
+				if (bodyText.includes("no longer available") || bodyText.includes("is not available") || bodyText.includes("is retired")) return {
+					ok: false,
+					status: res.status,
+					error: `Model is retired upstream: ${mappedModel}`,
+					durationMs: Date.now() - start
+				};
+				return {
+					ok: true,
+					status: res.status,
+					durationMs: Date.now() - start
+				};
+			}
+			const errBody = await res.text().catch(() => "");
+			if (errBody.toLowerCase().includes("validation_required")) return {
+				ok: false,
+				status: res.status,
+				error: "Account requires browser validation (VALIDATION_REQUIRED)",
+				durationMs: Date.now() - start
+			};
+			lastError = `HTTP ${res.status}: ${errBody.slice(0, 160)}`;
+			if (res.status === 401 || res.status === 403) return {
+				ok: false,
+				status: res.status,
+				error: lastError,
+				durationMs: Date.now() - start
+			};
+		} catch (err) {
+			lastError = String(err);
+		}
+		return {
+			ok: false,
+			status: lastStatus,
+			error: lastError,
+			durationMs: Date.now() - start
+		};
+	}
+	/**
+	* Warm up one account.
+	* If options.model is specified, warms up that model directly.
+	* Otherwise screens quota families for eligible weekly reset windows or cold-starts.
+	*/
+	async warmupAccount(account, options = {}) {
+		const results = [];
+		const identity = account.email || account.id;
+		const now = Date.now();
+		if (!account.enabled) return [{
+			accountId: account.id,
+			alias: account.alias,
+			email: account.email,
+			model: options.model ?? "default",
+			success: false,
+			durationMs: 0,
+			skipped: true,
+			skipReason: "Account is disabled"
+		}];
+		if (account.authRequired) return [{
+			accountId: account.id,
+			alias: account.alias,
+			email: account.email,
+			model: options.model ?? "default",
+			success: false,
+			durationMs: 0,
+			skipped: true,
+			skipReason: "Account requires authentication"
+		}];
+		if (!options.force && !shouldPollAccount(account)) return [{
+			accountId: account.id,
+			alias: account.alias,
+			email: account.email,
+			model: options.model ?? "default",
+			success: false,
+			durationMs: 0,
+			skipped: true,
+			skipReason: "Account is in cooldown or auth quarantine"
+		}];
+		if (options.model) {
+			const model = options.model;
+			const manualKey = `${identity}:${model}:100`;
+			const manualFailureKey = `${manualKey}:failed`;
+			if (!options.force && this.history.checkCooldown(manualKey, FOUR_HOURS_MS, now)) return [{
+				accountId: account.id,
+				alias: account.alias,
+				email: account.email,
+				model,
+				success: false,
+				durationMs: 0,
+				skipped: true,
+				skipReason: "Model in 4-hour warmup cooldown"
+			}];
+			if (!options.force && this.history.checkCooldown(manualFailureKey, FAILURE_BACKOFF_MS, now)) return [{
+				accountId: account.id,
+				alias: account.alias,
+				email: account.email,
+				model,
+				success: false,
+				durationMs: 0,
+				skipped: true,
+				skipReason: "Recent warmup attempt failed; retrying after backoff"
+			}];
+			this.log(`[Warmup] pinging ${model} for account ${account.id}...`);
+			const res = await this.warmupModelDirectly(account, model);
+			if (res.ok) this.history.record(manualKey, now);
+			else {
+				this.history.record(manualFailureKey, now);
+				if (res.status === 401) this.pool.markAuthRequired(account.id, "Warmup probe rejected with HTTP 401");
+			}
+			return [{
+				accountId: account.id,
+				alias: account.alias,
+				email: account.email,
+				model,
+				success: res.ok,
+				status: res.status,
+				error: res.error,
+				durationMs: res.durationMs
+			}];
+		}
+		const configuredModels = this.config().warmupModels;
+		if (configuredModels !== void 0 && configuredModels.length === 0) return [{
+			accountId: account.id,
+			alias: account.alias,
+			email: account.email,
+			model: "none",
+			success: true,
+			durationMs: 0,
+			skipped: true,
+			skipReason: "No warmup models configured"
+		}];
+		const monitored = configuredModels ?? ["gemini-3.8-flash", "claude-sonnet-4-6"];
+		const quotas = account.quotas ?? {};
+		const families = Object.keys(quotas);
+		const modelsToPing = [];
+		for (const fam of families) {
+			const q = quotas[fam];
+			if (!q) continue;
+			const familyCooldown = account.cooldowns?.[fam];
+			if (!options.force && familyCooldown && familyCooldown.cooldownUntil > now) continue;
+			const weeklyFrac = q.weeklyFraction;
+			if (weeklyFrac === void 0 || weeklyFrac < .999) continue;
+			let shouldWarm = false;
+			let historyKey = "";
+			if (q.weeklyResetTime) {
+				const resetTs = Date.parse(q.weeklyResetTime);
+				if (!isNaN(resetTs)) {
+					if (now >= resetTs - 6e4) {
+						historyKey = `${identity}:${fam}:weekly:${resetTs}`;
+						shouldWarm = options.force || !this.history.checkCooldown(historyKey, SIX_DAYS_MS, now);
+					}
+				}
+			} else {
+				historyKey = `${identity}:${fam}:weekly:initial`;
+				shouldWarm = options.force || !this.history.checkCooldown(historyKey, SIX_DAYS_MS, now);
+			}
+			const failureKey = `${historyKey}:failed`;
+			if (shouldWarm && !options.force && this.history.checkCooldown(failureKey, FAILURE_BACKOFF_MS, now)) shouldWarm = false;
+			if (shouldWarm) {
+				const model = pickWarmupModelForFamily(fam, monitored);
+				modelsToPing.push({
+					family: fam,
+					model,
+					historyKey,
+					failureKey
+				});
+			}
+		}
+		if (modelsToPing.length === 0 && options.force) {
+			const fallbackModel = pickWarmupModelForFamily("google", monitored);
+			modelsToPing.push({
+				family: "google",
+				model: fallbackModel,
+				historyKey: `${identity}:google:forced:${Math.floor(now / SIX_DAYS_MS)}`,
+				failureKey: `${identity}:google:forced:${Math.floor(now / SIX_DAYS_MS)}:failed`
+			});
+		}
+		if (modelsToPing.length === 0) return [{
+			accountId: account.id,
+			alias: account.alias,
+			email: account.email,
+			model: "none",
+			success: true,
+			durationMs: 0,
+			skipped: true,
+			skipReason: "All weekly quota windows in cooldown or not yet due for reset"
+		}];
+		for (let i = 0; i < modelsToPing.length; i++) {
+			const target = modelsToPing[i];
+			this.log(`[Warmup] weekly warmup for ${target.model} @ ${account.id} (${target.family})...`);
+			const res = await this.warmupModelDirectly(account, target.model);
+			if (res.ok) {
+				this.history.record(target.historyKey, now);
+				this.history.record(`${identity}:${target.model}:100`, now);
+			} else {
+				this.history.record(target.failureKey, now);
+				if (res.status === 401) this.pool.markAuthRequired(account.id, "Warmup probe rejected with HTTP 401");
+			}
+			results.push({
+				accountId: account.id,
+				alias: account.alias,
+				email: account.email,
+				model: target.model,
+				success: res.ok,
+				status: res.status,
+				error: res.error,
+				durationMs: res.durationMs
+			});
+			if (i < modelsToPing.length - 1) await new Promise((r) => setTimeout(r, warmupDelayMs()));
+		}
+		return results;
+	}
+	/**
+	* Warm up all accounts sequentially.
+	*/
+	async warmupAllAccounts(options = {}) {
+		const accounts = this.pool.getAccounts().filter((a) => options.force ? a.enabled && !a.authRequired : shouldPollAccount(a));
+		const allResults = [];
+		for (let i = 0; i < accounts.length; i++) {
+			const acc = accounts[i];
+			const res = await this.warmupAccount(acc, options);
+			allResults.push(...res);
+			if (i < accounts.length - 1) await new Promise((r) => setTimeout(r, warmupDelayMs()));
+		}
+		return allResults;
+	}
+	/**
+	* Scheduled periodic run: checks weekly quotas and triggers reset activation when due.
+	*/
+	async runScheduledWarmup() {
+		if (!this.config().autoWarmup) return [];
+		return this.warmupAllAccounts({ force: false });
+	}
+};
+//#endregion
 //#region src/host/mcp-bridge.ts
 const MCP_SERVER_KEY = "dsh-tools";
 /** MCP tool names are [a-zA-Z0-9_-]; DSH names may contain dots. */
@@ -34107,16 +34636,39 @@ function startMcpBridge(opts) {
 					return;
 				}
 				callSeq++;
+				const startedAt = Date.now();
+				const audit = (outcome) => {
+					try {
+						opts.log?.("mcp call " + dshName + " [" + outcome + "] " + (Date.now() - startedAt) + "ms");
+					} catch {}
+				};
 				try {
+					const sessionHeader = String(req.headers["x-dsh-session"] ?? "");
+					const resolveSession = async (id) => id === "" ? void 0 : await Promise.resolve(opts.resolveAgent?.(id));
+					let agent = await resolveSession(sessionHeader);
+					if (agent === void 0 && sessionHeader !== "" && !sessionHeader.startsWith("session-")) agent = await resolveSession("session-" + sessionHeader);
+					const controller = new AbortController();
+					const abortIfOpen = () => {
+						if (!res.writableEnded) controller.abort();
+					};
+					req.once("aborted", abortIfOpen);
+					res.once("close", () => {
+						if (!res.writableEnded) controller.abort();
+					});
+					const result = await svc.execute({
+						callId: "agy-mcp-" + callSeq,
+						name: dshName,
+						arguments: parsed.arguments ?? {},
+						signal: controller.signal,
+						...agent === void 0 ? {} : { agent }
+					});
+					audit("ok caller=" + (agent === void 0 ? "none" : "agent"));
 					sendJson(res, 200, {
 						ok: true,
-						text: resultText(await svc.execute({
-							callId: "agy-mcp-" + callSeq,
-							name: dshName,
-							arguments: parsed.arguments ?? {}
-						}))
+						text: resultText(result)
 					});
 				} catch (e) {
+					audit("failed: " + String(e).slice(0, 200));
 					sendJson(res, 200, {
 						ok: false,
 						error: String(e)
@@ -34149,12 +34701,30 @@ function startMcpBridge(opts) {
 	});
 }
 /**
-* Merge our server entry into the workspace .mcp.json. Returns a restore
-* function that puts the previous content back (or deletes the file we
-* created). Never throws.
+* Absolute path of the MCP server registry `agy` 1.4+ actually loads.
+* `override` wins so callers can target a specific file.
+* Correctly distinguishes between a home dir (`/path/to/home`) and a
+* direct .gemini dir (`/path/to/home/.gemini`).
 */
-function writeMcpConfig(workspaceRoot, bridge) {
-	const file = join(workspaceRoot, ".mcp.json");
+function agyMcpConfigPath(override = "", env = process.env) {
+	if (override !== "") return override;
+	const gch = env.GEMINI_CLI_HOME;
+	if (typeof gch === "string" && gch !== "") return basename(gch) === ".gemini" ? join(gch, "config", "mcp_config.json") : join(gch, ".gemini", "config", "mcp_config.json");
+	const home = typeof env.HOME === "string" && env.HOME !== "" ? env.HOME : homedir();
+	return join(home, ".gemini", "config", "mcp_config.json");
+}
+/** Registry key for one bridge instance: unique per port so two DSH hosts sharing a global file never clobber each other. */
+function mcpServerKey(port) {
+	return "dsh-tools-" + String(port);
+}
+/**
+* Merge our server entry into the MCP registry file at `file` (`agy` 1.4+
+* reads the global one; a workspace `.mcp.json` is ignored, see issue #55).
+* Returns a restore function that puts the previous content back (or deletes
+* the file we created). Never throws.
+*/
+function writeMcpConfig(file, bridge) {
+	const key = mcpServerKey(bridge.port);
 	let previous = null;
 	try {
 		if (existsSync(file)) previous = readFileSync(file, "utf8");
@@ -34169,7 +34739,8 @@ function writeMcpConfig(workspaceRoot, bridge) {
 		root = {};
 	}
 	const servers = root.mcpServers && typeof root.mcpServers === "object" ? root.mcpServers : {};
-	servers[MCP_SERVER_KEY] = {
+	if (MCP_SERVER_KEY in servers) delete servers[MCP_SERVER_KEY];
+	servers[key] = {
 		type: "stdio",
 		command: process.execPath,
 		args: [bridge.bridgeScript],
@@ -34180,8 +34751,11 @@ function writeMcpConfig(workspaceRoot, bridge) {
 	};
 	root.mcpServers = servers;
 	let written = false;
+	let writtenBytes = "";
 	try {
-		writeFileSync(file, JSON.stringify(root, null, 2) + "\n", "utf8");
+		mkdirSync(dirname(file), { recursive: true });
+		writtenBytes = JSON.stringify(root, null, 2) + "\n";
+		writeFileSync(file, writtenBytes, "utf8");
 		written = true;
 	} catch {
 		return () => {};
@@ -34196,6 +34770,31 @@ function writeMcpConfig(workspaceRoot, bridge) {
 				current = null;
 			}
 			if (current === null) return;
+			if (current !== writtenBytes) {
+				let live = {};
+				try {
+					const v = JSON.parse(current);
+					if (v && typeof v === "object") live = v;
+				} catch {
+					return;
+				}
+				const liveServers = live.mcpServers && typeof live.mcpServers === "object" ? live.mcpServers : {};
+				if (!(key in liveServers)) return;
+				delete liveServers[key];
+				const emptyRegistry = Object.keys(liveServers).length === 0;
+				const nothingElse = Object.keys(live).every((k) => k === "mcpServers");
+				if (emptyRegistry && nothingElse) {
+					try {
+						unlinkSync(file);
+					} catch {}
+					return;
+				}
+				writeFileSync(file, JSON.stringify({
+					...live,
+					mcpServers: liveServers
+				}, null, 2) + "\n", "utf8");
+				return;
+			}
 			let parsed = {};
 			try {
 				const v = JSON.parse(current);
@@ -34204,9 +34803,9 @@ function writeMcpConfig(workspaceRoot, bridge) {
 				return;
 			}
 			const curServers = parsed.mcpServers && typeof parsed.mcpServers === "object" ? parsed.mcpServers : {};
-			if (!(MCP_SERVER_KEY in curServers)) return;
+			if (!(key in curServers)) return;
 			if (previous === null) {
-				delete curServers[MCP_SERVER_KEY];
+				delete curServers[key];
 				if (Object.keys(curServers).length === 0) unlinkSync(file);
 				else writeFileSync(file, JSON.stringify({
 					...parsed,
@@ -34449,6 +35048,7 @@ function apply(ctx, entryConfig = {}) {
 		viaCli: () => getConfig().quotaViaCli,
 		preemptAutoUpdate: () => getConfig().suppressAgyAutoUpdate
 	});
+	const warmup = new WarmupService(pool, quota, () => getConfig().proxyUrl || detectSystemProxy() || "", version, getConfig, log);
 	const semaphore = new Semaphore(() => getConfig().maxConcurrent);
 	const getDiscoveryEnv = (account) => {
 		const cfg = getConfig();
@@ -34736,7 +35336,7 @@ function apply(ctx, entryConfig = {}) {
 			res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
 			res.end(JSON.stringify(body));
 		};
-		const readBody = (req) => {
+		const readBody = (req, strict = false) => {
 			const r = req;
 			return new Promise((resolve) => {
 				const chunks = [];
@@ -34746,7 +35346,7 @@ function apply(ctx, entryConfig = {}) {
 						const v = JSON.parse(Buffer.concat(chunks).toString("utf8"));
 						resolve(v && typeof v === "object" ? v : {});
 					} catch {
-						resolve({});
+						resolve(strict ? { __invalidJson: true } : {});
 					}
 				});
 			});
@@ -34783,6 +35383,8 @@ function apply(ctx, entryConfig = {}) {
 						},
 						catalogModels: sanitizeCatalogEntries(cat.models).entries,
 						hiddenModels: cfg.hiddenModels,
+						autoWarmup: cfg.autoWarmup,
+						warmupModels: cfg.warmupModels,
 						bindings: Object.keys(store.all()).length,
 						lastRun
 					});
@@ -34829,7 +35431,7 @@ function apply(ctx, entryConfig = {}) {
 							if (acc) quota.refreshAccountQuota(acc).catch(() => void 0);
 						} else quota.refreshAllQuotas().catch(() => void 0);
 						store.clear();
-						catalog.forceRefresh().then(() => notifyPicker()).catch(() => void 0);
+						catalog.forceRefresh().catch(() => void 0);
 					}
 					sendJson(res, 200, st);
 				})();
@@ -34958,6 +35560,13 @@ function apply(ctx, entryConfig = {}) {
 					const body = await readBody(req);
 					const alias = typeof body.alias === "string" ? body.alias : void 0;
 					const acc = pool.createAccountSlot(alias);
+					if (bridgeState.bridge !== null) {
+						const cfg = getConfig();
+						if (cfg.mcpConfigScope === "global" || cfg.mcpConfigScope === "both") {
+							const accTarget = agyMcpConfigPath("", isolatedHomeEnv(acc.dir));
+							bridgeState.restores.push(writeMcpConfig(accTarget, bridgeState.bridge));
+						}
+					}
 					pool.markAuthRequired(acc.id, "not signed in yet — complete the terminal login");
 					if (body.autoOpenTerminal !== false && acc.dir) openAccountTerminal(acc.dir);
 					sendJson(res, 200, {
@@ -35103,7 +35712,7 @@ function apply(ctx, entryConfig = {}) {
 						const acc = pool.getAccount(id);
 						if (acc) await quota.refreshAccountQuota(acc, true);
 					} else await quota.refreshAllQuotas(true);
-					catalog.forceRefresh().then(() => notifyPicker()).catch(() => void 0);
+					catalog.forceRefresh().catch(() => void 0);
 					sendJson(res, 200, {
 						ok: true,
 						pool: pool.getPoolData()
@@ -35111,6 +35720,60 @@ function apply(ctx, entryConfig = {}) {
 				})();
 			}
 		});
+		reg({
+			kind: "exact",
+			path: "/plugins/agy-link/pool/warmup",
+			handler: (req, res) => {
+				(async () => {
+					try {
+						if (methodOf(req) !== "POST") {
+							sendJson(res, 405, { error: "POST only" });
+							return;
+						}
+						const body = await readBody(req, true);
+						if (body.__invalidJson === true) {
+							sendJson(res, 400, { error: "invalid JSON body" });
+							return;
+						}
+						const id = typeof body.id === "string" ? body.id : "";
+						const force = body.force === true;
+						const rawModel = body.model;
+						if (rawModel !== void 0 && (typeof rawModel !== "string" || !/^[A-Za-z0-9._/-]{1,80}$/.test(rawModel))) {
+							sendJson(res, 400, { error: "invalid model" });
+							return;
+						}
+						const model = typeof rawModel === "string" ? rawModel : void 0;
+						if (id === "" && body.all !== true) {
+							sendJson(res, 400, { error: "id or { all: true } required" });
+							return;
+						}
+						let results = [];
+						if (id) {
+							const acc = pool.getAccount(id);
+							if (!acc) {
+								sendJson(res, 404, { error: "Account not found" });
+								return;
+							}
+							results = await warmup.warmupAccount(acc, {
+								force,
+								model
+							});
+							await quota.refreshAccountQuota(acc, true).catch(() => void 0);
+						} else {
+							results = await warmup.warmupAllAccounts({ force });
+							await quota.refreshAllQuotas(false).catch(() => void 0);
+						}
+						sendJson(res, 200, {
+							ok: true,
+							results,
+							pool: pool.getPoolData()
+						});
+					} catch (e) {
+						sendJson(res, 500, { error: String(e) });
+					}
+				})();
+			}
+		});
 		reg({
 			kind: "exact",
 			path: "/plugins/agy-link/pool/clear-cooldown",
@@ -35143,7 +35806,7 @@ function apply(ctx, entryConfig = {}) {
 					const body = await readBody(req);
 					const id = typeof body.id === "string" ? body.id : "";
 					const ok = id !== "" && pool.setActiveAccount(id);
-					if (ok) catalog.forceRefresh(id).then(() => notifyPicker()).catch(() => notifyPicker());
+					if (ok) catalog.forceRefresh(id).catch(() => void 0);
 					sendJson(res, ok ? 200 : 400, {
 						ok,
 						pool: pool.getPoolData()
@@ -35187,7 +35850,9 @@ function apply(ctx, entryConfig = {}) {
 						"defaultEffort",
 						"askTool",
 						"workspaceRoot",
-						"hiddenModels"
+						"hiddenModels",
+						"autoWarmup",
+						"warmupModels"
 					].includes(key)) {
 						sendJson(res, 400, { error: "key not settable" });
 						return;
@@ -35196,6 +35861,10 @@ function apply(ctx, entryConfig = {}) {
 						sendJson(res, 400, { error: "hiddenModels must be an array of model ids" });
 						return;
 					}
+					if (key === "warmupModels" && (!Array.isArray(body.value) || !body.value.every((x) => typeof x === "string"))) {
+						sendJson(res, 400, { error: "warmupModels must be an array of model names" });
+						return;
+					}
 					setOverride(key, body.value);
 					syncAskTool();
 					syncMirrorTool();
@@ -35280,7 +35949,11 @@ function apply(ctx, entryConfig = {}) {
 	ctx.effect(() => {
 		if (!getConfig().enabled) return () => void 0;
 		const refresh = () => {
-			quota.refreshAllQuotas().then(() => notifyPicker()).catch(() => void 0);
+			const prevArgon = pool.getAccounts().map((a) => Boolean(a.quotas?.argon)).join(",");
+			quota.refreshAllQuotas().then(() => {
+				const nextArgon = pool.getAccounts().map((a) => Boolean(a.quotas?.argon)).join(",");
+				if (prevArgon !== nextArgon) notifyPicker();
+			}).catch(() => void 0);
 		};
 		const boot = setTimeout(refresh, 5e3);
 		boot.unref?.();
@@ -35291,9 +35964,25 @@ function apply(ctx, entryConfig = {}) {
 			clearInterval(timer);
 		};
 	});
+	ctx.effect(() => {
+		if (!getConfig().enabled) return () => void 0;
+		let running = false;
+		const checkWarmup = () => {
+			if (running) return;
+			const cfg = getConfig();
+			if (!cfg.enabled || !cfg.autoWarmup) return;
+			running = true;
+			warmup.runScheduledWarmup().catch(() => void 0).finally(() => {
+				running = false;
+			});
+		};
+		const timer = setInterval(checkWarmup, 3e5);
+		timer.unref?.();
+		return () => clearInterval(timer);
+	});
 	const bridgeState = {
 		bridge: null,
-		restore: null
+		restores: []
 	};
 	let bridgeDisposed = false;
 	const syncMcpBridge = () => {
@@ -35303,10 +35992,14 @@ function apply(ctx, entryConfig = {}) {
 			try {
 				const script = fileURLToPath(new URL("./bridge.mjs", import.meta.url));
 				const toolsSvc = ctx.get("tools");
+				const agents = () => {
+					return ctx.get("agents") ?? ctx.agents;
+				};
 				const bridge = await startMcpBridge({
 					bridgeScript: script,
 					tools: () => ctx.get("tools"),
 					allowlist: () => getConfig().mcpToolAllowlist,
+					resolveAgent: (sessionId) => agents()?.get(sessionId),
 					log
 				});
 				if (bridgeDisposed) {
@@ -35315,21 +36008,28 @@ function apply(ctx, entryConfig = {}) {
 				}
 				bridgeState.bridge = bridge;
 				const root = cfg.workspaceRoot !== "" ? cfg.workspaceRoot : process.cwd();
-				bridgeState.restore = writeMcpConfig(root, bridge);
-				log("mcp bridge ready at " + bridge.url + (toolsSvc ? "" : " (tools service not yet available)"));
+				const targets = [];
+				if (cfg.mcpConfigScope === "global" || cfg.mcpConfigScope === "both") {
+					targets.push(agyMcpConfigPath(cfg.mcpConfigPath));
+					for (const acc of pool.getAccounts()) if (acc.dir) targets.push(agyMcpConfigPath("", isolatedHomeEnv(acc.dir)));
+				}
+				if (cfg.mcpConfigScope === "workspace" || cfg.mcpConfigScope === "both") targets.push(join(root, ".mcp.json"));
+				const uniqueTargets = Array.from(new Set(targets));
+				bridgeState.restores = uniqueTargets.map((file) => writeMcpConfig(file, bridge));
+				log("mcp bridge ready at " + bridge.url + " (registries: " + uniqueTargets.join(", ") + ")" + (toolsSvc ? "" : " (tools service not yet available)"));
 			} catch (e) {
-				bridgeState.restore?.();
+				for (const undo of bridgeState.restores) undo();
 				await bridgeState.bridge?.close();
 				bridgeState.bridge = null;
-				bridgeState.restore = null;
+				bridgeState.restores = [];
 				log("mcp bridge failed to start: " + String(e));
 			}
 		})();
 		else if (!want && bridgeState.bridge !== null) {
-			bridgeState.restore?.();
+			for (const undo of bridgeState.restores) undo();
 			bridgeState.bridge.close();
 			bridgeState.bridge = null;
-			bridgeState.restore = null;
+			bridgeState.restores = [];
 		}
 	};
 	syncMcpBridge();
@@ -35340,7 +36040,7 @@ function apply(ctx, entryConfig = {}) {
 			poolAuth.cancel();
 			if (askToolDispose.current !== null) askToolDispose.current();
 			if (mirrorToolDispose.current !== null) mirrorToolDispose.current();
-			bridgeState.restore?.();
+			for (const undo of bridgeState.restores) undo();
 			bridgeState.bridge?.close();
 		};
 	});