dsh-agy-link 0.4.59 → 0.4.66

package/dist/index.js

@@ -1,13 +1,14 @@
 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 { accessSync, chmodSync, constants, copyFileSync, createReadStream, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+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";
 import { LlmAdapter, LlmError } from "@deepseek-ai/dsh-llm";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { chmod, copyFile, mkdir, mkdtemp, readFile, readdir, rm, stat, unlink, writeFile } from "node:fs/promises";
+import { EventEmitter } from "node:events";
 import { createServer } from "node:http";
 import { promisify } from "node:util";
 import { fileURLToPath } from "node:url";
@@ -54,6 +55,15 @@ const DEFAULT_FALLBACK_MODELS = [
 			"high"
 		]
 	},
+	{
+		id: "gemini-4-argon",
+		name: "Gemini 4 Argon",
+		efforts: [
+			"low",
+			"medium",
+			"high"
+		]
+	},
 	{
 		id: "claude-sonnet-4-6",
 		name: "Claude Sonnet 4.6 (Thinking)"
@@ -126,7 +136,8 @@ function defaultConfig() {
 		logRetentionDays: 7,
 		disableTelemetry: true,
 		quotaPollIntervalMs: 9e5,
-		proxyUrl: ""
+		proxyUrl: "",
+		suppressAgyAutoUpdate: process.platform === "win32"
 	};
 }
 /**
@@ -192,8 +203,25 @@ function shouldMarkAuthRequired(code, message) {
 	if (code === "AUTH") return true;
 	return isAuthoritativeAuthError(message);
 }
+/**
+* Recognize context-overflow and token limit exceeded errors from Google Antigravity / agy CLI.
+* Aligns with DSH's CONTEXT_WINDOW_EXCEEDED_CODE contract so the agent loop triggers context
+* auto-compaction instead of terminating the turn with a fatal process exit.
+*/
+function looksLikeContextWindowExceeded(message) {
+	if (!message) return false;
+	if (/prompt is too long:\s*\d+\s*tokens\s*>\s*\d+\s*maximum/i.test(message)) return true;
+	if (/context[\s_-]*(?:length|window)[\s_-]*(?:exceeded|overflow|limit[\s_-]*exceeded)/i.test(message)) return true;
+	if (/\b(?:maximum|max)(?:\s+(?:allowed|supported))?\s+context\s+(?:length|window)\b/i.test(message)) return true;
+	if (/\b(?:request|prompt|input|messages?)\s+(?:is\s+|are\s+)?too\s+(?:large|long)\s+for\s+(?:(?:this|the)\s+)?(?:model(?:'s)?\s+)?context(?:\s+window)?\b/i.test(message)) return true;
+	if (/\btoken[\s_-]*limit[\s_-]*exceeded\b/i.test(message)) return true;
+	if (/\bexceed(?:s|ed|ing)?\b.{0,40}\b(?:model(?:'s)?\s+)?context(?:\s+(?:length|window))?\b/i.test(message)) return true;
+	if (/\b(?:model(?:'s)?\s+)?context(?:\s+(?:length|window))?\b.{0,40}\bexceed(?:s|ed|ing)?\b/i.test(message)) return true;
+	return false;
+}
 const Err = {
 	AUTH: "AUTH",
+	INVALID_CREDENTIAL: "INVALID_CREDENTIAL",
 	AGY_NOT_INSTALLED: "AGY_NOT_INSTALLED",
 	AGY_VERSION_UNSUPPORTED: "AGY_VERSION_UNSUPPORTED",
 	AGY_ERROR: "AGY_ERROR",
@@ -204,6 +232,7 @@ const Err = {
 	* deterministic AGY_ERRORs (bad region, empty request, dead pool).
 	*/
 	RATE_LIMIT: "RATE_LIMIT",
+	QUOTA: "QUOTA",
 	/**
 	* Google-side region / account eligibility refusal ("User location is not
 	* supported for the API use"). Account-level, so it is retryable: the
@@ -232,7 +261,12 @@ const Err = {
 	UNKNOWN_MODEL: "UNKNOWN_MODEL",
 	UNSUPPORTED_REASONING_EFFORT: "UNSUPPORTED_REASONING_EFFORT",
 	AUX_DISABLED: "AUX_DISABLED",
-	BUSY: "BUSY"
+	BUSY: "BUSY",
+	/**
+	* Canonical provider-neutral code for context window overflow.
+	* Enables DSH agent loop to trigger context auto-compaction rather than aborting.
+	*/
+	CONTEXT_WINDOW_EXCEEDED: "CONTEXT_WINDOW_EXCEEDED"
 };
 function looksLikeAuthFailure(text) {
 	return /authentication required|authentication failed|please sign in|not signed in|timed out waiting for authentication/i.test(text);
@@ -277,14 +311,22 @@ function isAccountScopedFailure(code) {
 	return code === "RATE_LIMIT" || code === "ELIGIBILITY" || code === "NETWORK" || code === "OVERLOADED" || code === "AUTH";
 }
 /**
+* Capacity exhaustion / server-side pressure signals (model overloaded / 503 / 529 / high traffic).
+* Distinct from account-level quota exhaustion (429): Google's backend capacity is shared across
+* accounts, so rotating accounts on a server capacity refusal burns every healthy account's turn
+* for nothing. The scheduler should STAY on the current account with backoff retry rather than rotating.
+*/
+function looksLikeCapacityExhaustion(text) {
+	if (!text) return false;
+	return /model (?:is )?overloaded|experiencing high traffic|is overloaded|capacity (?:exhausted|unavailable)|temporarily (?:overloaded|unavailable)|server (?:is )?busy|overloaded and unable to|503\s+Service\s+Unavailable|529\s+Overloaded/i.test(text);
+}
+/**
 * Soft heuristic adds capacity signals (model overloaded / high traffic).
 * Shapes the user-facing error message only — NEVER cools an account down.
-* The adapter still ROTATES on these: nothing was spent locally, and ending a
-* turn while an idle account could serve it is the interruption users report.
 */
 function looksLikeRateLimit(text) {
 	if (!text) return false;
-	return looksLikeHardRateLimit(text) || /model overloaded|experiencing high traffic|is overloaded|capacity (?:exhausted|unavailable)|temporarily overloaded/i.test(text);
+	return looksLikeHardRateLimit(text) || looksLikeCapacityExhaustion(text);
 }
 /**
 * Parse reset duration in milliseconds from rate-limit / quota-exhausted error strings.
@@ -415,7 +457,8 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 		logRetentionDays: asNum(get("logRetentionDays")) ?? base.logRetentionDays,
 		disableTelemetry: asBool(get("disableTelemetry")) ?? base.disableTelemetry,
 		quotaPollIntervalMs: asNum(get("quotaPollIntervalMs")) ?? base.quotaPollIntervalMs,
-		proxyUrl: asString(get("proxyUrl")) ?? base.proxyUrl
+		proxyUrl: asString(get("proxyUrl")) ?? base.proxyUrl,
+		suppressAgyAutoUpdate: asBool(get("suppressAgyAutoUpdate")) ?? base.suppressAgyAutoUpdate
 	};
 	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;
@@ -474,6 +517,10 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 		if (q && q >= 6e4) cfg.quotaPollIntervalMs = q;
 	}
 	if (env.DSH_AGY_PROXY_URL) cfg.proxyUrl = env.DSH_AGY_PROXY_URL;
+	if (env.DSH_AGY_SUPPRESS_AUTOUPDATE !== void 0) {
+		const sa = asBool(env.DSH_AGY_SUPPRESS_AUTOUPDATE);
+		if (sa !== void 0) cfg.suppressAgyAutoUpdate = sa;
+	}
 	return cfg;
 }
 //#endregion
@@ -841,10 +888,12 @@ function mirrorCallId(runId, eventIndex) {
 function parseMirrorCallId(callId) {
 	if (!callId.startsWith("agytc-")) return null;
 	const rest = callId.slice(6);
-	const idx = rest.lastIndexOf("-");
+	const hashIdx = rest.indexOf("#");
+	const baseRest = hashIdx >= 0 ? rest.slice(0, hashIdx) : rest;
+	const idx = baseRest.lastIndexOf("-");
 	if (idx <= 0) return null;
-	const runId = rest.slice(0, idx);
-	const n = Number(rest.slice(idx + 1));
+	const runId = baseRest.slice(0, idx);
+	const n = Number(baseRest.slice(idx + 1));
 	if (!Number.isSafeInteger(n) || n < 0) return null;
 	return {
 		runId,
@@ -1500,12 +1549,28 @@ function isPlanMode(messages) {
 	return false;
 }
 /**
+* Harness-injected user-role texts (turn-preparation time samples, system
+* reminders, runtime context) are NOT user instructions: they must not break
+* the completion-hop scan, while a genuine instruction must.
+*/
+function isHarnessInjectedUserText(text) {
+	const t = text.trimStart();
+	return t.startsWith("Time sampled while preparing") || t.startsWith("Current runtime context") || t.includes("<system-reminder>");
+}
+/**
 * Check if the trailing span represents completion of a bridge-emitted `update_goal` call.
 * This covers both the direct tool-result message and DSH's deferred `<goal_complete>` notice.
+*
+* The markers only mean "synthetic completion hop" while they are the TRAILING
+* content. A genuine user message appearing before any marker is a fresh
+* instruction that must reach agy — scanning a fixed window for markers
+* "anywhere" swallowed exactly that: a message sent right after a goal
+* completed was finished as an empty turn without spawning agy
+* (2026-10-17, "把相关的经验整理到agents.md" × 2).
 */
 function isGoalToolContinuation(messages) {
 	if (messages.length === 0) return false;
-	const spanStart = Math.max(0, messages.length - 4);
+	const spanStart = Math.max(0, messages.length - 8);
 	for (let i = messages.length - 1; i >= spanStart; i--) {
 		const m = messages[i];
 		if (!m) continue;
@@ -1513,7 +1578,9 @@ function isGoalToolContinuation(messages) {
 		if (typeof callId === "string" && callId.startsWith("agytc-bridge-goal-")) return true;
 		const src = m.source;
 		if (src && typeof src === "object" && src.kind === "tool-goal") return true;
-		if (extractText$1(m).includes("<goal_complete>")) return true;
+		const text = extractText$1(m);
+		if (text.includes("<goal_complete>")) return true;
+		if (m.role === "user" && text.trim() !== "" && !isHarnessInjectedUserText(text)) return false;
 	}
 	return false;
 }
@@ -1575,6 +1642,24 @@ function buildPlanExitToolCallBlock(planMarkdown, blockIdx) {
 //#endregion
 //#region src/host/mapper.ts
 const toToolCallId = dshLlm.ToolCallId ?? dshLlm.CallId ?? ((id) => id);
+/**
+* Disambiguate duplicate tool-call IDs across turns or multiple calls in a session.
+* Reusing a call ID across different tool names triggers INVALID_ARGS in DSH; suffixing
+* with #${name} keeps each call uniquely addressable and self-healing.
+*/
+function rememberToolCallId(toolNames, rawCallId, name) {
+	const state = toolNames.get(rawCallId);
+	const assigned = state === void 0 ? rawCallId : state.last.name === name ? state.last.id : `${rawCallId}#${name}`;
+	const binding = {
+		id: assigned,
+		name
+	};
+	toolNames.set(rawCallId, {
+		last: binding,
+		pending: [...state?.pending ?? [], binding]
+	});
+	return assigned;
+}
 function usageFromRaw(raw) {
 	const usage = {
 		inputTokens: raw.input_tokens ?? 0,
@@ -1583,6 +1668,7 @@ function usageFromRaw(raw) {
 	if (raw.cache_read_tokens !== void 0) usage.cacheReadTokens = raw.cache_read_tokens;
 	if (raw.cache_write_tokens !== void 0) usage.cacheWriteTokens = raw.cache_write_tokens;
 	if (raw.thinking_tokens !== void 0) usage.reasoningTokens = raw.thinking_tokens;
+	if (raw.total_tokens !== void 0) usage.totalTokens = raw.total_tokens;
 	return usage;
 }
 /** Suffix-delta: emit only what grew; fall back to a newline + full text. */
@@ -1622,6 +1708,7 @@ var EventMapper = class {
 	sawTextStep;
 	finished = false;
 	totalTextOutput = "";
+	toolCallStates = /* @__PURE__ */ new Map();
 	constructor(opts) {
 		this.opts = opts;
 		this.sawTextStep = opts.initialSawText === true;
@@ -1807,6 +1894,8 @@ var EventMapper = class {
 					tool: ev.tool.name,
 					...effectiveArgs !== void 0 ? { input: effectiveArgs } : {}
 				});
+				const rawCallId = mirrorCallId(this.opts.runId, absIndex);
+				const assignedCallId = rememberToolCallId(this.toolCallStates, rawCallId, toolName);
 				yield {
 					type: "block-start",
 					index: idx,
@@ -1817,7 +1906,7 @@ var EventMapper = class {
 					index: idx,
 					block: {
 						type: "tool-call",
-						id: toToolCallId(mirrorCallId(this.opts.runId, absIndex)),
+						id: toToolCallId(assignedCallId),
 						name: toolName,
 						arguments: argumentsJson
 					}
@@ -2020,7 +2109,7 @@ function foldEfforts(raw) {
 	const verbatim = [];
 	const slugSet = new Set(raw.map((r) => r.slug));
 	for (const r of raw) {
-		if (!r.slug.startsWith("gemini")) {
+		if (!r.slug.startsWith("gemini") && !r.slug.startsWith("argon")) {
 			verbatim.push({
 				id: r.slug,
 				name: r.label,
@@ -2363,17 +2452,17 @@ function parseUsage(v) {
 	const o = v;
 	const num = (x) => typeof x === "number" && Number.isFinite(x) ? x : void 0;
 	const out = {};
-	const inT = num(o.input_tokens);
-	const outT = num(o.output_tokens);
+	const inT = num(o.input_tokens) ?? num(o.inputTokens) ?? num(o.prompt_tokens);
+	const outT = num(o.output_tokens) ?? num(o.outputTokens) ?? num(o.completion_tokens);
 	if (inT !== void 0) out.input_tokens = inT;
 	if (outT !== void 0) out.output_tokens = outT;
-	const t = num(o.thinking_tokens);
+	const t = num(o.thinking_tokens) ?? num(o.thinkingTokens) ?? num(o.reasoning_tokens);
 	if (t !== void 0) out.thinking_tokens = t;
-	const cr = num(o.cache_read_tokens);
+	const cr = num(o.cache_read_tokens) ?? num(o.cacheReadTokens) ?? num(o.cached_tokens) ?? num(o.cache_read_input_tokens);
 	if (cr !== void 0) out.cache_read_tokens = cr;
-	const cw = num(o.cache_write_tokens);
+	const cw = num(o.cache_write_tokens) ?? num(o.cacheWriteTokens) ?? num(o.cache_creation_input_tokens);
 	if (cw !== void 0) out.cache_write_tokens = cw;
-	const tot = num(o.total_tokens);
+	const tot = num(o.total_tokens) ?? num(o.totalTokens);
 	if (tot !== void 0) out.total_tokens = tot;
 	return out;
 }
@@ -2688,6 +2777,85 @@ async function sweepDir(dir, ttlMs, now = Date.now()) {
 function defaultMediaDir(stateDir) {
 	return join(stateDir, "media");
 }
+function nonBlank(v) {
+	return (v ?? "").trim();
+}
+/**
+* agy's application data directory for a given spawn environment.
+*
+* The plugin isolates pooled accounts by rewriting HOME / USERPROFILE /
+* GEMINI_CLI_HOME / ANTIGRAVITY_APP_DATA_DIR (see `isolatedHomeEnv`), and agy
+* resolves its data dir from exactly those variables — an isolated spawn was
+* verified to write `<home>/.gemini/antigravity-cli/last_check.timestamp`.
+*/
+function agyAppDataDir(env = process.env) {
+	const explicit = nonBlank(env.ANTIGRAVITY_APP_DATA_DIR);
+	if (explicit !== "") return explicit;
+	const geminiDir = nonBlank(env.GEMINI_CLI_HOME);
+	if (geminiDir !== "") return join(geminiDir, "antigravity-cli");
+	let home = nonBlank(env.HOME);
+	if (home === "") home = nonBlank(env.USERPROFILE);
+	if (home === "") try {
+		home = homedir();
+	} catch {
+		home = "";
+	}
+	if (home === "") return null;
+	return join(home, ".gemini", "antigravity-cli");
+}
+/**
+* Candidate `last_check.timestamp` locations for one spawn environment.
+*
+* The issue reporter observed `<appData>/updater/last_check.timestamp` on
+* Windows while macOS uses `<appData>/last_check.timestamp`. Refreshing both is
+* cheap and keeps the fix independent of agy's per-platform path choice.
+*/
+function agyUpdateCheckPaths(env = process.env) {
+	const appData = agyAppDataDir(env);
+	if (appData === null) return [];
+	return [join(appData, "last_check.timestamp"), join(appData, "updater", "last_check.timestamp")];
+}
+/**
+* Refresh agy's update-check timestamp so the next spawn takes the fast path.
+* Best-effort: a read-only or missing profile must never fail a run.
+*/
+function preemptAgyAutoUpdate(env = process.env, now = Date.now()) {
+	const result = {
+		touched: [],
+		failures: []
+	};
+	const seconds = Math.floor(now / 1e3);
+	for (const path of agyUpdateCheckPaths(env)) try {
+		mkdirSync(dirname(path), { recursive: true });
+		if (!existsSync(path)) writeFileSync(path, "");
+		utimesSync(path, seconds, seconds);
+		result.touched.push(path);
+	} catch (err) {
+		result.failures.push({
+			path,
+			error: err instanceof Error ? err.message : String(err)
+		});
+	}
+	return result;
+}
+/** Age (ms) of the most recent recorded update check, or null when none exists. */
+function agyUpdateCheckAgeMs(env = process.env, now = Date.now()) {
+	let freshest = null;
+	for (const path of agyUpdateCheckPaths(env)) try {
+		const age = now - statSync(path).mtimeMs;
+		if (freshest === null || age < freshest) freshest = age;
+	} catch {}
+	return freshest;
+}
+/** One-line `/agy doctor` summary of the auto-update suppression state. */
+function describeAgyAutoUpdate(env = process.env, now = Date.now()) {
+	if (agyUpdateCheckPaths(env).length === 0) return "unknown — no agy home directory in the spawn env";
+	const age = agyUpdateCheckAgeMs(env, now);
+	if (age === null) return "armed — no agy update check recorded yet; the next spawn pre-empts it";
+	const minutes = Math.max(0, Math.round(age / 6e4));
+	if (age < 9e5) return "suppressed — last check " + minutes + "m ago (agy fast path < 15m)";
+	return "stale — last check " + minutes + "m ago; the next spawn pre-empts it";
+}
 //#endregion
 //#region src/host/runner.ts
 const IS_WIN$2 = process.platform === "win32";
@@ -2808,9 +2976,12 @@ function windowsQuote(arg) {
 * platforms for its .gemini dir.
 */
 function isolatedHomeEnv(dir) {
+	const geminiDir = join(dir, ".gemini");
 	const env = {
 		HOME: dir,
-		GEMINI_CLI_HOME: join(dir, ".gemini")
+		GEMINI_CLI_HOME: geminiDir,
+		ANTIGRAVITY_GEMINI_DIR: geminiDir,
+		ANTIGRAVITY_APP_DATA_DIR: join(geminiDir, "antigravity-cli")
 	};
 	if (IS_WIN$2) {
 		env.USERPROFILE = dir;
@@ -3209,7 +3380,10 @@ function withAgyQuietEnv(env = process.env) {
 	return {
 		...env,
 		AGY_CLI_DISABLE_AUTO_UPDATE: env.AGY_CLI_DISABLE_AUTO_UPDATE ?? "1",
-		AGY_CLI_INTERACTIVE_HEADLESS: env.AGY_CLI_INTERACTIVE_HEADLESS ?? "1"
+		AGY_CLI_INTERACTIVE_HEADLESS: env.AGY_CLI_INTERACTIVE_HEADLESS ?? "1",
+		AGY_CLI_NONINTERACTIVE_HEADLESS: env.AGY_CLI_NONINTERACTIVE_HEADLESS ?? "1",
+		BROWSER: env.BROWSER ?? "none",
+		CI: env.CI ?? "1"
 	};
 }
 const escalating = /* @__PURE__ */ new WeakSet();
@@ -3277,6 +3451,7 @@ function startAgyProcess(opts) {
 	const viaCmd = IS_WIN$2 && isCmdShim(opts.bin);
 	const isNode = IS_WIN$2 && /\.(mjs|js|cjs)$/i.test(opts.bin);
 	const env = withAgyQuietEnv(opts.env ?? process.env);
+	if (opts.preemptAutoUpdate !== false && !isNode) preemptAgyAutoUpdate(env);
 	const child = viaCmd ? spawn(process.env.ComSpec ?? "cmd.exe", [
 		"/d",
 		"/s",
@@ -3411,13 +3586,14 @@ function startAgyProcess(opts) {
 	};
 }
 /** Simple one-shot helper for --version / models probes. */
-async function probeProcess(bin, args, timeoutMs = 3e4, signal, env) {
+async function probeProcess(bin, args, timeoutMs = 3e4, signal, env, preemptAutoUpdate) {
 	return startAgyProcess({
 		bin,
 		args,
 		timeoutMs,
 		signal,
-		env
+		env,
+		preemptAutoUpdate
 	}).outcome;
 }
 //#endregion
@@ -3531,13 +3707,21 @@ function runWinCredPs(target, user, action, payload = "") {
 		]
 	}).trim();
 }
-/** Read raw UTF-8 credential blob from Windows Credential Manager. */
-function readWindowsCredentialRaw(target = "gemini:antigravity") {
+let cachedWinCredRaw = null;
+/** Read raw UTF-8 credential blob from Windows Credential Manager (with short-lived in-memory caching). */
+function readWindowsCredentialRaw(target = "gemini:antigravity", maxAgeMs = 2500) {
 	if (!IS_WIN$1) return null;
+	const now = Date.now();
+	if (cachedWinCredRaw && cachedWinCredRaw.target === target && now - cachedWinCredRaw.time < maxAgeMs) return cachedWinCredRaw.val;
 	try {
 		const out = runWinCredPs(target, "antigravity", "read");
-		if (!out) return null;
-		return Buffer.from(out, "base64").toString("utf8");
+		const val = out ? Buffer.from(out, "base64").toString("utf8") : null;
+		cachedWinCredRaw = {
+			target,
+			val,
+			time: now
+		};
+		return val;
 	} catch {
 		return null;
 	}
@@ -3546,7 +3730,13 @@ function readWindowsCredentialRaw(target = "gemini:antigravity") {
 function writeWindowsCredentialRaw(secret, target = "gemini:antigravity", userName = "antigravity") {
 	if (!IS_WIN$1) return false;
 	try {
-		return runWinCredPs(target, userName, "write", Buffer.from(secret, "utf8").toString("base64")).toLowerCase() === "true";
+		const ok = runWinCredPs(target, userName, "write", Buffer.from(secret, "utf8").toString("base64")).toLowerCase() === "true";
+		if (ok) cachedWinCredRaw = {
+			target,
+			val: secret,
+			time: Date.now()
+		};
+		return ok;
 	} catch {
 		return false;
 	}
@@ -3714,8 +3904,6 @@ function detectSystemProxy(platform = process.platform) {
 		expiresAt: now + 3e5
 	};
 }
-//#endregion
-//#region src/host/pool.ts
 function defaultPoolDir() {
 	const dshState = process.env.DSH_STATE_DIR || join(homedir(), ".dsh");
 	return join(dshState, "agy-accounts");
@@ -3836,12 +4024,14 @@ var AccountPoolManager = class {
 	*/
 	bootstrapDefaultAccount() {
 		if (this.data.accounts.some((a) => a.systemHome)) return;
+		const sysProxy = detectSystemProxy();
 		const primary = {
 			id: "acc_primary",
 			alias: "Primary account (system sign-in)",
 			defaultAlias: true,
 			dir: "",
 			systemHome: true,
+			...sysProxy ? { proxyUrl: sysProxy } : {},
 			enabled: true,
 			createdAt: Date.now(),
 			cooldowns: {},
@@ -3858,20 +4048,35 @@ var AccountPoolManager = class {
 	* The stale directory is left untouched (never deletes user data).
 	*/
 	normalizeLegacyPrimary() {
-		const primary = this.data.accounts.find((a) => a.id === "acc_primary");
+		const primary = this.data.accounts.find((a) => a.id === "acc_primary" || a.systemHome);
 		if (!primary) return;
-		if (primary.systemHome) return;
-		primary.dir = "";
-		primary.systemHome = true;
-		primary.alias = "Primary account (system sign-in)";
-		primary.defaultAlias = true;
-		this.data.primaryAccountId = primary.id;
-		this.persist();
+		let changed = false;
+		if (!primary.systemHome || primary.dir) {
+			primary.dir = "";
+			primary.systemHome = true;
+			primary.alias = "Primary account (system sign-in)";
+			primary.defaultAlias = true;
+			this.data.primaryAccountId = primary.id;
+			changed = true;
+		}
+		if (process.platform === "win32") try {
+			const credFile = join(this.baseDir, ".primary-credential.json");
+			if (existsSync(credFile)) {
+				const parsed = JSON.parse(readFileSync(credFile, "utf8"));
+				if (parsed && typeof parsed.email === "string" && parsed.email && primary.email !== parsed.email) {
+					primary.email = parsed.email;
+					changed = true;
+				}
+			}
+		} catch {}
+		if (changed) this.persist();
 	}
-	getPoolData() {
+	getPoolData(defaultProxy) {
+		const sysProxy = defaultProxy || detectSystemProxy();
 		return {
 			...this.data,
-			activeAccountId: this.getActiveAccountId("google")
+			activeAccountId: this.getActiveAccountId("google"),
+			...sysProxy ? { systemProxy: sysProxy } : {}
 		};
 	}
 	getAccounts() {
@@ -4190,13 +4395,13 @@ var AccountPoolManager = class {
 		const cd = acc.cooldowns?.[family];
 		if (cd && cd.cooldownUntil > now) return false;
 		const quota = acc.quotas?.[family];
-		if (quota && typeof quota.remainingFraction === "number" && quota.remainingFraction <= .02) {
+		if (quota && typeof quota.remainingFraction === "number" && quota.remainingFraction <= .1) {
 			if (quota.resetTime) {
 				const resetMs = Date.parse(quota.resetTime);
 				if (Number.isNaN(resetMs) || resetMs > now) return false;
 			} else return false;
 		}
-		if (quota && typeof quota.weeklyFraction === "number" && quota.weeklyFraction <= .01) {
+		if (quota && typeof quota.weeklyFraction === "number" && quota.weeklyFraction <= .05) {
 			if (quota.weeklyResetTime) {
 				const resetMs = Date.parse(quota.weeklyResetTime);
 				if (Number.isNaN(resetMs) || resetMs > now) return false;
@@ -4302,8 +4507,8 @@ var AccountPoolManager = class {
 		const now = Date.now();
 		for (const [famKey, info] of Object.entries(quotas)) {
 			if (!info) continue;
-			const isExhausted5h = typeof info.remainingFraction === "number" && info.remainingFraction <= .02 && (!info.resetTime || Number.isNaN(Date.parse(info.resetTime)) || Date.parse(info.resetTime) > now);
-			const isExhaustedWeekly = typeof info.weeklyFraction === "number" && info.weeklyFraction <= .01 && (!info.weeklyResetTime || Number.isNaN(Date.parse(info.weeklyResetTime)) || Date.parse(info.weeklyResetTime) > now);
+			const isExhausted5h = typeof info.remainingFraction === "number" && info.remainingFraction <= .1 && (!info.resetTime || Number.isNaN(Date.parse(info.resetTime)) || Date.parse(info.resetTime) > now);
+			const isExhaustedWeekly = typeof info.weeklyFraction === "number" && info.weeklyFraction <= .05 && (!info.weeklyResetTime || Number.isNaN(Date.parse(info.weeklyResetTime)) || Date.parse(info.weeklyResetTime) > now);
 			if (isExhausted5h || isExhaustedWeekly) {
 				if (this.data.activeAccountIds?.[famKey] === id || this.data.lastActiveAccountId === id) this.advanceAccount(id, famKey);
 			}
@@ -4439,8 +4644,8 @@ var AccountPoolManager = class {
 			if (cd && cd.cooldownUntil > now) bump(cd.cooldownUntil);
 			const quota = acc.quotas?.[family];
 			if (quota === void 0) continue;
-			const drained5h = typeof quota.remainingFraction === "number" && quota.remainingFraction <= .02 && typeof quota.resetTime === "string" && Date.parse(quota.resetTime) > now;
-			const drainedWeekly = typeof quota.weeklyFraction === "number" && quota.weeklyFraction <= .01 && typeof quota.weeklyResetTime === "string" && Date.parse(quota.weeklyResetTime) > now;
+			const drained5h = typeof quota.remainingFraction === "number" && quota.remainingFraction <= .1 && typeof quota.resetTime === "string" && Date.parse(quota.resetTime) > now;
+			const drainedWeekly = typeof quota.weeklyFraction === "number" && quota.weeklyFraction <= .05 && typeof quota.weeklyResetTime === "string" && Date.parse(quota.weeklyResetTime) > now;
 			if (drained5h || drainedWeekly) bump(this.nextQuotaResetAt(acc, family));
 		}
 		return earliest !== null ? Math.max(0, earliest - now) : null;
@@ -6940,8 +7145,8 @@ var require_request$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region node_modules/undici/lib/dispatcher/dispatcher.js
 var require_dispatcher = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const EventEmitter$2 = __require("node:events");
-	var Dispatcher = class extends EventEmitter$2 {
+	const EventEmitter$3 = __require("node:events");
+	var Dispatcher = class extends EventEmitter$3 {
 		dispatch() {
 			throw new Error("not implemented");
 		}
@@ -13873,7 +14078,7 @@ var require_socks5_utils = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region node_modules/undici/lib/core/socks5-client.js
 var require_socks5_client = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const { EventEmitter: EventEmitter$1 } = __require("node:events");
+	const { EventEmitter: EventEmitter$2 } = __require("node:events");
 	const { Buffer: Buffer$1 } = __require("node:buffer");
 	const { InvalidArgumentError, Socks5ProxyError } = require_errors();
 	const { debuglog: debuglog$1 } = __require("node:util");
@@ -13922,7 +14127,7 @@ var require_socks5_client = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 	* SOCKS5 client implementation
 	* Handles SOCKS5 protocol negotiation and connection establishment
 	*/
-	var Socks5Client = class extends EventEmitter$1 {
+	var Socks5Client = class extends EventEmitter$2 {
 		constructor(socket, options = {}) {
 			super();
 			if (!socket) throw new InvalidArgumentError("socket is required");
@@ -20114,7 +20319,7 @@ var require_cache_handler = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 //#region node_modules/undici/lib/cache/memory-cache-store.js
 var require_memory_cache_store = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { Writable: Writable$2 } = __require("node:stream");
-	const { EventEmitter } = __require("node:events");
+	const { EventEmitter: EventEmitter$1 } = __require("node:events");
 	const { assertCacheKey, assertCacheValue } = require_cache$2();
 	/**
 	* @typedef {import('../../types/cache-interceptor.d.ts').default.CacheKey} CacheKey
@@ -20126,7 +20331,7 @@ var require_memory_cache_store = /* @__PURE__ */ __commonJSMin(((exports, module
 	* @implements {CacheStore}
 	* @extends {EventEmitter}
 	*/
-	var MemoryCacheStore = class extends EventEmitter {
+	var MemoryCacheStore = class extends EventEmitter$1 {
 		#maxCount = 1024;
 		#maxSize = 104857600;
 		#maxEntrySize = 5242880;
@@ -27937,10 +28142,10 @@ const OAUTH_USERINFO_URL$1 = "https://www.googleapis.com/oauth2/v1/userinfo";
 /** Fixed loopback callback registered for the Antigravity client (like opencode). */
 const OAUTH_CALLBACK_PORT = 51121;
 const OAUTH_REDIRECT_URI = `http://localhost:${OAUTH_CALLBACK_PORT}/oauth-callback`;
-/** Runtime endpoint fallback order (official production first, then staging/daily fallbacks). */
+/** Runtime endpoint fallback order (Antigravity endpoint first, then Cloud Code PA fallbacks). */
 const AGY_ENDPOINTS = [
-	"https://cloudcode-pa.googleapis.com",
 	"https://daily-cloudcode-pa.googleapis.com",
+	"https://cloudcode-pa.googleapis.com",
 	"https://daily-cloudcode-pa.sandbox.googleapis.com",
 	"https://autopush-cloudcode-pa.sandbox.googleapis.com"
 ];
@@ -28416,6 +28621,99 @@ var WaitTimeoutError = class extends Error {
 	}
 };
 const credentialSlotMutex = new AsyncMutex();
+/**
+* Detect whether an external process by PID is currently running.
+* Uses process.kill(pid, 0) which tests for process existence without sending a signal.
+* - Returns true if the process exists (including EPERM when owned by another user).
+* - Returns false if ESRCH (process does not exist / exited), or if the PID is invalid.
+*/
+function isProcessAlive(pid) {
+	if (typeof pid !== "number" || !Number.isInteger(pid) || pid <= 0) return false;
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch (err) {
+		if (err?.code === "EPERM") return true;
+		return false;
+	}
+}
+const SLOT_LOCK_NAME = ".credential-slot.lock";
+const SLOT_LOCK_STALE_MS = 45e3;
+function slotLockFilePath(baseDir) {
+	return join(baseDir, SLOT_LOCK_NAME);
+}
+/**
+* Acquire a cross-process lock for the Windows credential slot.
+* Inspects any existing lock's PID via `process.kill(pid, 0)`.
+* If the recorded holder process has crashed/exited, the dead lock is reclaimed
+* immediately instead of stalling for timeout.
+*/
+async function acquireCrossProcessSlotLock(baseDir, options = {}) {
+	const lockFile = slotLockFilePath(baseDir);
+	const timeoutMs = options.timeoutMs ?? 15e3;
+	const pollMs = options.pollIntervalMs ?? 50;
+	const log = options.log ?? (() => {});
+	const deadline = timeoutMs > 0 ? Date.now() + timeoutMs : 0;
+	try {
+		mkdirSync(baseDir, { recursive: true });
+	} catch {}
+	for (;;) {
+		if (options.signal?.aborted) throw new AbortedWaitError("aborted while waiting for cross-process slot lock");
+		if (existsSync(lockFile)) {
+			let isStale = false;
+			let holderPid;
+			try {
+				const content = readFileSync(lockFile, "utf8");
+				const parsed = JSON.parse(content);
+				holderPid = parsed.pid;
+				if (typeof holderPid === "number") {
+					if (!isProcessAlive(holderPid)) {
+						isStale = true;
+						log(`[agy-link] removing stale slot lock from dead process ${holderPid} (instant self-heal)`);
+					} else if (Date.now() - (parsed.acquiredAt || 0) > 45e3) {
+						isStale = true;
+						log(`[agy-link] removing stale slot lock exceeding ${SLOT_LOCK_STALE_MS}ms timeout`);
+					}
+				} else isStale = true;
+			} catch {
+				isStale = true;
+			}
+			if (isStale) try {
+				unlinkSync(lockFile);
+			} catch {}
+		}
+		const payload = {
+			pid: process.pid,
+			acquiredAt: Date.now(),
+			holder: options.holder
+		};
+		const tempFile = lockFile + ".tmp-" + process.pid + "-" + Date.now();
+		try {
+			writeFileSync(tempFile, JSON.stringify(payload), {
+				flag: "wx",
+				encoding: "utf8"
+			});
+			renameSync(tempFile, lockFile);
+			let released = false;
+			return () => {
+				if (released) return;
+				released = true;
+				try {
+					if (existsSync(lockFile)) {
+						const raw = readFileSync(lockFile, "utf8");
+						if (JSON.parse(raw).pid === process.pid) unlinkSync(lockFile);
+					}
+				} catch {}
+			};
+		} catch {
+			try {
+				unlinkSync(tempFile);
+			} catch {}
+		}
+		if (deadline > 0 && Date.now() >= deadline) throw new WaitTimeoutError("timed out waiting for cross-process slot lock");
+		await new Promise((r) => setTimeout(r, pollMs));
+	}
+}
 function defaultSlotIo() {
 	return {
 		platform: process.platform,
@@ -28544,10 +28842,44 @@ var SlotUnavailableError = class extends Error {
 	}
 };
 let primaryFastRuns = 0;
-let slotSwitchPending = false;
-/** Live fast-path (same-account) run count — exported for diagnostics. */
+/** The secondary identity currently installed in the slot, if any. */
+let installedIdentity = null;
+/** Event bus to immediately wake queued same-identity runs when an identity is installed. */
+const slotEvents = new EventEmitter();
+slotEvents.setMaxListeners(500);
+/**
+* Identities that waiting runs want installed, keyed by grant fingerprint
+* (`'primary'` for the system account). Same-identity peers may still join
+* while a key for their OWN grant is pending; joins are refused as soon as a
+* DIFFERENT identity waits, so a switcher can never be postponed forever.
+*/
+const pendingSwitchTargets = /* @__PURE__ */ new Map();
+function claimSwitchTarget(key) {
+	pendingSwitchTargets.set(key, (pendingSwitchTargets.get(key) ?? 0) + 1);
+}
+function releaseSwitchTarget(key) {
+	const left = (pendingSwitchTargets.get(key) ?? 0) - 1;
+	if (left > 0) pendingSwitchTargets.set(key, left);
+	else pendingSwitchTargets.delete(key);
+}
+/** Live same-identity run count — exported for diagnostics. */
 function fastPathRunCount() {
-	return primaryFastRuns;
+	return primaryFastRuns + (installedIdentity?.holders ?? 0);
+}
+/** True while a run is waiting for (or performing) a slot identity switch. */
+function isSlotSwitchPending() {
+	return pendingSwitchTargets.size > 0;
+}
+/**
+* Leave a reference-counted secondary identity. The last holder completes the
+* handoff: persist a rotated token, restore the primary, release the mutex.
+*/
+function leaveInstalledIdentity(state) {
+	if (state.holders <= 0) return;
+	state.holders -= 1;
+	if (state.holders > 0) return;
+	if (installedIdentity === state) installedIdentity = null;
+	state.finish();
 }
 /**
 * Take ownership of the credential slot for a run and arrange its guaranteed
@@ -28556,12 +28888,14 @@ function fastPathRunCount() {
 * Non-Windows platforms have no shared slot (per-account Keychain isolation
 * works), so this is a no-op there.
 *
-* Same-account runs (the sticky primary — the common case) take a FAST PATH:
-* when the slot already provably holds this account's credential and no slot
-* switch is pending, the run starts IMMEDIATELY without the mutex, so
-* multiple sessions on one account run truly in parallel (agy is a stateless
-* CLI and handles concurrent processes natively). Only identity SWITCHES
-* serialize.
+* Same-identity runs take a FAST PATH: when the slot provably holds THIS
+* account's credential and no switch is pending, the run starts IMMEDIATELY
+* without the mutex, so multiple sessions on one account run truly in parallel
+* (agy is a stateless CLI and handles concurrent processes natively). For a
+* secondary account the first run performs the handoff and later runs on the
+* same grant join it — including runs that were already QUEUED for the slot,
+* which poll and join as soon as their own grant is installed. The last holder
+* restores the primary. Only identity SWITCHES serialize.
 *
 * @param options.signal  cancels the wait for the slot — without it a turn
 *   queued behind another session's long run ignored Stop entirely (the
@@ -28584,7 +28918,7 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 	const log = options.log ?? (() => {});
 	const parallel = options.parallel !== false;
 	const isPrimarySlot = Boolean(account.systemHome) || !account.dir;
-	if (parallel && isPrimarySlot && !slotSwitchPending && !options.signal?.aborted) {
+	if (parallel && isPrimarySlot && !isSlotSwitchPending() && !options.signal?.aborted) {
 		const stored = readPrimaryCredential(baseDir);
 		if (stored && sameCredentialGrant(io.readSlot(), stored.raw)) {
 			primaryFastRuns += 1;
@@ -28605,18 +28939,119 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 			};
 		}
 	}
-	const releaseMutex = await credentialSlotMutex.acquire({
-		signal: options.signal,
-		timeoutMs: options.dispatchTimeoutMs,
-		pollMs: 5e3,
-		shouldProceed: () => true
-	});
+	const requestedFile = isPrimarySlot ? null : accountTokenFilePath(account, homeDir);
+	const requestedRaw = requestedFile === null ? null : readTokenFileRaw(requestedFile);
+	const requestedFingerprint = isPrimarySlot ? null : credentialFingerprint(requestedRaw);
+	const switchKey = isPrimarySlot ? "primary" : requestedFingerprint ?? "unknown";
+	const joinInstalled = () => {
+		if (!parallel || isPrimarySlot || requestedRaw === null || requestedFingerprint === null) return null;
+		if (options.signal?.aborted) return null;
+		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;
+		state.holders += 1;
+		return {
+			identity: account.email,
+			release: () => leaveInstalledIdentity(state)
+		};
+	};
+	const immediate = joinInstalled();
+	if (immediate) {
+		log("[agy-link] same-identity fast path: slot already holds this account's credential — running without exclusivity");
+		return immediate;
+	}
+	let claimSwitch = false;
+	const claim = () => {
+		if (claimSwitch || !parallel) return;
+		claimSwitch = true;
+		claimSwitchTarget(switchKey);
+	};
+	const releaseClaim = () => {
+		if (!claimSwitch) return;
+		claimSwitch = false;
+		releaseSwitchTarget(switchKey);
+	};
+	claim();
+	const joinAbort = new AbortController();
+	const waitSignal = options.signal ? AbortSignal.any([options.signal, joinAbort.signal]) : joinAbort.signal;
+	let joinLease = null;
+	const onSlotInstalled = (fp) => {
+		if ((fp === switchKey || fp === "any") && joinLease === null) {
+			const lease = joinInstalled();
+			if (lease !== null) {
+				joinLease = lease;
+				joinAbort.abort();
+			}
+		}
+	};
+	slotEvents.on("installed", onSlotInstalled);
+	const joinPoll = setInterval(() => {
+		if (joinLease !== null) return;
+		const lease = joinInstalled();
+		if (lease !== null) {
+			joinLease = lease;
+			joinAbort.abort();
+		}
+	}, 100);
+	joinPoll.unref?.();
+	let releaseMutex = null;
+	try {
+		releaseMutex = await credentialSlotMutex.acquire({
+			signal: waitSignal,
+			timeoutMs: options.dispatchTimeoutMs,
+			pollMs: 5e3,
+			shouldProceed: () => true
+		});
+	} catch (err) {
+		clearInterval(joinPoll);
+		slotEvents.off("installed", onSlotInstalled);
+		if (joinLease !== null) {
+			const lease = joinLease;
+			releaseClaim();
+			log("[agy-link] queued run joined an installed same-identity slot lease — running in parallel");
+			return lease;
+		}
+		releaseClaim();
+		throw err;
+	}
+	clearInterval(joinPoll);
+	slotEvents.off("installed", onSlotInstalled);
+	if (joinLease !== null) {
+		const lease = joinLease;
+		joinLease = null;
+		releaseMutex();
+		releaseClaim();
+		log("[agy-link] queued run joined an installed same-identity slot lease — running in parallel");
+		return lease;
+	}
+	const releaseMutexSlot = releaseMutex;
+	let releaseFileLock = null;
+	if (io.platform === "win32") try {
+		releaseFileLock = await acquireCrossProcessSlotLock(baseDir, {
+			timeoutMs: options.dispatchTimeoutMs,
+			signal: options.signal,
+			log,
+			holder: account.alias || account.id
+		});
+	} catch (err) {
+		releaseClaim();
+		releaseMutexSlot();
+		throw err;
+	}
+	const releaseLockFileNow = () => {
+		try {
+			releaseFileLock?.();
+			releaseFileLock = null;
+		} catch {}
+	};
 	let released = false;
 	const done = () => {
 		if (released) return;
 		released = true;
-		slotSwitchPending = false;
-		releaseMutex();
+		releaseLockFileNow();
+		releaseClaim();
+		releaseMutexSlot();
 	};
 	if (options.signal?.aborted) {
 		done();
@@ -28639,6 +29074,9 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 				log("[agy-link] re-asserting the primary credential into the Windows credential slot");
 				io.writeSlot(primary.raw);
 			}
+			releaseLockFileNow();
+			releaseClaim();
+			slotEvents.emit("installed", "primary");
 			return {
 				identity: primary.email,
 				release: () => {
@@ -28662,27 +29100,20 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 			};
 		}
 		if (parallel && primaryFastRuns > 0) {
-			slotSwitchPending = true;
 			const deadline = options.dispatchTimeoutMs !== void 0 && options.dispatchTimeoutMs > 0 ? Date.now() + options.dispatchTimeoutMs : 0;
 			log(`[agy-link] waiting for ${primaryFastRuns} same-account run(s) to finish before switching the credential slot to ${account.alias || account.id}`);
 			while (primaryFastRuns > 0) {
-				if (options.signal?.aborted) {
-					slotSwitchPending = false;
-					throw new AbortedWaitError("aborted while waiting for same-account runs to finish");
-				}
-				if (deadline !== 0 && Date.now() > deadline) {
-					slotSwitchPending = false;
-					throw new WaitTimeoutError(`timed out waiting for ${primaryFastRuns} same-account run(s) to finish before switching the credential slot`);
-				}
+				if (options.signal?.aborted) throw new AbortedWaitError("aborted while waiting for same-account runs to finish");
+				if (deadline !== 0 && Date.now() > deadline) throw new WaitTimeoutError(`timed out waiting for ${primaryFastRuns} same-account run(s) to finish before switching the credential slot`);
 				await new Promise((r) => setTimeout(r, 200));
 			}
-			slotSwitchPending = false;
 		}
 		if (!accountRaw) {
 			done();
 			throw new SlotUnavailableError(`Account ${account.alias || account.id} has no stored credential. Sign it in again before using it.`);
 		}
-		if (!credentialFingerprint(accountRaw)) {
+		const accountFingerprint = credentialFingerprint(accountRaw);
+		if (!accountFingerprint) {
 			done();
 			throw new SlotUnavailableError(`Account ${account.alias || account.id} has an unreadable credential file. Sign it in again.`);
 		}
@@ -28691,9 +29122,11 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 			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.`);
 		}
 		io.writeSlot(accountRaw);
-		return {
-			identity: account.email,
-			release: () => {
+		releaseLockFileNow();
+		const state = {
+			fingerprint: accountFingerprint,
+			holders: 1,
+			finish: () => {
 				try {
 					const afterRaw = io.readSlot();
 					const afterFingerprint = credentialFingerprint(afterRaw);
@@ -28709,6 +29142,13 @@ async function acquireCredentialSlot(account, pool, options = {}) {
 				}
 			}
 		};
+		installedIdentity = state;
+		releaseClaim();
+		slotEvents.emit("installed", accountFingerprint);
+		return {
+			identity: account.email,
+			release: () => leaveInstalledIdentity(state)
+		};
 	} catch (err) {
 		done();
 		throw err;
@@ -28831,6 +29271,26 @@ var SessionStore = class {
 		return this.data;
 	}
 	/**
+	* Purge bindings associated with accounts that no longer exist in the pool.
+	* Prevents deleted account ids from lingering in sessions.json.
+	*/
+	cleanupStaleAccounts(validAccountIds) {
+		let changed = false;
+		for (const key of Object.keys(this.data)) {
+			const colon = key.indexOf(":");
+			if (colon >= 0) {
+				const accId = key.slice(colon + 1);
+				if (accId && !validAccountIds.has(accId)) {
+					delete this.data[key];
+					this.dirty.delete(key);
+					this.removed.add(key);
+					changed = true;
+				}
+			}
+		}
+		if (changed) this.persist();
+	}
+	/**
 	* Atomic write: tmp file + rename, MERGING with whatever another host
 	* process wrote in the meantime (web + headless share this file). Only the
 	* keys this process touched are overwritten and only the keys it deleted are
@@ -29890,7 +30350,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 		else args.push("--mode", opts.permissionMode);
 		const effectiveModel = resolveModelSlug(opts.model);
 		if (effectiveModel !== "") args.push("--model", effectiveModel);
-		if ((effectiveModel === "" || effectiveModel.toLowerCase().startsWith("gemini")) && opts.effort && opts.effort !== "") args.push("--effort", opts.effort);
+		if ((effectiveModel === "" || effectiveModel.toLowerCase().startsWith("gemini") || effectiveModel.toLowerCase().startsWith("argon")) && opts.effort && opts.effort !== "") args.push("--effort", opts.effort);
 		if (opts.conversationId) args.push("--conversation", opts.conversationId);
 		for (const d of opts.addDirs ?? []) args.push("--add-dir", d);
 		args.push(...opts.extraArgs);
@@ -30016,7 +30476,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				if (boundAcc) {
 					mostRecentAccount = boundAcc;
 					latestUpdated = b.updatedAt;
-				}
+				} else this.deps.store.delete(k);
 			}
 			if (mostRecentAccount && this.deps.pool.isAccountEligible(mostRecentAccount, family)) account = mostRecentAccount;
 		}
@@ -30246,8 +30706,18 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 		let sawAnyEvent = false;
 		/** Timestamp of the most recent stdout line — drives the silence heartbeat. */
 		let lastOutputAt = 0;
+		/**
+		* Generation-phase silence budget: after the first event but with NO open
+		* tool step, a hung SSE stream (quota-wall stalls hang instead of
+		* returning a 429 — observed 2026-10-17 01:17: the last
+		* streamGenerateContent simply never answered) used to sit for the full
+		* 240-minute long-tool budget because "sawAnyEvent" upgraded it. Long
+		* silence is only legitimate while a TOOL is running; bare generation
+		* gets a bounded floor so the turn can fail, classify and rotate.
+		*/
+		const generationIdleMs = Math.max(cfg.timeoutMs, 9e5);
 		const applyToolIdleBudget = () => {
-			runningProc?.noteActivity(openToolKeys.size > 0 || sawAnyEvent ? longToolIdleMs : cfg.timeoutMs);
+			runningProc?.noteActivity(openToolKeys.size > 0 ? longToolIdleMs : generationIdleMs);
 		};
 		const TOOL_HEARTBEAT_MS = 3e5;
 		let toolHeartbeat = null;
@@ -30435,6 +30905,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				signal: options.signal,
 				env,
 				stdinPayload,
+				preemptAutoUpdate: cfg.suppressAgyAutoUpdate,
 				stderrKeepalive: true,
 				onLine: (line) => {
 					sawAnyEvent = true;
@@ -30530,10 +31001,18 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				};
 				else if (isRateLimit) {
 					const bestMsg = parser.stats.lastResultError || (outcome.stderrTail ? brief(outcome.stderrTail) : "Rate limit or quota reached");
+					const hard = looksLikeHardRateLimit(rawErrText);
+					failure = {
+						kind: "error",
+						code: hard ? Err.RATE_LIMIT : Err.OVERLOADED,
+						message: hard ? "Google Antigravity quota / rate limit reached: " + bestMsg : "Google Antigravity quota / rate limit reached (server capacity overloaded): " + bestMsg
+					};
+				} else if (looksLikeContextWindowExceeded(rawErrText) || looksLikeContextWindowExceeded(parser.stats.lastResultError ?? "")) {
+					const detail = parser.stats.lastResultError || (outcome.stderrTail !== "" ? brief(outcome.stderrTail) : "Prompt exceeds context window limit");
 					failure = {
 						kind: "error",
-						code: looksLikeHardRateLimit(rawErrText) ? Err.RATE_LIMIT : Err.OVERLOADED,
-						message: "Google Antigravity quota / rate limit reached: " + bestMsg
+						code: Err.CONTEXT_WINDOW_EXCEEDED,
+						message: "Google Antigravity context window exceeded: " + detail
 					};
 				} else if (!transportFailure && (looksLikeEligibilityFailure(rawErrText) || looksLikeEligibilityFailure(parser.stats.lastResultError ?? ""))) {
 					const detail = parser.stats.lastResultError ?? (outcome.stderrTail !== "" ? brief(outcome.stderrTail) : "");
@@ -30589,7 +31068,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				if (account && !outcome.aborted && looksLikeHardRateLimit(rawErrText)) this.deps.pool?.recordFailure(account.id, family, failure.message);
 				if (account && silentTimeout) this.deps.pool?.advanceAccount(account.id, family);
 				if (account && failure.code === Err.ELIGIBILITY) this.deps.pool?.advanceAccount(account.id, family);
-				if (!outcome.aborted && failure.code !== Err.RATE_LIMIT && (failure.code === Err.NETWORK || failure.code === Err.OVERLOADED || failure.code === Err.AUTH) && account) this.deps.pool?.advanceAccount(account.id, family);
+				if (!outcome.aborted && failure.code !== Err.RATE_LIMIT && failure.code !== Err.OVERLOADED && (failure.code === Err.NETWORK || failure.code === Err.AUTH) && account) this.deps.pool?.advanceAccount(account.id, family);
 				if (account && shouldMarkAuthRequired(failure.code, failure.message)) {
 					const authoritative = isAuthoritativeAuthError(rawErrText + " " + runLogText);
 					if (failure.code === Err.AUTH && !authoritative) this.deps.pool?.noteAuthFailure(account.id, failure.message);
@@ -30910,6 +31389,7 @@ async function runAgyOnce(deps, req) {
 		timeoutMs,
 		signal: req.signal,
 		stdinPayload,
+		preemptAutoUpdate: cfg.suppressAgyAutoUpdate,
 		onLine: (line) => {
 			for (const ev of parser.feed(line + "\n")) {
 				if (ev.kind === "init" && ev.conversationId) conversationId = ev.conversationId;
@@ -31088,6 +31568,7 @@ const URL_WAIT_MS = 2e4;
 const CODE_SETTLE_MS = 9e4;
 var AuthHelper = class {
 	bin;
+	preemptAutoUpdate;
 	state = { phase: "idle" };
 	probe = null;
 	capturedUrl = null;
@@ -31099,8 +31580,9 @@ var AuthHelper = class {
 	beginSeq = 0;
 	signedInCache = null;
 	signedInFlight = null;
-	constructor(bin) {
+	constructor(bin, preemptAutoUpdate = () => true) {
 		this.bin = bin;
+		this.preemptAutoUpdate = preemptAutoUpdate;
 	}
 	status() {
 		return { ...this.state };
@@ -31127,7 +31609,7 @@ var AuthHelper = class {
 					...process.env,
 					HOME: homeDir
 				} : process.env;
-				const out = await probeProcess(bin, ["models"], 15e3, void 0, env);
+				const out = await probeProcess(bin, ["models"], 15e3, void 0, env, this.preemptAutoUpdate());
 				const tail = out.stderrTail + "\n" + out.stdout.slice(0, 2e3);
 				if (out.code === 0 && !looksLikeAuthFailure(out.stdout)) value = true;
 				else if (out.code !== 0 && looksLikeAuthFailure(tail)) value = false;
@@ -31168,6 +31650,11 @@ var AuthHelper = class {
 		this.cancel();
 		this.capturedUrl = null;
 		if (homeDir) ensureIsolatedKeychain(homeDir);
+		const env = {
+			...process.env,
+			...homeDir ? isolatedHomeEnv(homeDir) : {},
+			...proxyEnvFor(proxyUrl || detectSystemProxy())
+		};
 		const proc = startAgyProcess({
 			bin,
 			args: [
@@ -31181,11 +31668,8 @@ var AuthHelper = class {
 			timeoutMs: 3e5,
 			keepStdin: true,
 			stderrKeepalive: true,
-			env: {
-				...process.env,
-				...homeDir ? isolatedHomeEnv(homeDir) : {},
-				...proxyEnvFor(proxyUrl || detectSystemProxy())
-			},
+			preemptAutoUpdate: this.preemptAutoUpdate(),
+			env,
 			onLine: (line) => {
 				if (this.capturedUrl) return;
 				const url = extractAuthUrl(line);
@@ -31404,6 +31888,7 @@ function writeDoctorReport(deps) {
 	lines.push("- generated: " + (/* @__PURE__ */ new Date()).toISOString());
 	lines.push("- agy binary: " + (deps.bin() ?? "NOT FOUND"));
 	lines.push("- agy version: " + (deps.version() ?? "unknown"));
+	lines.push("- agy auto-updater: " + (cfg.suppressAgyAutoUpdate ? describeAgyAutoUpdate() : "not suppressed (suppressAgyAutoUpdate=false)"));
 	const cfgDump = {
 		...cfg,
 		extraArgs: cfg.extraArgs.length
@@ -31484,8 +31969,8 @@ async function handle(deps, raw, invocation) {
 				const qG = a.quotas.google?.remainingFraction !== void 0 ? `${Math.round(a.quotas.google.remainingFraction * 100)}%` : "unknown";
 				const qC = a.quotas.anthropic?.remainingFraction !== void 0 ? `${Math.round(a.quotas.anthropic.remainingFraction * 100)}%` : "unknown";
 				const qO = a.quotas.openai?.remainingFraction !== void 0 ? `${Math.round(a.quotas.openai.remainingFraction * 100)}%` : "unknown";
-				const qA = a.quotas.argon?.weeklyFraction;
-				const quotaLine = `   - Quota: Gemini ${qG} | Claude ${qC} | GPT-OSS ${qO}` + (qA !== void 0 ? ` | Argon ${Math.round(qA * 100)}% (weekly)` : "");
+				const qA = a.quotas.argon?.weeklyFraction ?? a.quotas.argon?.remainingFraction;
+				const quotaLine = `   - Quota: Gemini ${qG} | Claude ${qC} | GPT-OSS ${qO}` + (qA !== void 0 ? ` | Argon ${Math.round(qA * 100)}%` : "");
 				const cds = [];
 				for (const [fam, cd] of Object.entries(a.cooldowns)) if (cd && cd.cooldownUntil > Date.now()) {
 					const sec = Math.ceil((cd.cooldownUntil - Date.now()) / 1e3);
@@ -31752,7 +32237,7 @@ async function handle(deps, raw, invocation) {
 				`- 硬超时：**${cfg.dispatchTimeoutMinutes > 0 ? `${cfg.dispatchTimeoutMinutes} 分钟/次` : "不限时（无限等待）"}**（重试次数 ${cfg.dispatchRetries}${cfg.dispatchTimeoutMinutes > 0 ? `，总坚持 ≈ ${(1 + cfg.dispatchRetries) * cfg.dispatchTimeoutMinutes} 分钟` : ""}）`,
 				"- 同账号并行：**" + (cfg.parallelSameAccount ? "开（快路径，多会话并行跑同一账号）" : "关（同一时刻仅 1 个 agy 进程）") + "**",
 				`- 并发上限：**${cfg.maxConcurrent > 0 ? cfg.maxConcurrent + " 个流" : "不限制（原生并发）"}**`,
-				`- 当前凭据槽位队列：**${mutex.waiting} 个等待者 / ${mutex.pending - mutex.waiting} 个持有者**，同账号快路径活跃 **${fastPathRunCount()}** 个`,
+				`- 当前凭据槽位队列：**${mutex.waiting} 个等待者 / ${mutex.pending - mutex.waiting} 个持有者**，同身份并行活跃 **${fastPathRunCount()}** 个（主账号快路径 + 次级同授权租约）`,
 				`- 排队期间：Stop 随时可停；丢失唤醒 5 秒内自愈；每 2 分钟心跳日志`,
 				`- 修改：/agy dispatch <分钟|off>　/agy dispatch-retries <次数>　/agy parallel <on|off>`
 			].join("\n"));
@@ -32041,6 +32526,7 @@ var PoolAuthFlow = class {
 			if (flow.primary) {
 				const primary = this.pool.getAccount("acc_primary") ?? this.pool.getAccounts().find((a) => a.systemHome) ?? this.pool.getAccounts()[0];
 				if (primary) {
+					if (flow.proxyUrl && !primary.proxyUrl) this.pool.setAccountProxy(primary.id, flow.proxyUrl);
 					this.pool.updateAccountQuotas(primary.id, primary.quotas, email);
 					this.quota.refreshAccountQuota(primary).catch(() => void 0);
 				}
@@ -32130,7 +32616,7 @@ function detectEmailFromAgyLogs(homeDir) {
 }
 const OAUTH_USERINFO_URL = "https://www.googleapis.com/oauth2/v1/userinfo";
 /** Platform-faithful agy User-Agent (hardcoding darwin/arm64 on Windows is a bad fingerprint). */
-function agyUserAgent(version = "1.1.15") {
+function agyUserAgent(version = "2.24.0") {
 	return `antigravity/${version} ${process.platform === "win32" ? "windows" : process.platform}/${process.arch === "x64" ? "amd64" : process.arch}`;
 }
 /** Coerce an expiry value (ISO string, epoch millis, or epoch seconds) to ms. */
@@ -32166,6 +32652,17 @@ function normalizeStoredToken(raw) {
 	};
 }
 /**
+* Detects whether a 5-hour quota bucket from retrieveUserQuotaSummary is an
+* unmetered placeholder (remainingFraction = 1.0 and resetTime = now + ~5h).
+* In unmetered environments (e.g. Cloud Code PA prod for free tier), the window
+* never starts billing and stays frozen at 100% forever.
+*/
+function isStale5hBucket(remainingFraction, resetTime, now = Date.now()) {
+	if (remainingFraction !== 1 || !resetTime) return false;
+	const resetMs = Date.parse(resetTime) - now;
+	return resetMs > 162e5 && resetMs < 1872e4;
+}
+/**
 * Parse a go-keyring payload (optionally "go-keyring-base64:" prefixed) into
 * a normalized StoredToken. Shared by the macOS and Linux keyring readers.
 */
@@ -32528,7 +33025,18 @@ var QuotaService = class {
 						const desc = (g.description || "").toLowerCase();
 						return name.includes("gemini") || desc.includes("gemini");
 					})) {
-						this.preferredEndpointIndex = AGY_ENDPOINTS.indexOf(endpoint);
+						if (partialSummary && Array.isArray(partialSummary.groups)) {
+							const existingNames = new Set(partialSummary.groups.map((g) => (g.displayName || "").toLowerCase()));
+							for (const g of summary.groups || []) {
+								const name = (g.displayName || "").toLowerCase();
+								if (!existingNames.has(name)) {
+									partialSummary.groups.push(g);
+									existingNames.add(name);
+								}
+							}
+							return partialSummary;
+						}
+						if (i > 0 && !partialSummary) this.preferredEndpointIndex = AGY_ENDPOINTS.indexOf(endpoint);
 						return summary;
 					}
 					if (!partialSummary && summary && Array.isArray(summary.groups) && summary.groups.length > 0) partialSummary = summary;
@@ -32538,6 +33046,32 @@ var QuotaService = class {
 		}
 		return partialSummary;
 	}
+	async fetchUserQuotaEndpoint(endpoint, accessToken, proxyUrl) {
+		return agyFetch(`${endpoint}/v1internal:retrieveUserQuota`, {
+			method: "POST",
+			headers: {
+				Authorization: `Bearer ${accessToken}`,
+				"Content-Type": "application/json",
+				"User-Agent": agyUserAgent()
+			},
+			body: JSON.stringify({})
+		}, proxyUrl);
+	}
+	/**
+	* Fetch per-model live user quota via v1internal:retrieveUserQuota.
+	*/
+	async fetchUserQuota(accessToken, proxyUrl) {
+		const endpoints = this.getOrderedEndpoints();
+		for (let i = 0; i < endpoints.length; i++) {
+			const endpoint = endpoints[i];
+			try {
+				const res = await this.fetchUserQuotaEndpoint(endpoint, accessToken, proxyUrl);
+				if (res.ok) return await res.json();
+				if (res.status === 401 || res.status === 403) break;
+			} catch {}
+		}
+		return null;
+	}
 	/**
 	* Fetch available models and model-level quotas via v1internal:fetchAvailableModels.
 	*/
@@ -32587,15 +33121,30 @@ var QuotaService = class {
 			}
 		}
 		let email = account.email;
-		if (account.systemHome || !email) {
+		if ((account.systemHome || !account.dir) && process.platform === "win32") {
+			const stored = readPrimaryCredential(this.pool.dir);
+			if (stored?.email) email = stored.email;
+		}
+		if (!email) {
 			const detected = detectEmailFromAgyLogs(home);
-			if (detected) email = detected;
+			const siblingEmails = new Set(this.pool.getAccounts().filter((a) => a.id !== account.id && a.email).map((a) => a.email));
+			if (detected && !siblingEmails.has(detected)) email = detected;
 		}
 		const accessToken = await this.getValidAccessToken(account);
 		if (!accessToken) return null;
 		if (force) {
 			const info = await this.fetchUserInfo(accessToken, this.proxyFor(account));
-			if (info?.email) email = info.email;
+			if (info?.email) {
+				email = info.email;
+				if ((account.systemHome || !account.dir) && process.platform === "win32") {
+					const stored = readPrimaryCredential(this.pool.dir);
+					if (stored && stored.email !== info.email) writePrimaryCredential({
+						...stored,
+						email: info.email,
+						savedAt: Date.now()
+					}, this.pool.dir);
+				}
+			}
 		}
 		if (email && email !== account.email) {
 			if (Boolean(account.dir) && this.pool.getAccounts().some((other) => other.id !== account.id && other.email !== void 0 && other.email === email && other.dir !== account.dir)) {
@@ -32604,18 +33153,47 @@ var QuotaService = class {
 			}
 			this.pool.resetAccountIdentity(account.id, email);
 		}
-		const [summary, discovered] = await Promise.all([this.fetchQuotaSummary(accessToken, this.proxyFor(account)), this.fetchAvailableModels(accessToken, this.proxyFor(account))]);
+		const [summary, discovered, userQuota] = await Promise.all([
+			this.fetchQuotaSummary(accessToken, this.proxyFor(account)),
+			this.fetchAvailableModels(accessToken, this.proxyFor(account)),
+			this.fetchUserQuota(accessToken, this.proxyFor(account)).catch(() => null)
+		]);
 		if (!email) {
 			const info = await this.fetchUserInfo(accessToken, this.proxyFor(account));
 			if (info?.email) email = info.email;
 		}
-		if (!summary && (!discovered || !discovered.models)) return null;
+		const modelsCatalog = { ...discovered?.models || {} };
+		if (userQuota && Array.isArray(userQuota.buckets)) for (const b of userQuota.buckets) {
+			if (!b.modelId) continue;
+			const frac = typeof b.remainingFraction === "number" && Number.isFinite(b.remainingFraction) ? Math.min(1, Math.max(0, b.remainingFraction)) : void 0;
+			if (frac !== void 0) {
+				const existing = modelsCatalog[b.modelId];
+				modelsCatalog[b.modelId] = {
+					...existing,
+					quotaInfo: {
+						remainingFraction: frac,
+						resetTime: b.resetTime || existing?.quotaInfo?.resetTime
+					}
+				};
+			}
+		}
+		if (!summary && Object.keys(modelsCatalog).length === 0) return null;
 		if (account.authRequired) this.pool.clearAuthRequired(account.id);
 		const familyQuotas = {};
-		if (summary && Array.isArray(summary.groups)) for (const group of summary.groups) {
+		const stale5hFamilies = /* @__PURE__ */ new Set();
+		const summaryGroups = [];
+		if (summary) {
+			if (Array.isArray(summary.groups)) summaryGroups.push(...summary.groups);
+			if (Array.isArray(summary.buckets) && summary.buckets.length > 0) summaryGroups.push({
+				displayName: summary.description || "Quota",
+				buckets: summary.buckets
+			});
+		}
+		if (summaryGroups.length > 0) for (const group of summaryGroups) {
 			const dName = (group.displayName || "").toLowerCase();
 			const desc = (group.description || "").toLowerCase();
-			const isArgon = dName.includes("argon") || desc.includes("argon");
+			const hasArgonBucket = Array.isArray(group.buckets) && group.buckets.some((b) => (b.bucketId || "").toLowerCase().includes("argon") || (b.displayName || "").toLowerCase().includes("argon"));
+			const isArgon = dName.includes("argon") || desc.includes("argon") || hasArgonBucket;
 			const isGoogle = !isArgon && (dName.includes("gemini") || desc.includes("gemini"));
 			const is3P = dName.includes("claude") || dName.includes("gpt") || desc.includes("claude") || desc.includes("gpt");
 			const targetFamilies = isArgon ? ["argon"] : isGoogle ? ["google"] : is3P ? ["anthropic", "openai"] : [];
@@ -32634,17 +33212,20 @@ var QuotaService = class {
 					weeklyReset = b.resetTime;
 				}
 			}
-			for (const fam of targetFamilies) familyQuotas[fam] = {
-				remainingFraction: fiveHourFrac,
-				resetTime: fiveHourReset,
-				weeklyFraction: weeklyFrac,
-				weeklyResetTime: weeklyReset,
-				description: group.description,
-				updatedAt: now
-			};
+			for (const fam of targetFamilies) {
+				if (isStale5hBucket(fiveHourFrac, fiveHourReset, now)) stale5hFamilies.add(fam);
+				familyQuotas[fam] = {
+					remainingFraction: fiveHourFrac,
+					resetTime: fiveHourReset,
+					weeklyFraction: weeklyFrac,
+					weeklyResetTime: weeklyReset,
+					description: group.description,
+					updatedAt: now
+				};
+			}
 		}
 		const familyModels = {};
-		if (discovered && discovered.models) for (const [modelId, entry] of Object.entries(discovered.models)) {
+		if (Object.keys(modelsCatalog).length > 0) for (const [modelId, entry] of Object.entries(modelsCatalog)) {
 			const fam = modelFamilyOf(modelId);
 			if (fam === "unknown") continue;
 			const rawRemaining = entry.quotaInfo?.remainingFraction;
@@ -32658,23 +33239,26 @@ var QuotaService = class {
 				remainingFraction: remaining,
 				resetTime
 			});
-			if (!familyQuotas[fam]) familyQuotas[fam] = mergeFallbackFamilyQuota(account.quotas[fam], {
-				remainingFraction: remaining,
-				resetTime,
-				updatedAt: now
-			});
-			else {
-				const curRemaining = familyQuotas[fam].remainingFraction ?? 1;
-				const fbReset = resetTime ? Date.parse(resetTime) : NaN;
-				const is5hWindow = !Number.isNaN(fbReset) && fbReset - now <= 216e5;
-				if (familyQuotas[fam].remainingFraction === void 0 || is5hWindow) {
-					if (remaining < curRemaining) {
-						familyQuotas[fam].remainingFraction = remaining;
-						familyQuotas[fam].resetTime = resetTime;
-					} else if (familyQuotas[fam].remainingFraction === void 0) {
-						familyQuotas[fam].remainingFraction = remaining;
-						familyQuotas[fam].resetTime = resetTime;
-					}
+			const isStale = stale5hFamilies.has(fam);
+			if (!familyQuotas[fam]) {
+				familyQuotas[fam] = mergeFallbackFamilyQuota(account.quotas[fam], {
+					remainingFraction: remaining,
+					resetTime,
+					updatedAt: now
+				});
+				if (fam === "argon" && familyQuotas[fam].weeklyFraction === void 0) {
+					familyQuotas[fam].weeklyFraction = remaining;
+					familyQuotas[fam].weeklyResetTime = resetTime;
+				}
+			} else {
+				if (remaining < (familyQuotas[fam].remainingFraction ?? 1) || isStale) {
+					familyQuotas[fam].remainingFraction = remaining;
+					familyQuotas[fam].resetTime = resetTime;
+					stale5hFamilies.delete(fam);
+				}
+				if (fam === "argon" && familyQuotas[fam].weeklyFraction === void 0) {
+					familyQuotas[fam].weeklyFraction = remaining;
+					familyQuotas[fam].weeklyResetTime = resetTime;
 				}
 			}
 		}
@@ -32705,7 +33289,17 @@ var QuotaService = class {
 			for (const acc of accounts) {
 				const flagged = acc.authRequired || Object.values(acc.cooldowns ?? {}).some((cd) => cd && cd.cooldownUntil > now);
 				if (!acc.systemHome || !flagged) continue;
-				const detected = detectEmailFromAgyLogs(acc.systemHome || !acc.dir ? homedir() : acc.dir);
+				const home = acc.systemHome || !acc.dir ? homedir() : acc.dir;
+				let detected;
+				if (process.platform === "win32") {
+					const stored = readPrimaryCredential(this.pool.dir);
+					if (stored?.email) detected = stored.email;
+				}
+				if (!detected) {
+					const fromLogs = detectEmailFromAgyLogs(home);
+					const siblingEmails = new Set(this.pool.getAccounts().filter((a) => a.id !== acc.id && a.email).map((a) => a.email));
+					if (fromLogs && !siblingEmails.has(fromLogs)) detected = fromLogs;
+				}
 				if (detected && detected !== acc.email) this.pool.resetAccountIdentity(acc.id, detected);
 			}
 			accounts = accounts.filter((acc) => shouldPollAccount(acc) || needsAuthReverify(acc));
@@ -33175,11 +33769,11 @@ function apply(ctx, entryConfig = {}) {
 		const poolData = pool.getPoolData();
 		const primaryAcc = poolData.primaryAccountId ? pool.getAccount(poolData.primaryAccountId) : void 0;
 		const candidateAccount = primaryAcc && primaryAcc.enabled && !primaryAcc.authRequired ? primaryAcc : pool.getAccounts().find((a) => a.enabled && !a.authRequired);
-		let out = await probeProcess(b, ["models"], 3e4, signal, getDiscoveryEnv(candidateAccount));
+		let out = await probeProcess(b, ["models"], 3e4, signal, getDiscoveryEnv(candidateAccount), getConfig().suppressAgyAutoUpdate);
 		if ((out.code !== 0 || out.stdout.includes("Please sign in") || /sign in|auth|not logged in/i.test(out.stderrTail)) && (!candidateAccount || !candidateAccount.dir)) {
 			const secondary = pool.getAccounts().find((a) => a.enabled && !a.authRequired && a.dir);
 			if (secondary) {
-				const secondaryOut = await probeProcess(b, ["models"], 3e4, signal, getDiscoveryEnv(secondary));
+				const secondaryOut = await probeProcess(b, ["models"], 3e4, signal, getDiscoveryEnv(secondary), getConfig().suppressAgyAutoUpdate);
 				if (secondaryOut.code === 0 && secondaryOut.stdout.trim() !== "") out = secondaryOut;
 			}
 		}
@@ -33188,10 +33782,14 @@ function apply(ctx, entryConfig = {}) {
 			stdout: out.stdout,
 			stderr: out.stderrTail
 		};
-	}, getConfig().fallbackModels, 3e5, notifyPicker);
-	const auth = new AuthHelper(bin);
+	}, getConfig().fallbackModels, getConfig().modelsCacheTtlMs, notifyPicker);
+	const auth = new AuthHelper(bin, () => getConfig().suppressAgyAutoUpdate);
 	const poolAuth = new PoolAuthFlow(pool, quota, log);
 	const runs = new RunRegistry();
+	try {
+		const validAccIds = new Set(pool.getAccounts().map((a) => a.id));
+		store.cleanupStaleAccounts(validAccIds);
+	} catch {}
 	const swept = pool.sweepStaleStaging();
 	if (swept > 0) log("swept " + swept + " stale staging dir(s)");
 	const logsSwept = pool.sweepOldLogs(getConfig().logRetentionDays);
@@ -33328,7 +33926,7 @@ function apply(ctx, entryConfig = {}) {
 				return;
 			}
 			try {
-				versionCache = parseVersion((await probeProcess(currentBin, ["--version"], 1e4)).stdout);
+				versionCache = parseVersion((await probeProcess(currentBin, ["--version"], 1e4, void 0, void 0, getConfig().suppressAgyAutoUpdate)).stdout);
 				if (versionCache && compareVersions(versionCache, "1.1.8") < 0) {
 					dormantReason = "agy " + versionCache + " is older than 1.1.8 — run: agy update";
 					log("dormant: " + dormantReason);
@@ -33475,7 +34073,7 @@ function apply(ctx, entryConfig = {}) {
 						askTool: cfg.askTool,
 						auth: auth.status(),
 						poolAuth: poolAuth.status(),
-						pool: pool.getPoolData(),
+						pool: pool.getPoolData(cfg.proxyUrl?.trim() || void 0),
 						catalog: {
 							source: cat.source,
 							count: cat.models.length,
@@ -33579,7 +34177,7 @@ function apply(ctx, entryConfig = {}) {
 			kind: "exact",
 			path: "/plugins/agy-link/pool",
 			handler: (_req, res) => {
-				sendJson(res, 200, pool.getPoolData());
+				sendJson(res, 200, pool.getPoolData(getConfig().proxyUrl.trim() || void 0));
 			}
 		});
 		reg({
@@ -33980,7 +34578,6 @@ function apply(ctx, entryConfig = {}) {
 		if (!getConfig().enabled) return () => void 0;
 		const refresh = () => {
 			quota.refreshAllQuotas().catch(() => void 0);
-			catalog.refreshIfNeeded().catch(() => void 0);
 		};
 		const boot = setTimeout(refresh, 5e3);
 		boot.unref?.();