dsh-agy 0.2.9 → 0.2.10

package/README.md

@@ -230,5 +230,6 @@ pnpm run record:fixtures       # re-record real-API fixtures (needs a real accou
 pnpm run e2e                   # real-account end-to-end (needs AGY_REFRESH_TOKEN)
 pnpm run debug:request         # endpoint/header bisection probe
 pnpm run verify:tools          # live two-turn tool-signature check
+pnpm run verify:proxy-routing  # live per-account proxy routing + fail-closed check
 npm pack --dry-run             # verify the publishable artifact
 ```

package/lib/{accounts-Um8N9I56.mjs → accounts-hsgwm7J9.mjs}

@@ -1,195 +1,233 @@
-import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { i as proxiedFetch, n as isProxyUnreachableError } from "./proxy-DQPIwUov.mjs";
+import { a as AGY_VERSION_FALLBACK, g as isProxyRouted, h as AgyPoolBlockedError, m as AgyAuthError, p as resolveAgyClientCredentials, s as OAUTH_TOKEN_URL, t as AGY_CLIENT_ID } from "./constants-BFKYjOmh.mjs";
+import { a as proxiedFetch, r as isProxyUnreachableError, t as accountFetch } from "./proxy-DLvX8yxv.mjs";
+import { t as deriveAntigravitySessionId } from "./identity-DsftHTJC.mjs";
+import { i as parseRefreshParts, n as calculateTokenExpiry, r as formatRefreshParts, t as accessTokenExpired } from "./auth-DPPVFwio.mjs";
 import { createCipheriv, createDecipheriv, createHash, randomBytes, randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import lockfile from "proper-lockfile";
 import { Document, isMap, isScalar, parseDocument } from "yaml";
-//#region src/types.ts
+//#region src/runtime/classify.ts
 /**
-* Host-independent authentication error. The adapter maps `kind` to the DSH
-* error protocol without coupling the session or CLI layers to dsh-llm.
+* Upstream failure classification: HTTP status + headers + body → FailureKind.
+* Conservative by design: only auth-failure may revoke an account; everything
+* else cools, rotates, or retries.
 */
-var AgyAuthError = class extends Error {
-	kind;
-	constructor(kind, message, options) {
-		super(message, options);
-		this.name = "AgyAuthError";
-		this.kind = kind;
-	}
-};
-/**
-* Enabled accounts exist, but every candidate is temporarily blocked. Kept
-* independent of dsh-llm so CLI and web entry points do not gain a host import.
-*/
-var AgyPoolBlockedError = class extends Error {
-	kind;
-	blockedUntil;
-	constructor(kind, blockedUntil) {
-		super(kind === "quota-exhausted" ? "All agy accounts have exhausted quota for the requested model family." : "All agy accounts are temporarily blocked for the requested model family.");
-		this.name = "AgyPoolBlockedError";
-		this.kind = kind;
-		this.blockedUntil = blockedUntil;
+const QUOTA_EXHAUSTED_KEYWORDS = [
+	"quota_exhausted",
+	"quota exhausted",
+	"quota reached",
+	"enable overages",
+	"individual quota"
+];
+/** Classify a 429 body into the four upstream categories. */
+function classifyRateLimit(bodyText, retryAfterMs) {
+	const text = (bodyText ?? "").toLowerCase();
+	if (QUOTA_EXHAUSTED_KEYWORDS.some((keyword) => text.includes(keyword))) return "quota_exhausted";
+	if (retryAfterMs !== void 0 && retryAfterMs < 3e3) return "soft_rate_limit";
+	if (retryAfterMs !== void 0) return "rate_limited";
+	return text.includes("quota") || text.includes("resource_exhausted") ? "quota_exhausted" : "unknown";
+}
+const RATE_LIMIT_RESET_FIELDS = [
+	"resetTime",
+	"reset_time",
+	"resetAt",
+	"quotaResetTime"
+];
+function extractResetTime(bodyText) {
+	if (!bodyText) return void 0;
+	try {
+		const data = JSON.parse(bodyText);
+		for (const field of RATE_LIMIT_RESET_FIELDS) {
+			const value = data[field];
+			if (typeof value === "string" && value) return value;
+			if (typeof value === "number" && Number.isFinite(value)) return value > 0xe8d4a51000 ? new Date(value).toISOString() : new Date(Date.now() + value * 1e3).toISOString();
+		}
+		const quotaInfo = data.quotaInfo;
+		if (quotaInfo && typeof quotaInfo.resetTime === "string") return quotaInfo.resetTime;
+	} catch {}
+}
+function parseRetryAfter(header) {
+	if (!header) return void 0;
+	const seconds = Number(header);
+	if (Number.isFinite(seconds) && seconds >= 0) return seconds * 1e3;
+	const date = Date.parse(header);
+	if (!Number.isNaN(date)) return Math.max(0, date - Date.now());
+}
+/** Classify a completed HTTP response (non-2xx). */
+function classifyHttpError(status, headers, bodyText) {
+	const retryAfterMs = parseRetryAfter(headers.get("retry-after"));
+	const resetTime = extractResetTime(bodyText);
+	if (status === 429) return {
+		kind: "rate-limit",
+		rateLimitCategory: classifyRateLimit(bodyText, retryAfterMs),
+		status,
+		retryAfterMs,
+		resetTime,
+		message: bodyText ? bodyText.slice(0, 200) : void 0
+	};
+	if (status === 401) return {
+		kind: "auth-failure",
+		status,
+		message: bodyText ? bodyText.slice(0, 200) : void 0
+	};
+	if (status === 403) {
+		const category = classifyRateLimit(bodyText, void 0);
+		if (category === "quota_exhausted") return {
+			kind: "rate-limit",
+			rateLimitCategory: category,
+			status,
+			message: bodyText ? bodyText.slice(0, 200) : void 0
+		};
+		return {
+			kind: "auth-failure",
+			status,
+			message: bodyText ? bodyText.slice(0, 200) : void 0
+		};
 	}
-};
-//#endregion
-//#region src/oauth/constants.ts
-/**
-* Antigravity (agy) OAuth and API constants.
-*
-* The client id/secret below are the public Google consumer-OAuth credentials
-* shipped inside the Antigravity desktop product and its `agy` CLI; they are
-* embedded in many public tools (see NOTICE.md). They are not secrets owned by
-* this project.
-*/
-var constants_exports = /* @__PURE__ */ __exportAll({
-	AGY_CLIENT_ID: () => AGY_CLIENT_ID,
-	AGY_CLIENT_SECRET: () => AGY_CLIENT_SECRET,
-	AGY_DEFAULT_REDIRECT_URI: () => AGY_DEFAULT_REDIRECT_URI,
-	AGY_ENDPOINT_AUTOPUSH: () => AGY_ENDPOINT_AUTOPUSH,
-	AGY_ENDPOINT_DAILY: () => AGY_ENDPOINT_DAILY,
-	AGY_ENDPOINT_DAILY_SANDBOX: () => AGY_ENDPOINT_DAILY_SANDBOX,
-	AGY_ENDPOINT_FALLBACKS: () => AGY_ENDPOINT_FALLBACKS,
-	AGY_ENDPOINT_PROD: () => AGY_ENDPOINT_PROD,
-	AGY_ENDPOINT_SKIP_STATUSES: () => AGY_ENDPOINT_SKIP_STATUSES,
-	AGY_SCOPES: () => AGY_SCOPES,
-	AGY_VERSION_FALLBACK: () => AGY_VERSION_FALLBACK,
-	OAUTH_AUTHORIZE_URL: () => OAUTH_AUTHORIZE_URL,
-	OAUTH_TOKEN_URL: () => OAUTH_TOKEN_URL,
-	OAUTH_USERINFO_URL: () => OAUTH_USERINFO_URL,
-	fetchAgyFirstOk: () => fetchAgyFirstOk,
-	getAgyBootstrapClientMetadata: () => getAgyBootstrapClientMetadata,
-	getAgyBootstrapUserAgent: () => getAgyBootstrapUserAgent,
-	resolveAgyClientCredentials: () => resolveAgyClientCredentials
-});
-const AGY_CLIENT_ID = "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com";
-const AGY_CLIENT_SECRET = "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";
-/**
-* Effective OAuth client credentials: AGY_CLIENT_ID / AGY_CLIENT_SECRET env
-* overrides win when set (BYO OAuth app escape hatch, mirrors pi-antigravity);
-* otherwise the embedded public Antigravity credentials are used.
-*/
-function resolveAgyClientCredentials(overrideClientId) {
-	if (overrideClientId) {
-		if (overrideClientId === "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com") return {
-			clientId: AGY_CLIENT_ID,
-			clientSecret: AGY_CLIENT_SECRET
+	if (status === 404) return {
+		kind: "transient",
+		status,
+		message: bodyText ? bodyText.slice(0, 200) : void 0
+	};
+	if (status >= 500) return {
+		kind: "transient",
+		status,
+		retryAfterMs,
+		message: bodyText ? bodyText.slice(0, 200) : void 0
+	};
+	if (status === 400) {
+		const text = (bodyText ?? "").toLowerCase();
+		if (text.includes("context") && (text.includes("overflow") || text.includes("too long") || text.includes("exceeded")) || text.includes("model") && (text.includes("not found") || text.includes("unavailable") || text.includes("not supported"))) return {
+			kind: "transient",
+			status,
+			message: bodyText ? bodyText.slice(0, 200) : void 0
 		};
 		return {
-			clientId: overrideClientId,
-			clientSecret: process.env.AGY_CLIENT_SECRET || "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"
+			kind: "request-error",
+			status,
+			message: bodyText ? bodyText.slice(0, 200) : void 0
 		};
 	}
 	return {
-		clientId: process.env.AGY_CLIENT_ID || "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com",
-		clientSecret: process.env.AGY_CLIENT_SECRET || "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"
+		kind: "transient",
+		status,
+		message: bodyText ? bodyText.slice(0, 200) : void 0
 	};
 }
-/** Required scopes. `openid` must NOT be added: it routes Google into the hanging
-* `firstparty/nativeapp` consent for this client (verified by OmniRoute). */
-const AGY_SCOPES = [
-	"https://www.googleapis.com/auth/cloud-platform",
-	"https://www.googleapis.com/auth/userinfo.email",
-	"https://www.googleapis.com/auth/userinfo.profile",
-	"https://www.googleapis.com/auth/cclog",
-	"https://www.googleapis.com/auth/experimentsandconfigs"
-];
-const OAUTH_AUTHORIZE_URL = "https://accounts.google.com/o/oauth2/v2/auth";
-const OAUTH_TOKEN_URL = "https://oauth2.googleapis.com/token";
-const OAUTH_USERINFO_URL = "https://www.googleapis.com/oauth2/v1/userinfo";
-/** Default loopback callback used by the standalone CLI listener (fixed port, like opencode). */
-const AGY_DEFAULT_REDIRECT_URI = "http://localhost:51121/oauth-callback";
+/** Codes that carry a socket/syscall `code` worth surfacing in a failure message. */
+const TRANSPORT_CAUSE_CODES = /* @__PURE__ */ new Set([
+	"ECONNREFUSED",
+	"ECONNRESET",
+	"ETIMEDOUT",
+	"ENETUNREACH",
+	"EHOSTUNREACH",
+	"EPIPE",
+	"ENOTFOUND",
+	"EAI_AGAIN",
+	"CERT_HAS_EXPIRED",
+	"DEPTH_ZERO_SELF_SIGNED_CERT",
+	"UNABLE_TO_VERIFY_LEAF_SIGNATURE",
+	"ERR_TLS_CERT_ALTNAME_INVALID",
+	"UND_ERR_CONNECT_TIMEOUT",
+	"UND_ERR_SOCKET",
+	"UND_ERR_HEADERS_TIMEOUT",
+	"UND_ERR_BODY_TIMEOUT",
+	"UND_ERR_ABORTED"
+]);
 /**
-* Antigravity API endpoints. The daily runtime host (no .sandbox suffix) is the
-* live endpoint for consumer OAuth accounts — cloudcode-pa.googleapis.com
-* answers RESOURCE_EXHAUSTED for them (verified by live probe), while the
-* daily host answers 200. Order matters: first reachable non-429/403/503 wins.
+* Strip proxy credentials from URL-like text so `user:pass` never reaches logs
+* or the GUI. Splits at the LAST `@` of the authority, which is the real
+* userinfo delimiter (RFC 3986: a host cannot contain a raw `@`), so a password
+* that itself contains `@` is redacted whole rather than truncated at the first
+* one — the failure mode of the character-class regex this replaced.
 */
-const AGY_ENDPOINT_DAILY = "https://daily-cloudcode-pa.googleapis.com";
-const AGY_ENDPOINT_PROD = "https://cloudcode-pa.googleapis.com";
-const AGY_ENDPOINT_DAILY_SANDBOX = "https://daily-cloudcode-pa.sandbox.googleapis.com";
-const AGY_ENDPOINT_AUTOPUSH = "https://autopush-cloudcode-pa.sandbox.googleapis.com";
-/** Runtime/bootstrap endpoint fallback order (daily first, mirroring OmniRoute). */
-const AGY_ENDPOINT_FALLBACKS = [
-	AGY_ENDPOINT_DAILY,
-	AGY_ENDPOINT_PROD,
-	AGY_ENDPOINT_DAILY_SANDBOX,
-	AGY_ENDPOINT_AUTOPUSH
-];
+function redactCredentials(text) {
+	return text.replace(/([a-z][a-z0-9+.-]*:\/\/)([^\s/?#]+)/gi, (match, scheme, authority) => {
+		const at = authority.lastIndexOf("@");
+		if (at === -1) return match;
+		return `${scheme}<REDACTED>@${authority.slice(at + 1)}`;
+	});
+}
 /**
-* Statuses that mean "this endpoint is not usable for this attempt"; skip to the
-* next one in the chain. 429/403 = rate/quota/entitlement wall, 503 = capacity
-* rejection (e.g. "No capacity available for model ..."). A 503 skipped here
-* still reaches the caller when every endpoint fails, where the classifier marks
-* it transient and the adapter surfaces it as a retryable SERVER error.
+* Placeholder messages undici/Node emit while the real reason sits deeper in
+* the cause chain; they must not shadow a usable code further down.
 */
-const AGY_ENDPOINT_SKIP_STATUSES = /* @__PURE__ */ new Set([
-	429,
-	403,
-	503
+const GENERIC_CAUSE_MESSAGES = /* @__PURE__ */ new Set([
+	"fetch failed",
+	"terminated",
+	"other side closed",
+	"aborted"
 ]);
 /**
-* Try each runtime endpoint in order, skipping unusable ones (429/403/503/network).
-* Returns the first other response (2xx or a real error like 400/401); when
-* every endpoint is unusable, returns the last skipped response so the caller's
-* classifier can still produce a meaningful error (a returned 503 becomes a
-* retryable SERVER failure rather than being swallowed here).
+* Walk the error cause chain collecting the actionable `code` and message.
+* Node/undici reports `TypeError: fetch failed` and stores the real reason in
+* `error.cause` (verified against live failures): without this, DNS, TLS,
+* timeout, reset, and proxy failures are indistinguishable in DSH session
+* events and the GUI.
 */
-async function fetchAgyFirstOk(urlPath, init, fetchImpl = proxiedFetch) {
-	let lastSkipped = null;
-	for (const baseEndpoint of AGY_ENDPOINT_FALLBACKS) try {
-		const response = await fetchImpl(`${baseEndpoint}${urlPath}`, init);
-		if (!AGY_ENDPOINT_SKIP_STATUSES.has(response.status)) return response;
-		lastSkipped = response;
-	} catch (error) {
-		const { isProxyUnreachableError } = await import("./proxy-DQPIwUov.mjs").then((n) => n.o);
-		if (isProxyUnreachableError(error)) throw error;
+function describeCause(error) {
+	const seen = /* @__PURE__ */ new Set();
+	let current = error?.cause ?? error;
+	let fallbackMessage;
+	for (let depth = 0; current && depth < 6 && !seen.has(current); depth++) {
+		seen.add(current);
+		if (typeof current === "object") {
+			const code = current.code;
+			const message = current.message;
+			const usableMessage = typeof message === "string" && message.length > 0 ? message : void 0;
+			if (typeof code === "string" && TRANSPORT_CAUSE_CODES.has(code)) return {
+				code,
+				message: usableMessage
+			};
+			if (usableMessage && !GENERIC_CAUSE_MESSAGES.has(usableMessage) && !fallbackMessage) fallbackMessage = usableMessage;
+			const errors = current.errors;
+			if (Array.isArray(errors)) for (const nested of errors) {
+				const described = describeCause({ cause: nested });
+				if (described.code) return described;
+				if (described.message && !fallbackMessage) fallbackMessage = described.message;
+			}
+		}
+		current = current?.cause;
 	}
-	if (lastSkipped) return lastSkipped;
-	throw new Error("all agy endpoints failed");
-}
-/** Default Antigravity client version used in User-Agent strings; overridden by the
-* runtime version fetcher (see runtime/fingerprint.ts). */
-const AGY_VERSION_FALLBACK = "1.18.3";
-/** Electron-style UA used for bootstrap calls (loadCodeAssist/onboardUser). */
-function getAgyBootstrapUserAgent(version = AGY_VERSION_FALLBACK) {
-	return `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Antigravity/${version} Chrome/138.0.7204.235 Electron/37.3.1 Safari/537.36`;
+	return fallbackMessage ? { message: fallbackMessage } : {};
 }
-/** Client-Metadata payload for bootstrap calls — ideType only (backend enum
-* validation rejects freely-added platform/pluginType; AGENTS.md invariant). */
-function getAgyBootstrapClientMetadata() {
-	return "{\"ideType\":\"ANTIGRAVITY\"}";
-}
-//#endregion
-//#region src/runtime/identity.ts
 /**
-* Antigravity request/session identity generation (mirrors the active
-* OmniRoute implementation; the archived reference stopped maintaining these).
+* Human-readable transport failure: `fetch failed (UND_ERR_SOCKET: other side
+* closed)`. The sanitized cause code/message is what makes a transient socket
+* error distinguishable from a DNS, TLS, or proxy failure in session records.
 */
-/** One request id per upstream call: `agent/<epoch>/<8 hex>`. */
-function generateAntigravityRequestId() {
-	return `agent/${Date.now()}/${randomBytes(4).toString("hex")}`;
-}
-const FNV_OFFSET_I64 = -3750763044362895579n;
-const FNV_PRIME_I64 = 1099511628211n;
-/** 64-bit FNV-1a hash of a string (stable across processes). */
-function fnv1a64(input) {
-	let hash = FNV_OFFSET_I64;
-	for (let i = 0; i < input.length; i++) {
-		hash ^= BigInt(input.charCodeAt(i));
-		hash = BigInt.asIntN(64, hash * FNV_PRIME_I64);
-	}
-	return hash;
+function describeFetchError(error) {
+	const base = error instanceof Error ? error.message : String(error);
+	const { code, message } = describeCause(error);
+	if (!code && !message) return redactCredentials(base);
+	const detail = code && message ? message.includes(code) ? message : `${code}: ${message}` : code ?? message;
+	if (detail === base) return redactCredentials(base);
+	return redactCredentials(`${base} (${detail})`);
 }
 /**
-* Stable per-account session id: same account always derives the same id, so
-* multi-turn context caching keys consistently; unknown accounts get a fresh
-* random id.
+* Classify a fetch-level failure (DNS, refused, timeout, abort).
+* @param routing - how the failed request was routed; fail-closed applies only
+*   when it carried an explicit per-account proxy (see {@link AccountRouting}).
 */
-function deriveAntigravitySessionId(accountKey) {
-	if (!accountKey || accountKey.trim().length === 0) return null;
-	const hash = fnv1a64(accountKey.trim());
-	return `-${((hash < 0n ? -hash : hash) % 9000000000000000000n).toString()}`;
+function classifyFetchError(error, routing) {
+	const message = describeFetchError(error);
+	if (error instanceof DOMException && error.name === "AbortError") return {
+		kind: "network-error",
+		message
+	};
+	if (error?.errorCode === "proxy_unreachable" || error?.code === "PROXY_UNREACHABLE") return {
+		kind: "proxy-unreachable",
+		message
+	};
+	if (isProxyRouted(routing) && isProxyUnreachableError(error)) return {
+		kind: "proxy-unreachable",
+		message
+	};
+	return {
+		kind: "network-error",
+		message
+	};
 }
 //#endregion
 //#region src/runtime/version.ts
@@ -306,35 +344,6 @@ function peekCachedAntigravityVersion() {
 const ideState = { inFlight: null };
 const cliState = { inFlight: null };
 //#endregion
-//#region src/oauth/auth.ts
-const ACCESS_TOKEN_EXPIRY_BUFFER_MS = 6e4;
-/** Split the packed refresh string into its constituent refresh token and project ids. */
-function parseRefreshParts(refresh) {
-	const [refreshToken = "", projectId = "", managedProjectId = ""] = (refresh ?? "").split("|");
-	return {
-		refreshToken: refreshToken || void 0,
-		projectId: projectId || void 0,
-		managedProjectId: managedProjectId || void 0
-	};
-}
-/** Serialize refresh token parts into the stored string format. */
-function formatRefreshParts(parts) {
-	const projectSegment = parts.projectId ?? "";
-	const base = `${parts.refreshToken ?? ""}|${projectSegment}`;
-	return parts.managedProjectId ? `${base}|${parts.managedProjectId}` : base;
-}
-/** Whether the access token is expired or missing, with a buffer for clock skew. */
-function accessTokenExpired(auth) {
-	if (!auth.access || typeof auth.expires !== "number") return true;
-	return auth.expires <= Date.now() + ACCESS_TOKEN_EXPIRY_BUFFER_MS;
-}
-/** Absolute expiry timestamp from a duration; malformed durations expire immediately. */
-function calculateTokenExpiry(requestTimeMs, expiresInSeconds) {
-	const seconds = typeof expiresInSeconds === "number" ? expiresInSeconds : 3600;
-	if (Number.isNaN(seconds) || seconds <= 0) return requestTimeMs;
-	return requestTimeMs + seconds * 1e3;
-}
-//#endregion
 //#region src/oauth/refresh.ts
 var AgyTokenRefreshError = class extends Error {
 	code;
@@ -1033,8 +1042,9 @@ var AgySessionManager = class AgySessionManager {
 					expires: cached.expires,
 					refresh: account.refresh
 				};
-				if (isProxyUnreachableError(result.error)) throw new AgyAuthError("transport", "proxy_unreachable", { cause: result.error });
-				throw new AgyAuthError(result.error.status === 429 ? "rate-limit" : result.error.status === 0 || result.error.status === 408 || result.error.status >= 500 ? "transport" : "invalid-credential", result.error.message, { cause: result.error });
+				if (account.proxy && isProxyUnreachableError(result.error)) throw new AgyAuthError("transport", "proxy_unreachable", { cause: result.error });
+				const kind = result.error.status === 429 ? "rate-limit" : result.error.status === 0 || result.error.status === 408 || result.error.status >= 500 ? "transport" : "invalid-credential";
+				throw new AgyAuthError(kind, describeFetchError(result.error), { cause: result.error });
 			}
 			if (result.type === "revoked") {
 				this.tokenCache.delete(key);
@@ -1093,15 +1103,12 @@ var AgySessionManager = class AgySessionManager {
 				try {
 					const auth = await this.accessTokenFor(account);
 					if (!auth) return null;
-					const { fetchAvailableModels } = await import("./models-F-1cWO0f.mjs").then((n) => n.r);
+					const { fetchAvailableModels } = await import("./models-IfOGIOS9.mjs").then((n) => n.r);
+					const routed = accountFetch({ proxyUrl: account.proxy });
 					const quotas = ingestFamilyQuotas(await fetchAvailableModels(auth.access, account.projectId, (input, init) => {
 						const timeout = AbortSignal.timeout(AgySessionManager.QUOTA_FETCH_TIMEOUT_MS);
 						const signal = init?.signal ? AbortSignal.any([init.signal, timeout]) : timeout;
-						if (account.proxy) return proxiedFetch(input, {
-							...init,
-							signal
-						}, { proxyUrl: account.proxy });
-						return fetch(input, {
+						return routed(input, {
 							...init,
 							signal
 						});
@@ -1205,6 +1212,15 @@ var AgySessionManager = class AgySessionManager {
 		let storage = await this.store.load();
 		const maxAttempts = storage.accounts.filter((account) => account.enabled !== false).length;
 		let proxyUnreachableCount = 0;
+		/**
+		* Last transport failure seen on a *proxyless* account. Such an account is
+		* skipped (another enabled account may be healthy) without writing a
+		* cooldown: a cooldown would surface as AgyPoolBlockedError — i.e. RATE_LIMIT
+		* for a plain network error — and would block a solo pool outright. It is
+		* remembered so the request still reports its real cause rather than
+		* degrading into "no account configured" when every account fails this way.
+		*/
+		let lastTransportError;
 		for (let attempt = 0; attempt < maxAttempts; attempt++) {
 			if (storage.accounts.filter((account) => account.enabled !== false).length > 1) await this.refreshQuotaCache(storage);
 			const picked = await this.pickAccount(storage, model);
@@ -1213,29 +1229,14 @@ var AgySessionManager = class AgySessionManager {
 			try {
 				auth = await this.accessTokenFor(picked.account);
 			} catch (error) {
-				if (error instanceof AgyAuthError && error.kind === "transport" && isProxyUnreachableError(error)) {
+				if (Boolean(picked.account.proxy) && isProxyUnreachableError(error)) {
 					proxyUnreachableCount++;
-					this.lastUsed = null;
-					const deadIndex = storage.accounts.findIndex((a) => this.accountKey(a) === this.accountKey(picked.account));
-					if (deadIndex !== -1) {
-						const next = pickNextAccountIndex(storage.accounts, deadIndex, Date.now());
-						if (next !== storage.activeIndex) {
-							storage.activeIndex = next;
-							await this.store.mutate((s) => {
-								s.activeIndex = next;
-							}).catch(() => {});
-						}
-					}
-					storage = await this.store.load();
-					continue;
-				}
-				if (isProxyUnreachableError(error)) {
-					proxyUnreachableCount++;
-					this.lastUsed = null;
-					storage = await this.store.load();
+					storage = await this.skipAccount(storage, picked.account);
 					continue;
 				}
-				throw error;
+				lastTransportError = error;
+				storage = await this.skipAccount(storage, picked.account);
+				continue;
 			}
 			if (!auth) {
 				this.lastUsed = null;
@@ -1244,8 +1245,8 @@ var AgySessionManager = class AgySessionManager {
 			}
 			const key = this.accountKey(picked.account);
 			if (!picked.account.projectId && !this.projectRetryFailed.has(key)) try {
-				const { loadCodeAssist } = await import("./exchange-Bdql4kf3.mjs").then((n) => n.n);
-				const { projectId } = await loadCodeAssist(auth.access);
+				const { loadCodeAssist } = await import("./exchange-dQm2mjJ5.mjs").then((n) => n.n);
+				const { projectId } = await loadCodeAssist(auth.access, { proxyUrl: picked.account.proxy });
 				if (projectId) {
 					await this.store.mutate((s) => {
 						const account = s.accounts.find((candidate) => this.accountKey(candidate) === key);
@@ -1276,6 +1277,27 @@ var AgySessionManager = class AgySessionManager {
 			};
 		}
 		if (proxyUnreachableCount === maxAttempts && maxAttempts > 0) throw new AgyAuthError("transport", "proxy_unreachable");
+		if (lastTransportError !== void 0) throw lastTransportError;
+	}
+	/**
+	* Drop the session pin and move the pool cursor off an account that just
+	* failed, so the next `pickAccount` in this same request tries another one.
+	* State on the account itself is deliberately left untouched (no cooldown).
+	*/
+	async skipAccount(storage, account) {
+		this.lastUsed = null;
+		const key = this.accountKey(account);
+		const deadIndex = storage.accounts.findIndex((candidate) => this.accountKey(candidate) === key);
+		if (deadIndex !== -1) {
+			const next = pickNextAccountIndex(storage.accounts, deadIndex, Date.now());
+			if (next !== storage.activeIndex) {
+				storage.activeIndex = next;
+				await this.store.mutate((s) => {
+					s.activeIndex = next;
+				}).catch(() => {});
+			}
+		}
+		return this.store.load();
 	}
 	/** Adapter hook: apply rotation decisions and fingerprint regeneration. */
 	async reportFailure(kind, session, info) {
@@ -1339,8 +1361,8 @@ var AgySessionManager = class AgySessionManager {
 				ok: false,
 				error: "No agy account configured — run `dsh-agy login` first."
 			};
-			const { toAgyRequestBody } = await import("./translate-CE9tNXiV.mjs").then((n) => n.n);
-			const { fetchAgyFirstOk } = await Promise.resolve().then(() => constants_exports);
+			const { toAgyRequestBody } = await import("./translate-D0JHjwC-.mjs").then((n) => n.n);
+			const { fetchAgyFirstOk } = await import("./constants-BFKYjOmh.mjs").then((n) => n.l);
 			const { parseAgySse } = await import("./parse-Bs4rPkHA.mjs").then((n) => n.n);
 			const body = toAgyRequestBody({
 				provider: "agy",
@@ -1358,16 +1380,21 @@ var AgySessionManager = class AgySessionManager {
 				projectId: session.account.projectId,
 				sessionId: deriveAntigravitySessionId(session.account.email) ?? void 0
 			});
+			const headers = {
+				authorization: `Bearer ${session.auth.access}`,
+				"content-type": "application/json",
+				accept: "text/event-stream",
+				...session.impersonation
+			};
+			const routing = {
+				proxyUrl: session.account.proxy,
+				streaming: true
+			};
 			const response = await fetchAgyFirstOk("/v1internal:streamGenerateContent?alt=sse", {
 				method: "POST",
-				headers: {
-					authorization: `Bearer ${session.auth.access}`,
-					"content-type": "application/json",
-					accept: "text/event-stream",
-					...session.impersonation
-				},
+				headers,
 				body: JSON.stringify(body)
-			});
+			}, accountFetch(routing), routing);
 			if (!response.ok) {
 				const text = await response.text().catch(() => "");
 				return {
@@ -1945,6 +1972,6 @@ var JsonAccountStore = class {
 	}
 };
 //#endregion
-export { AgyPoolBlockedError as A, OAUTH_TOKEN_URL as C, getAgyBootstrapUserAgent as D, getAgyBootstrapClientMetadata as E, resolveAgyClientCredentials as O, OAUTH_AUTHORIZE_URL as S, fetchAgyFirstOk as T, deriveAntigravitySessionId as _, deriveKey as a, AGY_ENDPOINT_FALLBACKS as b, resolveDshHome as c, isAgyDisabled as d, generateFingerprint as f, resolveAntigravityVersionBounded as g, resolveAntigravityVersion as h, createAesGcmCodec as i, AgyAuthError as k, resolveMasterKeyCodec as l, calculateTokenExpiry as m, maskProxyUrl as n, loadMasterKey as o, recordFingerprintVersion as p, MASTER_KEY_REF as r, persistMasterKey as s, JsonAccountStore as t, AgySessionManager as u, generateAntigravityRequestId as v, OAUTH_USERINFO_URL as w, AGY_SCOPES as x, AGY_DEFAULT_REDIRECT_URI as y };
+export { classifyHttpError as _, deriveKey as a, resolveDshHome as c, isAgyDisabled as d, generateFingerprint as f, classifyFetchError as g, resolveAntigravityVersionBounded as h, createAesGcmCodec as i, resolveMasterKeyCodec as l, resolveAntigravityVersion as m, maskProxyUrl as n, loadMasterKey as o, recordFingerprintVersion as p, MASTER_KEY_REF as r, persistMasterKey as s, JsonAccountStore as t, AgySessionManager as u, describeFetchError as v };
 
-//# sourceMappingURL=accounts-Um8N9I56.mjs.map
+//# sourceMappingURL=accounts-hsgwm7J9.mjs.map