dsh-agy-link 0.4.49 → 0.4.53

package/dist/index.js

@@ -457,6 +457,7 @@ const AUTH_REVERIFY_DELAY_MS = 6e5;
 * simply re-stamped.
 */
 function needsAuthReverify(account, now = Date.now()) {
+	if (!account.enabled) return false;
 	if (!account.authRequired) return false;
 	if (typeof account.authMarkedAt !== "number") return true;
 	return now - account.authMarkedAt > AUTH_REVERIFY_DELAY_MS;
@@ -1348,6 +1349,158 @@ function defineAgyMirrorTool(deps) {
 	});
 }
 //#endregion
+//#region src/host/dsh-goal.ts
+const toToolCallId$1 = dshLlm.ToolCallId ?? dshLlm.CallId ?? ((id) => id);
+function extractText$1(m) {
+	const content = m.content;
+	if (typeof content === "string") return content;
+	if (Array.isArray(content)) {
+		const parts = [];
+		for (const b of content) if (b && typeof b === "object") {
+			const blk = b;
+			if (blk.type === "text" && typeof blk.text === "string") parts.push(blk.text);
+		}
+		return parts.join("\n");
+	}
+	return "";
+}
+function parseGoalRoundText(text) {
+	if (!text.includes("<goal_round>")) return null;
+	const roundMatch = text.match(/Round:\s*(\d+)(?:\/(\d+))?/);
+	const round = roundMatch ? parseInt(roundMatch[1], 10) : void 0;
+	const maxRounds = roundMatch && roundMatch[2] ? parseInt(roundMatch[2], 10) : void 0;
+	const objMatch = text.match(/Objective:\s*(?:"([^"]*)"|'([^']*)'|([^\n]+))/);
+	const objective = objMatch ? (objMatch[1] || objMatch[2] || objMatch[3])?.trim() : void 0;
+	const idMatch = text.match(/goal-[a-zA-Z0-9_-]+/);
+	return {
+		goalId: idMatch ? idMatch[0] : void 0,
+		round,
+		maxRounds,
+		objective
+	};
+}
+/**
+* Detect whether the incoming request is part of a DSH <goal_round> continuation.
+* Extracts goalId, revision, round, and objective if available.
+*/
+function detectGoalContext(messages) {
+	let goalId;
+	let revision;
+	let round;
+	let maxRounds;
+	let objective;
+	let isGoal = false;
+	for (let i = messages.length - 1; i >= 0; i--) {
+		const m = messages[i];
+		if (!m) continue;
+		const src = m.source;
+		if (src && typeof src === "object" && src.kind === "goal") {
+			isGoal = true;
+			if (!goalId && typeof src.goalId === "string") goalId = src.goalId;
+			if (revision === void 0 && typeof src.revision === "number") revision = src.revision;
+			if (round === void 0 && typeof src.round === "number") round = src.round;
+		}
+		const text = extractText$1(m);
+		if (text.includes("<goal_round>")) {
+			isGoal = true;
+			const parsed = parseGoalRoundText(text);
+			if (parsed) {
+				if (!goalId && parsed.goalId) goalId = parsed.goalId;
+				if (revision === void 0 && parsed.revision !== void 0) revision = parsed.revision;
+				if (round === void 0 && parsed.round !== void 0) round = parsed.round;
+				if (maxRounds === void 0 && parsed.maxRounds !== void 0) maxRounds = parsed.maxRounds;
+				if (!objective && parsed.objective) objective = parsed.objective;
+			}
+		}
+	}
+	if (isGoal) return {
+		goalId,
+		revision: revision ?? 1,
+		round,
+		maxRounds,
+		objective
+	};
+	return null;
+}
+/**
+* Detect whether DSH is in Plan Mode.
+* DSH plan-mode injects "You are in plan mode" into the runtime context prompt.
+*/
+function isPlanMode(messages) {
+	for (let i = messages.length - 1; i >= 0; i--) {
+		const m = messages[i];
+		if (!m) continue;
+		if (extractText$1(m).includes("You are in plan mode")) return true;
+	}
+	return false;
+}
+/**
+* Check if the trailing message is the tool result of a bridge-emitted `update_goal` call.
+*/
+function isGoalToolContinuation(messages) {
+	if (messages.length === 0) return false;
+	const last = messages[messages.length - 1];
+	if (!last) return false;
+	const callId = last.toolCallId ?? last.source?.callId;
+	if (typeof callId === "string" && callId.startsWith("agytc-bridge-goal-")) return true;
+	return false;
+}
+/**
+* Check if the trailing message is the tool result of a bridge-emitted `exit_plan_mode` call.
+*/
+function isPlanToolContinuation(messages) {
+	if (messages.length === 0) return false;
+	const last = messages[messages.length - 1];
+	if (!last) return false;
+	const callId = last.toolCallId ?? last.source?.callId;
+	if (typeof callId === "string" && callId.startsWith("agytc-bridge-plan-")) return true;
+	return false;
+}
+/**
+* Build the synthetic `update_goal` tool-call chunk that marks the goal complete on DSH.
+*/
+function buildGoalCompleteToolCallBlock(goalContext, blockIdx) {
+	const goalId = goalContext.goalId || "active-goal";
+	const revision = goalContext.revision ?? 1;
+	return [{
+		type: "block-start",
+		index: blockIdx,
+		blockType: "tool-call"
+	}, {
+		type: "block-end",
+		index: blockIdx,
+		block: {
+			type: "tool-call",
+			id: toToolCallId$1(`agytc-bridge-goal-${goalId}-${revision}`),
+			name: "update_goal",
+			arguments: JSON.stringify({
+				goal_id: goalId,
+				revision,
+				action: "complete"
+			})
+		}
+	}];
+}
+/**
+* Build the synthetic `exit_plan_mode` tool-call chunk that presents the generated plan to DSH.
+*/
+function buildPlanExitToolCallBlock(planMarkdown, blockIdx) {
+	return [{
+		type: "block-start",
+		index: blockIdx,
+		blockType: "tool-call"
+	}, {
+		type: "block-end",
+		index: blockIdx,
+		block: {
+			type: "tool-call",
+			id: toToolCallId$1(`agytc-bridge-plan-${Date.now()}`),
+			name: "exit_plan_mode",
+			arguments: JSON.stringify({ plan: planMarkdown.trim() !== "" ? planMarkdown : "# Plan Completed\n\nPlan generated and ready for review." })
+		}
+	}];
+}
+//#endregion
 //#region src/host/mapper.ts
 const toToolCallId = dshLlm.ToolCallId ?? dshLlm.CallId ?? ((id) => id);
 function usageFromRaw(raw) {
@@ -1396,6 +1549,7 @@ var EventMapper = class {
 	bannerOnlyThinkingEmitted = false;
 	sawTextStep;
 	finished = false;
+	totalTextOutput = "";
 	constructor(opts) {
 		this.opts = opts;
 		this.sawTextStep = opts.initialSawText === true;
@@ -1438,6 +1592,7 @@ var EventMapper = class {
 	appendDelta(delta) {
 		if (delta === "") return null;
 		this.openAcc += delta;
+		if (this.openType === "text") this.totalTextOutput += delta;
 		return this.openType === "text" ? {
 			type: "text-delta",
 			index: this.blockIdx,
@@ -1449,10 +1604,10 @@ var EventMapper = class {
 		};
 	}
 	/**
-	* Emit thinking: always retain the [agy thinking turn · ... thinking tokens]
-	* banner. When real thought prose is present, place the banner and thought
+	* Emit thinking: always retain the [agy · ... tokens] banner.
+	* When real thought prose is present, place the banner and thought
 	* text on the same initial line so DSH's collapsed summary renders:
-	*   [agy thinking turn · *** thinking tokens] [Chain-of-Thought body]
+	*   [agy · *** tokens] [Chain-of-Thought body]
 	*
 	* With `allowBannerOnly` the bare banner is emitted when the DB prose never
 	* arrived (desktop hosts without any sqlite reader, issue #43): the user
@@ -1466,7 +1621,7 @@ var EventMapper = class {
 		const bannerAlreadyShown = this.bannerOnlyShown.has(stepKey);
 		if (hasText) this.bannerOnlyShown.delete(stepKey);
 		yield* this.ensureBlock("reasoning");
-		const banner = thoughtTokens > 0 ? "[agy thinking turn · " + thoughtTokens + " thinking tokens]" : "[agy thinking turn]";
+		const banner = thoughtTokens > 0 ? "[agy · " + thoughtTokens + " tokens]" : "[agy]";
 		const combined = !hasText ? `${banner}\n` : bannerAlreadyShown ? `${text.trim()}\n` : `${banner} ${text.trim()}\n`;
 		const d = this.appendDelta(combined);
 		if (d) yield d;
@@ -1650,6 +1805,28 @@ var EventMapper = class {
 			type: "usage",
 			usage: usageFromRaw(this.opts.usage?.finalUsage(ev.usage) ?? ev.usage)
 		};
+		if (this.opts.supportsGoalUpdate && this.opts.goalContext?.goalId) {
+			for (const ch of buildGoalCompleteToolCallBlock(this.opts.goalContext, this.blockIdx)) yield ch;
+			this.blockIdx++;
+			yield {
+				type: "finish",
+				reason: { kind: "tool-calls" },
+				...ev.conversationId !== "" ? { replayState: { response: { conversationId: ev.conversationId } } } : {}
+			};
+			this.finished = true;
+			return;
+		}
+		if (this.opts.supportsPlanExit && this.totalTextOutput.trim() !== "") {
+			for (const ch of buildPlanExitToolCallBlock(this.totalTextOutput, this.blockIdx)) yield ch;
+			this.blockIdx++;
+			yield {
+				type: "finish",
+				reason: { kind: "tool-calls" },
+				...ev.conversationId !== "" ? { replayState: { response: { conversationId: ev.conversationId } } } : {}
+			};
+			this.finished = true;
+			return;
+		}
 		yield {
 			type: "finish",
 			reason: { kind: "stop" },
@@ -2291,24 +2468,25 @@ var StreamJsonParser = class {
 		const ev = this.takeLine(rest);
 		return ev ? [ev] : [];
 	}
+	recordAuthFailure(text) {
+		this.stats.sawAuthFailure = true;
+		const prev = this.stats.authFailureText ?? "";
+		if (prev.length < 600) this.stats.authFailureText = (prev === "" ? "" : prev + " ") + text.trim().slice(0, 300);
+	}
 	takeLine(line) {
 		if (line.trim() === "") return void 0;
 		this.stats.lines++;
 		this.recentLines.push(line);
 		if (this.recentLines.length > this.maxRecent) this.recentLines.splice(0, this.recentLines.length - this.maxRecent);
-		if (looksLikeAuthFailure(line)) {
-			this.stats.sawAuthFailure = true;
-			const prev = this.stats.authFailureText ?? "";
-			if (prev.length < 600) this.stats.authFailureText = (prev === "" ? "" : prev + " ") + line.trim().slice(0, 300);
-		}
-		if (this.stats.authUrl === void 0) {
-			const u = extractAuthUrl(line);
-			if (u) this.stats.authUrl = u;
-		}
 		let obj;
 		try {
 			obj = JSON.parse(line);
 		} catch {
+			if (looksLikeAuthFailure(line)) this.recordAuthFailure(line);
+			if (this.stats.authUrl === void 0) {
+				const u = extractAuthUrl(line);
+				if (u) this.stats.authUrl = u;
+			}
 			this.stats.garbage++;
 			this.stats.consecutiveGarbage++;
 			return {
@@ -2325,7 +2503,10 @@ var StreamJsonParser = class {
 				line
 			};
 		}
-		if (ev.kind === "result") this.stats.lastResultError = ev.error ?? void 0;
+		if (ev.kind === "result") {
+			this.stats.lastResultError = ev.error ?? void 0;
+			if (!ev.ok && ev.error && looksLikeAuthFailure(ev.error)) this.recordAuthFailure(ev.error);
+		}
 		this.stats.consecutiveGarbage = 0;
 		return ev;
 	}
@@ -2735,6 +2916,20 @@ function buildStreamInputLine(prompt) {
 		}
 	}) + "\n";
 }
+/**
+* Remove NUL characters from text destined for a child process.
+*
+* `spawn()` rejects any argv element containing U+0000 with
+* `ERR_INVALID_ARG_VALUE: The argument 'args[N]' must be a string without null
+* bytes`, which aborts the whole turn before agy is even started. NULs reach the
+* assembled prompt through binary tool output (a tool result that quoted a
+* binary file — `.git` objects, packed refs, images, …), so every prompt that
+* can carry tool text passes through here. Other control characters are legal in
+* argv and are left untouched.
+*/
+function stripNulBytes(text) {
+	return text.includes("\0") ? text.split("\0").join("") : text;
+}
 /** Whether the assembled argv (including a trailing `-p <prompt>`) risks ENAMETOOLONG. */
 function shouldUsePromptStdin(argsWithPrompt) {
 	let size = 0;
@@ -3497,6 +3692,21 @@ var AccountPoolManager = class {
 		this.data.lastActiveAccountId = id;
 		this.persist();
 	}
+	/**
+	* Manually pin the active slot for one family (console "设为当前使用").
+	* The pin survives until the scheduler legitimately rotates away (quota
+	* exhaustion / cooldown / auth flag) — getActiveAccountId still enforces
+	* eligibility, so pinning an ineligible slot simply does not stick.
+	*/
+	setActiveAccount(id, family = "google") {
+		const acc = this.getAccount(id);
+		if (!acc || !acc.enabled || acc.authRequired) return false;
+		if (!this.data.activeAccountIds) this.data.activeAccountIds = {};
+		this.data.activeAccountIds[family] = id;
+		this.data.lastActiveAccountId = id;
+		this.persist();
+		return true;
+	}
 	markAuthRequired(id, reason) {
 		const acc = this.getAccount(id);
 		if (!acc) return;
@@ -3548,9 +3758,11 @@ var AccountPoolManager = class {
 	setPrimaryAccount(id) {
 		const idx = this.data.accounts.findIndex((a) => a.id === id);
 		if (idx === -1) return false;
-		this.data.primaryAccountId = id;
 		const [acc] = this.data.accounts.splice(idx, 1);
-		if (acc) this.data.accounts.unshift(acc);
+		if (!acc) return false;
+		acc.enabled = true;
+		this.data.primaryAccountId = id;
+		this.data.accounts.unshift(acc);
 		this.data.activeAccountIds = {
 			google: id,
 			anthropic: id,
@@ -3598,7 +3810,7 @@ var AccountPoolManager = class {
 		if (quota && typeof quota.weeklyFraction === "number" && quota.weeklyFraction <= .01) {
 			if (quota.weeklyResetTime) {
 				const resetMs = Date.parse(quota.weeklyResetTime);
-				if (!Number.isNaN(resetMs) && resetMs > now) return false;
+				if (Number.isNaN(resetMs) || resetMs > now) return false;
 			} else return false;
 		}
 		return true;
@@ -3617,7 +3829,7 @@ var AccountPoolManager = class {
 		}
 		const next = this.selectAccount(family);
 		if (next) return next.id;
-		return this.data.primaryAccountId ?? this.data.accounts[0]?.id;
+		return this.data.accounts.find((a) => a.id === this.data.primaryAccountId && a.enabled)?.id ?? this.data.accounts.find((a) => a.enabled)?.id;
 	}
 	/**
 	* Next moment this account's quota state refreshes for one family: the
@@ -3639,23 +3851,34 @@ var AccountPoolManager = class {
 		return (idx - start + total) % total;
 	}
 	/**
-	* "Use it or lose it" rotation order. When the sticky account is drained we
-	* prefer the eligible account whose quota window refreshes SOONEST: residual
-	* quota disappears at that reset, so draining it first is free capacity the
-	* pool would otherwise throw away. Accounts with no quota metadata yet keep
-	* the legacy cyclic order (which also keeps a drained slot from bouncing
-	* straight back to the primary).
+	* "Use it or lose it" rotation order.
+	* Priority 1: Weekly quota expiring soonest (least remaining time until weeklyResetTime).
+	* Priority 2: 5-hour quota expiring soonest (least remaining time until resetTime).
+	* Priority 3: Cyclic distance from `fromId` (or pool order).
 	*/
 	orderByExpiry(candidates, family, fromId) {
-		return candidates.map((acc, index) => ({
-			acc,
-			index,
-			at: this.nextQuotaResetAt(acc, family)
-		})).sort((a, b) => {
-			const aKnown = !Number.isNaN(a.at);
-			const bKnown = !Number.isNaN(b.at);
-			if (aKnown !== bKnown) return aKnown ? -1 : 1;
-			if (aKnown && bKnown && a.at !== b.at) return a.at - b.at;
+		const now = Date.now();
+		return candidates.map((acc, index) => {
+			const q = acc.quotas?.[family];
+			const weeklyMs = q?.weeklyResetTime ? Date.parse(q.weeklyResetTime) : NaN;
+			const fiveHourMs = q?.resetTime ? Date.parse(q.resetTime) : NaN;
+			const weeklyRemaining = !Number.isNaN(weeklyMs) ? Math.max(0, weeklyMs - now) : Number.POSITIVE_INFINITY;
+			const fiveHourRemaining = !Number.isNaN(fiveHourMs) ? Math.max(0, fiveHourMs - now) : Number.POSITIVE_INFINITY;
+			return {
+				acc,
+				index,
+				weeklyRemaining,
+				fiveHourRemaining,
+				weeklyKnown: Number.isFinite(weeklyRemaining),
+				fiveHourKnown: Number.isFinite(fiveHourRemaining)
+			};
+		}).sort((a, b) => {
+			if (a.weeklyKnown && b.weeklyKnown) {
+				if (a.weeklyRemaining !== b.weeklyRemaining) return a.weeklyRemaining - b.weeklyRemaining;
+			} else if (a.weeklyKnown !== b.weeklyKnown) return a.weeklyKnown ? -1 : 1;
+			if (a.fiveHourKnown && b.fiveHourKnown) {
+				if (a.fiveHourRemaining !== b.fiveHourRemaining) return a.fiveHourRemaining - b.fiveHourRemaining;
+			} else if (a.fiveHourKnown !== b.fiveHourKnown) return a.fiveHourKnown ? -1 : 1;
 			const da = this.cyclicDistance(fromId, a.acc.id);
 			const db = this.cyclicDistance(fromId, b.acc.id);
 			return da !== db ? da - db : a.index - b.index;
@@ -3781,7 +4004,7 @@ var AccountPoolManager = class {
 				return activeCandidate;
 			}
 		}
-		const nextAccount = activeId !== void 0 ? this.orderByExpiry(candidates, family, activeId)[0] : candidates[0];
+		const nextAccount = this.orderByExpiry(candidates, family, activeId)[0];
 		if (!this.data.activeAccountIds) this.data.activeAccountIds = {};
 		this.data.activeAccountIds[family] = nextAccount.id;
 		this.data.lastActiveAccountId = nextAccount.id;
@@ -28739,14 +28962,14 @@ function mergeSentImageIds(existing, added, max = 64) {
 * budget is filled from the newest other turns.
 */
 function buildDigest(messages, fromIdx, maxChars) {
-	const taskText = latestUserTaskText(messages.slice(fromIdx));
+	const taskText = stripNulBytes(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;
 		if (isSyntheticHarnessMessage(m)) continue;
-		const text = textOf(m);
+		const text = stripNulBytes(textOf(m));
 		if (text === "") continue;
 		if (taskLine !== "" && !isToolResultMessage(m) && m.role === "user" && text === taskText) continue;
 		otherLines.push(digestLabel(m) + text);
@@ -28809,7 +29032,9 @@ function brief(s) {
 }
 function sawAuthFailure(parser, outcome) {
 	if (parser.stats.sawAuthFailure) return true;
-	return looksLikeAuthFailure(outcome.stderrTail) || looksLikeAuthFailure(outcome.stdout.slice(0, 4e3));
+	if (looksLikeAuthFailure(outcome.stderrTail)) return true;
+	if (parser.stats.lastResultError && looksLikeAuthFailure(parser.stats.lastResultError)) return true;
+	return false;
 }
 /**
 * Bounded wait for an aborted run to settle, so a steer replacement never
@@ -29068,12 +29293,29 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				this.warnOnce("cwd:" + (sessionKey || "anon"), "session workspace unresolved (sessionId=" + (sessionKey || "none") + ") — running agy in the DSH process cwd: " + workspaceRoot);
 			}
 		}
+		if (isGoalToolContinuation(options.messages) || isPlanToolContinuation(options.messages)) {
+			yield {
+				type: "finish",
+				reason: { kind: "stop" }
+			};
+			return;
+		}
+		const goalContext = detectGoalContext(options.messages);
+		if (goalContext && (!goalContext.goalId || goalContext.revision === void 0) && sessionKey && this.deps.sessionGoal) {
+			const sg = this.deps.sessionGoal(sessionKey);
+			if (sg) {
+				if (!goalContext.goalId) goalContext.goalId = sg.goalId;
+				if (goalContext.revision === void 0) goalContext.revision = sg.revision;
+			}
+		}
+		const supportsGoalUpdate = Boolean(options.tools?.some((t) => t.name === "update_goal"));
+		const supportsPlanExit = Boolean(options.tools?.some((t) => t.name === "exit_plan_mode")) && isPlanMode(options.messages);
 		const continuation = detectContinuation(options.messages);
 		if (continuation !== null) {
 			const rec = this.deps.runs.get(continuation.runId);
 			const deadFailure = rec !== void 0 && rec.isSettled ? rec.failureInfo : null;
 			if (rec !== void 0 && !(deadFailure !== null && this.claimFailover(sessionKey, deadFailure.code))) {
-				yield* this.driveSpan(rec, continuation.eventIndex + 1, hasToolSupport, isCodeMode);
+				yield* this.driveSpan(rec, continuation.eventIndex + 1, hasToolSupport, isCodeMode, goalContext, supportsGoalUpdate, supportsPlanExit);
 				return;
 			}
 			if (rec !== void 0) {
@@ -29163,7 +29405,9 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 			}
 			if (!account) {
 				const pool = this.deps.pool;
-				const accounts = pool.getAccounts().filter((a) => a.enabled);
+				const allAccounts = pool.getAccounts();
+				const accounts = allAccounts.filter((a) => a.enabled);
+				const disabled = allAccounts.length - accounts.length;
 				const cooling = accounts.filter((a) => pool.isAccountEligible(a, family) === false && !a.authRequired).length;
 				const signedOut = accounts.filter((a) => a.authRequired === true).length;
 				const countdown = pool.getEarliestAvailableCountdown?.(family) ?? pool.getEarliestResetCountdown(family);
@@ -29172,7 +29416,17 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 					account = pool.selectAccount(family) ?? void 0;
 				}
 				if (!account) {
-					const why = signedOut > 0 && signedOut === accounts.length ? "every account needs a re-login (run /agy auth)" : `no account can serve ${family} right now (${cooling} in cooldown, ${signedOut} signed out)`;
+					let why;
+					if (accounts.length === 0 && allAccounts.length > 0) why = "all accounts are disabled (enable an account in the console or run /agy enable-account)";
+					else if (signedOut > 0 && signedOut === accounts.length) why = "every account needs a re-login (run /agy auth)";
+					else {
+						const details = [];
+						if (cooling > 0) details.push(`${cooling} in cooldown`);
+						if (signedOut > 0) details.push(`${signedOut} signed out`);
+						if (disabled > 0) details.push(`${disabled} disabled`);
+						const detailStr = details.length > 0 ? ` (${details.join(", ")})` : "";
+						why = `no account can serve ${family} right now${detailStr}`;
+					}
 					const waitStr = countdown !== null && countdown > 0 ? ` (earliest reset in ${Math.ceil(countdown / 1e3)}s)` : "";
 					throw new LlmError(`All Antigravity accounts are unavailable: ${why}${waitStr}. Add an account, wait for reset, or run /agy clear-cooldown.`, Err.AGY_ERROR);
 				}
@@ -29294,7 +29548,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 						startedAt: now,
 						inFlight: true
 					});
-					yield* this.driveSpan(liveRun, rescueFrom, hasToolSupport, isCodeMode);
+					yield* this.driveSpan(liveRun, rescueFrom, hasToolSupport, isCodeMode, goalContext, supportsGoalUpdate, supportsPlanExit);
 					return;
 				}
 				throw new LlmError("Duplicate request ignored: an identical request is already running for this session.", Err.BUSY);
@@ -29379,6 +29633,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 		};
 		const activeModelForArgs = activeModel === "" ? cfg.defaultModel : activeModel;
 		const effectiveAddDirs = workspaceRoot !== "" ? stagedDirs.includes(workspaceRoot) ? stagedDirs : [workspaceRoot, ...stagedDirs] : stagedDirs;
+		prompt = stripNulBytes(prompt);
 		const argsBase = this.buildArgs({
 			prompt,
 			model: activeModelForArgs,
@@ -29544,31 +29799,31 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				code: Err.TIMEOUT,
 				message: "agy run was idle for " + cfg.timeoutMs + "ms without output" + (silentTimeout ? " — agy never emitted a single event; it is likely unable to reach Google (check proxy/network). 无法连接 Google，请检查代理或网络配置" : "")
 			};
-			else if (sawAuthFailure(parser, outcome)) failure = transportFailure ? {
-				kind: "error",
-				code: Err.NETWORK,
-				message: "agy could not validate its Google login over the network (transport failure, not a sign-out) — retrying on another account. " + (rawErrText !== "" ? brief(rawErrText) : "")
-			} : {
-				kind: "error",
-				code: Err.AUTH,
-				message: "agy is not signed in — run /agy auth (or run agy once in a terminal) to login"
-			};
-			else if (isRateLimit) {
-				const bestMsg = parser.stats.lastResultError || (outcome.stderrTail ? brief(outcome.stderrTail) : "Rate limit or quota reached");
-				failure = {
+			else if (!consumable) {
+				if (sawAuthFailure(parser, outcome)) failure = transportFailure ? {
 					kind: "error",
-					code: looksLikeHardRateLimit(rawErrText) ? Err.RATE_LIMIT : Err.OVERLOADED,
-					message: "Google Antigravity quota / rate limit reached: " + bestMsg
-				};
-			} else if (!transportFailure && (looksLikeEligibilityFailure(rawErrText) || looksLikeEligibilityFailure(parser.stats.lastResultError ?? ""))) {
-				const detail = parser.stats.lastResultError ?? (outcome.stderrTail !== "" ? brief(outcome.stderrTail) : "");
-				failure = {
+					code: Err.NETWORK,
+					message: "agy could not validate its Google login over the network (transport failure, not a sign-out) — retrying on another account. " + (rawErrText !== "" ? brief(rawErrText) : "")
+				} : {
 					kind: "error",
-					code: Err.ELIGIBILITY,
-					message: ELIGIBILITY_ERROR_HINT + (detail !== "" ? " (" + detail + ")" : "")
+					code: Err.AUTH,
+					message: "agy is not signed in — run /agy auth (or run agy once in a terminal) to login"
 				};
-			} else if (!consumable) {
-				if (outcome.code !== 0) {
+				else if (isRateLimit) {
+					const bestMsg = parser.stats.lastResultError || (outcome.stderrTail ? brief(outcome.stderrTail) : "Rate limit or quota reached");
+					failure = {
+						kind: "error",
+						code: looksLikeHardRateLimit(rawErrText) ? Err.RATE_LIMIT : Err.OVERLOADED,
+						message: "Google Antigravity quota / rate limit reached: " + bestMsg
+					};
+				} else if (!transportFailure && (looksLikeEligibilityFailure(rawErrText) || looksLikeEligibilityFailure(parser.stats.lastResultError ?? ""))) {
+					const detail = parser.stats.lastResultError ?? (outcome.stderrTail !== "" ? brief(outcome.stderrTail) : "");
+					failure = {
+						kind: "error",
+						code: Err.ELIGIBILITY,
+						message: ELIGIBILITY_ERROR_HINT + (detail !== "" ? " (" + detail + ")" : "")
+					};
+				} else if (outcome.code !== 0) {
 					const detail = parser.stats.lastResultError ?? (outcome.stderrTail !== "" ? brief(outcome.stderrTail) : "");
 					failure = transportFailure ? {
 						kind: "error",
@@ -29648,7 +29903,7 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				message: "internal error: " + brief(String(err))
 			});
 		});
-		yield* this.driveSpan(rec, 0, !isAux && hasToolSupport, isCodeMode);
+		yield* this.driveSpan(rec, 0, !isAux && hasToolSupport, isCodeMode, goalContext, supportsGoalUpdate, supportsPlanExit);
 	}
 	/**
 	* Stream one span of a recording: map events from `from` until the mapper
@@ -29657,18 +29912,18 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 	* as this span's terminal chunk — the turn ends exactly like a native
 	* provider error.
 	*/
-	async *driveSpan(rec, from, cutOnTool, useCodeWrapper) {
+	async *driveSpan(rec, from, cutOnTool, useCodeWrapper, goalContext, supportsGoalUpdate, supportsPlanExit) {
 		this.deps.runs.remember(rec);
 		this.deps.runs.pin(rec.runId);
 		try {
-			yield* this.driveSpanBody(rec, from, cutOnTool, useCodeWrapper);
+			yield* this.driveSpanBody(rec, from, cutOnTool, useCodeWrapper, goalContext, supportsGoalUpdate, supportsPlanExit);
 		} finally {
 			this.deps.runs.unpin(rec.runId);
 			this.deps.runs.remember(rec);
 		}
 	}
 	/** Body of {@link driveSpan}: map recorded events until the span finishes. */
-	async *driveSpanBody(rec, from, cutOnTool, useCodeWrapper) {
+	async *driveSpanBody(rec, from, cutOnTool, useCodeWrapper, goalContext, supportsGoalUpdate, supportsPlanExit) {
 		const queue = new ChunkQueue();
 		(async () => {
 			const resolved = /* @__PURE__ */ new Map();
@@ -29682,7 +29937,10 @@ var AgyAdapter = class AgyAdapter extends LlmAdapter {
 				usage: rec,
 				resolvedFullArgs: resolved,
 				resolvedThoughts,
-				mediaBaseUrl: this.deps.getMediaBaseUrl?.() ?? void 0
+				mediaBaseUrl: this.deps.getMediaBaseUrl?.() ?? void 0,
+				goalContext,
+				supportsGoalUpdate,
+				supportsPlanExit
 			});
 			let i = from;
 			try {
@@ -29868,6 +30126,7 @@ async function runAgyOnce(deps, req) {
 	if (req.effort) args.push("--effort", req.effort);
 	let prompt = req.prompt;
 	if (req.readPaths && req.readPaths.length > 0) prompt = await inlineFiles(prompt, req.readPaths, cfg.workspaceRoot !== "" ? cfg.workspaceRoot : process.cwd());
+	prompt = stripNulBytes(prompt);
 	let cleanup = null;
 	if (req.schema !== void 0 && req.schema !== null) {
 		const sa = await schemaArgs(req.schema);
@@ -29922,15 +30181,15 @@ async function runAgyOnce(deps, req) {
 		error: "timed out after " + timeoutMs + "ms",
 		durationMs: outcome.durationMs
 	};
-	if (looksLikeAuthFailure(outcome.stderrTail) || looksLikeAuthFailure(outcome.stdout.slice(0, 4e3))) return {
+	const joined = textParts.join("\n").trim();
+	const text = joined !== "" ? joined : resultText;
+	if (text === "" && (looksLikeAuthFailure(outcome.stderrTail) || parser.stats.sawAuthFailure)) return {
 		ok: false,
 		text: "",
 		conversationId,
 		error: "agy is not signed in — run /agy auth",
 		durationMs: outcome.durationMs
 	};
-	const joined = textParts.join("\n").trim();
-	const text = joined !== "" ? joined : resultText;
 	if (outcome.code !== 0 && text === "") return {
 		ok: false,
 		text: "",
@@ -30417,7 +30676,11 @@ const HELP = [
 	"**/agy** — Antigravity (agy CLI) bridge",
 	"- `/agy status` — binary, version, auth, mode, catalog, bindings",
 	"- `/agy pool` / `/agy accounts` — account pool, live quota %, cooldowns",
+	"- `/agy goal [status|complete|clear|pause]` — inspect or control the current DSH goal",
+	"- `/agy session [info|clear]` — view or drop the current session agy binding",
 	"- `/agy add-account [alias]` — start OAuth login for a new account slot",
+	"- `/agy enable-account <id>` — enable an account slot",
+	"- `/agy disable-account <id>` — disable an account slot (skips in rotation)",
 	"- `/agy refresh-quota` — query Google backend for fresh quota %",
 	"- `/agy clear-cooldown` — reset cooldown timers across all accounts",
 	"- `/agy remove-account <id>` — delete an account slot",
@@ -30434,12 +30697,12 @@ const HELP = [
 function agyCommandDefinition(deps) {
 	return {
 		name: "agy",
-		description: "Antigravity (agy CLI) bridge: status, login, models, mode, diagnostics",
-		input: { hint: "<status|pool|models|mode|effort|workspace|clear|doctor|help>" },
-		handler: (invocation) => handle(deps, invocation.rawInput)
+		description: "Antigravity (agy CLI) bridge: status, login, models, mode, diagnostics, goal",
+		input: { hint: "<status|pool|goal|session|enable-account|disable-account|models|mode|effort|workspace|clear|doctor|help>" },
+		handler: (invocation) => handle(deps, invocation.rawInput, invocation)
 	};
 }
-async function handle(deps, raw) {
+async function handle(deps, raw, invocation) {
 	const parts = raw.trim().split(/\s+/).filter(Boolean);
 	const sub = parts[0] ?? "help";
 	const arg = parts[1] ?? "";
@@ -30463,10 +30726,21 @@ 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 ? redactProxyUrl(a.proxyUrl) : deps.cfg().proxyUrl ? redactProxyUrl(deps.cfg().proxyUrl) : "system default"}`, `   - Quota: Gemini ${qG} | Claude ${qC} | GPT-OSS ${qO}`, cds.length > 0 ? `   - ⚠️ ${cds.join("; ")}` : "   - Status: 🟢 Ready");
+				let statusText = "   - Status: 🟢 Ready";
+				if (!a.enabled) statusText = "   - Status: ⏸️ Disabled";
+				else if (a.authRequired) statusText = `   - Status: 🔴 Auth required (${a.authError || "sign in again"})`;
+				else if (cds.length > 0) statusText = `   - ⚠️ ${cds.join("; ")}`;
+				lines.push(`${i + 1}. **${a.alias}** (${a.email || a.id})${isPrimary ? " ⭐ primary" : ""}`, `   - Proxy: ${a.proxyUrl ? redactProxyUrl(a.proxyUrl) : deps.cfg().proxyUrl ? redactProxyUrl(deps.cfg().proxyUrl) : "system default"}`, `   - Quota: Gemini ${qG} | Claude ${qC} | GPT-OSS ${qO}`, statusText);
 			}
 			return ok(lines.join("\n"));
 		}
+		if (sub === "enable-account" || sub === "disable-account") {
+			if (!arg) return err(`usage: /agy ${sub} <id>`);
+			const pool = deps.pool?.();
+			if (!pool) return err("Account pool not available");
+			const enabled = sub === "enable-account";
+			return pool.setAccountEnabled(arg, enabled) ? ok(`${enabled ? "Enabled" : "Disabled"} account ${arg}`) : err(`Account ${arg} not found`);
+		}
 		if (sub === "add-account") {
 			const pool = deps.pool?.();
 			if (!pool) return err("Account pool not available");
@@ -30498,6 +30772,164 @@ async function handle(deps, raw) {
 			if (!pool) return err("Account pool not available");
 			return pool.deleteAccount(arg) ? ok(`Removed account ${arg}`) : err(`Account ${arg} not found`);
 		}
+		if (sub === "goal") {
+			const action = arg || "status";
+			const session = invocation?.agent?.session ?? (deps.sessions?.() && invocation?.agent?.id ? deps.sessions().get(invocation.agent.id) : void 0);
+			if (!session) return err("No active DSH session available for goal command.");
+			const events = session.events;
+			let latestGoalChange = null;
+			if (events) for (let i = events.length - 1; i >= 0; i--) {
+				const ev = events[i];
+				if (ev?.type === "goal/change" && ev.data && typeof ev.data === "object") {
+					const d = ev.data;
+					if (d.kind === "goal/change") {
+						latestGoalChange = d;
+						break;
+					}
+				}
+			}
+			const activeGoal = latestGoalChange && latestGoalChange.operation !== "clear" ? latestGoalChange.goal : null;
+			if (action === "status") {
+				if (!activeGoal || !latestGoalChange) return ok("**DSH Goal Status**: No active goal in this session.");
+				return ok([
+					`**DSH Goal Status** (${{
+						active: "🟢",
+						paused: "⏸️",
+						blocked: "🚫",
+						complete: "✅"
+					}[activeGoal.phase] ?? "⚪"} \`${activeGoal.phase}\`)`,
+					`- **Goal ID**: \`${activeGoal.id}\` (rev ${activeGoal.revision})`,
+					`- **Objective**: ${activeGoal.objective}`,
+					`- **Rounds**: ${latestGoalChange.roundsStarted ?? 1} / ${activeGoal.maxGoalRounds ?? 256}`,
+					...activeGoal.blockedReason ? [`- **Blocked Reason**: ${activeGoal.blockedReason.message}`] : []
+				].join("\n"));
+			}
+			if (action === "complete") {
+				if (!activeGoal || !latestGoalChange) return err("No active goal to complete.");
+				if (typeof session.append === "function") {
+					session.append("goal/change", {
+						kind: "goal/change",
+						version: 1,
+						operation: "complete",
+						goal: {
+							id: activeGoal.id,
+							revision: activeGoal.revision + 1,
+							objective: activeGoal.objective,
+							phase: "complete",
+							maxGoalRounds: activeGoal.maxGoalRounds
+						},
+						roundsStarted: latestGoalChange.roundsStarted ?? 1,
+						createdAt: latestGoalChange.createdAt ?? Date.now(),
+						updatedAt: Date.now()
+					});
+					return ok(`✅ Marked goal \`${activeGoal.id}\` as complete. Automatic continuation rounds stopped.`);
+				}
+				return err("Session cannot append events.");
+			}
+			if (action === "pause") {
+				if (!activeGoal || !latestGoalChange) return err("No active goal to pause.");
+				if (typeof session.append === "function") {
+					session.append("goal/change", {
+						kind: "goal/change",
+						version: 1,
+						operation: "pause",
+						goal: {
+							id: activeGoal.id,
+							revision: activeGoal.revision + 1,
+							objective: activeGoal.objective,
+							phase: "paused",
+							maxGoalRounds: activeGoal.maxGoalRounds
+						},
+						roundsStarted: latestGoalChange.roundsStarted ?? 1,
+						createdAt: latestGoalChange.createdAt ?? Date.now(),
+						updatedAt: Date.now()
+					});
+					return ok(`⏸️ Paused goal \`${activeGoal.id}\`.`);
+				}
+				return err("Session cannot append events.");
+			}
+			if (action === "resume") {
+				if (!activeGoal || !latestGoalChange) return err("No active goal to resume.");
+				if (typeof session.append === "function") {
+					session.append("goal/change", {
+						kind: "goal/change",
+						version: 1,
+						operation: "resume",
+						goal: {
+							id: activeGoal.id,
+							revision: activeGoal.revision + 1,
+							objective: activeGoal.objective,
+							phase: "active",
+							maxGoalRounds: activeGoal.maxGoalRounds
+						},
+						roundsStarted: latestGoalChange.roundsStarted ?? 1,
+						createdAt: latestGoalChange.createdAt ?? Date.now(),
+						updatedAt: Date.now()
+					});
+					return ok(`▶️ Resumed goal \`${activeGoal.id}\`.`);
+				}
+				return err("Session cannot append events.");
+			}
+			if (action === "clear") {
+				if (!activeGoal) return ok("No active goal to clear.");
+				if (typeof session.append === "function") {
+					session.append("goal/change", {
+						kind: "goal/change",
+						version: 1,
+						operation: "clear",
+						cleared: {
+							id: activeGoal.id,
+							revision: activeGoal.revision + 1
+						},
+						clearedAt: Date.now()
+					});
+					return ok(`Cleared goal \`${activeGoal.id}\`.`);
+				}
+				return err("Session cannot append events.");
+			}
+			return err(`Unknown goal action \`${action}\`. Usage: /agy goal [status|complete|pause|resume|clear]`);
+		}
+		if (sub === "session") {
+			const action = arg || "info";
+			const sessionId = invocation?.agent?.id ? String(invocation.agent.id) : void 0;
+			const session = invocation?.agent?.session ?? (deps.sessions?.() && sessionId ? deps.sessions().get(sessionId) : void 0);
+			if (action === "info") {
+				const lines = ["**DSH Session & agy Bridge Info**"];
+				if (sessionId) {
+					lines.push(`- **Session ID**: \`${sessionId}\``);
+					const cwd = session?.header?.cwd;
+					if (cwd) lines.push(`- **Workspace CWD**: \`${cwd}\``);
+					const bindings = deps.store().all();
+					const matchedKey = Object.keys(bindings).find((k) => k === sessionId || k.startsWith(`${sessionId}:`));
+					if (matchedKey && bindings[matchedKey]) {
+						const b = bindings[matchedKey];
+						lines.push(`- **Bound agy Conversation**: \`${b.conversationId}\``, `- **Bound Model**: \`${b.model || "default"}\``, `- **Last Message Count**: ${b.lastMessageCount}`, `- **Last Updated**: ${new Date(b.updatedAt).toLocaleTimeString()}`);
+					} else lines.push("- **Bound agy Conversation**: *(none - next turn starts fresh)*");
+					if (session?.events) lines.push(`- **Total Session Events**: ${session.events.length}`);
+				} else lines.push("- Current session ID could not be identified from invocation context.");
+				return ok(lines.join("\n"));
+			}
+			if (action === "clear") {
+				if (!sessionId) {
+					const all = deps.store().all();
+					const keys = Object.keys(all);
+					if (keys.length === 0) return ok("No conversation bindings yet.");
+					const key = keys.reduce((a, b) => (all[a]?.updatedAt ?? 0) >= (all[b]?.updatedAt ?? 0) ? a : b);
+					const dropped = all[key];
+					if (dropped === void 0) return ok("No conversation bindings yet.");
+					deps.store().delete(key);
+					return ok(`Dropped binding for session \`${key}\` (agy conversation \`${dropped.conversationId}\`). Next turn starts fresh.`);
+				}
+				const bindings = deps.store().all();
+				let count = 0;
+				for (const k of Object.keys(bindings)) if (k === sessionId || k.startsWith(`${sessionId}:`)) {
+					deps.store().delete(k);
+					count++;
+				}
+				return ok(`Dropped ${count > 0 ? count : "any"} agy conversation binding(s) for session \`${sessionId}\`. Next turn will start a fresh agy conversation.`);
+			}
+			return err(`Unknown session action \`${action}\`. Usage: /agy session [info|clear]`);
+		}
 		if (sub === "auth") {
 			const flow = deps.poolAuth?.();
 			if (!flow) return err("auth flow not available");
@@ -30558,6 +30990,15 @@ async function handle(deps, raw) {
 			return ok("Workspace set to **" + arg + "** — effective next turn.");
 		}
 		if (sub === "clear") {
+			const sessionId = invocation?.agent?.id ? String(invocation.agent.id) : void 0;
+			if (sessionId) {
+				const bindings = deps.store().all();
+				const keys = Object.keys(bindings).filter((k) => k === sessionId || k.startsWith(`${sessionId}:`));
+				if (keys.length > 0) {
+					for (const k of keys) deps.store().delete(k);
+					return ok(`Dropped binding for session \`${sessionId}\`. The next turn starts a fresh agy conversation.`);
+				}
+			}
 			const all = deps.store().all();
 			const keys = Object.keys(all);
 			if (keys.length === 0) return ok("No conversation bindings yet.");
@@ -31941,6 +32382,22 @@ function apply(ctx, entryConfig = {}) {
 		sessionCwd: (sessionId) => {
 			return ctx.get("sessions")?.get(sessionId)?.header?.cwd;
 		},
+		sessionGoal: (sessionId) => {
+			const session = (ctx.get("sessions") ?? ctx.sessions)?.get(sessionId);
+			if (!session?.events) return null;
+			for (let i = session.events.length - 1; i >= 0; i--) {
+				const ev = session.events[i];
+				if (ev?.type === "goal/change" && ev.data && typeof ev.data === "object") {
+					const d = ev.data;
+					if (d.operation === "clear") return null;
+					if (d.goal?.id) return {
+						goalId: d.goal.id,
+						revision: typeof d.goal.revision === "number" ? d.goal.revision : 1
+					};
+				}
+			}
+			return null;
+		},
 		syncSessionModel: (sessionId, model, effort) => {
 			if (!sessionId) return;
 			try {
@@ -32046,6 +32503,7 @@ function apply(ctx, entryConfig = {}) {
 		quota: () => quota,
 		lastRun: () => lastRun,
 		setOverride,
+		sessions: () => ctx.get("sessions") ?? ctx.sessions,
 		runDoctor: async () => {
 			return writeDoctorReport({
 				cfg: getConfig,
@@ -32415,6 +32873,26 @@ function apply(ctx, entryConfig = {}) {
 				})();
 			}
 		});
+		reg({
+			kind: "exact",
+			path: "/plugins/agy-link/pool/enable",
+			handler: (req, res) => {
+				(async () => {
+					if (methodOf(req) !== "POST") {
+						sendJson(res, 405, { error: "POST only" });
+						return;
+					}
+					const body = await readBody(req);
+					const id = typeof body.id === "string" ? body.id : "";
+					const enabled = typeof body.enabled === "boolean" ? body.enabled : true;
+					const ok = pool.setAccountEnabled(id, enabled);
+					sendJson(res, ok ? 200 : 400, {
+						ok,
+						pool: pool.getPoolData()
+					});
+				})();
+			}
+		});
 		reg({
 			kind: "exact",
 			path: "/plugins/agy-link/pool/proxy",
@@ -32515,6 +32993,25 @@ function apply(ctx, entryConfig = {}) {
 				})();
 			}
 		});
+		reg({
+			kind: "exact",
+			path: "/plugins/agy-link/pool/set-active",
+			handler: (req, res) => {
+				(async () => {
+					if (methodOf(req) !== "POST") {
+						sendJson(res, 405, { error: "POST only" });
+						return;
+					}
+					const body = await readBody(req);
+					const id = typeof body.id === "string" ? body.id : "";
+					const ok = id !== "" && pool.setActiveAccount(id);
+					sendJson(res, ok ? 200 : 400, {
+						ok,
+						pool: pool.getPoolData()
+					});
+				})();
+			}
+		});
 		reg({
 			kind: "exact",
 			path: "/plugins/agy-link/pool/reorder",