dsh-agy-link 0.4.53 → 0.4.57

package/dist/index.js

@@ -129,6 +129,35 @@ function looksLikeNetworkError(message) {
 	return /dial tcp|fetch failed|econn(?:refused|reset|aborted)|enotfound|ehostunreach|enetunreach|socket hang up|getaddrinfo|bad gateway|service unavailable|unexpected eof|\beof\b|tls handshake timeout|i\/o timeout|network (?:error|is unreachable)|no route to host|connection reset|context deadline exceeded|temporary failure in name resolution|proxyconnect|token validation failed|validate (?:the )?token|silent auth failed/i.test(message);
 }
 /**
+* Evidence from agy's OWN per-run log that a stored credential was present but
+* could not be VALIDATED over the network — i.e. jitter wearing an auth costume.
+*
+* The stderr banner agy prints when silent auth fails is byte-identical for a
+* genuine sign-out and for a keyring validation that missed its hard 10s
+* window, so the banner cannot decide AUTH vs NETWORK. The log can:
+*
+*   real sign-out   printmode.go:403 not authenticated, trying silent auth
+*                   printmode.go:409 silent auth failed        ← 29 ms later,
+*                   (NO keyringAuth: line — nothing to validate)  no keyring line
+*   network blip    printmode.go:403 not authenticated, trying silent auth
+*                   keyring.go:64   keyringAuth: loaded token … expired=false
+*                   keyring.go:111  keyringAuth: timed out after 10s
+*                   printmode.go:409 silent auth failed
+*                   keyring.go:93   keyringAuth: failed to fetch user info:
+*                                   userinfo request failed: … i/o timeout
+*
+* `keyringAuth:` lines only exist when agy actually HAD a credential to
+* validate, and the timeout / userinfo markers are transport failures inside
+* that validation. Verified against real logs (2026-10-16): the sign-out log
+* contains 0 occurrences of every marker below, the blip log contains all of
+* them.
+*/
+function looksLikeAuthVerificationJitter(agyLogText) {
+	if (agyLogText === "") return false;
+	if (isAuthoritativeAuthError(agyLogText)) return false;
+	return /keyringAuth: timed out after|failed to fetch user info|userinfo request failed/i.test(agyLogText);
+}
+/**
 * Decide whether a failed call may flag an account as "needs re-login".
 * Genuine AUTH classification wins (unless the failure was transport-shaped),
 * and the message must name an authoritative token state otherwise.
@@ -421,10 +450,18 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 }
 //#endregion
 //#region src/common/pool-types.ts
-/** Map a model slug to its backend quota counter family. */
+/**
+* Map a model slug to its backend quota counter family.
+*
+* Gemini 4 Argon (Pro/Ultra-only) bills against its OWN weekly quota pool —
+* never the plain Gemini one. Its ids look like `gemini-4-argon-low/-medium`
+* and MUST be detected before the generic `gemini-` prefix below, otherwise
+* argon usage would silently drain/report the Gemini counter.
+*/
 function modelFamilyOf(modelId) {
 	if (!modelId) return "unknown";
 	const id = modelId.toLowerCase();
+	if (id.includes("argon")) return "argon";
 	if (id.startsWith("claude-") || id.includes("claude")) return "anthropic";
 	if (id.startsWith("gemini-") || id.startsWith("gemma-") || id.includes("gemini")) return "google";
 	if (id.startsWith("gpt-") || id.startsWith("openai/") || id.includes("gpt-oss")) return "openai";
@@ -2824,6 +2861,209 @@ function ensureIsolatedKeychain(dir, platform = process.platform, run = (file, a
 		return false;
 	}
 }
+/**
+* Purge any stale locked keychain from an isolated account HOME directory.
+* 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.
+*/
+function purgeStaleIsolatedKeychain(dir, platform = process.platform, run = (file, args, env) => execFileSync(file, args, {
+	stdio: "ignore",
+	env,
+	timeout: 5e3
+})) {
+	if (platform !== "darwin") return false;
+	if (dir === "") return false;
+	const kc = join(dir, "Library", "Keychains", "login.keychain-db");
+	if (!existsSync(kc)) return false;
+	const env = {
+		...process.env,
+		HOME: dir
+	};
+	try {
+		run("security", [
+			"unlock-keychain",
+			"-p",
+			"",
+			kc
+		], env);
+		return false;
+	} catch {
+		try {
+			run("security", ["delete-keychain", kc], env);
+		} catch {}
+		try {
+			rmSync(kc, { force: true });
+		} catch {}
+		return true;
+	}
+}
+/**
+* macOS: Repair hijacked user-level keychain configuration.
+*
+* Versions prior to v0.4.49 set `security default-keychain -s <isolated-kc>`,
+* redirecting the user's desktop session default and login keychain into an
+* account-specific folder under ~/.dsh/agy-accounts/.
+*
+* This function detects if default-keychain, login-keychain, or the search list
+* (`list-keychains -d user`) point to any path containing `agy-accounts` or `.dsh`,
+* and restores them to the user's real login keychain (`~/Library/Keychains/login.keychain-db`).
+*/
+function repairMacSystemKeychain(userHome = homedir(), platform = process.platform, run = (file, args, env) => execFileSync(file, args, {
+	encoding: "utf8",
+	env: env ?? process.env,
+	timeout: 5e3
+})) {
+	if (platform !== "darwin") return false;
+	if (!userHome) return false;
+	let repaired = false;
+	const realKc = [join(userHome, "Library", "Keychains", "login.keychain-db"), join(userHome, "Library", "Keychains", "login.keychain")].find((p) => existsSync(p));
+	if (!realKc) return false;
+	const isIsolatedPath = (p) => /[\\/]\.dsh[\\/]agy-accounts[\\/]/i.test(p);
+	const env = {
+		...process.env,
+		HOME: userHome
+	};
+	try {
+		if (isIsolatedPath(run("security", ["default-keychain"], env).trim().replace(/^"|"$/g, ""))) {
+			run("security", [
+				"default-keychain",
+				"-s",
+				realKc
+			], env);
+			repaired = true;
+		}
+	} catch {}
+	try {
+		if (isIsolatedPath(run("security", ["login-keychain"], env).trim().replace(/^"|"$/g, ""))) {
+			run("security", [
+				"login-keychain",
+				"-s",
+				realKc
+			], env);
+			repaired = true;
+		}
+	} catch {}
+	try {
+		const entries = run("security", [
+			"list-keychains",
+			"-d",
+			"user"
+		], env).split("\n").map((l) => l.trim().replace(/^"|"$/g, "")).filter(Boolean);
+		const hasTainted = entries.some(isIsolatedPath);
+		const hasReal = entries.includes(realKc);
+		if (hasTainted || !hasReal) {
+			const cleaned = entries.filter((p) => !isIsolatedPath(p));
+			if (!cleaned.includes(realKc)) cleaned.unshift(realKc);
+			const sysKc = "/Library/Keychains/System.keychain";
+			if (!cleaned.includes(sysKc) && existsSync(sysKc)) cleaned.push(sysKc);
+			run("security", [
+				"list-keychains",
+				"-d",
+				"user",
+				"-s",
+				...cleaned
+			], env);
+			repaired = true;
+		}
+	} catch {}
+	return repaired;
+}
+/**
+* Open an interactive terminal session inside the given account directory.
+* Supports macOS (Terminal.app via AppleScript), Windows (cmd.exe start),
+* and Linux (xdg-terminal-exec, x-terminal-emulator, gnome-terminal, konsole,
+* xfce4-terminal, alacritty, xterm across distributions).
+* Safe, non-blocking and non-throwing.
+*/
+function openAccountTerminal(accDir, platform = process.platform, run = (file, args, opts) => execFile(file, [...args], { windowsHide: opts?.windowsHide }, () => {})) {
+	if (!accDir) return false;
+	if (platform === "darwin") {
+		const script = `tell application "Terminal" to activate\ntell application "Terminal" to do script "export HOME='${accDir}'; agy"`;
+		try {
+			run("osascript", ["-e", script]);
+			return true;
+		} catch {
+			return false;
+		}
+	}
+	if (platform === "win32") try {
+		run("cmd.exe", [
+			"/c",
+			"start",
+			"cmd.exe",
+			"/k",
+			`set "HOME=${accDir}" && set "USERPROFILE=${accDir}" && agy`
+		], { windowsHide: true });
+		return true;
+	} catch {
+		return false;
+	}
+	const cmd = `export HOME='${accDir}'; agy; exec bash`;
+	const candidates = [
+		{
+			bin: "xdg-terminal-exec",
+			args: [
+				"bash",
+				"-c",
+				cmd
+			]
+		},
+		{
+			bin: "x-terminal-emulator",
+			args: ["-e", `sh -c "export HOME='${accDir}'; agy; exec sh"`]
+		},
+		{
+			bin: "gnome-terminal",
+			args: [
+				"--",
+				"bash",
+				"-c",
+				cmd
+			]
+		},
+		{
+			bin: "konsole",
+			args: [
+				"-e",
+				"bash",
+				"-c",
+				cmd
+			]
+		},
+		{
+			bin: "xfce4-terminal",
+			args: ["-e", `bash -c "${cmd}"`]
+		},
+		{
+			bin: "alacritty",
+			args: [
+				"-e",
+				"bash",
+				"-c",
+				cmd
+			]
+		},
+		{
+			bin: "xterm",
+			args: [
+				"-e",
+				"bash",
+				"-c",
+				cmd
+			]
+		}
+	];
+	for (const c of candidates) try {
+		run(c.bin, c.args);
+		return true;
+	} catch {
+		continue;
+	}
+	return false;
+}
 function resolveAgyBin(cfg) {
 	const candidates = [];
 	if (cfg.agyBin !== "") candidates.push(cfg.agyBin);
@@ -3307,15 +3547,42 @@ function parseWindowsProxyServer(raw) {
 	}
 	return /^https?:\/\//i.test(s) ? s : `http://${s}`;
 }
+/**
+* Parse macOS `scutil --proxy` dictionary output.
+* Keys of interest:
+*   HTTPEnable : 1
+*   HTTPPort : 7890
+*   HTTPProxy : 127.0.0.1
+*   HTTPSEnable : 1
+*   HTTPSPort : 7890
+*   HTTPSProxy : 127.0.0.1
+*   SOCKSEnable : 1
+*   SOCKSPort : 7890
+*   SOCKSProxy : 127.0.0.1
+*/
+function parseMacScutilProxy(raw) {
+	if (!raw.trim()) return void 0;
+	const lines = raw.split("\n");
+	const dict = {};
+	for (const line of lines) {
+		const m = /^\s*([A-Za-z0-9_]+)\s*:\s*(.+)$/.exec(line);
+		if (m && m[1] && m[2]) dict[m[1]] = m[2].trim();
+	}
+	if (dict.HTTPSEnable === "1" && dict.HTTPSProxy && dict.HTTPSPort) return `http://${dict.HTTPSProxy}:${dict.HTTPSPort}`;
+	if (dict.HTTPEnable === "1" && dict.HTTPProxy && dict.HTTPPort) return `http://${dict.HTTPProxy}:${dict.HTTPPort}`;
+	if (dict.SOCKSEnable === "1" && dict.SOCKSProxy && dict.SOCKSPort) return `socks5://${dict.SOCKSProxy}:${dict.SOCKSPort}`;
+}
 let cachedProxy = null;
 /**
-* Detect system proxy configuration.
+* Detect system proxy configuration across Windows, macOS, and Linux.
 * Priority:
-* 1. Standard environment variables (HTTPS_PROXY, HTTP_PROXY, ALL_PROXY)
+* 1. Standard environment variables (HTTPS_PROXY, HTTP_PROXY, ALL_PROXY, and lowercase)
 * 2. Windows Registry (HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings)
-* Results are cached for 5 seconds to minimize registry queries.
+* 3. macOS scutil (--proxy)
+* 4. Linux desktop system proxy (GNOME gsettings)
+* Results are cached for 5 minutes (300s) to minimize subprocess and registry queries.
 */
-function detectSystemProxy() {
+function detectSystemProxy(platform = process.platform) {
 	const now = Date.now();
 	if (cachedProxy && cachedProxy.expiresAt > now) return cachedProxy.value;
 	const envProxy = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy || process.env.ALL_PROXY || process.env.all_proxy;
@@ -3327,7 +3594,7 @@ function detectSystemProxy() {
 		};
 		return val;
 	}
-	if (IS_WIN$1) try {
+	if (platform === "win32") try {
 		const out = execFileSync("reg", ["query", "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"], {
 			encoding: "utf8",
 			timeout: 2e3,
@@ -3353,6 +3620,74 @@ function detectSystemProxy() {
 			}
 		}
 	} catch {}
+	if (platform === "darwin") try {
+		const val = parseMacScutilProxy(execFileSync("scutil", ["--proxy"], {
+			encoding: "utf8",
+			timeout: 2e3,
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}));
+		if (val) {
+			cachedProxy = {
+				value: val,
+				expiresAt: now + 3e5
+			};
+			return val;
+		}
+	} catch {}
+	if (platform === "linux") try {
+		if (execFileSync("gsettings", [
+			"get",
+			"org.gnome.system.proxy",
+			"mode"
+		], {
+			encoding: "utf8",
+			timeout: 1e3,
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}).trim().replace(/^'|'$/g, "") === "manual") {
+			const host = execFileSync("gsettings", [
+				"get",
+				"org.gnome.system.proxy.https",
+				"host"
+			], {
+				encoding: "utf8",
+				timeout: 1e3,
+				stdio: [
+					"ignore",
+					"pipe",
+					"ignore"
+				]
+			}).trim().replace(/^'|'$/g, "");
+			const port = execFileSync("gsettings", [
+				"get",
+				"org.gnome.system.proxy.https",
+				"port"
+			], {
+				encoding: "utf8",
+				timeout: 1e3,
+				stdio: [
+					"ignore",
+					"pipe",
+					"ignore"
+				]
+			}).trim();
+			if (host && port && port !== "0") {
+				const val = `http://${host}:${port}`;
+				cachedProxy = {
+					value: val,
+					expiresAt: now + 3e5
+				};
+				return val;
+			}
+		}
+	} catch {}
 	cachedProxy = {
 		value: void 0,
 		expiresAt: now + 3e5
@@ -3375,6 +3710,13 @@ var AccountPoolManager = class {
 	* sessions.json: web + headless share this file).
 	*/
 	knownIds = /* @__PURE__ */ new Set();
+	/**
+	* Consecutive non-authoritative auth failures per account id (noteAuthFailure).
+	* Deliberately in-memory: losing the streak on restart only costs one extra
+	* confirmation round, while persisting it could quarantine an account for a
+	* blip that healed while the process was down.
+	*/
+	authStrikes = /* @__PURE__ */ new Map();
 	/** Serialized snapshot of the last successful persist/load; skips no-op writes. */
 	persistedJson = "";
 	constructor(baseDir = defaultPoolDir()) {
@@ -3717,9 +4059,34 @@ var AccountPoolManager = class {
 		if (this.data.activeAccountIds) {
 			for (const [fam, accId] of Object.entries(this.data.activeAccountIds)) if (accId === id) delete this.data.activeAccountIds[fam];
 		}
+		this.authStrikes.delete(id);
 		this.persist();
 	}
 	/**
+	* Confirmation-gated quarantine for auth-classified failures that carry NO
+	* authoritative evidence (no invalid_grant / revoked / unauthorized_client).
+	*
+	* agy prints the same "not signed in" banner whether the login is really
+	* dead or its keyring validation merely missed a 10s window on a flaky
+	* network, so one banner used to sticky-quarantine healthy accounts — the
+	* user then saw a red 需重新登录 and could not even 设为当前使用. A single
+	* strike now only rotates the account away for the current retry; the flag
+	* hardens into a real quarantine only when the failure repeats with no
+	* success in between. Authoritative OAuth paths keep calling
+	* markAuthRequired directly and quarantine on first sight.
+	*
+	* Returns true when the account is now hard-quarantined.
+	*/
+	noteAuthFailure(id, reason) {
+		const strikes = (this.authStrikes.get(id) ?? 0) + 1;
+		if (strikes < 2) {
+			this.authStrikes.set(id, strikes);
+			return false;
+		}
+		this.markAuthRequired(id, reason);
+		return true;
+	}
+	/**
 	* External re-login detected (agy logout + new login): identity-bound
 	* state from the PREVIOUS account (cooldowns, quotas, auth quarantine)
 	* must not leak onto the new one. Resets everything email-bound while
@@ -3742,6 +4109,7 @@ var AccountPoolManager = class {
 		delete acc.authRequired;
 		delete acc.authError;
 		delete acc.authMarkedAt;
+		this.authStrikes.delete(id);
 		this.persist();
 	}
 	/**
@@ -3958,6 +4326,7 @@ var AccountPoolManager = class {
 			delete acc.authMarkedAt;
 		}
 		if (acc.cooldowns?.[family]) delete acc.cooldowns[family];
+		this.authStrikes.delete(id);
 		this.persist();
 	}
 	clearCooldown(id, family) {
@@ -27547,10 +27916,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 (daily first, mirroring OmniRoute). */
+/** Runtime endpoint fallback order (official production first, then staging/daily fallbacks). */
 const AGY_ENDPOINTS = [
-	"https://daily-cloudcode-pa.googleapis.com",
 	"https://cloudcode-pa.googleapis.com",
+	"https://daily-cloudcode-pa.googleapis.com",
 	"https://daily-cloudcode-pa.sandbox.googleapis.com",
 	"https://autopush-cloudcode-pa.sandbox.googleapis.com"
 ];
@@ -28166,6 +28535,58 @@ function findDuplicateCredentialIdentities(accounts, homeDir) {
 	return reports;
 }
 //#endregion
+//#region src/host/agy-log.ts
+/** Same home resolution quota.ts uses for per-account credential access. */
+function agyHomeDirFor(account) {
+	return account?.systemHome || !account?.dir ? homedir() : account.dir;
+}
+function agyLogDir(homeDir) {
+	return join(homeDir, ".gemini", "antigravity-cli", "log");
+}
+/** Names of the cli-*.log files present right now (cheap readdir). */
+function snapshotAgyLogs(homeDir) {
+	const dir = agyLogDir(homeDir);
+	try {
+		return new Set(readdirSync(dir).filter((f) => f.startsWith("cli-") && f.endsWith(".log")));
+	} catch {
+		return /* @__PURE__ */ new Set();
+	}
+}
+/** Upper bound so one pathological log cannot balloon the failure path. */
+const MAX_LOG_BYTES = 262144;
+const MAX_LOG_FILES = 3;
+/**
+* Concatenated text of the log files THIS run created (present now, absent
+* from the pre-spawn snapshot), newest first. Returns '' when the run wrote no
+* readable log — callers must treat that as "no evidence", never as proof
+* either way.
+*/
+function readAgyRunLogText(homeDir, before) {
+	const dir = agyLogDir(homeDir);
+	let names;
+	try {
+		if (!existsSync(dir)) return "";
+		names = readdirSync(dir).filter((f) => f.startsWith("cli-") && f.endsWith(".log") && !before.has(f)).map((f) => ({
+			f,
+			m: statSync(join(dir, f)).mtimeMs
+		})).sort((a, b) => b.m - a.m).slice(0, MAX_LOG_FILES).map((e) => e.f);
+	} catch {
+		return "";
+	}
+	const parts = [];
+	let budget = MAX_LOG_BYTES;
+	for (const name of names) {
+		if (budget <= 0) break;
+		try {
+			const text = readFileSync(join(dir, name), "utf8");
+			const slice = text.length > budget ? text.slice(-budget) : text;
+			parts.push(slice);
+			budget -= slice.length;
+		} catch {}
+	}
+	return parts.join("\n");
+}
+//#endregion
 //#region src/host/sessions.ts
 var SessionStore = class {
 	file;
@@ -29248,9 +29669,13 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 	* { model: LlmResolvedModelInfo; stream(options): AsyncIterable<StreamChunk> }.
 	*/
 	async prepareCall(provider, model, signal) {
+		if (signal?.aborted) throw signal.reason ?? new LlmError("aborted", "ABORTED");
 		return {
 			model: await this.resolveModel(provider, model, signal),
-			stream: (options) => this.stream(options)
+			stream: (options) => this.stream({
+				...options,
+				signal: options.signal ?? signal
+			})
 		};
 	}
 	/** Build the agy argv for one call. Exported for tests. */
@@ -29315,7 +29740,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 			const rec = this.deps.runs.get(continuation.runId);
 			const deadFailure = rec !== void 0 && rec.isSettled ? rec.failureInfo : null;
 			if (rec !== void 0 && !(deadFailure !== null && this.claimFailover(sessionKey, deadFailure.code))) {
-				yield* this.driveSpan(rec, continuation.eventIndex + 1, hasToolSupport, isCodeMode, goalContext, supportsGoalUpdate, supportsPlanExit);
+				yield* this.driveSpan(rec, continuation.eventIndex + 1, hasToolSupport, isCodeMode, goalContext, supportsGoalUpdate, supportsPlanExit, options.signal);
 				return;
 			}
 			if (rec !== void 0) {
@@ -29548,7 +29973,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 						startedAt: now,
 						inFlight: true
 					});
-					yield* this.driveSpan(liveRun, rescueFrom, hasToolSupport, isCodeMode, goalContext, supportsGoalUpdate, supportsPlanExit);
+					yield* this.driveSpan(liveRun, rescueFrom, hasToolSupport, isCodeMode, goalContext, supportsGoalUpdate, supportsPlanExit, options.signal);
 					return;
 				}
 				throw new LlmError("Duplicate request ignored: an identical request is already running for this session.", Err.BUSY);
@@ -29659,7 +30084,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 			promptViaStdin: true
 		}) : argsBase;
 		const stdinPayload = promptViaStdin ? buildStreamInputLine(prompt) : void 0;
-		const release = await this.deps.acquire();
+		const release = await this.deps.acquire(options.signal);
 		let released = false;
 		let slotLease;
 		try {
@@ -29687,6 +30112,8 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 			throw new LlmError("request aborted before the agy process was spawned", Err.AGY_ERROR);
 		}
 		if (account && account.dir) ensureIsolatedKeychain(account.dir);
+		const runLogHome = agyHomeDirFor(account);
+		const runLogsBefore = snapshotAgyLogs(runLogHome);
 		const effectiveProxy = account?.proxyUrl || cfg.proxyUrl || detectSystemProxy() || void 0;
 		const env = {
 			...process.env,
@@ -29707,7 +30134,20 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				const elapsed = Date.now() - lastSpawn;
 				const jitter = Math.floor(Math.random() * 300);
 				const targetInterval = this.minSpawnIntervalMs + jitter;
-				if (elapsed < targetInterval) await new Promise((r) => setTimeout(r, targetInterval - elapsed));
+				if (elapsed < targetInterval) {
+					if (options.signal?.aborted) throw new LlmError("request aborted before the agy process was spawned", Err.AGY_ERROR);
+					await new Promise((r, reject) => {
+						const timer = setTimeout(() => {
+							options.signal?.removeEventListener("abort", onAbort);
+							r();
+						}, targetInterval - elapsed);
+						const onAbort = () => {
+							clearTimeout(timer);
+							reject(new LlmError("request aborted before the agy process was spawned", Err.AGY_ERROR));
+						};
+						options.signal?.addEventListener("abort", onAbort, { once: true });
+					});
+				}
 				this.lastAccountSpawnTime.set(account.id, Date.now());
 			}
 			proc = startAgyProcess({
@@ -29781,7 +30221,9 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 			const consumable = r !== null && (r.ok || r.response !== "");
 			const rawErrText = [outcome.stderrTail, parser.stats.lastResultError].filter(Boolean).join(" ");
 			const isRateLimit = looksLikeRateLimit(rawErrText);
-			const transportFailure = looksLikeNetworkError([
+			const runLogText = readAgyRunLogText(runLogHome, runLogsBefore);
+			const keyringJitter = looksLikeAuthVerificationJitter(runLogText);
+			const transportFailure = keyringJitter || looksLikeNetworkError([
 				rawErrText,
 				parser.stats.authFailureText ?? "",
 				outcome.stderrTail,
@@ -29803,7 +30245,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				if (sawAuthFailure(parser, outcome)) failure = transportFailure ? {
 					kind: "error",
 					code: Err.NETWORK,
-					message: "agy could not validate its Google login over the network (transport failure, not a sign-out) — retrying on another account. " + (rawErrText !== "" ? brief(rawErrText) : "")
+					message: "agy could not validate its Google login over the network (transport failure" + (keyringJitter ? "; its own log shows keyring auth timing out on the network, not a sign-out" : "") + ", not a sign-out) — retrying on another account. " + (rawErrText !== "" ? brief(rawErrText) : "")
 				} : {
 					kind: "error",
 					code: Err.AUTH,
@@ -29871,7 +30313,11 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				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 (account && shouldMarkAuthRequired(failure.code, failure.message)) this.deps.pool?.markAuthRequired(account.id, failure.message);
+				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);
+					else this.deps.pool?.markAuthRequired(account.id, failure.message);
+				}
 				const staleConversation = failure.code === Err.AUTH || failure.message !== "" && /conversation.*(not found|invalid|not recognized|expired|does not exist)|session.*(expired|invalid)/i.test(failure.message);
 				const interruptedTurn = failure.kind === "aborted" || outcome.timedOut === true;
 				if (!isAux && sessionAccountKey !== "" && staleConversation) this.deps.store.delete(sessionAccountKey);
@@ -29903,7 +30349,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				message: "internal error: " + brief(String(err))
 			});
 		});
-		yield* this.driveSpan(rec, 0, !isAux && hasToolSupport, isCodeMode, goalContext, supportsGoalUpdate, supportsPlanExit);
+		yield* this.driveSpan(rec, 0, !isAux && hasToolSupport, isCodeMode, goalContext, supportsGoalUpdate, supportsPlanExit, options.signal);
 	}
 	/**
 	* Stream one span of a recording: map events from `from` until the mapper
@@ -29912,19 +30358,50 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 	* as this span's terminal chunk — the turn ends exactly like a native
 	* provider error.
 	*/
-	async *driveSpan(rec, from, cutOnTool, useCodeWrapper, goalContext, supportsGoalUpdate, supportsPlanExit) {
+	async *driveSpan(rec, from, cutOnTool, useCodeWrapper, goalContext, supportsGoalUpdate, supportsPlanExit, signal) {
+		if (signal?.aborted) {
+			rec.requestAbort?.();
+			yield {
+				type: "finish",
+				reason: {
+					kind: "aborted",
+					failure: {
+						code: "ABORTED",
+						message: "aborted by caller"
+					}
+				}
+			};
+			return;
+		}
 		this.deps.runs.remember(rec);
 		this.deps.runs.pin(rec.runId);
 		try {
-			yield* this.driveSpanBody(rec, from, cutOnTool, useCodeWrapper, goalContext, supportsGoalUpdate, supportsPlanExit);
+			yield* this.driveSpanBody(rec, from, cutOnTool, useCodeWrapper, goalContext, supportsGoalUpdate, supportsPlanExit, signal);
 		} finally {
 			this.deps.runs.unpin(rec.runId);
 			this.deps.runs.remember(rec);
 		}
 	}
 	/** Body of {@link driveSpan}: map recorded events until the span finishes. */
-	async *driveSpanBody(rec, from, cutOnTool, useCodeWrapper, goalContext, supportsGoalUpdate, supportsPlanExit) {
+	async *driveSpanBody(rec, from, cutOnTool, useCodeWrapper, goalContext, supportsGoalUpdate, supportsPlanExit, signal) {
 		const queue = new ChunkQueue();
+		let abortedLocally = false;
+		const onAbort = () => {
+			abortedLocally = true;
+			rec.requestAbort?.();
+			queue.push({
+				type: "finish",
+				reason: {
+					kind: "aborted",
+					failure: {
+						code: "ABORTED",
+						message: "aborted by caller"
+					}
+				}
+			});
+			queue.close();
+		};
+		signal?.addEventListener("abort", onAbort, { once: true });
 		(async () => {
 			const resolved = /* @__PURE__ */ new Map();
 			const resolvedThoughts = /* @__PURE__ */ new Map();
@@ -29945,6 +30422,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 			let i = from;
 			try {
 				for await (const ev of rec.eventsFrom(from)) {
+					if (abortedLocally || signal?.aborted) break;
 					const recordedThought = rec.getThoughts(i);
 					if (recordedThought !== void 0) resolvedThoughts.set(i, recordedThought);
 					else if (ev.kind === "step") {
@@ -30008,17 +30486,21 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 						break;
 					}
 				}
-				if (!mapper.isFinished) {
+				if (!mapper.isFinished && !abortedLocally && !signal?.aborted) {
 					const f = rec.failureInfo;
 					if (f !== null) for (const ch of mapper.emitFailure(f.kind, f.code, f.message)) queue.push(ch);
 					else for (const ch of mapper.emitFailure("error", Err.INVALID_OUTPUT, "agy stream ended without a result event")) queue.push(ch);
 				}
 			} catch (err) {
-				for (const ch of mapper.emitFailure("error", Err.PROCESS_EXIT, "internal error: " + brief(String(err)))) queue.push(ch);
+				if (!abortedLocally && !signal?.aborted) for (const ch of mapper.emitFailure("error", Err.PROCESS_EXIT, "internal error: " + brief(String(err)))) queue.push(ch);
 			}
 			queue.close();
 		})();
-		yield* queue.drain();
+		try {
+			yield* queue.drain();
+		} finally {
+			signal?.removeEventListener("abort", onAbort);
+		}
 	}
 };
 /**
@@ -30721,6 +31203,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 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);
@@ -30730,7 +31214,7 @@ async function handle(deps, raw, invocation) {
 				if (!a.enabled) statusText = "   - Status: ⏸️ Disabled";
 				else if (a.authRequired) statusText = `   - Status: 🔴 Auth required (${a.authError || "sign in again"})`;
 				else if (cds.length > 0) statusText = `   - ⚠️ ${cds.join("; ")}`;
-				lines.push(`${i + 1}. **${a.alias}** (${a.email || a.id})${isPrimary ? " ⭐ primary" : ""}`, `   - Proxy: ${a.proxyUrl ? redactProxyUrl(a.proxyUrl) : deps.cfg().proxyUrl ? redactProxyUrl(deps.cfg().proxyUrl) : "system default"}`, `   - Quota: Gemini ${qG} | Claude ${qC} | GPT-OSS ${qO}`, statusText);
+				lines.push(`${i + 1}. **${a.alias}** (${a.email || a.id})${isPrimary ? " ⭐ primary" : ""}`, `   - Proxy: ${a.proxyUrl ? redactProxyUrl(a.proxyUrl) : deps.cfg().proxyUrl ? redactProxyUrl(deps.cfg().proxyUrl) : "system default"}`, quotaLine, statusText);
 			}
 			return ok(lines.join("\n"));
 		}
@@ -31691,32 +32175,44 @@ var QuotaService = class {
 		for (let i = 0; i < total; i++) ordered.push(AGY_ENDPOINTS[(this.preferredEndpointIndex + i) % total]);
 		return ordered;
 	}
+	async fetchSummaryEndpoint(endpoint, accessToken, proxyUrl) {
+		return agyFetch(`${endpoint}/v1internal:retrieveUserQuotaSummary`, {
+			method: "POST",
+			headers: {
+				Authorization: `Bearer ${accessToken}`,
+				"Content-Type": "application/json",
+				"User-Agent": agyUserAgent()
+			},
+			body: JSON.stringify({})
+		}, proxyUrl);
+	}
 	/**
 	* Fetch official multi-bucket quota summary (both weekly and 5h limit windows)
 	* via v1internal:retrieveUserQuotaSummary.
 	*/
 	async fetchQuotaSummary(accessToken, proxyUrl) {
 		const endpoints = this.getOrderedEndpoints();
+		let partialSummary = null;
 		for (let i = 0; i < endpoints.length; i++) {
 			const endpoint = endpoints[i];
 			try {
-				const res = await agyFetch(`${endpoint}/v1internal:retrieveUserQuotaSummary`, {
-					method: "POST",
-					headers: {
-						Authorization: `Bearer ${accessToken}`,
-						"Content-Type": "application/json",
-						"User-Agent": agyUserAgent()
-					},
-					body: JSON.stringify({})
-				}, proxyUrl);
+				const res = await this.fetchSummaryEndpoint(endpoint, accessToken, proxyUrl);
 				if (res.ok) {
-					this.preferredEndpointIndex = AGY_ENDPOINTS.indexOf(endpoint);
-					return await res.json();
+					const summary = await res.json();
+					if (summary?.groups?.some((g) => {
+						const name = (g.displayName || "").toLowerCase();
+						const desc = (g.description || "").toLowerCase();
+						return name.includes("gemini") || desc.includes("gemini");
+					})) {
+						this.preferredEndpointIndex = AGY_ENDPOINTS.indexOf(endpoint);
+						return summary;
+					}
+					if (!partialSummary && summary && Array.isArray(summary.groups) && summary.groups.length > 0) partialSummary = summary;
 				}
 				if (res.status === 401 || res.status === 403) break;
 			} catch {}
 		}
-		return null;
+		return partialSummary;
 	}
 	/**
 	* Fetch available models and model-level quotas via v1internal:fetchAvailableModels.
@@ -31795,9 +32291,10 @@ var QuotaService = class {
 		if (summary && Array.isArray(summary.groups)) for (const group of summary.groups) {
 			const dName = (group.displayName || "").toLowerCase();
 			const desc = (group.description || "").toLowerCase();
-			const isGoogle = dName.includes("gemini") || desc.includes("gemini");
+			const isArgon = dName.includes("argon") || desc.includes("argon");
+			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 = isGoogle ? ["google"] : is3P ? ["anthropic", "openai"] : [];
+			const targetFamilies = isArgon ? ["argon"] : isGoogle ? ["google"] : is3P ? ["anthropic", "openai"] : [];
 			let fiveHourFrac;
 			let fiveHourReset;
 			let weeklyFrac;
@@ -32271,16 +32768,26 @@ var Semaphore = class {
 	constructor(max) {
 		this.max = max;
 	}
-	async acquire() {
+	async acquire(signal) {
+		if (signal?.aborted) throw new Error("aborted before semaphore acquisition");
 		if (this.active < Math.max(1, this.max())) {
 			this.active++;
 			return () => this.releaseOne();
 		}
-		return new Promise((resolve) => {
-			this.queue.push(() => {
+		return new Promise((resolve, reject) => {
+			let entry;
+			const onAbort = () => {
+				const idx = this.queue.indexOf(entry);
+				if (idx >= 0) this.queue.splice(idx, 1);
+				reject(/* @__PURE__ */ new Error("aborted while waiting for semaphore slot"));
+			};
+			entry = () => {
+				signal?.removeEventListener("abort", onAbort);
 				this.active++;
 				resolve(() => this.releaseOne());
-			});
+			};
+			signal?.addEventListener("abort", onAbort, { once: true });
+			this.queue.push(entry);
 		});
 	}
 	releaseOne() {
@@ -32355,8 +32862,14 @@ function apply(ctx, entryConfig = {}) {
 	if (swept > 0) log("swept " + swept + " stale staging dir(s)");
 	const logsSwept = pool.sweepOldLogs(getConfig().logRetentionDays);
 	if (logsSwept > 0) log("swept " + logsSwept + " old log file(s)");
+	if (process.platform === "darwin") try {
+		if (repairMacSystemKeychain()) log("repaired macOS system keychain settings (restored real login keychain)");
+	} catch {}
 	let kcProvisioned = 0;
-	for (const acc of pool.getAccounts()) if (acc.dir && ensureIsolatedKeychain(acc.dir)) kcProvisioned++;
+	for (const acc of pool.getAccounts()) if (acc.dir) {
+		purgeStaleIsolatedKeychain(acc.dir);
+		if (ensureIsolatedKeychain(acc.dir)) kcProvisioned++;
+	}
 	if (kcProvisioned > 0) log("provisioned isolated keychains for " + kcProvisioned + " pool account(s)");
 	if (process.platform === "win32") {
 		resolvePrimaryCredential(pool, {
@@ -32375,7 +32888,7 @@ function apply(ctx, entryConfig = {}) {
 		store,
 		pool,
 		bin,
-		acquire: () => semaphore.acquire(),
+		acquire: (signal) => semaphore.acquire(signal),
 		log,
 		runs,
 		getMediaBaseUrl: () => webServerPort.current ? `http://127.0.0.1:${webServerPort.current}/plugins/agy-link/media` : null,
@@ -32799,19 +33312,7 @@ function apply(ctx, entryConfig = {}) {
 					const alias = typeof body.alias === "string" ? body.alias : void 0;
 					const acc = pool.createAccountSlot(alias);
 					pool.markAuthRequired(acc.id, "not signed in yet — complete the terminal login");
-					if (body.autoOpenTerminal !== false && acc.dir) {
-						if (process.platform === "darwin") {
-							const script = `tell application "Terminal" to activate\ntell application "Terminal" to do script "export HOME='${acc.dir}'; agy"`;
-							execFile("osascript", ["-e", script], () => {});
-						} else if (process.platform === "win32") execFile("cmd.exe", [
-							"/c",
-							"start",
-							"cmd.exe",
-							"/k",
-							`set "HOME=${acc.dir}" && set "USERPROFILE=${acc.dir}" && agy`
-						], { windowsHide: true }, () => {});
-						else execFile("x-terminal-emulator", ["-e", `sh -c "export HOME='${acc.dir}'; agy; exec sh"`], () => {});
-					}
+					if (body.autoOpenTerminal !== false && acc.dir) openAccountTerminal(acc.dir);
 					sendJson(res, 200, {
 						ok: true,
 						account: acc,
@@ -32836,17 +33337,7 @@ function apply(ctx, entryConfig = {}) {
 						sendJson(res, 400, { error: "account has no isolated directory" });
 						return;
 					}
-					if (process.platform === "darwin") {
-						const script = `tell application "Terminal" to activate\ntell application "Terminal" to do script "export HOME='${acc.dir}'; agy"`;
-						execFile("osascript", ["-e", script], () => {});
-					} else if (process.platform === "win32") execFile("cmd.exe", [
-						"/c",
-						"start",
-						"cmd.exe",
-						"/k",
-						`set "HOME=${acc.dir}" && set "USERPROFILE=${acc.dir}" && agy`
-					], { windowsHide: true }, () => {});
-					else execFile("x-terminal-emulator", ["-e", `sh -c "export HOME='${acc.dir}'; agy; exec sh"`], () => {});
+					openAccountTerminal(acc.dir);
 					sendJson(res, 200, {
 						ok: true,
 						dir: acc.dir