dsh-agy-link 0.4.38 → 0.4.41

package/CHANGELOG.md

@@ -1,5 +1,55 @@
 # Changelog
 
+## 0.4.41 (2026-09-30)
+
+### English
+
+- **Fix: the UI Stop button could not kill an offline wedged run.** `killTree` sent a single SIGTERM to the process group; agy's graceful-shutdown path ignores it while the process is wedged in offline dial retries (verified live: the run survived `kill <pid>` and only died on `kill -9`). The runner now escalates to SIGKILL for the whole group 3s after SIGTERM, so Stop always wins.
+- **Fix: offline runs spun on "thinking" forever.** The idle watchdog treated stderr chatter as activity — agy logs a dial-retry line to stderr every ~35s when it cannot reach Google, so a run that never emitted one stdout event stayed "active" until the 240m print-timeout. The watchdog is now **stdout-only**; login flows opt back in via the new `stderrKeepalive` run option (a browser login is legitimately stdout-silent for minutes). A timeout with zero stdout events now reports the likely cause: the run cannot reach Google (check proxy/network).
+- **Add: global `proxyUrl` config (`DSH_AGY_PROXY_URL` env works too).** GUI hosts don't inherit shell proxy env — the #1 reason plugin runs time out while the same command in a terminal works. An account's dedicated `proxyUrl` wins, then the global config; the effective proxy is injected into every agy spawn (`ALL_PROXY`/`HTTP(S)_PROXY`) and used by the quota / OAuth fetches. `/agy pool` now shows the effective proxy per account.
+- **Fix (macOS): recurring "create login keychain" password popup.** Pool accounts run with an isolated HOME, and macOS has **no login keychain inside it** (`security default-keychain` → "A default keychain could not be found"), so agy's keyring save triggered the `system.keychain.create.loginkc` password dialog on every ~hourly token refresh; denying it fell back to the on-disk token (auth kept working — exit status 45/154 in agy logs). The plugin now provisions a throwaway per-account keychain and sets it as the default under that HOME — idempotently at boot, before every spawn and before every login — so keyring writes are silent and truly per-account.
+- **Fix: transient network errors no longer flag accounts as "needs re-login".** Both flagging paths were too eager: the run-failure path matched any message containing `/auth/i` (e.g. `oauth2.googleapis.com … i/o timeout` transport noise) and the token-refresh path flagged **any** `token endpoint 400` — including captive-portal / proxy error pages. Both now require an authoritative OAuth state (`invalid_grant` / `invalid_client` / `revoked` / `disabled` / `unauthorized_client`) and transport-shaped failures are exempt — even a genuine AUTH classification is not trusted when the message is transport-shaped. A false flag also **removed the account from pool rotation** (`selectAccount` skips authRequired), so this was silent capacity loss plus a scary badge that the next manual quota refresh would immediately disprove.
+- **Add: flagged accounts self-heal in the background.** `markAuthRequired` now stamps `authMarkedAt`; after 10 minutes the background poll includes the flagged account for one token verification — if the stored refresh token still works the flag clears itself (previously this required a manual 刷新额度 click); if it is truly dead the flag is re-stamped. Risk-control exposure: at most one token-endpoint call per 10 minutes per flagged account.
+- **Add: "In use" badge in the Antigravity console.** Each account card now shows a green zap badge when the sticky scheduler is currently routing runs to it (per model family, from the pool's `activeAccountIds`), answering "which account is agy using right now" at a glance. Localized (zh/en/pt-BR/es).
+## 0.4.40 (2026-09-28)
+
+### English
+
+- **Fix (issue #34): post-tool hops dropped the task text and images.** dsh-llm 0.1.7 promotes tool results to `role: 'tool'` (0.1.x used `role: 'user'` + `source.callId`). `detectContinuation` and the trailing-span extractor only accepted the 0.1.x shape, so every hop after the first tool round-trip lost the mirror continuation, assembled an empty/digest-only prompt (`request carries no user text` or "what should I do next?"), and silently dropped image attachments. Both schemas are now accepted (`message.toolCallId`, `source.callId`, nested `tool-result` blocks); nested tool-result text and images are forwarded.
+- **Fix (issue #35): continuation prompts must keep the live task.** `buildDigest` used to let a wall of tool-result text consume the 8K budget and truncate the user's question away. The latest real user turn is now reserved at the head of the digest; the assembled prompt always re-states it whenever the trailing span is tool-results only. A dead loop of "read my own agy logs" with no task can no longer start.
+- **Fix (issue #35): aborted runs now persist the agy conversation id.** Binding was only written when `failure === null`, but a tool-cut / caller abort / timeout is exactly the path that used to drop it — so the next hop always started a brand-new agy conversation (`conversationID=""`) with digest-only prompt. The id is now harvested from a live run before steer-preemption and persisted on abort/timeout/process-exit (auth / rate-limit / conversation-rejected still drop the binding).
+- **Fix (issue #32): region eligibility refusals get a clear cause.** agy exits 1 with `Eligibility check failed: … not currently available in your location` (e.g. Seoul). This is a Google-side account/region restriction, not a proxy or quota bug. The bridge now classifies it and surfaces an explicit `AGY_ERROR` with guidance instead of a bare `PROCESS_EXIT`.
+
+### 中文 (Chinese)
+
+- **修复：UI 的 Stop 按钮杀不掉离线卡死的 run。** `killTree` 只对进程组发一次 SIGTERM；而 agy 困在离线拨号重试里时会无视 SIGTERM（实测 `kill <pid>` 无效、只有 `kill -9` 能杀掉）。现在 runner 在 SIGTERM 3 秒后对整组升级 SIGKILL，Stop 按钮必定生效。
+- **修复：连不上 Google 时 run 永远转圈。** 旧看门狗把 stderr 输出当作活动——agy 连不上 Google 时每 ~35 秒往 stderr 写一条拨号重试日志，于是一个连一条 stdout 事件都没有的 run 一直“活着”，直到 240 分钟的 print-timeout。看门狗现在**只认 stdout**；登录流程通过新的 `stderrKeepalive` 选项继续保活（浏览器登录本来就会长时间没有 stdout）。零 stdout 事件的超时现在会直接说明原因：无法连接 Google（检查代理/网络）。
+- **新增：全局 `proxyUrl` 配置（也支持 `DSH_AGY_PROXY_URL` 环境变量）。** GUI 应用不继承 shell 的代理环境变量——这是“终端里没问题、插件里必超时”的头号原因。账号专属 `proxyUrl` 优先，其次全局配置；生效代理会注入每个 agy 进程（`ALL_PROXY`/`HTTP(S)_PROXY`），额度 / OAuth 请求同样走代理。`/agy pool` 现在会显示每个账号的生效代理。
+- **修复（macOS）：反复弹出“创建登录钥匙串”密码框。** 池账号使用隔离 HOME，而隔离 HOME 里**没有登录钥匙串**（`security default-keychain` → "A default keychain could not be found"），agy 每次约每小时的 token 续期写入都会触发 `system.keychain.create.loginkc` 密码弹窗；取消后回退磁盘 token（认证不受影响——agy 日志里的 exit status 45/154 即此）。插件现在会为每个池账号预置一个专属的一次性钥匙串并设为该 HOME 的默认——在启动时、每次拉起前、每次登录前幂等执行——钥匙串写入从此静默，且真正做到按账号隔离。
+- **修复：瞬时网络错误不再把账号标记为「需重新登录」（误判修复）。** 两条标记路径都过于激进：run 失败路径会匹配任何包含 `/auth/i` 的报错（比如 `oauth2.googleapis.com … i/o timeout` 这种纯传输噪音）；token 刷新路径会把**任何** `token endpoint 400` 都当成认证死亡——包括代理/门户返回的错误页。现在两条路径都要求出现权威的 OAuth 状态（`invalid_grant` / `invalid_client` / `revoked` / `disabled` / `unauthorized_client`），传输型失败一律豁免——即使带 AUTH 分类，只要报错文本是传输形态也不标记。误判的代价不只是吓人的徽标：被标记的账号会被调度器**排除出轮换**，等于静默损失一个账号，直到手动「刷新额度」把它证伪。
+- **新增：被标记的账号后台自动复验。** `markAuthRequired` 现在会记录 `authMarkedAt`；10 分钟后后台轮询会把该账号放进来做一次 token 验证——刷新令牌若仍可用，标记自动清除（以前必须手动点「刷新额度」）；若真的失效则重新盖章。风控代价：每个被标记账号至多每 10 分钟一次 token endpoint 调用。
+- **新增：控制台「当前使用」标识。** 账号卡片现在会显示绿色 ⚡「当前使用」徽标（基于号池调度器的 `activeAccountIds`，按模型族标注），一眼看出 agy 当前正在用哪个账号。四种语言（zh/en/pt-BR/es）均已本地化。
+## 0.4.40 (2026-09-28)
+
+### 中文 (Chinese)
+
+- **修复 #34：工具往返之后任务文本和图片丢失。** dsh-llm 0.1.7 把工具结果提升为 `role: 'tool'`（0.1.x 是 `role: 'user'` + `source.callId`）。`detectContinuation` 与尾部消息提取只认 0.1.x 形态，于是第一次工具往返之后的每一跳都丢掉镜像续跑，拼出空 prompt 或纯 digest（`request carries no user text`，或 agy 反问「接下来做什么」），图片附件也一并丢失。现在两种 schema 都识别（`message.toolCallId` / `source.callId` / 嵌套 `tool-result`），嵌套工具结果文本与图片会一并转发。
+- **修复 #35：续跑提示词必须保住任务。** 旧 `buildDigest` 允许大段工具结果吃掉 8K 预算，把用户的问题截掉。现在最新一条真实用户消息固定保留在 digest 开头；只要尾部只有工具结果，组装出的 prompt 也会重申该任务。「反复读自己日志、没有题目」的死循环不会再出现。
+- **修复 #35：aborted 路径也会落库 conversationId。** 旧逻辑只在 `failure === null` 时写 binding，而工具切断 / 调用方中止 / 超时恰恰是最容易丢 id 的路径——下一跳于是每次都开全新 agy 会话（`conversationID=""`）+ 纯 digest。现在会在 steer 抢占前从 live run 收割 id，并在 abort/timeout/process-exit 时落库（auth / 限流 / 会话失效仍会删除 binding）。
+- **修复 #32：地区资格拒绝给出明确原因。** agy 以 `Eligibility check failed: … not currently available in your location` 退出（例如首尔）。这是 Google 账号/地区限制，不是代理或额度问题。桥接层现在会识别并给出明确的 `AGY_ERROR` 与指引，而不是裸的 `PROCESS_EXIT`。
+
+## 0.4.39 (2026-09-21)
+
+### English
+
+- **Fix (issue #33): DSH session interrupt during long tools (maven / compile).** An ACTIVE agy tool is silent on stdout for many minutes while it builds. The idle watchdog used the normal `timeoutMs` (default 10 min) and killed the healthy run mid-compile. While any tool step is outstanding the idle budget now rises to the print-mode ceiling (≥ 4 h) and restores to `timeoutMs` when the last tool completes (`RunningProcess.noteActivity`).
+- **Fix (issue #33): identical retries no longer preempt a live long tool.** Session ownership is decided after prompt assembly: same prompt + live run → `BUSY` (leave the maven/compile alone); different prompt + live run → steer-preempt; settled run → retry allowed (still honors issue #32).
+
+### 中文 (Chinese)
+
+- **修复 #33：耗时工具（Maven/编译）期间会话被中断。** 工具 ACTIVE 后 agy 在 stdout 上长时间静默是正常的；旧空闲看门狗按 `timeoutMs`（默认 10 分钟）把还在编译的进程杀掉。现在只要存在未完成的工具步骤，空闲预算就抬到 print-mode 上限（≥ 4 小时），工具全部结束后恢复 `timeoutMs`。
+- **修复 #33：同 prompt 重试不再抢占正在跑的长任务。** 会话所有权在 prompt 组装之后判定：同 prompt + live run → `BUSY`（不杀 Maven/编译）；不同 prompt + live run → 作为 steer 抢占；已 settle 的请求仍放行重试（兼容 #32）。
+
 ## 0.4.38 (2026-09-21)
 
 ### English

package/dist/client.js

@@ -48,6 +48,7 @@ window.__ModuleLoader__.load({
 			"status.authRequired": "需重新登录",
 			"status.primary": "主用",
 			"status.proxy": "代理",
+			"status.inUse": "当前使用",
 			"account.add": "添加 Google 账号",
 			"account.aliasDefault": "备用 Google 账号 {number}",
 			"account.defaultAlias": "主账号（系统登录）",
@@ -138,6 +139,7 @@ window.__ModuleLoader__.load({
 			"status.authRequired": "Sign in again required",
 			"status.primary": "Primary",
 			"status.proxy": "Proxy",
+			"status.inUse": "In use",
 			"account.add": "Add Google account",
 			"account.aliasDefault": "Backup Google account {number}",
 			"account.defaultAlias": "Primary account (system sign-in)",
@@ -228,6 +230,7 @@ window.__ModuleLoader__.load({
 			"status.authRequired": "É necessário entrar novamente",
 			"status.primary": "Principal",
 			"status.proxy": "Proxy",
+			"status.inUse": "Em uso",
 			"account.add": "Adicionar conta Google",
 			"account.aliasDefault": "Conta Google reserva {number}",
 			"account.defaultAlias": "Conta principal (login do sistema)",
@@ -318,6 +321,7 @@ window.__ModuleLoader__.load({
 			"status.authRequired": "Debe iniciar sesión de nuevo",
 			"status.primary": "Principal",
 			"status.proxy": "Proxy",
+			"status.inUse": "En uso",
 			"account.add": "Añadir cuenta de Google",
 			"account.aliasDefault": "Cuenta de Google de respaldo {number}",
 			"account.defaultAlias": "Cuenta principal (inicio de sesión del sistema)",
@@ -2725,8 +2729,10 @@ body.dark,
 						color: "var(--agy-text-primary)"
 					} }, brandIcon(FAMILY_BRAND[familyKey], 14), h("span", null, label)), renderLine(t("quota.fiveHour"), pct5h, c5h, w5h.resetText ? w5h.resetText + cdNote : cdNote.replace(/^ · /, "")), renderLine(t("quota.weekly"), pctWeekly, cWeekly, wWeekly.resetText));
 				};
+				const inUseIds = new Set(Object.values(pool?.activeAccountIds ?? {}));
 				const renderedAccountCards = accounts.map((acc) => {
 					const isPrimary = acc.id === pool?.primaryAccountId;
+					const isInUse = inUseIds.has(acc.id);
 					const hasCooldown = Object.entries(acc.cooldowns).some(([, cd]) => cd && cd.cooldownUntil > Date.now());
 					const isAuthRequired = acc.authRequired;
 					const dotColor = !acc.enabled ? "#64748b" : isAuthRequired ? "#ef4444" : hasCooldown ? "#f59e0b" : "#10b981";
@@ -2792,7 +2798,14 @@ body.dark,
 					} }, uiIcon("mail", 11, "var(--agy-badge-email-text)"), acc.email) : null, isPrimary ? h("span", { style: {
 						...S.badgePrimary,
 						gap: "4px"
-					} }, uiIcon("star", 10, "var(--agy-badge-primary-text)"), t("status.primary")) : null, acc.proxyUrl ? h("span", { style: {
+					} }, uiIcon("star", 10, "var(--agy-badge-primary-text)"), t("status.primary")) : null, isInUse ? h("span", { style: {
+						...S.badgeTag,
+						background: "rgba(16, 185, 129, 0.12)",
+						color: "#10b981",
+						borderColor: "rgba(16, 185, 129, 0.45)",
+						gap: "4px",
+						fontWeight: 700
+					} }, uiIcon("zap", 11, "#10b981"), t("status.inUse")) : null, acc.proxyUrl ? h("span", { style: {
 						...S.badgeTag,
 						background: "var(--agy-badge-proxy-bg)",
 						color: "var(--agy-badge-proxy-text)",

package/dist/index.js

@@ -102,9 +102,34 @@ function defaultConfig() {
 		autoFallbackModel: false,
 		logRetentionDays: 7,
 		disableTelemetry: true,
-		quotaPollIntervalMs: 9e5
+		quotaPollIntervalMs: 9e5,
+		proxyUrl: ""
 	};
 }
+/**
+* Authoritative OAuth/token states that genuinely prove a login is dead.
+* A bare 400 (captive portal, proxy error page) or a body without an OAuth
+* error code must NOT flag an account — that used to produce "needs
+* re-login" false positives which a manual quota refresh immediately
+* disproved.
+*/
+function isAuthoritativeAuthError(message) {
+	return /invalid_grant|invalid_client|revoked|disabled|unauthorized_client/i.test(message);
+}
+/** Transient transport failures — never proof that a login is dead. */
+function looksLikeNetworkError(message) {
+	return /dial tcp|fetch failed|econn(?:refused|reset|aborted)|enotfound|ehostunreach|enetunreach|socket hang up|getaddrinfo|bad gateway|service unavailable/i.test(message);
+}
+/**
+* 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.
+*/
+function shouldMarkAuthRequired(code, message) {
+	if (looksLikeNetworkError(message)) return false;
+	if (code === "AUTH") return true;
+	return isAuthoritativeAuthError(message);
+}
 const Err = {
 	AUTH: "AUTH",
 	AGY_NOT_INSTALLED: "AGY_NOT_INSTALLED",
@@ -121,6 +146,16 @@ const Err = {
 function looksLikeAuthFailure(text) {
 	return /authentication required|authentication failed|please sign in|not signed in|timed out waiting for authentication/i.test(text);
 }
+/**
+* Google-side account/region eligibility refusals (issue #32). agy exits 1
+* with "Eligibility check failed: … not currently available in your
+* location" — not an auth bug and not something the bridge can retry past.
+*/
+function looksLikeEligibilityFailure(text) {
+	return /eligibility check failed|not eligible for antigravity|not currently available in your (?:location|country|region)|not available in your (?:location|country|region)/i.test(text);
+}
+/** One-line guidance for an eligibility refusal (shown in the turn error). */
+const ELIGIBILITY_ERROR_HINT = "Google Antigravity is not eligible for this account/region. Use an account and network location where Antigravity is available (see https://antigravity.google).";
 function extractAuthUrl(text) {
 	const m = text.match(/https:\/\/accounts\.google\.com\/\S+/);
 	if (!m) return void 0;
@@ -254,7 +289,8 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 		autoFallbackModel: asBool(get("autoFallbackModel")) ?? base.autoFallbackModel,
 		logRetentionDays: asNum(get("logRetentionDays")) ?? base.logRetentionDays,
 		disableTelemetry: asBool(get("disableTelemetry")) ?? base.disableTelemetry,
-		quotaPollIntervalMs: asNum(get("quotaPollIntervalMs")) ?? base.quotaPollIntervalMs
+		quotaPollIntervalMs: asNum(get("quotaPollIntervalMs")) ?? base.quotaPollIntervalMs,
+		proxyUrl: asString(get("proxyUrl")) ?? base.proxyUrl
 	};
 	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;
@@ -304,6 +340,7 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 		const q = asNum(env.DSH_AGY_QUOTA_POLL_INTERVAL_MS);
 		if (q && q >= 6e4) cfg.quotaPollIntervalMs = q;
 	}
+	if (env.DSH_AGY_PROXY_URL) cfg.proxyUrl = env.DSH_AGY_PROXY_URL;
 	return cfg;
 }
 //#endregion
@@ -331,6 +368,23 @@ function shouldPollAccount(account) {
 	for (const cd of Object.values(account.cooldowns)) if (cd && cd.cooldownUntil > now) return false;
 	return true;
 }
+/**
+* After this long, an authRequired flag becomes eligible for ONE background
+* re-verification per poll cycle: a single transient failure used to
+* quarantine an account until a manual quota refresh cleared it.
+*/
+const AUTH_REVERIFY_DELAY_MS = 6e5;
+/**
+* A flagged account whose flag is old enough (or whose flag predates the
+* authMarkedAt bookkeeping) may be re-verified in the background. If the
+* stored token still works the flag clears itself; if not, the flag is
+* simply re-stamped.
+*/
+function needsAuthReverify(account, now = Date.now()) {
+	if (!account.authRequired) return false;
+	if (typeof account.authMarkedAt !== "number") return true;
+	return now - account.authMarkedAt > AUTH_REVERIFY_DELAY_MS;
+}
 function defaultPoolData() {
 	return {
 		version: 1,
@@ -1978,6 +2032,64 @@ function isolatedHomeEnv(dir) {
 	}
 	return env;
 }
+/**
+* Standard proxy env block for one proxy URL. agy is a Go binary and only
+* honors HTTP(S)_PROXY / ALL_PROXY; GUI hosts don't inherit shell proxy
+* env, so the plugin injects this explicitly (global config or per-account).
+* Exported for tests.
+*/
+function proxyEnvFor(proxyUrl) {
+	const url = proxyUrl?.trim();
+	if (!url) return {};
+	return {
+		ALL_PROXY: url,
+		HTTPS_PROXY: url,
+		HTTP_PROXY: url,
+		all_proxy: url,
+		https_proxy: url,
+		http_proxy: url
+	};
+}
+/**
+* macOS: an isolated HOME has no login keychain, so the first keyring write
+* makes the Security framework pop the "create login keychain" password
+* dialog (right system.keychain.create.loginkc) on every token refresh.
+* Provisioning a throwaway per-account keychain and making it the default
+* under that HOME keeps keyring writes silent and fully per-account.
+* No-op on other platforms or when already provisioned. Never throws.
+* Exported for tests.
+*/
+function ensureIsolatedKeychain(dir, platform = process.platform, run = (file, args, env) => execFileSync(file, args, {
+	stdio: "ignore",
+	env,
+	timeout: 1e4
+})) {
+	if (platform !== "darwin") return false;
+	if (dir === "") return false;
+	const kc = join(dir, "Library", "Keychains", "login.keychain-db");
+	if (existsSync(kc)) return false;
+	try {
+		mkdirSync(join(dir, "Library", "Keychains"), { recursive: true });
+		const env = {
+			...process.env,
+			HOME: dir
+		};
+		run("security", [
+			"create-keychain",
+			"-p",
+			randomBytes(18).toString("base64url"),
+			kc
+		], env);
+		run("security", [
+			"default-keychain",
+			"-s",
+			kc
+		], env);
+		return true;
+	} catch {
+		return false;
+	}
+}
 function resolveAgyBin(cfg) {
 	const candidates = [];
 	if (cfg.agyBin !== "") candidates.push(cfg.agyBin);
@@ -2091,6 +2203,7 @@ function withAgyQuietEnv(env = process.env) {
 		AGY_CLI_INTERACTIVE_HEADLESS: env.AGY_CLI_INTERACTIVE_HEADLESS ?? "1"
 	};
 }
+const escalating = /* @__PURE__ */ new WeakSet();
 function killTree(child) {
 	if (child.pid === void 0) return;
 	if (IS_WIN) {
@@ -2117,7 +2230,24 @@ function killTree(child) {
 		try {
 			child.kill("SIGTERM");
 		} catch {}
+		return;
 	}
+	if (escalating.has(child)) return;
+	escalating.add(child);
+	const pid = child.pid;
+	const escalate = setTimeout(() => {
+		try {
+			process.kill(-pid, "SIGKILL");
+		} catch {}
+		try {
+			child.kill("SIGKILL");
+		} catch {}
+	}, 3e3);
+	escalate.unref?.();
+	child.once("exit", () => {
+		clearTimeout(escalate);
+		escalating.delete(child);
+	});
 }
 function startAgyProcess(opts) {
 	const started = Date.now();
@@ -2162,13 +2292,14 @@ function startAgyProcess(opts) {
 		child.stdin?.end();
 	} catch {}
 	let watchdog = null;
+	let idleBudgetMs = opts.timeoutMs;
 	const refreshWatchdog = () => {
-		if (!opts.timeoutMs || opts.timeoutMs <= 0 || settled) return;
+		if (!idleBudgetMs || idleBudgetMs <= 0 || settled) return;
 		if (watchdog) clearTimeout(watchdog);
 		watchdog = setTimeout(() => {
 			timedOut = true;
 			killTree(child);
-		}, opts.timeoutMs);
+		}, idleBudgetMs);
 	};
 	refreshWatchdog();
 	const onAbort = () => {
@@ -2192,7 +2323,7 @@ function startAgyProcess(opts) {
 		}
 	});
 	child.stderr?.on("data", (chunk) => {
-		refreshWatchdog();
+		if (opts.stderrKeepalive) refreshWatchdog();
 		stderr = (stderr + chunk).slice(-4096);
 	});
 	return {
@@ -2223,6 +2354,10 @@ function startAgyProcess(opts) {
 				finish(null, null);
 			});
 		}),
+		noteActivity: (budgetMs) => {
+			if (budgetMs !== void 0) idleBudgetMs = budgetMs;
+			refreshWatchdog();
+		},
 		kill: (reason) => {
 			if (reason === "timeout") timedOut = true;
 			else aborted = true;
@@ -2668,9 +2803,48 @@ async function readStepThoughts(conversationId, stepIndex, accountHome) {
 }
 //#endregion
 //#region src/host/adapter.ts
+/**
+* True for a tool-result message across dsh-llm schema revisions.
+*
+* 0.1.x: `role: 'user'` + `source: { kind: 'tool', callId }` and a sole
+* `tool-result` content block. 0.1.7+ promotes tool results to
+* `role: 'tool'` with `toolCallId` on the message itself. A call that only
+* looks at `role === 'user'` drops the whole trailing span after the first
+* tool round-trip (issues #34 / #35).
+*/
+function isToolResultMessage(m) {
+	if (m.role === "tool") return true;
+	if (m.source?.kind === "tool") return true;
+	const content = m.content;
+	return Array.isArray(content) && content.length > 0 && content.every((b) => b?.type === "tool-result");
+}
+/**
+* Correlation id of a tool-result message. Accepts `message.toolCallId`
+* (0.1.7+), `source.callId` (0.1.x), and nested `tool-result` blocks.
+*/
+function toolCallIdOf(m) {
+	const direct = m.toolCallId;
+	if (typeof direct === "string" && direct !== "") return direct;
+	const src = m.source;
+	if (typeof src?.callId === "string" && src.callId !== "") return src.callId;
+	for (const raw of m.content ?? []) {
+		const b = raw;
+		if (b?.type === "tool-result" && typeof b.toolCallId === "string" && b.toolCallId !== "") return b.toolCallId;
+	}
+	return null;
+}
+/** Flatten visible text, including nested tool-result payloads. */
 function textOf(m) {
 	const parts = [];
-	for (const b of m.content) if (b.type === "text") parts.push(b.text);
+	const walk = (blocks) => {
+		for (const raw of blocks ?? []) {
+			const b = raw;
+			if (b === void 0) continue;
+			if (b.type === "text" && typeof b.text === "string") parts.push(b.text);
+			else if (b.type === "tool-result" && Array.isArray(b.content)) walk(b.content);
+		}
+	};
+	walk(m.content);
 	return parts.filter((s) => s !== "").join("\n");
 }
 function isForeignAssistant(m) {
@@ -2678,25 +2852,82 @@ function isForeignAssistant(m) {
 	const src = m.source;
 	return !src || src.provider !== "antigravity";
 }
-/** Rolling digest of turns this agy conversation has not seen (ADR-7). */
+/**
+* Latest real human turn (not a tool result, not assistant). This is the
+* live task; a digest or tool-result-only trailing span must never drop it
+* (issue #35: "续跑提示词里没有任务").
+*/
+function latestUserTaskText(messages) {
+	for (let i = messages.length - 1; i >= 0; i--) {
+		const m = messages[i];
+		if (m === void 0 || m.role === "system" || m.role === "assistant") continue;
+		if (isToolResultMessage(m)) continue;
+		const text = textOf(m);
+		if (text !== "") return text;
+	}
+	return "";
+}
+/** Collect image refs from a message, walking nested tool-result payloads. */
+function collectImageRefs(m, out) {
+	const walk = (blocks) => {
+		for (const raw of blocks ?? []) {
+			const b = raw;
+			if (b === void 0) continue;
+			if (b.type === "image") {
+				if (b.attachment && typeof b.attachment === "object") out.push(b.attachment);
+				else if (typeof b.attachmentId === "string") out.push(b);
+			} else if (b.type === "tool-result" && Array.isArray(b.content)) walk(b.content);
+		}
+	};
+	walk(m.content);
+}
+function digestLabel(m) {
+	if (isToolResultMessage(m)) return "Tool result: ";
+	return m.role === "user" ? "User: " : "Assistant: ";
+}
+/**
+* Rolling digest of turns this agy conversation has not seen (ADR-7).
+*
+* Budget policy (issue #35): the latest real user task is reserved first so
+* a wall of tool-result text can never truncate the question away. Remaining
+* budget is filled from the newest other turns.
+*/
 function buildDigest(messages, fromIdx, maxChars) {
-	const parts = [];
-	let budget = maxChars;
-	for (let i = messages.length - 1; i >= fromIdx; i--) {
+	const taskText = latestUserTaskText(messages.slice(fromIdx));
+	const taskLine = taskText !== "" ? "User: " + taskText : "";
+	const otherLines = [];
+	for (let i = fromIdx; i < messages.length; i++) {
 		const m = messages[i];
 		if (m === void 0 || m.role === "system") continue;
 		const text = textOf(m);
 		if (text === "") continue;
-		const line = (m.role === "user" ? "User: " : "Assistant: ") + text;
+		if (taskLine !== "" && !isToolResultMessage(m) && m.role === "user" && text === taskText) continue;
+		otherLines.push(digestLabel(m) + text);
+	}
+	let budget = maxChars;
+	const kept = [];
+	if (taskLine !== "") {
+		if (taskLine.length > budget) {
+			kept.push(taskLine.slice(0, Math.max(0, budget)));
+			budget = 0;
+		} else {
+			kept.push(taskLine);
+			budget -= taskLine.length;
+		}
+	}
+	const keptOther = [];
+	for (let i = otherLines.length - 1; i >= 0 && budget > 0; i--) {
+		const line = otherLines[i];
 		if (line.length > budget) {
-			parts.unshift(line.slice(0, Math.max(0, budget)));
+			keptOther.unshift(line.slice(0, Math.max(0, budget)));
 			break;
 		}
+		keptOther.unshift(line);
 		budget -= line.length;
-		parts.unshift(line);
 	}
-	if (parts.length === 0) return "";
-	return "[conversation so far]\n" + parts.join("\n\n") + "\n[end of conversation so far]\n\n";
+	kept.push(...keptOther);
+	if (kept.length === 0) return "";
+	return "[conversation so far]\n" + kept.join("\n\n") + "\n[end of conversation so far]\n\n";
 }
 var ChunkQueue = class {
 	chunks = [];
@@ -2937,14 +3168,6 @@ var AgyAdapter = class extends LlmAdapter {
 			yield* this.driveSpan(rec, continuation.eventIndex + 1, true, isCodeMode);
 			return;
 		}
-		let sessionPreempted = false;
-		if (!isAux && sessionKey !== "") {
-			const prev = this.activeRuns.get(sessionKey);
-			if (prev !== void 0 && !prev.isSettled) {
-				prev.requestAbort?.();
-				sessionPreempted = true;
-			}
-		}
 		const catalog = this.deps.catalog.get();
 		const rawModel = options.model;
 		const model = resolveModelSlug(rawModel);
@@ -2969,7 +3192,10 @@ var AgyAdapter = class extends LlmAdapter {
 				break;
 			}
 		}
-		const trailingUser = messages.slice(lastAssistantIdx + 1).filter((m) => m.role === "user");
+		const trailingUser = messages.slice(lastAssistantIdx + 1).filter((m) => {
+			const role = m.role;
+			return role === "user" || role === "tool";
+		});
 		if (!isAux && cfg.rateLimitPerMinute > 0) {
 			const now = Date.now();
 			const windowStart = now - 6e4;
@@ -3002,6 +3228,16 @@ var AgyAdapter = class extends LlmAdapter {
 		}
 		const sessionAccountKey = account ? `${sessionKey}:${account.id}` : sessionKey;
 		let binding = sessionAccountKey !== "" ? this.deps.store.get(sessionAccountKey) : void 0;
+		if (binding === void 0 && !isAux && sessionKey !== "") {
+			const live = this.activeRuns.get(sessionKey);
+			const liveCid = live !== void 0 && !live.isSettled ? live.conversationId : null;
+			if (liveCid) binding = {
+				conversationId: liveCid,
+				lastMessageCount: Math.max(0, lastAssistantIdx + 1),
+				updatedAt: Date.now(),
+				model: activeModel === "" ? cfg.defaultModel : activeModel
+			};
+		}
 		const currentModel = activeModel === "" ? cfg.defaultModel : activeModel;
 		if (!isAux && binding !== void 0 && binding.model && binding.model !== currentModel) {
 			if (sessionAccountKey !== "") this.deps.store.delete(sessionAccountKey);
@@ -3026,7 +3262,11 @@ var AgyAdapter = class extends LlmAdapter {
 			}
 			prompt = "[summarize this conversation for context compaction]\n\n" + parts.join("\n\n") + "\n\nProduce a compact summary that preserves decisions, file paths, and open tasks.";
 		} else {
-			prompt = trailingUser.map(textOf).filter((s) => s !== "").join("\n\n");
+			const trailingText = trailingUser.map(textOf).filter((s) => s !== "");
+			const taskText = latestUserTaskText(messages);
+			const trailingJoined = trailingText.join("\n\n");
+			if (taskText !== "") prompt = trailingText.includes(taskText) || trailingJoined.includes(taskText) ? trailingJoined : trailingJoined === "" ? taskText : taskText + "\n\n" + trailingJoined;
+			else prompt = trailingJoined;
 			if (binding === void 0 && lastAssistantIdx >= 0) prompt = buildDigest(messages, 0, cfg.digestMaxChars) + prompt;
 			else if (binding !== void 0) {
 				const from = Math.min(binding.lastMessageCount, messages.length);
@@ -3039,12 +3279,10 @@ var AgyAdapter = class extends LlmAdapter {
 		let stagedDirs = [];
 		if (!isAux) {
 			const imageRefs = [];
-			for (const m of trailingUser) for (const b of m.content ?? []) {
-				const blk = b;
-				if (blk && blk.type === "image") {
-					if (blk.attachment && typeof blk.attachment === "object") imageRefs.push(blk.attachment);
-					else if (typeof blk.attachmentId === "string") imageRefs.push(blk);
-				}
+			for (const m of trailingUser) collectImageRefs(m, imageRefs);
+			if (imageRefs.length === 0) for (const m of messages) {
+				if (m.role !== "user" || isToolResultMessage(m)) continue;
+				collectImageRefs(m, imageRefs);
 			}
 			if (imageRefs.length > 0 && this.deps.readImage) {
 				const dir = cfg.mediaDir !== "" ? cfg.mediaDir : defaultMediaDir(stateDir());
@@ -3069,9 +3307,18 @@ var AgyAdapter = class extends LlmAdapter {
 			const prevPrompt = this.activeSessionPrompts.get(sessionKey);
 			const liveRun = this.activeRuns.get(sessionKey);
 			const runLive = liveRun !== void 0 && !liveRun.isSettled;
-			if (!sessionPreempted && prevPrompt !== void 0 && prevPrompt.prompt === prompt) {
-				if (runLive) throw new LlmError("Duplicate request ignored: an identical request is already running for this session.", Err.BUSY);
-				if (prevPrompt.inFlight && liveRun === void 0 && now - prevPrompt.startedAt < 2e3) throw new LlmError("Duplicate request ignored: an identical request is already running for this session.", Err.BUSY);
+			const samePrompt = prevPrompt !== void 0 && prevPrompt.prompt === prompt;
+			if (runLive && samePrompt) throw new LlmError("Duplicate request ignored: an identical request is already running for this session.", Err.BUSY);
+			if (samePrompt && prevPrompt !== void 0 && prevPrompt.inFlight && liveRun === void 0 && now - prevPrompt.startedAt < 2e3) throw new LlmError("Duplicate request ignored: an identical request is already running for this session.", Err.BUSY);
+			if (runLive && !samePrompt) {
+				const liveCid = liveRun.conversationId;
+				if (liveCid !== null && binding === void 0 && !isAux && sessionAccountKey !== "") binding = {
+					conversationId: liveCid,
+					lastMessageCount: Math.max(0, lastAssistantIdx + 1),
+					updatedAt: Date.now(),
+					model: currentModel
+				};
+				liveRun.requestAbort?.();
 			}
 			this.activeSessionPrompts.set(sessionKey, {
 				prompt,
@@ -3085,6 +3332,13 @@ var AgyAdapter = class extends LlmAdapter {
 		const parser = new StreamJsonParser();
 		this.deps.onParser?.(parser);
 		let streamCid = null;
+		const openToolKeys = /* @__PURE__ */ new Set();
+		const printTimeoutMinutes = Math.max(240, Math.ceil(cfg.timeoutMs / 6e4));
+		const longToolIdleMs = printTimeoutMinutes * 6e4;
+		let runningProc = null;
+		const applyToolIdleBudget = () => {
+			runningProc?.noteActivity(openToolKeys.size > 0 ? longToolIdleMs : cfg.timeoutMs);
+		};
 		const activeModelForArgs = activeModel === "" ? cfg.defaultModel : activeModel;
 		const effectiveAddDirs = workspaceRoot !== "" ? stagedDirs.includes(workspaceRoot) ? stagedDirs : [workspaceRoot, ...stagedDirs] : stagedDirs;
 		const argsBase = this.buildArgs({
@@ -3094,7 +3348,7 @@ var AgyAdapter = class extends LlmAdapter {
 			conversationId: !isAux && binding !== void 0 ? binding.conversationId : void 0,
 			permissionMode: isAux ? "plan" : cfg.permissionMode,
 			timeoutMs: cfg.timeoutMs,
-			printTimeoutMinutes: Math.max(240, Math.ceil(cfg.timeoutMs / 6e4)),
+			printTimeoutMinutes,
 			extraArgs: cfg.extraArgs,
 			addDirs: effectiveAddDirs
 		});
@@ -3106,7 +3360,7 @@ var AgyAdapter = class extends LlmAdapter {
 			conversationId: !isAux && binding !== void 0 ? binding.conversationId : void 0,
 			permissionMode: isAux ? "plan" : cfg.permissionMode,
 			timeoutMs: cfg.timeoutMs,
-			printTimeoutMinutes: Math.max(240, Math.ceil(cfg.timeoutMs / 6e4)),
+			printTimeoutMinutes,
 			extraArgs: cfg.extraArgs,
 			addDirs: effectiveAddDirs,
 			promptViaStdin: true
@@ -3119,6 +3373,7 @@ var AgyAdapter = class extends LlmAdapter {
 			released = true;
 			release();
 		};
+		if (account && account.dir) ensureIsolatedKeychain(account.dir);
 		const env = {
 			...process.env,
 			...cfg.disableTelemetry ? {
@@ -3128,14 +3383,7 @@ var AgyAdapter = class extends LlmAdapter {
 				ANTIGRAVITY_DISABLE_TELEMETRY: "1"
 			} : {},
 			...account && account.dir ? isolatedHomeEnv(account.dir) : {},
-			...account?.proxyUrl ? {
-				ALL_PROXY: account.proxyUrl,
-				HTTPS_PROXY: account.proxyUrl,
-				HTTP_PROXY: account.proxyUrl,
-				all_proxy: account.proxyUrl,
-				https_proxy: account.proxyUrl,
-				http_proxy: account.proxyUrl
-			} : {}
+			...proxyEnvFor(account?.proxyUrl || cfg.proxyUrl || void 0)
 		};
 		if (account) {
 			const lastSpawn = this.lastAccountSpawnTime.get(account.id) ?? 0;
@@ -3159,10 +3407,20 @@ var AgyAdapter = class extends LlmAdapter {
 					for (const ev of parser.feed(line + "\n")) {
 						if (ev.kind === "init" && ev.conversationId) streamCid = ev.conversationId;
 						if (ev.kind === "result" && ev.conversationId !== "") streamCid = ev.conversationId;
+						if (ev.kind === "step" && ev.stepKind === "tool" && ev.tool) {
+							if (!(ev.state === "DONE" || ev.state === "ERROR" || ev.state === void 0 && (ev.tool.output !== void 0 || ev.tool.error !== void 0))) {
+								if (!openToolKeys.has(ev.stepKey)) {
+									openToolKeys.add(ev.stepKey);
+									applyToolIdleBudget();
+								}
+							} else if (openToolKeys.delete(ev.stepKey)) applyToolIdleBudget();
+						}
 						rec.append(ev);
 					}
 				}
 			});
+			runningProc = proc;
+			applyToolIdleBudget();
 			if (!isAux && sessionKey !== "") {
 				rec.requestAbort = () => proc.kill("abort");
 				this.activeRuns.set(sessionKey, rec);
@@ -3193,12 +3451,14 @@ var AgyAdapter = class extends LlmAdapter {
 				code: "ABORTED",
 				message: "agy run aborted by caller"
 			};
-			else if (outcome.timedOut) failure = {
-				kind: "error",
-				code: Err.TIMEOUT,
-				message: "agy run was idle for " + cfg.timeoutMs + "ms without output"
-			};
-			else if (sawAuthFailure(parser, outcome)) failure = {
+			else if (outcome.timedOut) {
+				const neverSpoke = outcome.stdout.trim() === "";
+				failure = {
+					kind: "error",
+					code: Err.TIMEOUT,
+					message: "agy run was idle for " + cfg.timeoutMs + "ms without output" + (neverSpoke ? " — agy never emitted a single event; it is likely unable to reach Google (check proxy/network). 无法连接 Google，请检查代理或网络配置" : "")
+				};
+			} else if (sawAuthFailure(parser, outcome)) failure = {
 				kind: "error",
 				code: Err.AUTH,
 				message: "agy is not signed in — run /agy auth (or run agy once in a terminal) to login"
@@ -3210,6 +3470,13 @@ var AgyAdapter = class extends LlmAdapter {
 					code: Err.AGY_ERROR,
 					message: "Google Antigravity quota / rate limit reached: " + bestMsg
 				};
+			} else if (looksLikeEligibilityFailure(rawErrText) || looksLikeEligibilityFailure(parser.stats.lastResultError ?? "")) {
+				const detail = parser.stats.lastResultError ?? (outcome.stderrTail !== "" ? brief(outcome.stderrTail) : "");
+				failure = {
+					kind: "error",
+					code: Err.AGY_ERROR,
+					message: ELIGIBILITY_ERROR_HINT + (detail !== "" ? " (" + detail + ")" : "")
+				};
 			} else if (!consumable) {
 				if (outcome.code !== 0) {
 					const detail = parser.stats.lastResultError ?? (outcome.stderrTail !== "" ? brief(outcome.stderrTail) : "");
@@ -3244,9 +3511,17 @@ var AgyAdapter = class extends LlmAdapter {
 			} else {
 				const effectiveRateLimit = isRateLimit || looksLikeRateLimit(failure.message);
 				if (account && looksLikeHardRateLimit(rawErrText)) this.deps.pool?.recordFailure(account.id, family, failure.message);
-				if (account && (failure.code === Err.AUTH || /invalid_grant|not signed in|auth/i.test(failure.message))) this.deps.pool?.markAuthRequired(account.id, failure.message);
-				if (!isAux && sessionAccountKey !== "") {
-					if (failure.code === Err.AUTH || effectiveRateLimit || failure.message && /conversation.*(not found|invalid|not recognized|expired|does not exist)|session.*(expired|invalid)/i.test(failure.message)) this.deps.store.delete(sessionAccountKey);
+				if (account && shouldMarkAuthRequired(failure.code, failure.message)) this.deps.pool?.markAuthRequired(account.id, failure.message);
+				const staleConversation = failure.code === Err.AUTH || effectiveRateLimit || failure.message && /conversation.*(not found|invalid|not recognized|expired|does not exist)|session.*(expired|invalid)/i.test(failure.message);
+				if (!isAux && sessionAccountKey !== "" && staleConversation) this.deps.store.delete(sessionAccountKey);
+				else if (!isAux && sessionAccountKey !== "" && !staleConversation) {
+					const finalId = binding !== void 0 ? binding.conversationId : conversationId;
+					if (finalId) this.deps.store.set(sessionAccountKey, {
+						conversationId: finalId,
+						lastMessageCount: messages.length,
+						updatedAt: Date.now(),
+						model: activeModel
+					});
 				}
 			}
 			this.deps.onRun?.({
@@ -3364,6 +3639,11 @@ var AgyAdapter = class extends LlmAdapter {
 * Detect a continuation span: the request's LAST message is the tool result
 * of one of our mirrored agy tool calls. Its callId encodes the recording
 * run and the event index to resume after.
+*
+* Accepts both dsh-llm tool-result shapes: `role: 'user'` + `source.callId`
+* (0.1.x) and `role: 'tool'` + `message.toolCallId` (0.1.7+). Rejecting the
+* latter made every post-tool hop spawn a fresh agy process with a
+* digest-only prompt (issues #34 / #35).
 */
 function detectContinuation(messages) {
 	let i = messages.length - 1;
@@ -3373,10 +3653,13 @@ function detectContinuation(messages) {
 		i--;
 	}
 	const last = messages[i];
-	if (last === void 0 || last.role !== "user") return null;
-	const src = last.source;
-	if (src === void 0 || src.kind !== "tool" || typeof src.callId !== "string") return null;
-	return parseMirrorCallId(src.callId);
+	if (last === void 0) return null;
+	const role = last.role;
+	if (role !== "user" && role !== "tool") return null;
+	if (!isToolResultMessage(last)) return null;
+	const callId = toolCallIdOf(last);
+	if (callId === null) return null;
+	return parseMirrorCallId(callId);
 }
 //#endregion
 //#region src/host/oneshot.ts
@@ -27450,6 +27733,7 @@ var AuthHelper = class {
 		if (!bin) return null;
 		this.cancel();
 		this.capturedUrl = null;
+		if (homeDir) ensureIsolatedKeychain(homeDir);
 		const proc = startAgyProcess({
 			bin,
 			args: [
@@ -27462,17 +27746,11 @@ var AuthHelper = class {
 			],
 			timeoutMs: 3e5,
 			keepStdin: true,
+			stderrKeepalive: true,
 			env: {
 				...process.env,
 				...homeDir ? isolatedHomeEnv(homeDir) : {},
-				...proxyUrl ? {
-					ALL_PROXY: proxyUrl,
-					HTTPS_PROXY: proxyUrl,
-					HTTP_PROXY: proxyUrl,
-					all_proxy: proxyUrl,
-					https_proxy: proxyUrl,
-					http_proxy: proxyUrl
-				} : {}
+				...proxyEnvFor(proxyUrl)
 			},
 			onLine: (line) => {
 				if (this.capturedUrl) return;
@@ -27693,7 +27971,7 @@ async function handle(deps, raw) {
 					const sec = Math.ceil((cd.cooldownUntil - Date.now()) / 1e3);
 					cds.push(`${fam} cooldown: ${sec}s left (${cd.reason})`);
 				}
-				lines.push(`${i + 1}. **${a.alias}** (${a.email || a.id})${isPrimary ? " ⭐ primary" : ""}`, `   - Proxy: ${a.proxyUrl || "system default"}`, `   - Quota: Gemini ${qG} | Claude ${qC} | GPT-OSS ${qO}`, cds.length > 0 ? `   - ⚠️ ${cds.join("; ")}` : "   - Status: 🟢 Ready");
+				lines.push(`${i + 1}. **${a.alias}** (${a.email || a.id})${isPrimary ? " ⭐ primary" : ""}`, `   - Proxy: ${a.proxyUrl || deps.cfg().proxyUrl || "system default"}`, `   - Quota: Gemini ${qG} | Claude ${qC} | GPT-OSS ${qO}`, cds.length > 0 ? `   - ⚠️ ${cds.join("; ")}` : "   - Status: 🟢 Ready");
 			}
 			return ok(lines.join("\n"));
 		}
@@ -28187,6 +28465,7 @@ var AccountPoolManager = class {
 		const acc = this.getAccount(id);
 		if (!acc) return;
 		acc.authRequired = true;
+		acc.authMarkedAt = Date.now();
 		acc.authError = reason || "Authentication expired or revoked (invalid_grant)";
 		if (this.data.activeAccountIds) {
 			for (const [fam, accId] of Object.entries(this.data.activeAccountIds)) if (accId === id) delete this.data.activeAccountIds[fam];
@@ -28207,6 +28486,7 @@ var AccountPoolManager = class {
 		acc.quotas = {};
 		delete acc.authRequired;
 		delete acc.authError;
+		delete acc.authMarkedAt;
 		this.persist();
 	}
 	clearAuthRequired(id) {
@@ -28214,6 +28494,7 @@ var AccountPoolManager = class {
 		if (!acc) return;
 		delete acc.authRequired;
 		delete acc.authError;
+		delete acc.authMarkedAt;
 		this.persist();
 	}
 	setPrimaryAccount(id) {
@@ -28291,6 +28572,7 @@ var AccountPoolManager = class {
 		if (acc.authRequired) {
 			delete acc.authRequired;
 			delete acc.authError;
+			delete acc.authMarkedAt;
 		}
 		if (acc.cooldowns[family]) delete acc.cooldowns[family];
 		this.persist();
@@ -28820,9 +29102,19 @@ function readWindowsCredentialToken() {
 }
 var QuotaService = class {
 	pool;
+	globalProxy;
 	preferredEndpointIndex = 0;
-	constructor(pool) {
+	/**
+	* @param globalProxy resolves the plugin-wide proxy URL; used when the
+	* account has no dedicated proxyUrl. Injected so tests stay network-free.
+	*/
+	constructor(pool, globalProxy = () => "") {
 		this.pool = pool;
+		this.globalProxy = globalProxy;
+	}
+	/** Dedicated account proxy wins, then the global config proxy. */
+	proxyFor(account) {
+		return account.proxyUrl || this.globalProxy() || void 0;
 	}
 	getTokenFilePath(account) {
 		const home = account.systemHome || !account.dir ? homedir() : account.dir;
@@ -28899,7 +29191,7 @@ var QuotaService = class {
 		if (!tok) return null;
 		if (tok.accessToken && (!tok.expiryMs || tok.expiryMs > Date.now() + 6e4)) return tok.accessToken;
 		if (tok.refreshToken) try {
-			const refreshed = await refreshTokens(tok.refreshToken, account.proxyUrl);
+			const refreshed = await refreshTokens(tok.refreshToken, this.proxyFor(account));
 			if (refreshed?.access_token) {
 				this.persistRefreshedToken(account, {
 					access_token: refreshed.access_token,
@@ -28910,7 +29202,7 @@ var QuotaService = class {
 			}
 		} catch (err) {
 			const errMsg = String(err);
-			if (/invalid_grant|revoked|disabled|unauthorized_client|token endpoint 400/i.test(errMsg)) this.pool.markAuthRequired(account.id, errMsg);
+			if (shouldMarkAuthRequired(void 0, errMsg)) this.pool.markAuthRequired(account.id, errMsg);
 		}
 		return tok.accessToken || null;
 	}
@@ -29006,13 +29298,13 @@ var QuotaService = class {
 		const accessToken = await this.getValidAccessToken(account);
 		if (!accessToken) return null;
 		if (force) {
-			const info = await this.fetchUserInfo(accessToken, account.proxyUrl);
+			const info = await this.fetchUserInfo(accessToken, this.proxyFor(account));
 			if (info?.email) email = info.email;
 		}
 		if (email && email !== account.email) this.pool.resetAccountIdentity(account.id, email);
-		const [summary, discovered] = await Promise.all([this.fetchQuotaSummary(accessToken, account.proxyUrl), this.fetchAvailableModels(accessToken, account.proxyUrl)]);
+		const [summary, discovered] = await Promise.all([this.fetchQuotaSummary(accessToken, this.proxyFor(account)), this.fetchAvailableModels(accessToken, this.proxyFor(account))]);
 		if (!email) {
-			const info = await this.fetchUserInfo(accessToken, account.proxyUrl);
+			const info = await this.fetchUserInfo(accessToken, this.proxyFor(account));
 			if (info?.email) email = info.email;
 		}
 		if (!summary && (!discovered || !discovered.models)) return null;
@@ -29106,7 +29398,7 @@ var QuotaService = class {
 				const detected = detectEmailFromAgyLogs(acc.systemHome || !acc.dir ? homedir() : acc.dir);
 				if (detected && detected !== acc.email) this.pool.resetAccountIdentity(acc.id, detected);
 			}
-			accounts = accounts.filter(shouldPollAccount);
+			accounts = accounts.filter((acc) => shouldPollAccount(acc) || needsAuthReverify(acc));
 		}
 		await Promise.allSettled(accounts.map((acc) => this.refreshAccountQuota(acc, force)));
 	}
@@ -29347,7 +29639,7 @@ function apply(ctx, entryConfig = {}) {
 	const version = () => versionCache;
 	const store = new SessionStore(join(stateDir(), "sessions.json"));
 	const pool = new AccountPoolManager();
-	const quota = new QuotaService(pool);
+	const quota = new QuotaService(pool, () => getConfig().proxyUrl);
 	const semaphore = new Semaphore(() => getConfig().maxConcurrent);
 	const getDiscoveryEnv = (account) => {
 		const cfg = getConfig();
@@ -29360,14 +29652,7 @@ function apply(ctx, entryConfig = {}) {
 				ANTIGRAVITY_DISABLE_TELEMETRY: "1"
 			} : {},
 			...account && account.dir ? isolatedHomeEnv(account.dir) : {},
-			...account?.proxyUrl ? {
-				ALL_PROXY: account.proxyUrl,
-				HTTPS_PROXY: account.proxyUrl,
-				HTTP_PROXY: account.proxyUrl,
-				all_proxy: account.proxyUrl,
-				https_proxy: account.proxyUrl,
-				http_proxy: account.proxyUrl
-			} : {}
+			...proxyEnvFor(account?.proxyUrl || cfg.proxyUrl || void 0)
 		};
 	};
 	const catalog = new ModelCatalog(async (signal) => {
@@ -29397,6 +29682,9 @@ 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)");
+	let kcProvisioned = 0;
+	for (const acc of pool.getAccounts()) if (acc.dir && ensureIsolatedKeychain(acc.dir)) kcProvisioned++;
+	if (kcProvisioned > 0) log("provisioned isolated keychains for " + kcProvisioned + " pool account(s)");
 	const adapter = new AgyAdapter({
 		getConfig,
 		catalog,
@@ -29617,7 +29905,8 @@ function apply(ctx, entryConfig = {}) {
 					const body = await readBody(req);
 					const homeDir = typeof body.homeDir === "string" ? body.homeDir : void 0;
 					const accountId = typeof body.accountId === "string" ? body.accountId : void 0;
-					const st = await auth.begin(homeDir, accountId);
+					const proxyUrl = typeof body.proxyUrl === "string" && body.proxyUrl.trim() !== "" ? body.proxyUrl.trim() : getConfig().proxyUrl.trim() || void 0;
+					const st = await auth.begin(homeDir, accountId, proxyUrl);
 					sendJson(res, 200, st);
 				})();
 			}
@@ -29683,7 +29972,7 @@ function apply(ctx, entryConfig = {}) {
 					}
 					const body = await readBody(req);
 					const alias = typeof body.alias === "string" ? body.alias : void 0;
-					const proxyUrl = typeof body.proxyUrl === "string" ? body.proxyUrl : void 0;
+					const proxyUrl = typeof body.proxyUrl === "string" && body.proxyUrl.trim() !== "" ? body.proxyUrl.trim() : getConfig().proxyUrl.trim() || void 0;
 					const st = await poolAuth.begin(alias, proxyUrl);
 					sendJson(res, st.ok ? 200 : 500, st);
 				})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-link",
-  "version": "0.4.38",
+  "version": "0.4.41",
   "description": "Google Antigravity (agy CLI) models for DeepSeek Harness — stream Gemini/Claude/GPT-OSS subscriptions into DSH with thinking, tool activity, token usage and in-GUI Google OAuth login.",
   "type": "module",
   "license": "MIT",