dsh-agy-link 0.4.26 → 0.4.28

package/dist/index.js

@@ -7,7 +7,8 @@ import * as dshLlm from "@deepseek-ai/dsh-llm";
 import { LlmAdapter, LlmError } from "@deepseek-ai/dsh-llm";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { defineTool } from "@deepseek-ai/dsh-tools";
-import { mkdir, mkdtemp, readFile, readdir, rm, stat, unlink, writeFile } from "node:fs/promises";
+import { copyFile, mkdir, mkdtemp, readFile, readdir, rm, stat, unlink, writeFile } from "node:fs/promises";
+import { promisify } from "node:util";
 import { createServer } from "node:http";
 import { fileURLToPath } from "node:url";
 //#region \0rolldown/runtime.js
@@ -219,7 +220,7 @@ function asMode(v) {
 /** Layered config read; cheap enough to call per request (thunk pattern). */
 function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 	const base = defaultConfig();
-	const layers = [entry ?? {}, overrides];
+	const layers = [overrides, entry ?? {}];
 	const get = (k) => {
 		for (const l of layers) if (l[k] !== void 0 && l[k] !== null && l[k] !== "") return l[k];
 	};
@@ -379,6 +380,12 @@ function diffConversations(before, dir = defaultConversationsDir()) {
 }
 //#endregion
 //#region src/host/recording.ts
+function classifyToolError(error) {
+	if (/\b(no such file|file not found|cannot find (?:the )?file|enoent)\b/i.test(error)) return "missing_file";
+	if (/\b(system protection|protected by (?:the )?system|hardcoded.*protection|cannot bypass.*protection)\b/i.test(error)) return "system_protection";
+	if (/\b(permission|denied|denial|approval)\b/i.test(error)) return "approval";
+	return "tool_error";
+}
 const waiters = Symbol("waiters");
 /** One agy run's append-only event log plus its settlement state. */
 var RunRecording = class {
@@ -389,6 +396,8 @@ var RunRecording = class {
 	resultConversationId = null;
 	lastStepUsageRaw = null;
 	[waiters] = /* @__PURE__ */ new Set();
+	/** DB-resolved full tool args keyed by event index (set during span driving). */
+	fullArgs = null;
 	/**
 	* Set by the adapter right after spawn. A mid-turn user steer makes DSH
 	* open a NEW stream() call for the same session while this run's process
@@ -404,6 +413,7 @@ var RunRecording = class {
 		if (this.settled) return;
 		this.events.push(ev);
 		if (ev.kind === "result") this.resultConversationId = ev.conversationId ?? null;
+		if (ev.kind === "init" && typeof ev.conversationId === "string" && ev.conversationId !== "") this.resultConversationId = this.resultConversationId ?? ev.conversationId;
 		this.wake();
 	}
 	/**
@@ -505,8 +515,27 @@ var RunRecording = class {
 	toolEventAt(eventIndex) {
 		const ev = this.events[eventIndex];
 		if (ev === void 0 || ev.kind !== "step" || ev.stepKind !== "tool" || !ev.tool) return null;
+		const full = this.fullArgs?.get(eventIndex);
+		if (full !== void 0 && full !== null) return {
+			...ev.tool,
+			args: {
+				...full,
+				...typeof ev.tool.args === "object" ? ev.tool.args : {}
+			}
+		};
 		return ev.tool;
 	}
+	/** Raw errors reported by completed agy tool steps, in event order. */
+	toolErrors() {
+		const errors = [];
+		for (const ev of this.events) if (ev.kind === "step" && ev.stepKind === "tool" && ev.tool?.error !== void 0) errors.push(ev.tool.error);
+		return errors;
+	}
+	/** Store full DB-resolved tool args for a step (set during span driving). */
+	setFullArgs(eventIndex, args) {
+		this.fullArgs ??= /* @__PURE__ */ new Map();
+		this.fullArgs.set(eventIndex, args);
+	}
 };
 /** Prefix every mirrored agy tool callId carries; continuation detection key. */
 const AGY_CALL_PREFIX = "agytc-";
@@ -1044,7 +1073,7 @@ var EventMapper = class {
 				return;
 			}
 			if (ev.stepKind === "tool" && ev.tool) {
-				if (!(ev.tool.output !== void 0 || ev.tool.error !== void 0)) return;
+				if (!(ev.state === "DONE" || ev.state === "ERROR" || ev.state === void 0 && (ev.tool.output !== void 0 || ev.tool.error !== void 0))) return;
 				if (this.announcedTools.has(ev.stepKey)) return;
 				this.announcedTools.add(ev.stepKey);
 				if (!this.opts.cutOnTool) return;
@@ -1053,11 +1082,16 @@ var EventMapper = class {
 				const idx = this.blockIdx;
 				const useCode = this.opts.useCodeWrapper === true;
 				const toolName = useCode ? WRAPPER_TOOL_NAME : MIRROR_TOOL_NAME;
+				const fullArgs = this.opts.resolvedFullArgs?.get(absIndex);
+				const effectiveArgs = fullArgs !== void 0 ? {
+					...fullArgs,
+					...typeof ev.tool.args === "object" ? ev.tool.args : {}
+				} : ev.tool.args;
 				const argumentsJson = useCode ? JSON.stringify(buildMirrorRunCode(this.opts.runId, absIndex, ev.tool.name)) : JSON.stringify({
 					run: this.opts.runId,
 					step: absIndex,
 					tool: ev.tool.name,
-					...ev.tool.args !== void 0 ? { input: ev.tool.args } : {}
+					...effectiveArgs !== void 0 ? { input: effectiveArgs } : {}
 				});
 				yield {
 					type: "block-start",
@@ -1625,6 +1659,7 @@ function classifyEvent(obj, seq) {
 		const delta = extractTextDelta(src);
 		const text = delta !== void 0 ? delta : extractText(src);
 		const stateV = pick(src, ["state"]);
+		if (stateV === "ERROR" && toolInfo && !toolInfo.error) toolInfo.error = "tool execution failed";
 		const usageRaw = pick(src, ["usage"]);
 		return {
 			kind: "step",
@@ -1900,7 +1935,13 @@ function resolveAgyBin(cfg) {
 		const local = process.env.LOCALAPPDATA ?? "";
 		const appData = process.env.APPDATA ?? "";
 		if (local !== "") {
+			candidates.push(join(local, "agy", "bin", "agy.exe"));
+			candidates.push(join(local, "agy", "bin", "agy.cmd"));
+			candidates.push(join(local, "agy", "bin", "agy.bat"));
+			candidates.push(join(local, "agy", "agy.exe"));
 			candidates.push(join(local, "Programs", "agy", "agy.exe"));
+			candidates.push(join(local, "Programs", "agy", "bin", "agy.exe"));
+			candidates.push(join(local, "Microsoft", "WinGet", "Links", "agy.exe"));
 			candidates.push(join(local, "pnpm", "agy.cmd"));
 			candidates.push(join(local, "pnpm", "agy.exe"));
 		}
@@ -1959,6 +2000,44 @@ function compareVersions(a, b) {
 function parseVersion(out) {
 	return out.match(/(\d+\.\d+\.\d+)/)?.[1] ?? null;
 }
+/**
+* Windows CreateProcess caps the command line at ~32767 chars. Leave headroom
+* for env, cwd, quoting, and the rest of the argv so a long `-p` prompt does
+* not fail with spawn ENAMETOOLONG (issue #14 / #11). Above this, the prompt
+* rides agy `--input-format stream-json` on stdin instead.
+*/
+const ARGV_PROMPT_LIMIT = 24e3;
+/** One NDJSON line for agy --input-format stream-json (verified on agy 1.2.x). */
+function buildStreamInputLine(prompt) {
+	return JSON.stringify({
+		event: "user",
+		message: {
+			role: "user",
+			content: prompt
+		}
+	}) + "\n";
+}
+/** Whether the assembled argv (including a trailing `-p <prompt>`) risks ENAMETOOLONG. */
+function shouldUsePromptStdin(argsWithPrompt) {
+	let size = 0;
+	for (const a of argsWithPrompt) size += a.length + 1;
+	return size > ARGV_PROMPT_LIMIT;
+}
+/**
+* Quiet env for every agy spawn (issue #23).
+*
+* agy.exe itself creates a visible conhost on Windows — especially via its
+* `--bg-updater` auto-update child chain — even when the parent spawn used
+* `windowsHide: true`. Both switches are present in the official binary.
+* Existing values win so operators can opt out (`=0`).
+*/
+function withAgyQuietEnv(env = process.env) {
+	return {
+		...env,
+		AGY_CLI_DISABLE_AUTO_UPDATE: env.AGY_CLI_DISABLE_AUTO_UPDATE ?? "1",
+		AGY_CLI_INTERACTIVE_HEADLESS: env.AGY_CLI_INTERACTIVE_HEADLESS ?? "1"
+	};
+}
 function killTree(child) {
 	if (child.pid === void 0) return;
 	if (IS_WIN) {
@@ -1990,7 +2069,7 @@ function killTree(child) {
 function startAgyProcess(opts) {
 	const started = Date.now();
 	const viaCmd = IS_WIN && isCmdShim(opts.bin);
-	const env = opts.env ?? process.env;
+	const env = withAgyQuietEnv(opts.env ?? process.env);
 	const child = viaCmd ? spawn(process.env.ComSpec ?? "cmd.exe", [
 		"/d",
 		"/s",
@@ -2022,7 +2101,11 @@ function startAgyProcess(opts) {
 	let timedOut = false;
 	let aborted = false;
 	let settled = false;
-	if (!opts.keepStdin) try {
+	if (opts.stdinPayload !== void 0) try {
+		child.stdin?.write(opts.stdinPayload);
+		child.stdin?.end();
+	} catch {}
+	else if (!opts.keepStdin) try {
 		child.stdin?.end();
 	} catch {}
 	let watchdog = null;
@@ -2106,6 +2189,208 @@ async function probeProcess(bin, args, timeoutMs = 3e4, signal, env) {
 	}).outcome;
 }
 //#endregion
+//#region src/host/agy-db.ts
+const execFileAsync = promisify(execFile);
+let AGY_DB_DIR = join(homedir(), ".gemini", "antigravity-cli", "conversations");
+const MAX_CACHE_AGE_MS = 3e5;
+let cache = null;
+let cacheTime = 0;
+/** agy conversation ids are path-safe tokens; reject anything else before join(). */
+const SAFE_CONVERSATION_ID = /^[A-Za-z0-9_-]{1,64}$/;
+function isSafeConversationId(id) {
+	return SAFE_CONVERSATION_ID.test(id);
+}
+/**
+* Copy the agy SQLite DB to a temp path (avoiding WAL lock issues), then
+* query tool step payloads via sqlite3 CLI. Returns a Map of stepIndex →
+* {name, args} for every tool step found.
+*/
+async function loadToolSteps(conversationId) {
+	const result = /* @__PURE__ */ new Map();
+	if (!isSafeConversationId(conversationId)) return result;
+	const dbPath = join(AGY_DB_DIR, `${conversationId}.db`);
+	try {
+		if ((await stat(dbPath)).size === 0) return result;
+	} catch {
+		return result;
+	}
+	const tmpDb = join(tmpdir(), `agy-db-${conversationId.slice(0, 8)}-${Date.now()}.db`);
+	try {
+		await copyFile(dbPath, tmpDb);
+		try {
+			await copyFile(dbPath + "-wal", tmpDb + "-wal");
+		} catch {}
+		try {
+			await copyFile(dbPath + "-shm", tmpDb + "-shm");
+		} catch {}
+		const { stdout } = await execFileAsync("sqlite3", [tmpDb, `SELECT idx, hex(step_payload) FROM steps WHERE step_type IN (5,7,8,9,17,21,33,101,132) AND length(step_payload) > 20`], {
+			timeout: 5e3,
+			encoding: "utf-8",
+			maxBuffer: 10485760
+		});
+		for (const line of stdout.split("\n")) {
+			const pipeIdx = line.indexOf("|");
+			if (pipeIdx < 0) continue;
+			const idx = parseInt(line.slice(0, pipeIdx), 10);
+			if (!Number.isFinite(idx)) continue;
+			const hexPayload = line.slice(pipeIdx + 1).trim();
+			if (hexPayload === "" || hexPayload === "NULL") continue;
+			const info = extractToolInfo(Buffer.from(hexPayload, "hex"));
+			if (info !== null) result.set(idx, info);
+		}
+	} catch {} finally {
+		try {
+			await unlink(tmpDb);
+		} catch {}
+		try {
+			await unlink(tmpDb + "-wal");
+		} catch {}
+		try {
+			await unlink(tmpDb + "-shm");
+		} catch {}
+	}
+	return result;
+}
+/**
+* Extract tool name and full JSON args from a protobuf step_payload.
+*
+* agy's tool step payload wraps the call in standard protobuf fields:
+*   field 2 (tag 0x12, length-delimited) → tool_name ("write_to_file", ...)
+*   field 3 (tag 0x1a, length-delimited) → args JSON ('{"CodeContent":"...",...}')
+*
+* We scan for this deterministic sequence directly (sub-millisecond, no
+* recursive descent or backtracking) and fall back to scanning for balanced
+* JSON slices containing known parameter keys.
+*/
+function extractToolInfo(payload) {
+	for (let i = 0; i < payload.length - 8; i++) if (payload[i] === 18) {
+		const nameLen = payload[i + 1];
+		if (nameLen >= 2 && nameLen <= 64 && i + 2 + nameLen < payload.length) {
+			if (payload[i + 2 + nameLen] === 26) {
+				const nameStr = payload.subarray(i + 2, i + 2 + nameLen).toString("utf-8");
+				if (/^[a-zA-Z0-9_]+$/.test(nameStr)) {
+					let pos = i + 3 + nameLen;
+					let jsonLen = 0;
+					let shift = 0;
+					while (pos < payload.length) {
+						const b = payload[pos];
+						pos++;
+						jsonLen |= (b & 127) << shift;
+						shift += 7;
+						if ((b & 128) === 0) break;
+					}
+					if (jsonLen > 1 && pos + jsonLen <= payload.length) {
+						const jsonSlice = payload.subarray(pos, pos + jsonLen);
+						if (jsonSlice[0] === 123) try {
+							const obj = JSON.parse(jsonSlice.toString("utf-8"));
+							if (typeof obj === "object" && obj !== null && !Array.isArray(obj)) return {
+								name: nameStr,
+								args: obj
+							};
+						} catch {}
+					}
+				}
+			}
+		}
+	}
+	return scanFallbackJson(payload);
+}
+function scanFallbackJson(payload) {
+	const toolKeys = [
+		"TargetFile",
+		"TargetContent",
+		"ReplacementContent",
+		"CodeContent",
+		"CommandLine",
+		"AbsolutePath",
+		"Query",
+		"Pattern",
+		"DirectoryPath"
+	];
+	let pos = 0;
+	let bestObj = null;
+	let bestKeyCount = 0;
+	while (pos < payload.length) {
+		const nextBrace = payload.indexOf(123, pos);
+		if (nextBrace === -1) break;
+		pos = nextBrace + 1;
+		const sample = payload.subarray(nextBrace, Math.min(payload.length, nextBrace + 200)).toString("utf-8");
+		if (!toolKeys.some((k) => sample.includes(k))) continue;
+		let brace = 0;
+		let inStr = false;
+		let esc = false;
+		let end = -1;
+		for (let j = nextBrace; j < Math.min(payload.length, nextBrace + 2e5); j++) {
+			const b = payload[j];
+			if (esc) {
+				esc = false;
+				continue;
+			}
+			if (b === 92) {
+				esc = true;
+				continue;
+			}
+			if (b === 34) {
+				inStr = !inStr;
+				continue;
+			}
+			if (!inStr) {
+				if (b === 123) brace++;
+				else if (b === 125) {
+					brace--;
+					if (brace === 0) {
+						end = j + 1;
+						break;
+					}
+				}
+			}
+		}
+		if (end > nextBrace) {
+			try {
+				const obj = JSON.parse(payload.subarray(nextBrace, end).toString("utf-8"));
+				if (typeof obj === "object" && obj !== null && !Array.isArray(obj)) {
+					const rec = obj;
+					const count = Object.keys(rec).length;
+					if (count > bestKeyCount) {
+						bestObj = rec;
+						bestKeyCount = count;
+					}
+				}
+			} catch {}
+			pos = end;
+		}
+	}
+	if (bestObj !== null) return {
+		name: typeof bestObj.tool === "string" ? bestObj.tool : "",
+		args: bestObj
+	};
+	return null;
+}
+/**
+* Read the full tool parameter object for a given step index from the agy
+* conversation database. Returns null when the DB is unavailable or does
+* not contain the requested step.
+*
+* Results are cached per conversationId for up to 5 minutes to avoid
+* repeated DB reads within the same session.
+*/
+async function readFullToolArgs(conversationId, stepIndex) {
+	if (!isSafeConversationId(conversationId)) return null;
+	const now = Date.now();
+	if (cache?.conversationId === conversationId && cache.loaded && now - cacheTime < MAX_CACHE_AGE_MS) {
+		const cached = cache.steps.get(stepIndex);
+		if (cached !== void 0) return cached;
+	}
+	const steps = await loadToolSteps(conversationId);
+	cache = {
+		conversationId,
+		steps,
+		loaded: true
+	};
+	cacheTime = now;
+	return steps.get(stepIndex) ?? null;
+}
+//#endregion
 //#region src/host/adapter.ts
 function textOf(m) {
 	const parts = [];
@@ -2314,7 +2599,8 @@ var AgyAdapter = class extends LlmAdapter {
 		if (opts.conversationId) args.push("--conversation", opts.conversationId);
 		for (const d of opts.addDirs ?? []) args.push("--add-dir", d);
 		args.push(...opts.extraArgs);
-		args.push("-p", opts.prompt);
+		if (opts.promptViaStdin) args.push("--input-format", "stream-json");
+		else args.push("-p", opts.prompt);
 		return args;
 	}
 	async *stream(options) {
@@ -2497,9 +2783,10 @@ var AgyAdapter = class extends LlmAdapter {
 		const parser = new StreamJsonParser();
 		this.deps.onParser?.(parser);
 		let streamCid = null;
-		const args = this.buildArgs({
+		const activeModelForArgs = activeModel === "" ? cfg.defaultModel : activeModel;
+		const argsBase = this.buildArgs({
 			prompt,
-			model: activeModel === "" ? cfg.defaultModel : activeModel,
+			model: activeModelForArgs,
 			effort,
 			conversationId: !isAux && binding !== void 0 ? binding.conversationId : void 0,
 			permissionMode: isAux ? "plan" : cfg.permissionMode,
@@ -2508,6 +2795,20 @@ var AgyAdapter = class extends LlmAdapter {
 			extraArgs: cfg.extraArgs,
 			addDirs: stagedDirs
 		});
+		const promptViaStdin = shouldUsePromptStdin(argsBase);
+		const args = promptViaStdin ? this.buildArgs({
+			prompt,
+			model: activeModelForArgs,
+			effort,
+			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)),
+			extraArgs: cfg.extraArgs,
+			addDirs: stagedDirs,
+			promptViaStdin: true
+		}) : argsBase;
+		const stdinPayload = promptViaStdin ? buildStreamInputLine(prompt) : void 0;
 		const release = await this.deps.acquire();
 		let released = false;
 		const releaseOnce = () => {
@@ -2550,6 +2851,7 @@ var AgyAdapter = class extends LlmAdapter {
 				timeoutMs: cfg.timeoutMs,
 				signal: options.signal,
 				env,
+				stdinPayload,
 				onLine: (line) => {
 					for (const ev of parser.feed(line + "\n")) {
 						if (ev.kind === "init" && ev.conversationId) streamCid = ev.conversationId;
@@ -2643,8 +2945,9 @@ var AgyAdapter = class extends LlmAdapter {
 				}
 			}
 			this.deps.onRun?.({
-				ok: failure === null,
-				code: failure !== null ? failure.code : "OK",
+				processOk: !outcome.aborted && !outcome.timedOut && outcome.code === 0,
+				processCode: outcome.aborted ? "ABORTED" : outcome.timedOut ? Err.TIMEOUT : outcome.code === 0 ? "OK" : "EXIT_" + String(outcome.code),
+				toolErrors: rec.toolErrors(),
 				durationMs: outcome.durationMs,
 				model
 			});
@@ -2668,16 +2971,52 @@ var AgyAdapter = class extends LlmAdapter {
 	async *driveSpan(rec, from, cutOnTool, useCodeWrapper) {
 		const queue = new ChunkQueue();
 		(async () => {
+			const resolved = /* @__PURE__ */ new Map();
+			rec.conversationId;
 			const mapper = new EventMapper({
 				runId: rec.runId,
 				cutOnTool,
 				initialSawText: rec.sawTextBefore(from),
 				useCodeWrapper,
-				usage: rec
+				usage: rec,
+				resolvedFullArgs: resolved
 			});
 			let i = from;
 			try {
 				for await (const ev of rec.eventsFrom(from)) {
+					if (ev.kind === "step" && ev.stepKind === "tool" && ev.tool) {
+						const rawObj = ev.raw && typeof ev.raw === "object" ? ev.raw : null;
+						const stepUpdate = rawObj?.step_update && typeof rawObj.step_update === "object" ? rawObj.step_update : null;
+						const activeConvId = rec.conversationId ?? (typeof rawObj?.conversation_id === "string" ? rawObj.conversation_id : null) ?? (typeof stepUpdate?.conversation_id === "string" ? stepUpdate.conversation_id : null);
+						const stepIdx = parseInt(ev.stepKey, 10);
+						if (activeConvId !== null && Number.isFinite(stepIdx)) try {
+							let full = await readFullToolArgs(activeConvId, stepIdx);
+							if (full === null) {
+								await new Promise((r) => setTimeout(r, 50));
+								full = await readFullToolArgs(activeConvId, stepIdx);
+							}
+							if (full !== null && full.args !== void 0) {
+								resolved.set(i, full.args);
+								rec.setFullArgs(i, full.args);
+							}
+						} catch {}
+						const toolName = ev.tool.name;
+						if (toolName === "write_to_file" || toolName === "write_file" || toolName === "create_file") {
+							const currentArgs = resolved.get(i) ?? (typeof ev.tool.args === "object" && ev.tool.args !== null ? ev.tool.args : {});
+							const targetFile = currentArgs.TargetFile ?? currentArgs.target_file ?? currentArgs.path ?? currentArgs.AbsolutePath;
+							if (targetFile && typeof targetFile === "string" && !currentArgs.oldText && !currentArgs.old_string && !currentArgs.TargetContent) {
+								const head = getGitHeadContent(targetFile);
+								if (head !== null) {
+									const updated = {
+										...currentArgs,
+										old_string: head
+									};
+									resolved.set(i, updated);
+									rec.setFullArgs(i, updated);
+								}
+							}
+						}
+					}
 					for (const ch of mapper.map(ev, i)) queue.push(ch);
 					i++;
 					if (mapper.isFinished) break;
@@ -2701,7 +3040,13 @@ var AgyAdapter = class extends LlmAdapter {
 * run and the event index to resume after.
 */
 function detectContinuation(messages) {
-	const last = messages[messages.length - 1];
+	let i = messages.length - 1;
+	while (i >= 0) {
+		const snapshot = messages[i];
+		if (snapshot.source?.kind !== "plugin" || snapshot.source.form !== "snapshot") break;
+		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;
@@ -2793,6 +3138,12 @@ async function runAgyOnce(deps, req) {
 		cleanup = sa.cleanup;
 	}
 	args.push("-p", prompt);
+	let stdinPayload;
+	if (shouldUsePromptStdin(args)) {
+		args.splice(args.length - 2, 2);
+		args.push("--input-format", "stream-json");
+		stdinPayload = buildStreamInputLine(prompt);
+	}
 	const parser = new StreamJsonParser();
 	const textParts = [];
 	let resultText = "";
@@ -2803,6 +3154,7 @@ async function runAgyOnce(deps, req) {
 		cwd: cfg.workspaceRoot !== "" ? cfg.workspaceRoot : void 0,
 		timeoutMs,
 		signal: req.signal,
+		stdinPayload,
 		onLine: (line) => {
 			for (const ev of parser.feed(line + "\n")) {
 				if (ev.kind === "init" && ev.conversationId) conversationId = ev.conversationId;
@@ -15410,7 +15762,7 @@ var require_mock_interceptor = /* @__PURE__ */ __commonJSMin(((exports, module)
 //#endregion
 //#region node_modules/undici/lib/mock/mock-client.js
 var require_mock_client = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const { promisify: promisify$1 } = __require("node:util");
+	const { promisify: promisify$2 } = __require("node:util");
 	const Client = require_client();
 	const { buildMockDispatch } = require_mock_utils();
 	const { kDispatches, kMockAgent, kClose, kOriginalClose, kOrigin, kOriginalDispatch, kConnected, kIgnoreTrailingSlash } = require_mock_symbols();
@@ -15450,7 +15802,7 @@ var require_mock_client = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			this[kDispatches] = [];
 		}
 		async [kClose]() {
-			await promisify$1(this[kOriginalClose])();
+			await promisify$2(this[kOriginalClose])();
 			this[kConnected] = 0;
 			this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
 		}
@@ -15614,7 +15966,7 @@ var require_mock_call_history = /* @__PURE__ */ __commonJSMin(((exports, module)
 //#endregion
 //#region node_modules/undici/lib/mock/mock-pool.js
 var require_mock_pool = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const { promisify } = __require("node:util");
+	const { promisify: promisify$1 } = __require("node:util");
 	const Pool = require_pool();
 	const { buildMockDispatch } = require_mock_utils();
 	const { kDispatches, kMockAgent, kClose, kOriginalClose, kOrigin, kOriginalDispatch, kConnected, kIgnoreTrailingSlash } = require_mock_symbols();
@@ -15654,7 +16006,7 @@ var require_mock_pool = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			this[kDispatches] = [];
 		}
 		async [kClose]() {
-			await promisify(this[kOriginalClose])();
+			await promisify$1(this[kOriginalClose])();
 			this[kConnected] = 0;
 			this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
 		}
@@ -26658,7 +27010,10 @@ function openBrowser(url) {
 				"/s",
 				"/c",
 				`start "" "${url}"`
-			], { windowsVerbatimArguments: true }, (err) => resolve(!err));
+			], {
+				windowsVerbatimArguments: true,
+				windowsHide: true
+			}, (err) => resolve(!err));
 			else execFile("xdg-open", [url], (err) => resolve(!err));
 		} catch {
 			resolve(false);
@@ -27055,7 +27410,7 @@ async function handle(deps, raw) {
 				"",
 				"备用：授权完成后运行 `/agy auth-code <授权码或完整回调URL>`。"
 			].join("\n"));
-			return err(st.message ?? "failed to start the login flow");
+			return err(`failed to start the login flow (${st.code ?? "request_failed"})`);
 		}
 		if (sub === "auth-code") {
 			if (arg === "") return err("usage: /agy auth-code <code-or-callback-url>");
@@ -27064,9 +27419,9 @@ async function handle(deps, raw) {
 			const st = await flow.submitCode(arg);
 			if (st.ok) {
 				deps.store().clear();
-				return ok(st.message ?? "Logged in to Antigravity.");
+				return ok("Logged in to Antigravity.");
 			}
-			return err(st.message ?? "login failed");
+			return err(`login failed (${st.code ?? "request_failed"})`);
 		}
 		if (sub === "models") {
 			const cat = await deps.catalog().forceRefresh();
@@ -27127,6 +27482,8 @@ async function renderStatus(deps) {
 	const cat = deps.catalog().get();
 	const bindings = Object.keys(deps.store().all()).length;
 	const last = deps.lastRun();
+	const errorKinds = last?.toolErrors.map(classifyToolError) ?? [];
+	const hasHeadlessPermissionDenial = errorKinds.includes("approval");
 	return [
 		"**dsh-agy-link status**",
 		"- agy binary: " + (bin ?? "not found — install via https://antigravity.google/docs/cli/install"),
@@ -27138,7 +27495,13 @@ async function renderStatus(deps) {
 		"- default effort: " + (cfg.defaultEffort === "" ? "(model default)" : cfg.defaultEffort),
 		"- catalog: " + cat.models.length + " models — " + cat.source + (cat.lastError === void 0 ? "" : " — last error: " + cat.lastError),
 		"- conversation bindings: " + bindings,
-		"- last run: " + (last ? (last.ok ? "ok" : last.code) + " — " + last.model + " in " + Math.round(last.durationMs / 100) / 10 + "s" : "none yet")
+		"- last run process: " + (last ? (last.processOk ? "ok" : last.processCode) + " — " + last.model + " in " + Math.round(last.durationMs / 100) / 10 + "s" : "none yet"),
+		...last && last.toolErrors.length > 0 ? [
+			"- last run tool errors (" + last.toolErrors.length + "): " + last.toolErrors.join(" | "),
+			...errorKinds.includes("missing_file") ? ["- Guidance: `missing_file` — verify the expected workspace/artifact path for this conversation; do not invent paths or bypass protections."] : [],
+			...errorKinds.includes("system_protection") ? ["- Guidance: `system_protection` — AGY hardcoded system protection remains enforced; do not attempt a bypass."] : [],
+			...hasHeadlessPermissionDenial && (cfg.permissionMode === "plan" || cfg.permissionMode === "accept-edits") ? ["- Note: in headless operation, agy can automatically deny a tool under this mode; the raw denial above is not evidence of a human approval or denial."] : []
+		] : []
 	].join("\n");
 }
 function ok(text) {
@@ -27298,7 +27661,8 @@ var AccountPoolManager = class {
 		if (this.data.accounts.some((a) => a.systemHome)) return;
 		const primary = {
 			id: "acc_primary",
-			alias: "主账号 (系统登录)",
+			alias: "Primary account (system sign-in)",
+			defaultAlias: true,
 			dir: "",
 			systemHome: true,
 			enabled: true,
@@ -27318,10 +27682,12 @@ var AccountPoolManager = class {
 	*/
 	normalizeLegacyPrimary() {
 		const primary = this.data.accounts.find((a) => a.id === "acc_primary");
-		if (!primary || primary.systemHome) return;
+		if (!primary) return;
+		if (primary.systemHome) return;
 		primary.dir = "";
 		primary.systemHome = true;
-		primary.alias = "主账号 (系统登录)";
+		primary.alias = "Primary account (system sign-in)";
+		primary.defaultAlias = true;
 		this.data.primaryAccountId = primary.id;
 		this.persist();
 	}
@@ -27357,7 +27723,8 @@ var AccountPoolManager = class {
 		const count = this.data.accounts.length + 1;
 		const newAccount = {
 			id,
-			alias: alias || `备用 Google 账号 ${count}`,
+			alias: alias?.trim() || `Backup Google account ${count}`,
+			defaultAlias: !alias?.trim(),
 			dir: existsSync(finalDir) ? finalDir : dir,
 			...email ? { email } : {},
 			...proxyUrl ? { proxyUrl } : {},
@@ -27435,7 +27802,8 @@ var AccountPoolManager = class {
 		const count = this.data.accounts.length + 1;
 		const newAccount = {
 			id,
-			alias: alias || `备用账号 ${count} (Account ${count})`,
+			alias: alias?.trim() || `Backup Google account ${count}`,
+			defaultAlias: !alias?.trim(),
 			dir,
 			enabled: true,
 			createdAt: Date.now(),
@@ -27474,6 +27842,7 @@ var AccountPoolManager = class {
 		const acc = this.getAccount(id);
 		if (!acc) return false;
 		acc.alias = alias.trim();
+		acc.defaultAlias = false;
 		this.persist();
 		return true;
 	}
@@ -27747,12 +28116,12 @@ var PoolAuthFlow = class {
 			url,
 			mode,
 			browserOpened,
-			message: browserOpened ? void 0 : "无法自动打开浏览器，请手动打开下方链接"
+			code: browserOpened ? void 0 : "browser_manual"
 		});
 		this.log(`pool auth begun (${mode} mode, browserOpened=${browserOpened}${active.primary ? ", primary" : ""})`);
 		if (listener) listener.result.then(({ code, state: returnedState }) => this.finishWithCode(code, returnedState)).catch((err) => {
 			if (!this.flow || this.flow.listener !== listener) return;
-			this.fail(`授权回调失败: ${err instanceof Error ? err.message : String(err)}`);
+			this.fail("callback_failed", err);
 		});
 		return {
 			ok: true,
@@ -27788,18 +28157,18 @@ var PoolAuthFlow = class {
 		if (!flow || this.statusValue.phase !== "waiting") return {
 			ok: false,
 			phase: this.statusValue.phase,
-			message: "当前没有进行中的授权流程"
+			code: "no_active_flow"
 		};
 		const parsed = parsePastedCode(input);
 		if (!parsed) return {
 			ok: false,
 			phase: "waiting",
-			message: "无法识别的授权码，请粘贴授权码或完整的回调 URL"
+			code: "invalid_code"
 		};
 		if (parsed.state && parsed.state !== flow.state) return {
 			ok: false,
 			phase: "waiting",
-			message: "state 校验失败：这段 URL 不属于本次授权流程"
+			code: "invalid_state"
 		};
 		await this.finishWithCode(parsed.code, parsed.state ?? flow.state);
 		const after = this.status();
@@ -27812,7 +28181,7 @@ var PoolAuthFlow = class {
 		const flow = this.flow;
 		if (!flow || this.statusValue.phase !== "waiting") return;
 		if (returnedState !== flow.state) {
-			this.fail("state 校验失败（可能的 CSRF 或过期回调）");
+			this.fail("invalid_state");
 			return;
 		}
 		this.setStatus({ phase: "exchanging" });
@@ -27832,7 +28201,7 @@ var PoolAuthFlow = class {
 				this.setStatus({
 					phase: "done",
 					alias: email,
-					message: `主账号已登录${email ? `: ${email}` : ""}`
+					code: "primary_activated"
 				});
 				return;
 			}
@@ -27844,15 +28213,15 @@ var PoolAuthFlow = class {
 			this.setStatus({
 				phase: "done",
 				alias: acc.alias,
-				message: `账号 ${acc.alias} 已激活`
+				code: "account_activated"
 			});
 		} catch (err) {
-			this.fail(`授权码交换失败: ${err instanceof Error ? err.message : String(err)}`);
+			this.fail("exchange_failed", err);
 		}
 	}
-	fail(message) {
+	fail(code, detail) {
 		const flow = this.flow;
-		this.log("pool auth failed: " + message);
+		this.log(`pool auth failed [${code}]${detail ? `: ${detail instanceof Error ? detail.message : String(detail)}` : ""}`);
 		if (flow) {
 			if (flow.listener) flow.listener.close().catch(() => void 0);
 			if (!flow.primary) this.pool.cleanupStagingSlot(flow.dir);
@@ -27860,7 +28229,7 @@ var PoolAuthFlow = class {
 		}
 		this.setStatus({
 			phase: "failed",
-			message
+			code
 		});
 	}
 	async cancel() {
@@ -27948,6 +28317,85 @@ function normalizeStoredToken(raw) {
 	};
 }
 /**
+* Parse a go-keyring payload (optionally "go-keyring-base64:" prefixed) into
+* a normalized StoredToken. Shared by the macOS and Linux keyring readers.
+*/
+function parseGoKeyringPayload(raw) {
+	let jsonStr = raw;
+	if (raw.startsWith("go-keyring-base64:")) {
+		const b64 = raw.slice(18);
+		jsonStr = Buffer.from(b64, "base64").toString("utf8");
+	}
+	try {
+		const tok = normalizeStoredToken(JSON.parse(jsonStr));
+		return tok && (tok.accessToken || tok.refreshToken) ? tok : null;
+	} catch {
+		return null;
+	}
+}
+/**
+* Reads the active primary Antigravity OAuth token from the Linux Secret
+* Service (GNOME Keyring / KDE Wallet via FreeDesktop secrets). agy 1.1.15+
+* on Linux stores primary credentials via go-keyring under service "gemini"
+* / username "antigravity" — the same JSON shape as the macOS Keychain.
+* GH #8: without this reader, Linux quota resolution always returned null.
+*/
+function readLinuxSecretToken() {
+	if (process.platform !== "linux") return null;
+	try {
+		const raw = execFileSync("secret-tool", [
+			"lookup",
+			"service",
+			"gemini",
+			"username",
+			"antigravity"
+		], {
+			encoding: "utf8",
+			timeout: 3e3,
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}).trim();
+		if (raw) {
+			const tok = parseGoKeyringPayload(raw);
+			if (tok) return tok;
+		}
+	} catch {}
+	const pyScript = [
+		"import dbus, sys",
+		"try:",
+		"    bus = dbus.SessionBus()",
+		"    svc = bus.get_object(\"org.freedesktop.secrets\", \"/org/freedesktop/secrets\")",
+		"    iface = dbus.Interface(svc, \"org.freedesktop.Secret.Service\")",
+		"    sp = iface.OpenSession(\"plain\", \"\")[1]",
+		"    res = iface.SearchItems({\"service\": \"gemini\", \"username\": \"antigravity\"})",
+		"    if res and res[0]:",
+		"        item = bus.get_object(\"org.freedesktop.secrets\", res[0][0])",
+		"        sec = dbus.Interface(item, \"org.freedesktop.Secret.Item\").GetSecret(sp)",
+		"        sys.stdout.write(bytes(sec[2]).decode(\"utf-8\"))",
+		"except Exception:",
+		"    pass"
+	].join("\n");
+	for (const pyBin of ["python3", "python"]) try {
+		const raw = execFileSync(pyBin, ["-c", pyScript], {
+			encoding: "utf8",
+			timeout: 4e3,
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}).trim();
+		if (raw) {
+			const tok = parseGoKeyringPayload(raw);
+			if (tok) return tok;
+		}
+	} catch {}
+	return null;
+}
+/**
 * Reads the active primary Antigravity OAuth token from the macOS Keychain.
 * agy 1.1.15+ on macOS stores primary credentials via go-keyring in the Keychain
 * under service "gemini" / account "antigravity" (base64-encoded JSON).
@@ -27972,12 +28420,7 @@ function readMacKeychainToken() {
 			]
 		}).trim();
 		if (!raw) return null;
-		let jsonStr = raw;
-		if (raw.startsWith("go-keyring-base64:")) {
-			const b64 = raw.slice(18);
-			jsonStr = Buffer.from(b64, "base64").toString("utf8");
-		}
-		return normalizeStoredToken(JSON.parse(jsonStr));
+		return parseGoKeyringPayload(raw);
 	} catch {
 		return null;
 	}
@@ -27997,7 +28440,9 @@ var QuotaService = class {
 	* platforms) can substitute the reader without touching the real Keychain.
 	*/
 	readSystemKeychainToken() {
-		return readMacKeychainToken();
+		if (process.platform === "darwin") return readMacKeychainToken();
+		if (process.platform === "linux") return readLinuxSecretToken();
+		return null;
 	}
 	/**
 	* Read the active token document and normalize it to a flat StoredToken.
@@ -28402,6 +28847,7 @@ function startMcpBridge(opts) {
 	return new Promise((resolve, reject) => {
 		server.once("error", reject);
 		server.listen(0, "127.0.0.1", () => {
+			server.unref();
 			const addr = server.address();
 			const port = typeof addr === "object" && addr !== null ? addr.port : 0;
 			opts.log?.("mcp bridge listening on 127.0.0.1:" + port);
@@ -28605,32 +29051,36 @@ function apply(ctx, entryConfig = {}) {
 			log("failed to persist override: " + String(e));
 		}
 	};
-	(async () => {
-		if (!getConfig().enabled) {
-			dormantReason = "disabled by config";
-			log("dormant: disabled by config");
-			return;
-		}
-		const currentBin = bin();
-		if (!currentBin) {
-			dormantReason = "agy binary not found — install via https://antigravity.google/docs/cli/install";
-			log("dormant: agy binary not found");
-			return;
-		}
-		try {
-			versionCache = parseVersion((await probeProcess(currentBin, ["--version"], 1e4)).stdout);
-			if (versionCache && compareVersions(versionCache, "1.1.8") < 0) {
-				dormantReason = "agy " + versionCache + " is older than 1.1.8 — run: agy update";
-				log("dormant: " + dormantReason);
+	const bootProbeTimer = setTimeout(() => {
+		(async () => {
+			if (!getConfig().enabled) {
+				dormantReason = "disabled by config";
+				log("dormant: disabled by config");
 				return;
 			}
-			dormantReason = null;
-			log("agy detected: " + (versionCache ?? "unknown version"));
-		} catch {
-			log("version probe failed — continuing with fallback catalog");
-		}
-		await catalog.refreshIfNeeded().catch(() => void 0);
-	})();
+			const currentBin = bin();
+			if (!currentBin) {
+				dormantReason = "agy binary not found — install via https://antigravity.google/docs/cli/install";
+				log("dormant: agy binary not found");
+				return;
+			}
+			try {
+				versionCache = parseVersion((await probeProcess(currentBin, ["--version"], 1e4)).stdout);
+				if (versionCache && compareVersions(versionCache, "1.1.8") < 0) {
+					dormantReason = "agy " + versionCache + " is older than 1.1.8 — run: agy update";
+					log("dormant: " + dormantReason);
+					return;
+				}
+				dormantReason = null;
+				log("agy detected: " + (versionCache ?? "unknown version"));
+			} catch {
+				log("version probe failed — continuing with fallback catalog");
+			}
+			await catalog.refreshIfNeeded().catch(() => void 0);
+		})();
+	}, 4e3);
+	bootProbeTimer.unref?.();
+	ctx.effect(() => () => clearTimeout(bootProbeTimer));
 	if (getConfig().enabled) try {
 		ctx.llm.registerAdapter([PROVIDER_ID], adapter);
 		log("registered provider route: antigravity");
@@ -28859,7 +29309,8 @@ function apply(ctx, entryConfig = {}) {
 					if (!code) {
 						sendJson(res, 400, {
 							ok: false,
-							error: "missing code"
+							phase: "waiting",
+							code: "missing_code"
 						});
 						return;
 					}
@@ -28867,7 +29318,7 @@ function apply(ctx, entryConfig = {}) {
 					sendJson(res, st.ok ? 200 : 400, {
 						ok: st.ok,
 						phase: st.phase,
-						message: st.message,
+						code: st.code,
 						pool: pool.getPoolData()
 					});
 				})();
@@ -28913,7 +29364,7 @@ function apply(ctx, entryConfig = {}) {
 							"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"`], () => {});
 					}
 					sendJson(res, 200, {
@@ -28949,7 +29400,7 @@ function apply(ctx, entryConfig = {}) {
 						"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"`], () => {});
 					sendJson(res, 200, {
 						ok: true,
@@ -29159,6 +29610,7 @@ function apply(ctx, entryConfig = {}) {
 		const timer = setInterval(() => {
 			sweepDir(mediaDir(), getConfig().mediaTtlMs).catch(() => void 0);
 		}, Math.max(6e4, Math.min(getConfig().mediaTtlMs, 36e5)));
+		timer.unref?.();
 		return () => clearInterval(timer);
 	});
 	ctx.effect(() => {
@@ -29167,7 +29619,9 @@ function apply(ctx, entryConfig = {}) {
 			quota.refreshAllQuotas().catch(() => void 0);
 		};
 		const boot = setTimeout(refresh, 5e3);
+		boot.unref?.();
 		const timer = setInterval(refresh, Math.max(6e4, getConfig().quotaPollIntervalMs));
+		timer.unref?.();
 		return () => {
 			clearTimeout(boot);
 			clearInterval(timer);
@@ -29177,6 +29631,7 @@ function apply(ctx, entryConfig = {}) {
 		bridge: null,
 		restore: null
 	};
+	let bridgeDisposed = false;
 	const syncMcpBridge = () => {
 		const cfg = getConfig();
 		const want = cfg.mcpBridge && cfg.enabled;
@@ -29190,11 +29645,19 @@ function apply(ctx, entryConfig = {}) {
 					allowlist: () => getConfig().mcpToolAllowlist,
 					log
 				});
+				if (bridgeDisposed) {
+					await bridge.close();
+					return;
+				}
 				bridgeState.bridge = bridge;
 				const root = cfg.workspaceRoot !== "" ? cfg.workspaceRoot : process.cwd();
 				bridgeState.restore = writeMcpConfig(root, bridge);
 				log("mcp bridge ready at " + bridge.url + (toolsSvc ? "" : " (tools service not yet available)"));
 			} catch (e) {
+				bridgeState.restore?.();
+				await bridgeState.bridge?.close();
+				bridgeState.bridge = null;
+				bridgeState.restore = null;
 				log("mcp bridge failed to start: " + String(e));
 			}
 		})();
@@ -29207,13 +29670,15 @@ function apply(ctx, entryConfig = {}) {
 	};
 	syncMcpBridge();
 	ctx.effect(() => {
-		auth.dispose();
-		poolAuth.cancel();
-		if (askToolDispose.current !== null) askToolDispose.current();
-		if (mirrorToolDispose.current !== null) mirrorToolDispose.current();
-		bridgeState.restore?.();
-		bridgeState.bridge?.close();
-		return () => void 0;
+		return () => {
+			bridgeDisposed = true;
+			auth.dispose();
+			poolAuth.cancel();
+			if (askToolDispose.current !== null) askToolDispose.current();
+			if (mirrorToolDispose.current !== null) mirrorToolDispose.current();
+			bridgeState.restore?.();
+			bridgeState.bridge?.close();
+		};
 	});
 }
 //#endregion