@gajae-code/coding-agent 0.12.0 → 0.12.2

package/src/task/receipt.ts

@@ -1,4 +1,9 @@
-import { hasCompleteUsageCostBreakdown, type SingleResult, type TaskToolDetails } from "./types";
+import {
+	hasCompleteUsageCostBreakdown,
+	type ReviewFindingsArtifactRef,
+	type SingleResult,
+	type TaskToolDetails,
+} from "./types";
 export interface TaskRoi {
 	tokens: number;
 	contextTokens?: number;
@@ -29,21 +34,32 @@ export interface TaskResultReceipt {
 	contextWindow?: number;
 	modelOverride?: string | string[];
 	modelSubstitutionWarning?: SingleResult["modelSubstitutionWarning"];
+	fastMode?: boolean;
 	usage?: SingleResult["usage"];
 	cost?: number;
 	usageCostBreakdownComplete?: true;
 	branchName?: string;
 	retryFailure?: { attempt: number; errorSummary: string };
+	setupFailure?: { summary: string };
 	errorSummary?: string;
 	abortSummary?: string;
 	preview: string;
 	previewTruncated: boolean;
-	outputRef?: { uri: string; sizeBytes: number; lineCount: number; sha256?: string };
+	outputRef?: {
+		uri: string;
+		sizeBytes: number;
+		lineCount: number;
+		sha256?: string;
+		/** Output remains readable for the parent session lifetime (and same-session descendants). */
+		durability?: "session";
+	};
 	outputUnavailable?: boolean;
 	review?: {
 		overallCorrectness?: string;
 		findingCount: number;
 		findings?: Array<{ severity?: string; summary: string }>;
+		/** Canonical full-fidelity findings; inline summaries are display-only. */
+		findingsRef?: ReviewFindingsArtifactRef;
 	};
 	extractedToolCounts?: Record<string, number>;
 	forkContext?: SingleResult["forkContext"];
@@ -103,6 +119,9 @@ function normalizeReviewFindingSeverity(severity: unknown, priority: unknown): s
 
 function buildSafeSynopsis(raw: SingleResult, outputRef: TaskResultReceipt["outputRef"]): string {
 	const status = getStatus(raw);
+	if (raw.setupFailure) {
+		return `Task ${status} during setup: ${raw.setupFailure.summary}`;
+	}
 	if (raw.modelSubstitutionWarning) {
 		return `Task ${status}; requested model substituted from ${raw.modelSubstitutionWarning.requested} to ${raw.modelSubstitutionWarning.effective}.`;
 	}
@@ -131,32 +150,34 @@ function getStatus(raw: SingleResult): TaskResultReceipt["status"] {
 
 function buildReview(raw: SingleResult): TaskResultReceipt["review"] | undefined {
 	const data = raw.extractedToolData;
-	if (!data) return undefined;
-	const yields = Array.isArray(data.yield) ? data.yield : [];
+	const findingsRef = raw.reviewFindingsRef;
+	const yields = Array.isArray(data?.yield) ? data.yield : [];
 	const reviewYield = yields
 		.map(item => (item && typeof item === "object" ? (item as { data?: unknown }).data : undefined))
 		.findLast(item => item && typeof item === "object" && "overall_correctness" in item) as
 		| { overall_correctness?: unknown }
 		| undefined;
-	const rawFindings = Array.isArray(data.report_finding) ? data.report_finding : [];
+	const rawFindings = Array.isArray(data?.report_finding) ? data.report_finding : [];
 	const findings = rawFindings.slice(0, 20).map(item => {
 		const value = item && typeof item === "object" ? (item as Record<string, unknown>) : {};
 		const severity = normalizeReviewFindingSeverity(value.severity, value.priority);
 		const summaryValue = value.summary ?? value.title ?? value.message ?? value.body ?? "finding";
 		return { severity, summary: truncateText(String(summaryValue), 200) ?? "finding" };
 	});
-	if (!reviewYield && findings.length === 0) return undefined;
+	if (!reviewYield && findings.length === 0 && !findingsRef) return undefined;
 	return {
 		overallCorrectness: truncateText(
 			typeof reviewYield?.overall_correctness === "string" ? reviewYield.overall_correctness : undefined,
 			200,
 		),
-		findingCount: rawFindings.length,
+		findingCount: findingsRef?.findingCount ?? rawFindings.length,
 		findings: findings.length > 0 ? findings : undefined,
+		findingsRef,
 	};
 }
 
 function hasReviewFindings(raw: SingleResult): boolean {
+	if (raw.reviewFindingsRef) return true;
 	const findings = raw.extractedToolData?.report_finding;
 	return Array.isArray(findings) && findings.length > 0;
 }
@@ -210,12 +231,15 @@ export function buildTaskRoiSummary(receipts: readonly TaskResultReceipt[]): Tas
 }
 
 export function buildTaskReceipt(raw: SingleResult): TaskResultReceipt {
+	// Receipts only include outputRef when production code kept outputMeta after a
+	// durable write (file-backed session dir or session-lifetime durable root).
 	const outputRef = raw.outputMeta
 		? {
 				uri: `agent://${raw.id}`,
 				sizeBytes: raw.outputMeta.byteSize ?? Buffer.byteLength(raw.output, "utf8"),
 				lineCount: raw.outputMeta.lineCount,
 				sha256: raw.outputMeta.sha256,
+				durability: "session" as const,
 			}
 		: undefined;
 	const preview = buildSafeSynopsis(raw, outputRef);
@@ -251,10 +275,12 @@ export function buildTaskReceipt(raw: SingleResult): TaskResultReceipt {
 		usageCostBreakdownComplete:
 			raw.usageCostBreakdownComplete === true && hasCompleteUsageCostBreakdown(raw.usage) ? true : undefined,
 		branchName: raw.branchName,
+		fastMode: raw.fastMode,
 		retryFailure: raw.retryFailure
 			? { attempt: raw.retryFailure.attempt, errorSummary: "Retry failure recorded." }
 			: undefined,
-		errorSummary: raw.error ? "Error recorded." : undefined,
+		errorSummary: raw.setupFailure?.summary ?? (raw.error ? "Error recorded." : undefined),
+		setupFailure: raw.setupFailure ? { summary: raw.setupFailure.summary } : undefined,
 		abortSummary: raw.abortReason ? "Abort reason recorded." : undefined,
 		preview,
 		previewTruncated: false,

package/src/task/render.ts

@@ -561,7 +561,7 @@ function renderAgentProgress(
 	const description = progress.description?.trim();
 	const displayId = formatTaskId(progress.id);
 	const titlePart = description ? `${theme.bold(displayId)}: ${description}` : displayId;
-	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", titlePart)}`;
+	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", titlePart)}${progress.fastMode && theme.icon.fast ? ` ${theme.icon.fast}` : ""}`;
 
 	// A provider recovery loop is operationally distinct from normal agent work.
 	if (progress.retryState && progress.status === "running") {
@@ -594,6 +594,10 @@ function renderAgentProgress(
 			)}`,
 		);
 	}
+	if (progress.setupFailure && progress.status !== "running") {
+		const summary = `Setup failure: ${truncateToWidth(replaceTabs(progress.setupFailure.summary), 80)}`;
+		lines.push(`${continuePrefix}${theme.tree.hook} ${theme.fg("error", summary)}`);
+	}
 
 	// Current tool (if running) or most recent completed tool
 	if (progress.status === "running") {
@@ -862,7 +866,7 @@ function renderAgentResult(result: TaskResultReceipt, isLast: boolean, expanded:
 	const description = result.description?.trim();
 	const displayId = formatTaskId(result.id);
 	const titlePart = description ? `${theme.bold(displayId)}: ${description}` : displayId;
-	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", titlePart)} ${formatBadge(
+	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", titlePart)}${result.fastMode && theme.icon.fast ? ` ${theme.icon.fast}` : ""} ${formatBadge(
 		statusText,
 		iconColor,
 		theme,

package/src/task/types.ts

@@ -212,6 +212,14 @@ export interface ReviewFinding {
 	line_end: number;
 }
 
+/** Durable full-fidelity review findings artifact associated with a task result. */
+export interface ReviewFindingsArtifactRef {
+	uri: `artifact://${string}`;
+	sizeBytes: number;
+	sha256: string;
+	findingCount: number;
+}
+
 /** Review summary submitted by the reviewer agent */
 export interface ReviewSummary {
 	overall_correctness: "correct" | "incorrect";
@@ -283,6 +291,8 @@ export interface AgentProgress {
 	durationMs: number;
 	modelOverride?: string | string[];
 	modelSubstitutionWarning?: ModelSubstitutionWarning;
+	/** Whether the resolved subagent model runs under the effective fast service tier. */
+	fastMode?: boolean;
 	/** Data extracted by registered subprocess tool handlers (keyed by tool name) */
 	extractedToolData?: Record<string, unknown[]>;
 	/**
@@ -313,6 +323,8 @@ export interface AgentProgress {
 		attempt: number;
 		errorMessage: string;
 	};
+	/** Safe diagnostic retained in terminal progress when setup fails before the first LLM request. */
+	setupFailure?: SetupFailureSummary;
 	/**
 	 * Snapshot of the most recent `task` tool call's in-flight `TaskToolDetails`,
 	 * captured from `tool_execution_update`. Lets the parent UI surface live
@@ -323,6 +335,96 @@ export interface AgentProgress {
 	inflightTaskDetails?: TaskToolDetails;
 }
 
+/** Bounded diagnostic retained when subagent setup fails before an LLM request starts. */
+export interface SetupFailureSummary {
+	summary: string;
+}
+
+const SETUP_FAILURE_SUMMARY_MAX_CHARS = 280;
+const SETUP_FAILURE_SUMMARY_MAX_BYTES = 1_024;
+const AUTHORIZATION_HEADER_VALUE_PATTERN = /(["']?(?:Proxy-)?Authorization\b["']?\s*:\s*)[^\r\n]*/gi;
+const COOKIE_HEADER_VALUE_PATTERN = /(["']?(?:Set-)?Cookie\b["']?\s*:\s*)[^\r\n]*/gi;
+const URL_CREDENTIAL_PATTERN = /([a-z][a-z0-9+.-]*:\/\/)[^/?#\s:@]+:[^@/?#\s]+@/gi;
+const API_KEY_LABEL_VALUE_PATTERN = /(["']?api\s+key["']?\s*:\s*)(?:"[^"]*"|'[^']*'|[^\s&]+)/gi;
+const SENSITIVE_SETUP_FAILURE_VALUE_PATTERN =
+	/(["']?(?:(?:[A-Za-z][A-Za-z0-9]*[_.-])*?)(?:access[_-]?token|refresh[_-]?token|session[_-]?token|id[_-]?token|api[_-]?key|client[_-]?secret|private[_-]?key|signing[_-]?key|secret|password|passwd|pwd|authorization|credential|token)(?:[_.-][A-Za-z0-9]+)*["']?)(\s*[=:]\s*)(?:"[^"]*"|'[^']*'|[^\s&]+)/gi;
+const BARE_PROVIDER_TOKEN_PATTERN =
+	/\b(?:gh[pousr]_[A-Za-z0-9_]{20,}|github_pat_[A-Za-z0-9_]{20,}|xox[baprs]-[A-Za-z0-9-]{20,}|sk-(?:proj-)?[A-Za-z0-9_-]{20,}|sk-ant-[A-Za-z0-9_-]{20,}|AIza[A-Za-z0-9_-]{35}|AKIA[A-Z0-9]{16})\b/g;
+const LOCAL_ABSOLUTE_PATH_PATTERN = /(^|[\s("'`=])((?:\/(?!\/)[^\s/:?"'`()[\]{},;<>]+){2,})/g;
+const WINDOWS_ABSOLUTE_PATH_PATTERN =
+	/(^|[\s("'`=])([A-Za-z]:\\(?:[^\\/:?"'`()[\]{},;<>\s]+\\)+[^\\/:?"'`()[\]{},;<>\s]+)/g;
+const LOCAL_FILE_URI_PATTERN = /\bfile:\/\/(?:localhost)?(?:\/[^\s/:?"'`()[\]{},;<>]+)+/gi;
+const SENSITIVE_PATH_BASENAME_PATTERN =
+	/(?:^|[_.-])(?:access[_-]?token|refresh[_-]?token|session[_-]?token|id[_-]?token|api[_-]?key|client[_-]?secret|private[_-]?key|signing[_-]?key|secrets?|password|passwd|pwd|authorization|credential|token)(?:[_.-]|$)|^(?:\.env(?:\..*)?|credentials?(?:\.[A-Za-z0-9_-]+)?|id_(?:rsa|ed25519)|.+\.(?:pem|p12|pfx|key))$|^(?:sk|pk|rk|gh[opsur]|github_pat|xox[baprs])[_-][A-Za-z0-9_-]+$/i;
+
+function redactPathBasename(path: string): string {
+	const basename = path.slice(Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\")) + 1);
+	return SENSITIVE_PATH_BASENAME_PATTERN.test(basename) ? "[redacted]" : basename;
+}
+
+function redactLocalAbsolutePath(_match: string, prefix: string, absolutePath: string): string {
+	return `${prefix}<path>/${redactPathBasename(absolutePath)}`;
+}
+
+function redactLocalFileUri(uri: string): string {
+	return `file://<path>/${redactPathBasename(uri)}`;
+}
+
+function normalizeSetupFailureText(value: string): string {
+	return value
+		.normalize("NFKC")
+		.replace(/\u001B(?:\[[0-?]*[ -/]*[@-~]|\][^\u0007\u001B]*(?:\u0007|\u001B\\))/g, "")
+		.replace(/[\u200B-\u200D\u2060\uFEFF]/g, "")
+		.replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F-\u009F]/g, "")
+		.replace(/\t/g, " ");
+}
+
+function capSetupFailureSummary(value: string): string {
+	const ellipsis = "…";
+	const ellipsisBytes = Buffer.byteLength(ellipsis, "utf8");
+	const chunks: string[] = [];
+	let chars = 0;
+	let bytes = 0;
+	for (const codePoint of value) {
+		const codePointBytes = Buffer.byteLength(codePoint, "utf8");
+		if (chars + 1 > SETUP_FAILURE_SUMMARY_MAX_CHARS || bytes + codePointBytes > SETUP_FAILURE_SUMMARY_MAX_BYTES) {
+			while (
+				chunks.length > 0 &&
+				(chars + 1 > SETUP_FAILURE_SUMMARY_MAX_CHARS || bytes + ellipsisBytes > SETUP_FAILURE_SUMMARY_MAX_BYTES)
+			) {
+				const removed = chunks.pop()!;
+				chars -= 1;
+				bytes -= Buffer.byteLength(removed, "utf8");
+			}
+			return `${chunks.join("")}${ellipsis}`;
+		}
+		chunks.push(codePoint);
+		chars += 1;
+		bytes += codePointBytes;
+	}
+	return chunks.join("");
+}
+
+/** Create a bounded diagnostic that preserves a setup failure's cause without exposing credentials or local paths. */
+export function createSetupFailureSummary(error: unknown): SetupFailureSummary {
+	const message = normalizeSetupFailureText(error instanceof Error ? error.message : String(error));
+	const summary = message
+		.replace(AUTHORIZATION_HEADER_VALUE_PATTERN, "$1[redacted]")
+		.replace(COOKIE_HEADER_VALUE_PATTERN, "$1[redacted]")
+		.replace(URL_CREDENTIAL_PATTERN, "$1[redacted]@")
+		.replace(API_KEY_LABEL_VALUE_PATTERN, "$1[redacted]")
+		.replace(LOCAL_FILE_URI_PATTERN, redactLocalFileUri)
+		.replace(LOCAL_ABSOLUTE_PATH_PATTERN, redactLocalAbsolutePath)
+		.replace(WINDOWS_ABSOLUTE_PATH_PATTERN, redactLocalAbsolutePath)
+		.replace(SENSITIVE_SETUP_FAILURE_VALUE_PATTERN, "$1$2[redacted]")
+		.replace(BARE_PROVIDER_TOKEN_PATTERN, "[redacted]")
+		.replace(/\s+/g, " ")
+		.trim();
+	return {
+		summary: capSetupFailureSummary(summary) || "Subagent setup failed.",
+	};
+}
+
 /** Result from a single agent execution */
 export interface SingleResult {
 	index: number;
@@ -346,7 +448,11 @@ export interface SingleResult {
 	contextWindow?: number;
 	modelOverride?: string | string[];
 	modelSubstitutionWarning?: ModelSubstitutionWarning;
+	/** Whether the resolved subagent model ran under the effective fast service tier. */
+	fastMode?: boolean;
 	error?: string;
+	/** Safe diagnostic for a failure before the subagent sent its first LLM request. */
+	setupFailure?: SetupFailureSummary;
 	aborted?: boolean;
 	abortReason?: string;
 	paused?: boolean;
@@ -366,6 +472,8 @@ export interface SingleResult {
 	producedChanges?: boolean;
 	/** Data extracted by registered subprocess tool handlers (keyed by tool name) */
 	extractedToolData?: Record<string, unknown[]>;
+	/** Full wrapper-owned review evidence, kept separate from caller completion data. */
+	reviewFindingsRef?: ReviewFindingsArtifactRef;
 	/**
 	 * Terminal retry failure, when the subagent exited because the auto-retry
 	 * loop gave up (retry-after exceeded the cap, or all attempts exhausted).

package/src/tools/ask-answer-registry.ts

@@ -11,21 +11,27 @@ import { logger } from "@gajae-code/utils";
 import type { WorkflowGateEmitter } from "../modes/shared/agent-wire/workflow-gate-broker";
 import type { AskAnswerSource } from "./index";
 
-const sources = new Map<string, AskAnswerSource>();
+const sources = new Map<string, AskAnswerSource[]>();
 const workflowGateEmitters = new Map<string, WorkflowGateEmitter>();
 const workflowGateListeners = new Map<string, Set<(emitter: WorkflowGateEmitter | undefined) => void>>();
 
-/** Register `source` for `sessionId`. Returns a disposer that clears it. */
+/** Register `source` for `sessionId`. Returns a disposer that restores the prior source. */
 export function registerAskAnswerSource(sessionId: string, source: AskAnswerSource): () => void {
-	sources.set(sessionId, source);
+	const stack = sources.get(sessionId) ?? [];
+	stack.push(source);
+	sources.set(sessionId, stack);
 	return () => {
-		if (sources.get(sessionId) === source) sources.delete(sessionId);
+		const current = sources.get(sessionId);
+		if (!current) return;
+		const index = current.lastIndexOf(source);
+		if (index >= 0) current.splice(index, 1);
+		if (current.length === 0) sources.delete(sessionId);
 	};
 }
 
-/** The answer source for `sessionId`, if one is registered. */
+/** The highest-priority answer source for `sessionId`, if one is registered. */
 export function getAskAnswerSource(sessionId: string): AskAnswerSource | undefined {
-	return sources.get(sessionId);
+	return sources.get(sessionId)?.at(-1);
 }
 
 /** Publish a session's current workflow-gate emitter after mode initialization. */

package/src/tools/ask.ts

@@ -1281,9 +1281,11 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 		// attended TUI asks would route to emitGate() and hang forever waiting on
 		// a remote responder.
 		const hasInteractiveUi = context?.hasUI === true && !!context.ui;
-		const canUseWorkflowGate = !hasInteractiveUi && gateEmitter?.supportsRemoteGateAnswers() === true;
-		// Headless fallback: SDK workflow gates are the non-TUI answer path.
-		if (!canUseWorkflowGate && (!context?.hasUI || !context.ui)) {
+		const initialAnswerSource = this.session.getAskAnswerSource?.();
+		const canUseWorkflowGate =
+			!hasInteractiveUi && !initialAnswerSource && gateEmitter?.supportsRemoteGateAnswers() === true;
+		// Headless fallback: an SDK answer source or workflow gate is the non-TUI answer path.
+		if (!hasInteractiveUi && !initialAnswerSource && !canUseWorkflowGate) {
 			context?.abort();
 			throw new ToolAbortError("Ask tool requires interactive mode");
 		}
@@ -1291,9 +1293,11 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 		const extensionUi = context?.ui;
 		const ui: UIContext = {
 			select: (prompt, options, dialogOptions) => {
-				if (!extensionUi) throw new ToolAbortError("Ask tool requires interactive mode");
 				const source = this.session.getAskAnswerSource?.();
-				if (!source) return extensionUi.select(prompt, options, dialogOptions);
+				if (!source) {
+					if (!extensionUi) throw new ToolAbortError("Ask tool requires interactive mode");
+					return extensionUi.select(prompt, options, dialogOptions);
+				}
 				// Race the local UI against a remote answer (e.g. an SDK reply) so asks
 				// can be answered without local UI interaction. The first valid answer
 				// wins; the loser is aborted so neither side is left hanging:
@@ -1322,7 +1326,10 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 						: source.awaitAnswer(prompt, options, remoteController.signal)
 				)
 					.then((answer): RemoteRaceResult | Promise<RemoteRaceResult> => {
-						if (answer === undefined) return new Promise<never>(() => {});
+						if (answer === undefined) {
+							if (!extensionUi) throw new ToolAbortError("Ask was cancelled by the remote client");
+							return new Promise<never>(() => {});
+						}
 						const receipt = typeof answer === "string" ? legacyAskReceipt(answer) : answer;
 						if (generation !== remoteGeneration) {
 							return receipt
@@ -1375,40 +1382,49 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 						}
 						return { winner: "remote" as const, value: selectedValue, receipt };
 					})
-					.catch(ignoreRemoteAnswerFailure);
-
-				const local = extensionUi
-					.select(prompt, options, { ...dialogOptions, signal: localController.signal })
-					.then(answer => {
-						if (generation === remoteGeneration) remoteGeneration++;
-						remoteController.abort();
-						return { winner: "local" as const, value: answer };
-					})
 					.catch(error => {
-						if (generation === remoteGeneration) remoteGeneration++;
-						remoteController.abort();
-						throw error;
+						if (!extensionUi) throw error;
+						return ignoreRemoteAnswerFailure(error);
 					});
+
+				const local = extensionUi
+					? extensionUi
+							.select(prompt, options, { ...dialogOptions, signal: localController.signal })
+							.then(answer => {
+								if (generation === remoteGeneration) remoteGeneration++;
+								remoteController.abort();
+								return { winner: "local" as const, value: answer };
+							})
+							.catch(error => {
+								if (generation === remoteGeneration) remoteGeneration++;
+								remoteController.abort();
+								throw error;
+							})
+					: new Promise<never>(() => {});
 				// The losing selector may reject when aborted after the race already settled;
 				// swallow that so it is not an unhandled rejection (the race result is unaffected).
 				void local.catch(() => undefined);
-				return Promise.race([local, remote]).then(async result => {
-					if (result.winner === "remote") {
-						localController.abort();
-						if (result.settlement) await result.receipt.settle(result.settlement);
-						else activeRemoteReceipt = result.receipt;
-					} else {
-						void remote.then(remoteResult =>
-							remoteResult.receipt.settle({ kind: "resolve_without_commit", reason: "aborted" }),
-						);
-					}
-					return result.value;
-				});
+				return Promise.race([local, remote])
+					.then(async result => {
+						if (result.winner === "remote") {
+							localController.abort();
+							if (result.settlement) await result.receipt.settle(result.settlement);
+							else activeRemoteReceipt = result.receipt;
+						} else {
+							void remote.then(remoteResult =>
+								remoteResult.receipt.settle({ kind: "resolve_without_commit", reason: "aborted" }),
+							);
+						}
+						return result.value;
+					})
+					.finally(() => toolSignal?.removeEventListener("abort", abortRace));
 			},
 			editor: (title, prefill, dialogOptions, editorOptions) => {
-				if (!extensionUi) throw new ToolAbortError("Ask tool requires interactive mode");
 				const source = this.session.getAskAnswerSource?.();
-				if (!source) return extensionUi.editor(title, prefill, dialogOptions, editorOptions);
+				if (!source) {
+					if (!extensionUi) throw new ToolAbortError("Ask tool requires interactive mode");
+					return extensionUi.editor(title, prefill, dialogOptions, editorOptions);
+				}
 				// Race the local editor against a remote free-text answer so "Other / type
 				// your own" custom input can be provided remotely (e.g. a typed Telegram
 				// reply) instead of blocking on the local-only editor. Mirrors `select`.
@@ -1439,7 +1455,10 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 						: source.awaitAnswer(title, [], remoteController.signal)
 				)
 					.then((answer): RemoteRaceResult | Promise<RemoteRaceResult> => {
-						if (answer === undefined) return new Promise<never>(() => {});
+						if (answer === undefined) {
+							if (!extensionUi) throw new ToolAbortError("Ask was cancelled by the remote client");
+							return new Promise<never>(() => {});
+						}
 						const receipt = typeof answer === "string" ? legacyAskReceipt(answer) : answer;
 						if (generation !== remoteGeneration) {
 							return receipt
@@ -1450,31 +1469,43 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 							receipt.interaction.kind === "control" ? REMOTE_NAVIGATION_FORWARD : receipt.interaction.value;
 						return { winner: "remote" as const, value, receipt };
 					})
-					.catch(ignoreRemoteAnswerFailure);
-				const local = extensionUi
-					.editor(title, prefill, { ...(dialogOptions ?? {}), signal: localController.signal }, editorOptions)
-					.then(answer => {
-						if (generation === remoteGeneration) remoteGeneration++;
-						remoteController.abort();
-						return { winner: "local" as const, value: answer };
-					})
 					.catch(error => {
-						if (generation === remoteGeneration) remoteGeneration++;
-						remoteController.abort();
-						throw error;
+						if (!extensionUi) throw error;
+						return ignoreRemoteAnswerFailure(error);
 					});
+				const local = extensionUi
+					? extensionUi
+							.editor(
+								title,
+								prefill,
+								{ ...(dialogOptions ?? {}), signal: localController.signal },
+								editorOptions,
+							)
+							.then(answer => {
+								if (generation === remoteGeneration) remoteGeneration++;
+								remoteController.abort();
+								return { winner: "local" as const, value: answer };
+							})
+							.catch(error => {
+								if (generation === remoteGeneration) remoteGeneration++;
+								remoteController.abort();
+								throw error;
+							})
+					: new Promise<never>(() => {});
 				void local.catch(() => undefined);
-				return Promise.race([local, remote]).then(result => {
-					if (result.winner === "remote") {
-						activeRemoteReceipt = result.receipt;
-						localController.abort();
-					} else {
-						void remote.then(remoteResult =>
-							remoteResult.receipt.settle({ kind: "resolve_without_commit", reason: "aborted" }),
-						);
-					}
-					return result.value;
-				});
+				return Promise.race([local, remote])
+					.then(result => {
+						if (result.winner === "remote") {
+							activeRemoteReceipt = result.receipt;
+							localController.abort();
+						} else {
+							void remote.then(remoteResult =>
+								remoteResult.receipt.settle({ kind: "resolve_without_commit", reason: "aborted" }),
+							);
+						}
+						return result.value;
+					})
+					.finally(() => toolSignal?.removeEventListener("abort", abortRace));
 			},
 		};
 

package/src/tools/ast-edit.ts

@@ -205,6 +205,7 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 				rawPaths: params.paths,
 				cwd: this.session.cwd,
 				getArtifactsDir: this.session.getArtifactsDir,
+				getAuthorizedArtifactsDirs: this.session.getAuthorizedArtifactsDirs,
 				internalUrlAction: "rewrite",
 			});
 			const { searchPath: resolvedSearchPath, scopePath, isDirectory, multiTargets, globFilter } = scope;

package/src/tools/ast-grep.ts

@@ -152,6 +152,7 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 				rawPaths: params.paths,
 				cwd: this.session.cwd,
 				getArtifactsDir: this.session.getArtifactsDir,
+				getAuthorizedArtifactsDirs: this.session.getAuthorizedArtifactsDirs,
 				internalUrlAction: "search",
 			});
 			const { searchPath: resolvedSearchPath, scopePath, isDirectory, multiTargets, globFilter } = scope;

package/src/tools/bash-interactive.ts

@@ -15,9 +15,9 @@ import type { Terminal as XtermTerminalType } from "@xterm/headless";
 import { Settings } from "../config/settings";
 import { NON_INTERACTIVE_ENV } from "../exec/non-interactive-env";
 import type { Theme } from "../modes/theme/theme";
-import { OutputSink, type OutputSummary } from "../session/streaming-output";
+import { OutputSink, type OutputSummary, type TerminalArtifactPublisher } from "../session/streaming-output";
 import { sanitizeWithOptionalSixelPassthrough } from "../utils/sixel";
-import { resolveOutputMaxColumns, resolveOutputSinkHeadBytes } from "./output-meta";
+import { resolveBashOutputSinkHeadBytes, resolveBashOutputSinkTailBytes, resolveOutputMaxColumns } from "./output-meta";
 import { formatStatusIcon, replaceTabs } from "./render-utils";
 
 export interface BashInteractiveResult extends OutputSummary {
@@ -293,6 +293,9 @@ export async function runInteractiveBashPty(
 		env?: Record<string, string>;
 		artifactPath?: string;
 		artifactId?: string;
+		artifactPublisher?: TerminalArtifactPublisher;
+		spillThreshold?: number;
+		headBytes?: number;
 	},
 ): Promise<BashInteractiveResult> {
 	const settings = await Settings.init();
@@ -300,7 +303,9 @@ export async function runInteractiveBashPty(
 	const sink = new OutputSink({
 		artifactPath: options.artifactPath,
 		artifactId: options.artifactId,
-		headBytes: resolveOutputSinkHeadBytes(settings),
+		artifactPublisher: options.artifactPublisher,
+		spillThreshold: options.spillThreshold ?? resolveBashOutputSinkTailBytes(settings),
+		headBytes: options.headBytes ?? resolveBashOutputSinkHeadBytes(settings),
 		maxColumns: resolveOutputMaxColumns(settings),
 	});
 	const { default: xterm } = await import("@xterm/headless");