@gajae-code/coding-agent 0.5.1 → 0.5.3

package/src/modes/components/runtime-mcp-add-wizard.ts

@@ -131,6 +131,11 @@ export class MCPAddWizard extends Container {
 		| null = null;
 	#onTestConnectionCallback: ((config: MCPServerConfig) => Promise<void>) | null = null;
 	#onRenderCallback: (() => void) | null = null;
+	#disposed = false;
+	#transitionTimers = new Set<NodeJS.Timeout>();
+	#healthCheckSpinner?: NodeJS.Timeout;
+	#healthCheckTimeout?: NodeJS.Timeout;
+	#asyncGeneration = 0;
 
 	constructor(
 		onComplete: (name: string, config: MCPServerConfig, scope: Scope) => void,
@@ -178,6 +183,39 @@ export class MCPAddWizard extends Container {
 		this.#renderStep();
 	}
 
+	dispose(): void {
+		if (this.#disposed) return;
+		this.#disposed = true;
+		this.#asyncGeneration += 1;
+		for (const timer of this.#transitionTimers) {
+			clearTimeout(timer);
+		}
+		this.#transitionTimers.clear();
+		this.#clearHealthCheckTimers();
+		super.dispose();
+	}
+
+	#scheduleTransition(callback: () => void, delay: number): void {
+		if (this.#disposed) return;
+		const timer = setTimeout(() => {
+			this.#transitionTimers.delete(timer);
+			if (this.#disposed) return;
+			callback();
+		}, delay);
+		this.#transitionTimers.add(timer);
+	}
+
+	#clearHealthCheckTimers(): void {
+		if (this.#healthCheckSpinner) {
+			clearInterval(this.#healthCheckSpinner);
+			this.#healthCheckSpinner = undefined;
+		}
+		if (this.#healthCheckTimeout) {
+			clearTimeout(this.#healthCheckTimeout);
+			this.#healthCheckTimeout = undefined;
+		}
+	}
+
 	#requestRender(): void {
 		this.#onRenderCallback?.();
 	}
@@ -941,6 +979,8 @@ export class MCPAddWizard extends Container {
 	 * Test connection and automatically detect if auth is needed.
 	 */
 	async #testConnectionAndDetectAuth(): Promise<void> {
+		if (this.#disposed) return;
+		const generation = ++this.#asyncGeneration;
 		const testConfig = this.#buildServerConfig();
 
 		if (!this.#onTestConnectionCallback) {
@@ -954,6 +994,7 @@ export class MCPAddWizard extends Container {
 		try {
 			// Try to connect - timeout is handled by the transport layer (5 seconds)
 			await this.#onTestConnectionCallback(testConfig);
+			if (this.#disposed || generation !== this.#asyncGeneration) return;
 
 			// Success! No auth required
 			this.#contentContainer.clear();
@@ -962,7 +1003,7 @@ export class MCPAddWizard extends Container {
 			this.#contentContainer.addChild(new Text("No authentication required", 0, 0));
 			this.#contentContainer.addChild(new Spacer(1));
 
-			setTimeout(() => {
+			this.#scheduleTransition(() => {
 				this.#state.authMethod = "none";
 				this.#currentStep = "scope";
 				this.#selectedIndex = 0;
@@ -978,10 +1019,12 @@ export class MCPAddWizard extends Container {
 				if (!oauth && this.#state.transport !== "stdio" && this.#state.url) {
 					try {
 						oauth = await discoverOAuthEndpoints(this.#state.url, authResult.authServerUrl);
+						if (this.#disposed || generation !== this.#asyncGeneration) return;
 					} catch {
 						// Ignore discovery failures and fallback to manual auth.
 					}
 				}
+				if (this.#disposed || generation !== this.#asyncGeneration) return;
 
 				if (oauth) {
 					this.#state.oauthAuthUrl = oauth.authorizationUrl;
@@ -1019,7 +1062,7 @@ export class MCPAddWizard extends Container {
 				this.#contentContainer.addChild(new Spacer(1));
 				this.#contentContainer.addChild(new Text(theme.fg("muted", "Adding server anyway..."), 0, 0));
 
-				setTimeout(() => {
+				this.#scheduleTransition(() => {
 					this.#state.authMethod = "none";
 					this.#currentStep = "scope";
 					this.#selectedIndex = 0;
@@ -1107,6 +1150,8 @@ export class MCPAddWizard extends Container {
 	}
 
 	async #launchOAuthFlow(): Promise<void> {
+		if (this.#disposed) return;
+		const generation = ++this.#asyncGeneration;
 		if (!this.#onOAuthCallback) {
 			this.#contentContainer.clear();
 			this.#contentContainer.addChild(new Text(theme.fg("error", "OAuth flow not available"), 0, 0));
@@ -1150,6 +1195,7 @@ export class MCPAddWizard extends Container {
 				this.#state.oauthClientSecret,
 				this.#state.oauthScopes,
 			);
+			if (this.#disposed || generation !== this.#asyncGeneration) return;
 
 			// Store credential ID + any dynamically-registered client credentials,
 			// so the final mcp.json entry persists everything needed for refresh.
@@ -1168,7 +1214,8 @@ export class MCPAddWizard extends Container {
 			this.#contentContainer.addChild(healthText);
 
 			let spinnerIndex = 0;
-			const spinner = setInterval(() => {
+			this.#healthCheckSpinner = setInterval(() => {
+				if (this.#disposed || generation !== this.#asyncGeneration) return;
 				healthText.setText(
 					theme.fg("muted", `${spinnerFrames[spinnerIndex % spinnerFrames.length]} Checking server connection...`),
 				);
@@ -1181,7 +1228,7 @@ export class MCPAddWizard extends Container {
 			if (this.#onTestConnectionCallback) {
 				try {
 					const { promise: timeoutPromise, reject: timeoutReject } = Promise.withResolvers<never>();
-					const timer = setTimeout(
+					this.#healthCheckTimeout = setTimeout(
 						() => timeoutReject(new Error("Health check timed out after 10 seconds")),
 						10_000,
 					);
@@ -1191,15 +1238,19 @@ export class MCPAddWizard extends Container {
 							timeoutPromise,
 						]);
 					} finally {
-						clearTimeout(timer);
+						if (this.#healthCheckTimeout) {
+							clearTimeout(this.#healthCheckTimeout);
+							this.#healthCheckTimeout = undefined;
+						}
 					}
 				} catch (error) {
 					healthPassed = false;
 					healthError = sanitize(error instanceof Error ? error.message : String(error));
 				}
 			}
+			if (this.#disposed || generation !== this.#asyncGeneration) return;
 
-			clearInterval(spinner);
+			this.#clearHealthCheckTimers();
 			if (healthPassed) {
 				healthText.setText(theme.fg("success", "✓ Health check passed"));
 			} else {
@@ -1210,7 +1261,7 @@ export class MCPAddWizard extends Container {
 			this.#requestRender();
 
 			// Move to scope selection after short delay
-			setTimeout(
+			this.#scheduleTransition(
 				() => {
 					this.#currentStep = "scope";
 					this.#selectedIndex = 0;

package/src/modes/components/skill-message.ts

@@ -1,6 +1,6 @@
 import type { TextContent } from "@gajae-code/ai";
 import type { Component } from "@gajae-code/tui";
-import { Box, Container, Markdown, Spacer, Text } from "@gajae-code/tui";
+import { Box, Container, Markdown, Spacer, Text, truncateToWidth } from "@gajae-code/tui";
 import { getMarkdownTheme, theme } from "../../modes/theme/theme";
 import type { CustomMessage, SkillPromptDetails } from "../../session/messages";
 
@@ -39,29 +39,37 @@ export class SkillMessageComponent extends Container {
 		this.addChild(this.#box);
 		this.#box.clear();
 
-		const label = theme.fg("customMessageLabel", theme.bold("[skill]"));
-		this.#box.addChild(new Text(label, 0, 0));
-		this.#box.addChild(new Spacer(1));
-
 		const details = this.message.details;
+		const name = details?.name ?? "unknown";
 		const args = details?.args?.trim();
-		const infoLines = [
-			`Skill: ${details?.name ?? "unknown"}`,
-			args ? `Args: ${args}` : undefined,
-			details?.path ? `Path: ${details.path}` : undefined,
-			typeof details?.lineCount === "number" ? `Prompt: ${details.lineCount} lines` : undefined,
-		].filter((line): line is string => Boolean(line));
 
-		this.#box.addChild(
-			new Markdown(infoLines.join("\n"), 0, 0, getMarkdownTheme(), {
-				color: (value: string) => theme.fg("customMessageText", value),
-			}),
-		);
+		// Single compact line: `[skill] <name>: <args>`. The summary is the
+		// args the user typed; with none, just `[skill] <name>`. Collapsed to
+		// one line — path / line-count / full prompt body are debugging detail
+		// and only render once expanded.
+		const summary = args ? truncateToWidth(args.replace(/\s+/g, " "), 72) : undefined;
+		const header = `${theme.fg("customMessageLabel", theme.bold("[skill]"))} ${theme.fg("customMessageText", name)}`;
+		const headerText = summary ? `${header}${theme.fg("customMessageText", `: ${summary}`)}` : header;
+		this.#box.addChild(new Text(headerText, 0, 0));
 
 		if (!this.#expanded) {
 			return;
 		}
 
+		const detailLines = [
+			details?.path ? `Path: ${details.path}` : undefined,
+			typeof details?.lineCount === "number" ? `Prompt: ${details.lineCount} lines` : undefined,
+		].filter((line): line is string => Boolean(line));
+
+		if (detailLines.length > 0) {
+			this.#box.addChild(new Spacer(1));
+			this.#box.addChild(
+				new Markdown(detailLines.join("\n"), 0, 0, getMarkdownTheme(), {
+					color: (value: string) => theme.fg("customMessageText", value),
+				}),
+			);
+		}
+
 		const text = this.#extractText();
 		if (!text) {
 			return;

package/src/modes/components/tool-execution.ts

@@ -375,6 +375,7 @@ export class ToolExecutionComponent extends Container {
 				this.#renderState.spinnerFrame = this.#spinnerFrame;
 				this.#ui.requestRender();
 			}, 80);
+			this.#spinnerInterval?.unref?.();
 		} else if (!needsSpinner && this.#spinnerInterval) {
 			clearInterval(this.#spinnerInterval);
 			this.#spinnerInterval = undefined;
@@ -394,6 +395,11 @@ export class ToolExecutionComponent extends Container {
 		this.#editDiffAbort = undefined;
 	}
 
+	override dispose(): void {
+		this.stopAnimation();
+		super.dispose();
+	}
+
 	setExpanded(expanded: boolean): void {
 		this.#expanded = expanded;
 		this.#updateDisplay();

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

@@ -36,9 +36,20 @@ export class ExtensionUiController {
 	#hookWidgetsAbove = new Map<string, ExtensionUiComponent>();
 	#hookWidgetsBelow = new Map<string, ExtensionUiComponent>();
 	#hookSelectorMouseReportingEnabled = false;
+	#activeHookCustomComponent?: Component & { dispose?(): void };
+	#activeHookCustomOverlay?: OverlayHandle;
 
 	constructor(private ctx: InteractiveModeContext) {}
 
+	#clearActiveHookCustom(): void {
+		const component = this.#activeHookCustomComponent;
+		const overlay = this.#activeHookCustomOverlay;
+		this.#activeHookCustomComponent = undefined;
+		this.#activeHookCustomOverlay = undefined;
+		component?.dispose?.();
+		overlay?.hide();
+	}
+
 	/**
 	 * Initialize the hook system with TUI-based UI context.
 	 */
@@ -301,7 +312,11 @@ export class ExtensionUiController {
 		spacerWhenEmpty: boolean,
 		leadingSpacer: boolean,
 	): void {
-		container.clear();
+		// Detach (not dispose): hook widgets are persistent instances owned by the
+		// #hookWidgets* maps and re-added on every rebuild. Disposal happens only on
+		// explicit removal (#removeHookWidget) or clearHookWidgets(), so a rebuild must
+		// not tear down a still-live widget (e.g. an extension CancellableLoader timer).
+		container.detachAll();
 
 		if (widgets.size === 0) {
 			if (spacerWhenEmpty) {
@@ -665,6 +680,9 @@ export class ExtensionUiController {
 					: undefined,
 			},
 		);
+		// Detach (not dispose) the reusable editor before mounting the transient hook UI, so the
+		// disposing clear() only tears down a prior transient — the editor is re-added intact on close.
+		this.ctx.editorContainer.detachChild(this.ctx.editor);
 		this.ctx.editorContainer.clear();
 		this.ctx.editorContainer.addChild(this.ctx.hookSelector);
 		this.ctx.ui.setFocus(this.ctx.hookSelector);
@@ -743,6 +761,9 @@ export class ExtensionUiController {
 				tui: this.ctx.ui,
 			},
 		);
+		// Detach (not dispose) the reusable editor before mounting the transient hook UI, so the
+		// disposing clear() only tears down a prior transient — the editor is re-added intact on close.
+		this.ctx.editorContainer.detachChild(this.ctx.editor);
 		this.ctx.editorContainer.clear();
 		this.ctx.editorContainer.addChild(this.ctx.hookInput);
 		this.ctx.ui.setFocus(this.ctx.hookInput);
@@ -791,6 +812,9 @@ export class ExtensionUiController {
 			editorOptions,
 		);
 
+		// Detach (not dispose) the reusable editor before mounting the transient hook UI, so the
+		// disposing clear() only tears down a prior transient — the editor is re-added intact on close.
+		this.ctx.editorContainer.detachChild(this.ctx.editor);
 		this.ctx.editorContainer.clear();
 		this.ctx.editorContainer.addChild(this.ctx.hookEditor);
 		this.ctx.ui.setFocus(this.ctx.hookEditor);
@@ -840,15 +864,12 @@ export class ExtensionUiController {
 
 		const { promise, resolve } = Promise.withResolvers<T>();
 		let component: (Component & { dispose?(): void }) | undefined;
-		let overlayHandle: OverlayHandle | undefined;
 		let closed = false;
 
 		const close = (result: T) => {
 			if (closed) return;
 			closed = true;
-			component?.dispose?.();
-			overlayHandle?.hide();
-			overlayHandle = undefined;
+			this.#clearActiveHookCustom();
 			if (!options?.overlay) {
 				this.ctx.editorContainer.clear();
 				this.ctx.editorContainer.addChild(this.ctx.editor);
@@ -859,14 +880,16 @@ export class ExtensionUiController {
 			resolve(result);
 		};
 
+		this.#clearActiveHookCustom();
 		Promise.try(() => factory(this.ctx.ui, theme, keybindings, close)).then(c => {
 			if (closed) {
 				c.dispose?.();
 				return;
 			}
 			component = c;
+			this.#activeHookCustomComponent = c;
 			if (options?.overlay) {
-				overlayHandle = this.ctx.ui.showOverlay(component, {
+				this.#activeHookCustomOverlay = this.ctx.ui.showOverlay(component, {
 					anchor: "bottom-center",
 					width: "100%",
 					maxHeight: "100%",
@@ -874,6 +897,9 @@ export class ExtensionUiController {
 				});
 				return;
 			}
+			// Detach (not dispose) the reusable editor before mounting the transient hook UI, so the
+			// disposing clear() only tears down a prior transient — the editor is re-added intact on close.
+			this.ctx.editorContainer.detachChild(this.ctx.editor);
 			this.ctx.editorContainer.clear();
 			this.ctx.editorContainer.addChild(component);
 			this.ctx.ui.setFocus(component);
@@ -895,6 +921,7 @@ export class ExtensionUiController {
 	}
 
 	clearHookWidgets(): void {
+		this.#clearActiveHookCustom();
 		for (const widget of this.#hookWidgetsAbove.values()) {
 			widget.dispose?.();
 		}

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

@@ -887,6 +887,11 @@ export class InputController {
 		this.ctx.session.agent.hideThinkingSummary = this.ctx.hideThinkingBlock;
 
 		// Rebuild chat from session messages
+		// Detach the live streaming component before the disposing clear() so the
+		// component we re-add below is not torn down (detach != dispose).
+		if (this.ctx.streamingComponent) {
+			this.ctx.chatContainer.detachChild(this.ctx.streamingComponent);
+		}
 		this.ctx.chatContainer.clear();
 		this.ctx.rebuildChatFromMessages();
 

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";
@@ -128,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());
 					}
@@ -141,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;
@@ -507,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" ||
@@ -605,7 +684,12 @@ export class SelectorController {
 					done();
 					this.ctx.ui.requestRender();
 				},
-				{ ...options, sessionId: this.ctx.session.sessionId },
+				{
+					...options,
+					sessionId: this.ctx.session.sessionId,
+					isFastForProvider: provider => this.ctx.session.isFastForProvider(provider),
+					isFastForSubagentProvider: provider => this.ctx.session.isFastForSubagentProvider(provider),
+				},
 			);
 			return { component: selector, focus: selector };
 		});

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;