@gajae-code/coding-agent 0.6.4 → 0.7.0

package/src/task/agents.ts

@@ -3,20 +3,14 @@
  *
  * Agents are embedded at build time via Bun's import with { type: "text" }.
  */
-import { Effort } from "@gajae-code/ai";
 import { parseFrontmatter, prompt } from "@gajae-code/utils";
 import { parseAgentFields } from "../discovery/helpers";
+// Embed agent markdown files at build time
 import architectMd from "../prompts/agents/architect.md" with { type: "text" };
 import criticMd from "../prompts/agents/critic.md" with { type: "text" };
 import executorMd from "../prompts/agents/executor.md" with { type: "text" };
-import exploreMd from "../prompts/agents/explore.md" with { type: "text" };
-// Embed agent markdown files at build time
 import agentFrontmatterTemplate from "../prompts/agents/frontmatter.md" with { type: "text" };
-
-import planMd from "../prompts/agents/plan.md" with { type: "text" };
 import plannerMd from "../prompts/agents/planner.md" with { type: "text" };
-import reviewerMd from "../prompts/agents/reviewer.md" with { type: "text" };
-import taskMd from "../prompts/agents/task.md" with { type: "text" };
 
 import type { AgentDefinition, AgentSource } from "./types";
 
@@ -50,21 +44,6 @@ const EMBEDDED_AGENT_DEFS: EmbeddedAgentDef[] = [
 	{ fileName: "architect.md", template: architectMd },
 	{ fileName: "planner.md", template: plannerMd },
 	{ fileName: "critic.md", template: criticMd },
-	{ fileName: "explore.md", template: exploreMd },
-	{ fileName: "plan.md", template: planMd },
-	{ fileName: "reviewer.md", template: reviewerMd },
-	{
-		fileName: "task.md",
-		frontmatter: {
-			name: "task",
-			description: "General-purpose subagent with full capabilities for delegated multi-step tasks",
-			spawns: "*",
-			model: "pi/default",
-			thinkingLevel: Effort.Medium,
-			hide: true,
-		},
-		template: taskMd,
-	},
 ];
 
 // Computed lazily on first loadBundledAgents() call to avoid eager prompt.render at module load.

package/src/task/executor.ts

@@ -1298,11 +1298,15 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 					requestPause: () => {
 						pauseRequested = true;
 					},
-					injectMessage: async (content, deliverAs) => {
+					injectMessage: async (content, deliverAs, opts) => {
 						if (deliverAs === "nextTurn") {
 							await session.prompt(content, { attribution: "agent" });
 							return;
 						}
+						if (deliverAs === "steer") {
+							const from = opts?.fromAgentId ?? manager.getSubagentRecord(liveSubagentId)?.ownerId ?? "?";
+							session.emitSubagentSteerObservation({ from, to: liveSubagentId, body: content });
+						}
 						await session.sendUserMessage(content, { deliverAs });
 					},
 				});

package/src/task/index.ts

@@ -55,7 +55,7 @@ import { assertNoRawTaskFields, buildTaskReceipt, buildTaskRoiSummary } from "./
 import { renderResult, renderCall as renderTaskCall } from "./render";
 import { reconcileSpawnRoi } from "./roi-reconciliation";
 import { getTaskSimpleModeCapabilities, type TaskSimpleMode } from "./simple-mode";
-import { DEFAULT_SPAWN_THRESHOLD, evaluateReviewerExploreGate, evaluateSpawnGate } from "./spawn-gate";
+import { DEFAULT_SPAWN_THRESHOLD, evaluateSpawnGate } from "./spawn-gate";
 import {
 	applyNestedPatches,
 	captureBaseline,
@@ -359,7 +359,6 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 	readonly renderResult = renderResult;
 	readonly #discoveredAgents: AgentDefinition[];
 	readonly #blockedAgent: string | undefined;
-	readonly #spawningAgentType: string | undefined;
 
 	get parameters(): TaskToolSchemaInstance {
 		const isolationEnabled = this.session.settings.get("task.isolation.mode") !== "none";
@@ -391,7 +390,6 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 		discoveredAgents: AgentDefinition[],
 	) {
 		this.#blockedAgent = $env.PI_BLOCKED_AGENT;
-		this.#spawningAgentType = session.currentAgentType;
 		this.#discoveredAgents = discoveredAgents;
 	}
 
@@ -478,23 +476,6 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 			};
 		}
 
-		const reviewerExploreDecision = evaluateReviewerExploreGate({
-			spawningAgentType: this.#spawningAgentType,
-			targetAgent: params.agent,
-			plan: params.spawnPlan,
-		});
-		if (reviewerExploreDecision.outcome === "rejected") {
-			return {
-				content: [
-					{
-						type: "text",
-						text: `Task spawn gate rejected reviewer->explore: ${reviewerExploreDecision.reason}. Provide spawnPlan fields: ${reviewerExploreDecision.missingFields.join(", ")}.`,
-					},
-				],
-				details: { projectAgentsDir: null, results: [], totalDurationMs: 0 },
-			};
-		}
-
 		const manager = AsyncJobManager.instance();
 		if (!manager) {
 			return {
@@ -1083,27 +1064,6 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 			};
 		}
 
-		const reviewerExploreDecision = evaluateReviewerExploreGate({
-			spawningAgentType: this.#spawningAgentType,
-			targetAgent: agentName,
-			plan: params.spawnPlan,
-		});
-		if (reviewerExploreDecision.outcome === "rejected") {
-			return {
-				content: [
-					{
-						type: "text",
-						text: `Task spawn gate rejected reviewer->explore: ${reviewerExploreDecision.reason}. Provide spawnPlan fields: ${reviewerExploreDecision.missingFields.join(", ")}.`,
-					},
-				],
-				details: {
-					projectAgentsDir,
-					results: [],
-					totalDurationMs: Date.now() - startTime,
-				},
-			};
-		}
-
 		let repoRoot: string | null = null;
 		let baseline: WorktreeBaseline | null = null;
 		if (isIsolated) {

package/src/task/spawn-gate.ts

@@ -1,7 +1,7 @@
 /** The hard, locked batch threshold enforced by the runtime gate. */
 export const DEFAULT_SPAWN_THRESHOLD = 4;
 
-/** The justification a large batch or reviewer-spawned explorer must supply to pass the hard gate. */
+/** The justification a large batch must supply to pass the hard gate. */
 export interface SpawnPlanReceipt {
 	whyParallel: string;
 	whyNotLocal: string;
@@ -17,15 +17,6 @@ export interface SpawnGateRequest {
 	plan?: SpawnPlanReceipt;
 }
 
-export interface ReviewerExploreGateRequest {
-	/** Agent type/name doing the spawning, when known. */
-	spawningAgentType?: string | null;
-	/** Target agent type/name requested by the task call. */
-	targetAgent: string;
-	/** The spawn-plan receipt, when provided. */
-	plan?: SpawnPlanReceipt;
-}
-
 export type SpawnGateOutcome = "allowed" | "rejected";
 
 export interface SpawnGateDecision {
@@ -102,31 +93,3 @@ export function decide(childCount: number, threshold: number, plan: SpawnPlanRec
 export function evaluateSpawnGate(request: SpawnGateRequest): SpawnGateDecision {
 	return decide(request.childCount, DEFAULT_SPAWN_THRESHOLD, request.plan);
 }
-
-export function evaluateReviewerExploreGate(request: ReviewerExploreGateRequest): SpawnGateDecision {
-	if (request.spawningAgentType !== "reviewer" || request.targetAgent !== "explore") {
-		return {
-			outcome: "allowed",
-			reason: "reviewer->explore gate does not apply",
-			planRequired: false,
-			missingFields: [],
-		};
-	}
-
-	const missingFields = findMissingPlanFields(request.plan);
-	if (missingFields.length > 0) {
-		return {
-			outcome: "rejected",
-			reason: `reviewer->explore spawn requires a complete spawn-plan receipt (${missingFields.join(", ")})`,
-			planRequired: true,
-			missingFields,
-		};
-	}
-
-	return {
-		outcome: "allowed",
-		reason: "reviewer->explore spawn has a complete spawn-plan receipt",
-		planRequired: true,
-		missingFields: [],
-	};
-}

package/src/task/types.ts

@@ -72,7 +72,7 @@ const spawnPlanSchema = z
 		expectedReceiptShape: z.string(),
 		maxInlineTokens: z.number(),
 	})
-	.describe("justification required before spawning more than four tasks or reviewer-spawned explore tasks");
+	.describe("justification required before spawning more than four tasks");
 
 const createTaskItemSchema = (_contextEnabled: boolean) =>
 	z.object({

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

@@ -0,0 +1,25 @@
+/**
+ * Process-wide registry mapping a session id to its active {@link AskAnswerSource}.
+ *
+ * Decouples the `ask` tool (which reads the source via `AgentSession`) from the
+ * notifications extension (which registers one), without threading a new method
+ * through the extension/runner/controller wiring. A session has at most one
+ * source; registering returns a disposer.
+ */
+
+import type { AskAnswerSource } from "./index";
+
+const sources = new Map<string, AskAnswerSource>();
+
+/** Register `source` for `sessionId`. Returns a disposer that clears it. */
+export function registerAskAnswerSource(sessionId: string, source: AskAnswerSource): () => void {
+	sources.set(sessionId, source);
+	return () => {
+		if (sources.get(sessionId) === source) sources.delete(sessionId);
+	};
+}
+
+/** The answer source for `sessionId`, if one is registered. */
+export function getAskAnswerSource(sessionId: string): AskAnswerSource | undefined {
+	return sources.get(sessionId);
+}

package/src/tools/ask.ts

@@ -34,7 +34,7 @@ import {
 	renderDeepInterviewAskQuestion,
 } from "../deep-interview/render-middleware";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
-import { appendOrMergeDeepInterviewRound } from "../gjc-runtime/deep-interview-recorder";
+import { appendOrMergeDeepInterviewRound, syncDeepInterviewRecorderHud } from "../gjc-runtime/deep-interview-recorder";
 import { deepInterviewStatePath } from "../gjc-runtime/deep-interview-runtime";
 import { gateAnswerToResult, questionToGate } from "../modes/shared/agent-wire/deep-interview-gate";
 import { getMarkdownTheme, type Theme, theme } from "../modes/theme/theme";
@@ -104,6 +104,30 @@ export interface AskToolDetails {
 const OTHER_OPTION = "Other (type your own)";
 const RECOMMENDED_SUFFIX = " (Recommended)";
 const DEEP_INTERVIEW_SELECTOR_SCROLL_TITLE_ROWS = Number.MAX_SAFE_INTEGER;
+const DEEP_INTERVIEW_RECORDER_AWAIT_TIMEOUT_MS = 250;
+
+function errorMessage(error: unknown): string {
+	return error instanceof Error ? error.message : String(error);
+}
+
+async function awaitDeepInterviewRecorderPersistence(persistence: Promise<void>): Promise<void> {
+	let timeout: ReturnType<typeof setTimeout> | undefined;
+	try {
+		await Promise.race([
+			persistence,
+			new Promise<never>((_resolve, reject) => {
+				timeout = setTimeout(
+					() => reject(new Error(`timed out after ${DEEP_INTERVIEW_RECORDER_AWAIT_TIMEOUT_MS}ms`)),
+					DEEP_INTERVIEW_RECORDER_AWAIT_TIMEOUT_MS,
+				);
+			}),
+		]);
+	} catch (error) {
+		logger.warn(`ask: deep-interview round recording failed: ${errorMessage(error)}`);
+	} finally {
+		if (timeout) clearTimeout(timeout);
+	}
+}
 
 function getDoneOptionLabel(): string {
 	return `${theme.status.success} Done selecting`;
@@ -406,8 +430,18 @@ async function askSingleQuestion(
 				// If input was dismissed (undefined), keep prior selectedOptions/customInput intact
 			}
 		} else {
-			selectedOptions = [stripRecommendedSuffix(choice)];
-			customInput = undefined;
+			const stripped = stripRecommendedSuffix(choice);
+			if (optionLabels.includes(stripped)) {
+				selectedOptions = [stripped];
+				customInput = undefined;
+			} else {
+				// A remote answer (e.g. a typed Telegram reply) that is not one of the
+				// listed options is the "provide my own" custom input — recorded the same
+				// as picking Other and typing it. The local selector can only ever return
+				// a listed entry, so this branch is reached only for free-text answers.
+				customInput = choice;
+				selectedOptions = [];
+			}
 		}
 		if (navigation?.allowForward) {
 			return { selectedOptions, customInput, timedOut, navigation: "forward" };
@@ -481,11 +515,11 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 	): Promise<void> {
 		const meta = q.deepInterview;
 		if (!meta) return;
-		try {
-			const cwd = this.session.cwd;
-			const sessionId = this.session.getSessionId?.() ?? undefined;
-			const statePath = deepInterviewStatePath(cwd, sessionId);
-			await appendOrMergeDeepInterviewRound(
+		const cwd = this.session.cwd;
+		const sessionId = this.session.getSessionId?.() ?? undefined;
+		const statePath = deepInterviewStatePath(cwd, sessionId);
+		await awaitDeepInterviewRecorderPersistence(
+			appendOrMergeDeepInterviewRound(
 				cwd,
 				statePath,
 				{
@@ -500,12 +534,10 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 					customInput,
 				},
 				{ sessionId },
-			);
-		} catch (error) {
-			logger.warn(
-				`ask: deep-interview round recording failed: ${error instanceof Error ? error.message : String(error)}`,
-			);
-		}
+			).then(async () => {
+				await syncDeepInterviewRecorderHud(cwd, statePath, sessionId);
+			}),
+		);
 	}
 
 	async execute(
@@ -529,11 +561,71 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 		const ui: UIContext = {
 			select: (prompt, options, dialogOptions) => {
 				if (!extensionUi) throw new ToolAbortError("Ask tool requires interactive mode");
-				return extensionUi.select(prompt, options, dialogOptions);
+				const source = this.session.getAskAnswerSource?.();
+				if (!source) return extensionUi.select(prompt, options, dialogOptions);
+				// Race the local UI against a remote answer (e.g. a Telegram reply via the
+				// notifications SDK) so asks can be answered without RPC mode. When the
+				// local UI wins, abort the remote source so it stops waiting and marks the
+				// action resolved-locally. First valid answer wins.
+				// Race the local UI against a remote answer (e.g. a Telegram reply via the
+				// notifications SDK) so asks can be answered without RPC mode. First valid
+				// answer wins; the loser is aborted so neither side is left hanging:
+				//   - local wins  -> abort the remote source (marks the action resolved-locally)
+				//   - remote wins -> abort the local selector so the TUI dialog actually closes
+				const remoteController = new AbortController();
+				const localController = new AbortController();
+				// Propagate an external cancel (the tool's signal) to the local selector too.
+				const toolSignal = dialogOptions?.signal;
+				if (toolSignal) {
+					if (toolSignal.aborted) localController.abort();
+					else toolSignal.addEventListener("abort", () => localController.abort(), { once: true });
+				}
+				const remote = source.awaitAnswer(prompt, options, remoteController.signal).then(answer => {
+					// undefined is not a valid remote answer (registration failed, or the local
+					// UI already won and aborted us): never settle the race, let the local
+					// selector decide instead of cancelling the ask.
+					if (answer === undefined) return new Promise<string | undefined>(() => {});
+					localController.abort();
+					return answer;
+				});
+				const local = extensionUi
+					.select(prompt, options, { ...dialogOptions, signal: localController.signal })
+					.then(answer => {
+						remoteController.abort();
+						return answer;
+					});
+				// 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]);
 			},
 			editor: (title, prefill, dialogOptions, editorOptions) => {
 				if (!extensionUi) throw new ToolAbortError("Ask tool requires interactive mode");
-				return extensionUi.editor(title, prefill, dialogOptions, editorOptions);
+				const source = this.session.getAskAnswerSource?.();
+				if (!source) 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`.
+				const remoteController = new AbortController();
+				const localController = new AbortController();
+				const toolSignal = dialogOptions?.signal;
+				if (toolSignal) {
+					if (toolSignal.aborted) localController.abort();
+					else toolSignal.addEventListener("abort", () => localController.abort(), { once: true });
+				}
+				const remote = source.awaitAnswer(title, [], remoteController.signal).then(answer => {
+					if (answer === undefined) return new Promise<string | undefined>(() => {});
+					localController.abort();
+					return answer;
+				});
+				const local = extensionUi
+					.editor(title, prefill, { ...(dialogOptions ?? {}), signal: localController.signal }, editorOptions)
+					.then(answer => {
+						remoteController.abort();
+						return answer;
+					});
+				void local.catch(() => undefined);
+				return Promise.race([local, remote]);
 			},
 		};
 

package/src/tools/computer.ts

@@ -6,6 +6,7 @@ import type { ImageContent } from "@gajae-code/ai";
 import { prompt } from "@gajae-code/utils";
 import * as z from "zod/v4";
 import computerDescription from "../prompts/tools/computer.md" with { type: "text" };
+import { resizeImage } from "../utils/image-resize";
 import type { ToolSession } from "./index";
 import type { OutputMeta } from "./output-meta";
 import { ToolAbortError, ToolError, throwIfAborted } from "./tool-errors";
@@ -174,6 +175,11 @@ let platformOverrideForTests: NodeJS.Platform | undefined;
 let archOverrideForTests: NodeJS.Architecture | undefined;
 const screenshotFallbackDirs = new WeakMap<ToolSession, Promise<string>>();
 
+const COMPUTER_INLINE_SCREENSHOT_MAX_WIDTH = 1568;
+const COMPUTER_INLINE_SCREENSHOT_MAX_HEIGHT = 1568;
+const COMPUTER_INLINE_SCREENSHOT_PROVIDER_MAX_BYTES = 5 * 1024 * 1024;
+const COMPUTER_INLINE_SCREENSHOT_JPEG_QUALITY = 70;
+
 export function setComputerControllerFactoryForTests(factory: ComputerControllerFactory | undefined): void {
 	controllerFactory = factory ?? createNativeComputerController;
 }
@@ -278,6 +284,9 @@ export class ComputerTool implements AgentTool<typeof computerSchema, ComputerTo
 				if (batchResult.failedStep) {
 					details.code = batchResult.failedStep.code;
 					details.message = batchResult.failedStep.message;
+					if (batchResult.screenshotSource !== undefined) {
+						await persistScreenshotFallback(batchResult.screenshotSource, details.screenshot, this.session);
+					}
 					await writeComputerAuditLog(this.session, details);
 					return {
 						...toolResult(details).text(`${details.code}: ${details.message}`).done(),
@@ -285,11 +294,11 @@ export class ComputerTool implements AgentTool<typeof computerSchema, ComputerTo
 					};
 				}
 				details.message = describeComputerSuccess(details);
-				const image = imageContentFromNativeResult(batchResult.screenshotSource);
 				if (batchResult.screenshotSource !== undefined) {
 					await persistScreenshotFallback(batchResult.screenshotSource, details.screenshot, this.session);
 					details.message = describeComputerSuccess(details);
 				}
+				const image = await inlineImageContentFromNativeResult(batchResult.screenshotSource, details, this.session);
 				await writeComputerAuditLog(this.session, details);
 				return image
 					? toolResult(details)
@@ -302,11 +311,11 @@ export class ComputerTool implements AgentTool<typeof computerSchema, ComputerTo
 			if (screenshot) details.screenshot = screenshot;
 			details.status = "success";
 			details.message = describeComputerSuccess(details);
-			const image = imageContentFromNativeResult(result);
 			if (screenshot) {
 				await persistScreenshotFallback(result, details.screenshot, this.session);
 				details.message = describeComputerSuccess(details);
 			}
+			const image = await inlineImageContentFromNativeResult(result, details, this.session);
 			await writeComputerAuditLog(this.session, details);
 			return image
 				? toolResult(details)
@@ -472,7 +481,7 @@ function normalizeScreenshot(value: unknown): ComputerScreenshotDetails | undefi
 	};
 }
 
-function imageContentFromNativeResult(value: unknown): ImageContent | undefined {
+function fullResolutionImageContentFromNativeResult(value: unknown): ImageContent | undefined {
 	const candidate =
 		value && typeof value === "object" && "screenshot" in value
 			? (value as { screenshot?: unknown }).screenshot
@@ -483,13 +492,42 @@ function imageContentFromNativeResult(value: unknown): ImageContent | undefined
 	return data ? { type: "image", data, mimeType: "image/png" } : undefined;
 }
 
+async function inlineImageContentFromNativeResult(
+	value: unknown,
+	details: ComputerToolDetails,
+	session: ToolSession,
+): Promise<ImageContent | undefined> {
+	const image = fullResolutionImageContentFromNativeResult(value);
+	if (!image) return undefined;
+	const maxBytes = getInlineScreenshotMaxBytes(session);
+	const originalBytes = Buffer.byteLength(image.data, "base64");
+	if (originalBytes <= maxBytes) return image;
+
+	try {
+		const resized = await resizeImage(image, {
+			maxWidth: COMPUTER_INLINE_SCREENSHOT_MAX_WIDTH,
+			maxHeight: COMPUTER_INLINE_SCREENSHOT_MAX_HEIGHT,
+			maxBytes,
+			jpegQuality: COMPUTER_INLINE_SCREENSHOT_JPEG_QUALITY,
+		});
+		if (resized.buffer.length <= maxBytes) {
+			return { type: "image", data: resized.data, mimeType: resized.mimeType };
+		}
+	} catch {
+		// Keep the action successful and rely on the full-resolution artifact path below.
+	}
+
+	details.message = `${details.message} Inline screenshot omitted because it could not be bounded below ${formatByteCount(maxBytes)}; use the saved screenshot artifact instead.`;
+	return undefined;
+}
+
 async function persistScreenshotFallback(
 	value: unknown,
 	screenshot: ComputerScreenshotDetails | undefined,
 	session: ToolSession,
 ): Promise<void> {
 	if (!screenshot || screenshot.path) return;
-	const image = imageContentFromNativeResult(value);
+	const image = fullResolutionImageContentFromNativeResult(value);
 	if (!image) return;
 	const dir = await getScreenshotFallbackDir(session);
 	const filePath = path.join(dir, `computer-${Date.now()}-${Math.random().toString(36).slice(2)}.png`);
@@ -526,6 +564,22 @@ function getPngByteLength(png: NativeScreenshot["png"]): number | undefined {
 	return png.byteLength;
 }
 
+function getInlineScreenshotMaxBytes(session: Pick<ToolSession, "settings">): number {
+	const configured = Number(session.settings.get("computer.screenshotMaxBytes"));
+	const finiteConfigured =
+		Number.isFinite(configured) && configured > 0
+			? Math.floor(configured)
+			: COMPUTER_INLINE_SCREENSHOT_PROVIDER_MAX_BYTES;
+	return Math.min(finiteConfigured, COMPUTER_INLINE_SCREENSHOT_PROVIDER_MAX_BYTES);
+}
+
+function formatByteCount(bytes: number): string {
+	if (bytes < 1024) return `${bytes} bytes`;
+	const kib = bytes / 1024;
+	if (kib < 1024) return `${Math.round(kib)} KiB`;
+	return `${(kib / 1024).toFixed(1)} MiB`;
+}
+
 function mapComputerError(error: unknown, hotkey?: string): { code: string; message: string } {
 	if (error instanceof Error && (error.name === "AbortError" || error.name === "TimeoutError")) {
 		return {

package/src/tools/image-gen.ts

@@ -472,20 +472,17 @@ async function findImageApiKey(
 		const openAI = await findOpenAIHostedImageCredentials(modelRegistry, activeModel, sessionId);
 		if (openAI) return openAI;
 		// Fall through to auto-detect if preferred provider key not found.
-	} else if (preferredImageProvider === "antigravity" && modelRegistry) {
-		const antigravity = await findAntigravityCredentials(modelRegistry, sessionId);
-		if (antigravity) return antigravity;
-		// Fall through to auto-detect if preferred provider key not found.
+	} else if (preferredImageProvider === "antigravity") {
+		if (!modelRegistry) return null;
+		return await findAntigravityCredentials(modelRegistry, sessionId);
 	} else if (preferredImageProvider === "gemini") {
 		const geminiKey = getEnvApiKey("google");
 		if (geminiKey) return { provider: "gemini", apiKey: geminiKey };
 		const googleKey = $env.GOOGLE_API_KEY;
-		if (googleKey) return { provider: "gemini", apiKey: googleKey };
-		// Fall through to auto-detect if preferred provider key not found.
+		return googleKey ? { provider: "gemini", apiKey: googleKey } : null;
 	} else if (preferredImageProvider === "openrouter") {
 		const openRouterKey = getEnvApiKey("openrouter");
-		if (openRouterKey) return { provider: "openrouter", apiKey: openRouterKey };
-		// Fall through to auto-detect if preferred provider key not found.
+		return openRouterKey ? { provider: "openrouter", apiKey: openRouterKey } : null;
 	}
 
 	// Auto-detect: GPT hosted image generation, then Antigravity, OpenRouter, Gemini.

package/src/tools/index.ts

@@ -118,6 +118,18 @@ export type {
 	DiscoverableToolSource,
 } from "../tool-discovery/tool-index";
 
+/**
+ * Source of remote answers for interactive asks (e.g. a Telegram reply routed
+ * through the notifications SDK). Lets a pending ask resolve without RPC mode.
+ */
+export interface AskAnswerSource {
+	/**
+	 * Race a remote answer against the local UI for one question. Resolves with the
+	 * chosen option label or free-text answer, or `undefined` to defer to local UI.
+	 */
+	awaitAnswer(question: string, options: string[], signal?: AbortSignal): Promise<string | undefined>;
+}
+
 /** Session context for tool factories */
 export interface ToolSession {
 	/** Current working directory */
@@ -214,6 +226,13 @@ export interface ToolSession {
 	getGoalModeState?: () => GoalModeState | undefined;
 	/** Unattended workflow-gate emitter (present only when unattended mode is negotiated). */
 	getWorkflowGateEmitter?: () => WorkflowGateEmitter | undefined;
+	/**
+	 * Optional remote answer source for interactive asks. When present, the ask
+	 * tool races the local UI selection against a remote answer (e.g. a Telegram
+	 * reply via the notifications SDK) so asks can be answered without RPC mode.
+	 * No-op when undefined: the ask path behaves exactly as before.
+	 */
+	getAskAnswerSource?: () => AskAnswerSource | undefined;
 	/** Optional per-session restriction for goal tool operations. */
 	goalToolAllowedOps?: readonly ("create" | "get" | "complete" | "resume" | "drop" | "pause")[];
 	/** Goal runtime for the active agent session. */

package/src/tools/inspect-image.ts

@@ -78,21 +78,26 @@ export class InspectImageTool implements AgentTool<typeof inspectImageSchema, In
 		};
 
 		const activeModelPattern = this.session.getActiveModelString?.() ?? this.session.getModelString?.();
-		let model = resolvePattern("pi/default") ?? resolvePattern(activeModelPattern) ?? availableModels[0];
+		const configuredVisionPattern = this.session.settings.getModelRole("vision")?.trim();
+		const configuredVisionModel = configuredVisionPattern ? resolvePattern("pi/vision") : undefined;
+		if (configuredVisionPattern && !configuredVisionModel) {
+			throw new ToolError(
+				`Configured modelRoles.vision (${configuredVisionPattern}) did not resolve to an available model. Configure modelRoles.vision with a vision-capable model.`,
+			);
+		}
+		const model = configuredVisionModel ?? resolvePattern("pi/default") ?? resolvePattern(activeModelPattern);
 		if (!model) {
-			throw new ToolError("Unable to resolve a model for inspect_image.");
+			throw new ToolError(
+				"Unable to resolve a model for inspect_image. Configure modelRoles.vision with a vision-capable model or select a vision-capable active/default model.",
+			);
 		}
 
-		// inspect_image requires image input; if the resolved model is text-only,
-		// fall back to any available vision-capable model before failing.
+		// inspect_image requires image input. A text-only selected model must be
+		// paired with an explicit vision role so the model/cost boundary is visible.
 		if (!model.input.includes("image")) {
-			const visionModel = availableModels.find(candidate => candidate.input.includes("image"));
-			if (!visionModel) {
-				throw new ToolError(
-					`Resolved model ${model.provider}/${model.id} does not support image input, and no vision-capable model is available. Configure a vision-capable model.`,
-				);
-			}
-			model = visionModel;
+			throw new ToolError(
+				`Resolved model ${model.provider}/${model.id} does not support image input. Configure modelRoles.vision with a vision-capable model.`,
+			);
 		}
 
 		const apiKey = await modelRegistry.getApiKey(model);

package/src/tools/subagent-render.ts

@@ -160,6 +160,13 @@ function renderSubagentSnapshotBody(snapshot: SubagentSnapshot, expanded: boolea
 		lines.push(`  ${theme.fg("dim", "Assignment:")}`);
 		for (const al of snapshot.assignment.split("\n")) lines.push(`    ${theme.fg("toolOutput", replaceTabs(al))}`);
 	}
+	if (snapshot.steerMessage) {
+		lines.push(`  ${theme.fg("accent", `Steer (${snapshot.steerState ?? "queued"})`)}`);
+		const maxLines = expanded ? PREVIEW_LINES_EXPANDED : PREVIEW_LINES_COLLAPSED;
+		for (const pl of getPreviewLines(snapshot.steerMessage, maxLines, PREVIEW_LINE_WIDTH, Ellipsis.Unicode)) {
+			lines.push(`    ${theme.fg("toolOutput", replaceTabs(pl))}`);
+		}
+	}
 
 	// Defense in depth: the producer only attaches `progress` when a live producer
 	// exists (subagent.ts #liveProgressFields), but the renderer also honors an