@gajae-code/coding-agent 0.5.0 → 0.5.2

package/src/lsp/defaults.json

@@ -4,6 +4,7 @@
 		"args": [],
 		"fileTypes": [".rs"],
 		"rootMarkers": ["Cargo.toml", "rust-analyzer.toml"],
+		"warmupTimeoutMs": 30000,
 		"initOptions": {},
 		"settings": {
 			"rust-analyzer": {

package/src/main.ts

@@ -30,6 +30,7 @@ import { activateModelProfile } from "./config/model-profile-activation";
 import { ModelRegistry, ModelsConfigFile } from "./config/model-registry";
 import { resolveCliModel, resolveModelRoleValue, resolveModelScope, type ScopedModel } from "./config/model-resolver";
 import { getDefault, type SettingPath, Settings, settings } from "./config/settings";
+import { BUNDLED_GROK_BUILD_EXTENSION_ID, getBundledGrokBuildExtensionFactory } from "./defaults/gjc-grok-cli";
 import { initializeWithSettings } from "./discovery";
 import { exportFromFile } from "./export/html";
 import type { ExtensionUIContext } from "./extensibility/extensions/types";
@@ -742,7 +743,9 @@ export async function runRootCommand(
 		await runListModelsCommand({
 			modelRegistry,
 			cwd: getProjectDir(),
-			additionalExtensionPaths: [],
+			extensionFactories: [
+				{ factory: getBundledGrokBuildExtensionFactory(), name: BUNDLED_GROK_BUILD_EXTENSION_ID },
+			],
 			settingsExtensions: [],
 			disabledExtensionIds: [],
 			disableExtensionDiscovery: true,
@@ -974,8 +977,20 @@ export async function runRootCommand(
 		}
 
 		if (mode === "rpc" || mode === "rpc-ui") {
-			const { runRpcMode } = await import("./modes/rpc/rpc-mode");
-			await runRpcMode(session, mode === "rpc-ui" ? setToolUIContext : undefined);
+			const { RpcListenRefusedError, runRpcMode } = await import("./modes/rpc/rpc-mode");
+			try {
+				await runRpcMode(session, mode === "rpc-ui" ? setToolUIContext : undefined, {
+					listen: parsedArgs.rpcListen,
+				});
+			} catch (error) {
+				if (!(error instanceof RpcListenRefusedError)) throw error;
+				logger.setTransports({ console: true, file: true });
+				logger.error(error.message);
+				await session.dispose();
+				stopThemeWatcher();
+				await postmortem.quit(1);
+				process.exit(1);
+			}
 		} else if (mode === "bridge") {
 			const { runBridgeMode } = await import("./modes/bridge/bridge-mode");
 			await runBridgeMode(session, setToolUIContext);

package/src/modes/acp/acp-agent.ts

@@ -43,7 +43,8 @@ import {
 	type Usage,
 } from "@agentclientprotocol/sdk";
 import type { AssistantMessage, Model } from "@gajae-code/ai";
-import { logger, VERSION } from "@gajae-code/utils";
+import { logger } from "@gajae-code/utils";
+import packageJson from "../../../package.json" with { type: "json" };
 import { disableProvider, enableProvider, reset as resetCapabilities } from "../../capability";
 import { Settings } from "../../config/settings";
 import { clearPluginRootsAndCaches, resolveActiveProjectRegistryPath } from "../../discovery/helpers";
@@ -98,6 +99,7 @@ const SESSION_PAGE_SIZE = 50;
  * wait past this guard without hard-coding the literal.
  */
 export const ACP_BOOTSTRAP_RACE_GUARD_MS = 50;
+const CODING_AGENT_VERSION: string = packageJson.version;
 const ACP_CANCEL_CLEANUP_TIMEOUT_MS = 5_000;
 const ACP_ASYNC_DELIVERY_DRAIN_TIMEOUT_MS = 250;
 const ACP_ASYNC_DELIVERY_DRAIN_MAX_PASSES = 3;
@@ -414,7 +416,7 @@ export class AcpAgent implements Agent {
 			agentInfo: {
 				name: "gajae-code",
 				title: "Gajae Code",
-				version: VERSION,
+				version: CODING_AGENT_VERSION,
 			},
 			authMethods,
 			agentCapabilities: {

package/src/modes/bridge/bridge-mode.ts

@@ -29,7 +29,7 @@ import {
 import { UiRequestBroker } from "../shared/agent-wire/ui-request-broker";
 import type { BridgeUiResult } from "../shared/agent-wire/ui-result";
 import { defaultAuditPath, UnattendedAuditLog } from "../shared/agent-wire/unattended-audit";
-import { UnattendedSessionControlPlane } from "../shared/agent-wire/unattended-session";
+import { modelSupportsTokenCostMetrics, UnattendedSessionControlPlane } from "../shared/agent-wire/unattended-session";
 import { FileGateStore } from "../shared/agent-wire/workflow-gate-broker";
 import { assertSafeBridgeBind, isBridgeTokenAuthorized } from "./auth";
 import { type BridgePermissionRequestPayload, createBridgeClientBridge } from "./bridge-client-bridge";
@@ -599,6 +599,7 @@ export async function runBridgeMode(
 		emitFrame: gate => eventStream.publish(toBridgeWorkflowGateFrame(gate, sequencer)),
 		store: gateStore,
 		audit: recordAudit,
+		providerSupportsTokenCostMetrics: modelSupportsTokenCostMetrics(session.model),
 		getUsageSnapshot: () => {
 			const stats = session.getSessionStats();
 			return { tokens: stats.tokens.total, costUsd: stats.cost };

package/src/modes/components/history-search.ts

@@ -10,6 +10,7 @@ import {
 	truncateToWidth,
 	visibleWidth,
 } from "@gajae-code/tui";
+import { getProjectDir } from "@gajae-code/utils";
 import { theme } from "../../modes/theme/theme";
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import type { HistoryEntry, HistoryStorage } from "../../session/history-storage";
@@ -72,6 +73,7 @@ class HistoryResultsList implements Component {
 
 export class HistorySearchComponent extends Container {
 	#historyStorage: HistoryStorage;
+	#cwd: string;
 	#searchInput: Input;
 	#results: HistoryEntry[] = [];
 	#selectedIndex = 0;
@@ -83,6 +85,7 @@ export class HistorySearchComponent extends Container {
 	constructor(historyStorage: HistoryStorage, onSelect: (prompt: string) => void, onCancel: () => void) {
 		super();
 		this.#historyStorage = historyStorage;
+		this.#cwd = getProjectDir();
 		this.#onSelect = onSelect;
 		this.#onCancel = onCancel;
 
@@ -150,8 +153,8 @@ export class HistorySearchComponent extends Container {
 	#updateResults(): void {
 		const query = this.#searchInput.getValue().trim();
 		this.#results = query
-			? this.#historyStorage.search(query, this.#resultLimit)
-			: this.#historyStorage.getRecent(this.#resultLimit);
+			? this.#historyStorage.search(query, this.#resultLimit, this.#cwd)
+			: this.#historyStorage.getRecent(this.#resultLimit, this.#cwd);
 		this.#selectedIndex = 0;
 		this.#resultsList.setResults(this.#results, this.#selectedIndex);
 	}

package/src/modes/components/hook-selector.ts

@@ -3,6 +3,7 @@
  * Displays a list of string options with keyboard navigation.
  */
 import {
+	type AutocompleteProvider,
 	Container,
 	Editor,
 	Markdown,
@@ -73,6 +74,12 @@ export interface HookSelectorOptions {
 		optionLabel: string;
 		onSubmit: (text: string) => void;
 	};
+	/**
+	 * Autocomplete provider for the inline custom-input editor. When present,
+	 * the "Other (type your own)" editor gains the same `@` file-link and `/`
+	 * completion behavior as the main prompt editor.
+	 */
+	autocompleteProvider?: AutocompleteProvider;
 }
 
 class OutlinedList extends Container {
@@ -320,6 +327,7 @@ export class HookSelectorComponent extends Container {
 	#helpTextComponent: Text;
 	#baseHelpText: string;
 	#tui: TUI | undefined;
+	#autocompleteProvider: AutocompleteProvider | undefined;
 	constructor(
 		title: string,
 		options: string[],
@@ -342,6 +350,7 @@ export class HookSelectorComponent extends Container {
 		this.#outline = opts?.outline === true;
 		this.#customInput = opts?.customInput;
 		this.#tui = opts?.tui;
+		this.#autocompleteProvider = opts?.autocompleteProvider;
 
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
@@ -491,6 +500,13 @@ export class HookSelectorComponent extends Container {
 
 	/** Keys while the inline custom-input editor is open below the option list. */
 	#handleInputModeKey(keyData: string, editor: Editor): void {
+		// While the autocomplete dropdown is open, every key belongs to the
+		// editor (navigate/apply/cancel the suggestion) instead of submitting
+		// or backing out of input mode.
+		if (editor.isAutocompleteOpen()) {
+			editor.handleInput(keyData);
+			return;
+		}
 		// Escape backs out to option selection instead of cancelling the dialog,
 		// so a stray Esc never throws away the question context.
 		if (matchesKey(keyData, "escape") || matchesAppInterrupt(keyData)) {
@@ -521,6 +537,9 @@ export class HookSelectorComponent extends Container {
 		editor.setBorderVisible(false);
 		editor.setPromptGutter("> ");
 		editor.disableSubmit = true;
+		if (this.#autocompleteProvider) {
+			editor.setAutocompleteProvider(this.#autocompleteProvider);
+		}
 		this.#inlineEditor = editor;
 		this.#inputArea.addChild(new Spacer(1));
 		this.#inputArea.addChild(editor);

package/src/modes/components/model-selector.ts

@@ -154,6 +154,20 @@ interface PresetBrowseRow {
 
 type PresetLandingRow = PresetGroupRow | PresetProfileRow | PresetBrowseRow;
 
+// Stable logical identity for a preset landing row, independent of its current
+// list position. Used to relocate the cursor after the expanded group changes so
+// navigation does not silently overshoot the destination group header/profiles.
+function presetRowIdentity(row: PresetLandingRow): string {
+	switch (row.kind) {
+		case "group":
+			return `group:${row.groupId}`;
+		case "profile":
+			return `profile:${row.groupId}:${row.profile.name}`;
+		case "browse":
+			return "browse";
+	}
+}
+
 const PROFILE_ROLE_PREVIEW_ORDER: GjcModelAssignmentTargetId[] = [
 	"default",
 	"executor",
@@ -705,6 +719,15 @@ export class ModelSelectorComponent extends Container {
 		return this.#getMissingProviders(profileOrProfiles).length === 0;
 	}
 
+	/**
+	 * A preset group is a list of alternative presets, not an all-or-nothing
+	 * bundle. Treat the group as usable when at least one member preset has all
+	 * of its required providers authenticated.
+	 */
+	#isPresetGroupUsable(profiles: ModelProfileDefinition[]): boolean {
+		return profiles.some(profile => this.#isPresetAuthenticated(profile));
+	}
+
 	async #refreshProviderAuth(): Promise<void> {
 		const providers = new Set<string>();
 		for (const profiles of this.#getPresetGroups().values()) {
@@ -730,6 +753,18 @@ export class ModelSelectorComponent extends Container {
 		if (selected?.kind === "group") this.#expandedPresetProviderId = selected.groupId;
 		if (selected?.kind === "profile") this.#expandedPresetProviderId = selected.groupId;
 		const rows = this.#getPresetRows();
+		// Expanding/collapsing a group shifts row positions. Relocate the cursor by
+		// the selected row's logical identity so crossing a provider group boundary
+		// keeps it on the same logical row instead of overshooting into the
+		// destination group's profiles (or off the end of the list).
+		if (selected) {
+			const targetIdentity = presetRowIdentity(selected);
+			const relocated = rows.findIndex(row => presetRowIdentity(row) === targetIdentity);
+			if (relocated >= 0) {
+				this.#presetCursor = relocated;
+				return;
+			}
+		}
 		this.#presetCursor = Math.min(this.#presetCursor, Math.max(0, rows.length - 1));
 	}
 
@@ -763,7 +798,7 @@ export class ModelSelectorComponent extends Container {
 				continue;
 			}
 			if (row.kind === "group") {
-				const authenticated = this.#isPresetAuthenticated(row.profiles);
+				const authenticated = this.#isPresetGroupUsable(row.profiles);
 				const mark = this.#providerAuthPending ? "…" : authenticated ? "✓" : "✗";
 				const label = `${mark} ${row.groupId}`;
 				const renderedLabel = selected ? theme.fg("accent", label) : authenticated ? label : theme.fg("dim", label);
@@ -1158,18 +1193,26 @@ export class ModelSelectorComponent extends Container {
 			this.#switchToModelMode();
 			return;
 		}
-		const missing =
-			row.kind === "group" ? this.#getMissingProviders(row.profiles) : this.#getMissingProviders(row.profile);
+		if (row.kind === "group") {
+			// A group is a list of alternative presets; only surface a login hint
+			// when none of its members are usable. A partially-usable group stays
+			// navigable so the user can drill in and pick a usable member.
+			if (!this.#isPresetGroupUsable(row.profiles)) {
+				const missing = this.#getMissingProviders(row.profiles);
+				this.#presetLoginHint = `Run ${missing.map(provider => `/login ${provider}`).join(", ")}`;
+				this.#renderPresetLanding();
+			}
+			return;
+		}
+		const missing = this.#getMissingProviders(row.profile);
 		if (missing.length > 0) {
 			this.#presetLoginHint = `Run ${missing.map(provider => `/login ${provider}`).join(", ")}`;
 			this.#renderPresetLanding();
 			return;
 		}
-		if (row.kind === "profile") {
-			this.#previewProfileName = row.profile.name;
-			this.#presetLoginHint = undefined;
-			this.#renderPresetLanding();
-		}
+		this.#previewProfileName = row.profile.name;
+		this.#presetLoginHint = undefined;
+		this.#renderPresetLanding();
 	}
 
 	#beginActionMenuOrSelect(item: ModelItem | CanonicalModelItem): void {

package/src/modes/components/provider-onboarding-selector.ts

@@ -4,7 +4,7 @@ import { matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
 import { formatModelOnboardingGuidance } from "../../setup/model-onboarding-guidance";
 import { DynamicBorder } from "./dynamic-border";
 
-export type ProviderOnboardingAction = "custom-provider-wizard" | "oauth-login" | "api-guide";
+export type ProviderOnboardingAction = "custom-provider-wizard" | "oauth-login" | "import-credentials" | "api-guide";
 
 interface ProviderOnboardingOption {
 	label: string;
@@ -28,6 +28,11 @@ const PROVIDER_ONBOARDING_OPTIONS: ProviderOnboardingOption[] = [
 		description: "Show the /provider add and gjc setup provider commands.",
 		action: "api-guide",
 	},
+	{
+		label: "Import existing credentials",
+		description: "Detect and import Claude Code / Codex CLI logins already on this machine.",
+		action: "import-credentials",
+	},
 ];
 
 export class ProviderOnboardingSelectorComponent extends Container {

package/src/modes/components/status-line/segments.ts

@@ -66,7 +66,7 @@ function classifyProjectDir(pwd: string): { scratch: boolean; relative: string |
 const gajaeSegment: StatusLineSegment = {
 	id: "gajae",
 	render(_ctx) {
-		return { content: theme.fg("accent", "GJC"), visible: true };
+		return { content: theme.fg("accent", "🦞"), visible: true };
 	},
 };
 

package/src/modes/controllers/command-controller.ts

@@ -13,6 +13,7 @@ import {
 import { Loader, Markdown, padding, Spacer, Text, visibleWidth } from "@gajae-code/tui";
 import { formatDuration, Snowflake, setProjectDir } from "@gajae-code/utils";
 import { $ } from "bun";
+import { jobElapsedMs } from "../../async";
 import { reset as resetCapabilities } from "../../capability";
 import { clearClaudePluginRootsCache } from "../../discovery/helpers";
 import { loadCustomShare } from "../../export/custom-share";
@@ -1279,7 +1280,7 @@ const BAR_WIDTH_MAX = 24;
 const BAR_WIDTH_MIN = 4;
 
 function renderJobLine(job: AsyncJobSnapshotItem, now: number): string {
-	const duration = formatDuration(Math.max(0, now - job.startTime));
+	const duration = formatDuration(jobElapsedMs(job, now));
 	const status = formatJobStatus(job.status);
 	return `${theme.fg("dim", job.id)} ${theme.fg("dim", `[${job.type}]`)} ${status} ${theme.fg("dim", `(${duration})`)}`;
 }
@@ -1538,7 +1539,7 @@ function resolveColumnWidth(count: number, available: number, trailing: number):
 	return ideal;
 }
 
-function renderUsageReports(
+export function renderUsageReports(
 	reports: UsageReport[],
 	uiTheme: typeof theme,
 	nowMs: number,
@@ -1592,17 +1593,35 @@ function renderUsageReports(
 
 		lines.push(uiTheme.bold(uiTheme.fg("accent", providerName)));
 
+		// Stable account column order shared across every window group, so each
+		// account keeps the same column in the 5h / 7d / ... rows. Rank accounts
+		// by total usage across their windows (a per-account value identical for
+		// every group), tie-broken by label for determinism.
+		const rankedAccounts = providerReports
+			.map(report => {
+				const [firstLimit] = report.limits;
+				return {
+					report,
+					total: report.limits.reduce((sum, limit) => sum + (resolveFraction(limit) ?? 0), 0),
+					label: firstLimit ? formatAccountLabel(firstLimit, report, 0) : formatUnlimitedReportLabel(report, 0),
+				};
+			})
+			.sort((a, b) => (a.total !== b.total ? b.total - a.total : a.label.localeCompare(b.label)));
+		const accountRank = new Map<UsageReport, number>();
+		rankedAccounts.forEach((entry, rank) => {
+			accountRank.set(entry.report, rank);
+		});
+
 		const renderableGroups = Array.from(limitGroups.values()).map(group => {
 			const entries = group.limits.map((limit, index) => ({
 				limit,
 				report: group.reports[index],
-				fraction: resolveFraction(limit),
 				index,
 			}));
 			entries.sort((a, b) => {
-				const aFraction = a.fraction ?? -1;
-				const bFraction = b.fraction ?? -1;
-				if (aFraction !== bFraction) return bFraction - aFraction;
+				const aRank = accountRank.get(a.report) ?? Number.MAX_SAFE_INTEGER;
+				const bRank = accountRank.get(b.report) ?? Number.MAX_SAFE_INTEGER;
+				if (aRank !== bRank) return aRank - bRank;
 				return a.index - b.index;
 			});
 			const sortedLimits = entries.map(entry => entry.limit);

package/src/modes/controllers/extension-ui-controller.ts

@@ -645,6 +645,9 @@ export class ExtensionUiController {
 				timeout: dialogOptions?.timeout,
 				onTimeout: dialogOptions?.onTimeout,
 				tui: this.ctx.ui,
+				// Share the main prompt editor's autocomplete provider so the
+				// inline "Other (type your own)" editor supports `@` file links.
+				autocompleteProvider: dialogOptions?.customInput ? this.ctx.editor.getAutocompleteProvider() : undefined,
 				outline: dialogOptions?.outline,
 				wrapFocused: dialogOptions?.wrapFocused,
 				scrollTitleRows,

package/src/modes/controllers/selector-controller.ts

@@ -32,13 +32,20 @@ import {
 import type { InteractiveModeContext } from "../../modes/types";
 import { type SessionInfo, SessionManager } from "../../session/session-manager";
 import { FileSessionStorage } from "../../session/session-storage";
+import { discoverExternalCredentials, formatDiscoverySummary, importCredentials } from "../../setup/credential-import";
 import {
 	MODEL_ONBOARDING_API_PROVIDER_COMMAND,
 	MODEL_ONBOARDING_PROVIDER_PRESET_COMMAND,
 	MODEL_ONBOARDING_SETUP_COMMAND,
 } from "../../setup/model-onboarding-guidance";
 import { addApiCompatibleProvider, formatProviderSetupResult } from "../../setup/provider-onboarding";
-import { isSearchProviderPreference, setPreferredImageProvider, setPreferredSearchProvider } from "../../tools";
+import {
+	isConfigurableSearchProviderId,
+	isSearchProviderPreference,
+	setPreferredImageProvider,
+	setPreferredSearchProvider,
+	setSearchFallbackProviders,
+} from "../../tools";
 import { setSessionTerminalTitle } from "../../utils/title-generator";
 import { AgentDashboard } from "../components/agent-dashboard";
 import { AssistantMessageComponent } from "../components/assistant-message";
@@ -70,6 +77,7 @@ const CALLBACK_SERVER_PROVIDERS = new Set<string>([
 	"google-gemini-cli",
 	"google-antigravity",
 	"xai",
+	"grok-build",
 ]);
 
 const MANUAL_LOGIN_TIP = "Tip: You can complete pairing with /login <redirect URL>.";
@@ -127,6 +135,8 @@ export class SelectorController {
 						this.showCustomProviderWizard();
 					} else if (action === "oauth-login") {
 						void this.showOAuthSelector("login");
+					} else if (action === "import-credentials") {
+						void this.#handleCredentialImport();
 					} else {
 						this.ctx.showStatus(formatProviderOnboardingCommandGuide());
 					}
@@ -140,6 +150,69 @@ export class SelectorController {
 		});
 	}
 
+	async #handleCredentialImport(): Promise<void> {
+		this.ctx.showStatus("Scanning for existing Claude Code / Codex CLI credentials…");
+		const result = await discoverExternalCredentials();
+		const summaryLines = formatDiscoverySummary(result);
+
+		if (result.importable.length === 0) {
+			this.ctx.chatContainer.addChild(new Spacer(1));
+			for (const line of summaryLines) {
+				this.ctx.chatContainer.addChild(new Text(theme.fg("dim", line), 1, 0));
+			}
+			this.ctx.chatContainer.addChild(
+				new Text(
+					theme.fg(
+						"warning",
+						"No importable Claude/Codex credentials found. Use /login or add a custom provider.",
+					),
+					1,
+					0,
+				),
+			);
+			this.ctx.ui.requestRender();
+			return;
+		}
+
+		const confirmed = await this.ctx.showHookConfirm(
+			`Import ${result.importable.length} credential(s)?`,
+			summaryLines.join("\n"),
+		);
+		if (!confirmed) {
+			this.ctx.showStatus("Credential import cancelled.");
+			return;
+		}
+
+		const summary = await importCredentials(result.importable, (provider, credential) =>
+			this.ctx.session.modelRegistry.authStorage.upsertCredential(provider, credential),
+		);
+		await this.ctx.session.modelRegistry.refresh();
+
+		this.ctx.chatContainer.addChild(new Spacer(1));
+		for (const credential of summary.imported) {
+			this.ctx.chatContainer.addChild(
+				new Text(
+					theme.fg("success", `${theme.status.success} Imported ${credential.provider} (${credential.source})`),
+					1,
+					0,
+				),
+			);
+		}
+		for (const failure of summary.failed) {
+			this.ctx.chatContainer.addChild(
+				new Text(
+					theme.fg("error", `${theme.status.error} Failed ${failure.credential.provider}: ${failure.error}`),
+					1,
+					0,
+				),
+			);
+		}
+		if (summary.imported.length > 0) {
+			this.ctx.chatContainer.addChild(new Text(theme.fg("dim", `Credentials saved to ${getAgentDbPath()}`), 1, 0));
+		}
+		this.ctx.ui.requestRender();
+	}
+
 	showCustomProviderWizard(): void {
 		this.showSelector(done => {
 			let wizard: CustomProviderWizardComponent;
@@ -506,6 +579,13 @@ export class SelectorController {
 					setPreferredSearchProvider(value);
 				}
 				break;
+			case "web_search.fallback":
+				if (Array.isArray(value)) {
+					setSearchFallbackProviders(
+						value.filter(item => typeof item === "string" && isConfigurableSearchProviderId(item)),
+					);
+				}
+				break;
 			case "providers.image":
 				if (
 					value === "auto" ||

package/src/modes/interactive-mode.ts

@@ -283,7 +283,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 	autoCompactionEscapeHandler?: () => void;
 	retryEscapeHandler?: () => void;
-	retryCountdownTimer?: ReturnType<typeof setInterval>;
+	retryCountdownTimer?: NodeJS.Timeout;
 	unsubscribe?: () => void;
 	onInputCallback?: (input: SubmittedUserInput) => void;
 	optimisticUserMessageSignature: string | undefined = undefined;
@@ -709,6 +709,16 @@ export class InteractiveMode implements InteractiveModeContext {
 			if (this.#pendingSubmittedInput) return;
 			if (this.editor.getText().trim().length > 0) return;
 			if ((this.pendingImages?.length ?? 0) > 0) return;
+			// Never fire an autonomous continuation prompt() while the session is
+			// busy. A wedged/orphaned subagent turn can leave isStreaming stuck true;
+			// firing prompt() here throws AgentBusyError, which submitInteractiveInput
+			// surfaces as a red "Error: Agent is already processing…" and then loops
+			// back to getUserInput(), re-arming this timer — an infinite error spam.
+			// Re-arm and only fire once the session returns to idle.
+			if (this.session.isStreaming || this.session.isCompacting) {
+				this.#scheduleGoalContinuation();
+				return;
+			}
 			const latestState = this.session.getGoalModeState();
 			if (!latestState?.enabled || latestState.goal.status !== "active") return;
 			this.#goalContinuationTurnInFlight = true;