@gajae-code/coding-agent 0.12.0 → 0.12.2

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

@@ -22,7 +22,12 @@ import { HookEditorComponent } from "../../modes/components/hook-editor";
 import { HookInputComponent } from "../../modes/components/hook-input";
 import { HookSelectorComponent } from "../../modes/components/hook-selector";
 import { getAvailableThemesWithPaths, getThemeByName, setTheme, type Theme, theme } from "../../modes/theme/theme";
-import type { InteractiveModeContext } from "../../modes/types";
+import {
+	clearInteractiveActivityLoaders,
+	type InteractiveModeContext,
+	stopInteractiveActivityIndicator,
+	syncInteractiveActivityIndicator,
+} from "../../modes/types";
 import { createReadonlySessionManager } from "../../session/session-manager";
 import { parseThinkingLevel } from "../../thinking";
 import type { TodoPhase } from "../../tools/todo-write";
@@ -36,12 +41,55 @@ const HOOK_SELECTOR_CHROME_ROWS = 7;
 const HOOK_SELECTOR_OUTLINE_ROWS = 2;
 const HOOK_SELECTOR_INLINE_INPUT_ROWS = 2;
 
+const EXTENSION_ACTION_MUTATIONS: ReadonlySet<PropertyKey> = new Set([
+	"sendMessage",
+	"sendUserMessage",
+	"appendEntry",
+	"setLabel",
+	"setActiveTools",
+	"setModel",
+	"setThinkingLevel",
+	"setThinkingVisibility",
+	"cycleThinkingLevel",
+	"setThinkingLevelForControl",
+	"setThinkingVisibilityForControl",
+	"setModelTemporaryForControl",
+	"setSessionName",
+]);
+const EXTENSION_CONTEXT_MUTATIONS: ReadonlySet<PropertyKey> = new Set([
+	"abort",
+	"abortPromptAndWait",
+	"shutdown",
+	"compact",
+	"clearContext",
+	"cycleModel",
+	"setModelProfile",
+	"cycleThinkingLevel",
+	"setQueueMode",
+	"invokeSkill",
+	"setPlanMode",
+	"operateGoal",
+	"setSdkPermissionProvider",
+	"setSdkClientBridge",
+	"sdkControl",
+]);
+const EXTENSION_COMMAND_MUTATIONS: ReadonlySet<PropertyKey> = new Set([
+	"reload",
+	"newSession",
+	"branch",
+	"navigateTree",
+	"compact",
+	"switchSession",
+]);
+
 export class ExtensionUiController {
 	#extensionTerminalInputUnsubscribers = new Set<() => void>();
+	#extensionErrorUnsubscribe?: () => void;
 	#hookWidgetsAbove = new Map<string, ExtensionUiComponent>();
 	#hookWidgetsBelow = new Map<string, ExtensionUiComponent>();
 	#activeHookCustomComponent?: Component & { dispose?(): void };
 	#activeHookCustomOverlay?: OverlayHandle;
+	#activeHookCustomCancel?: () => void;
 
 	constructor(private ctx: InteractiveModeContext) {}
 
@@ -317,6 +365,27 @@ export class ExtensionUiController {
 		this.ctx.restoreComposer();
 	}
 
+	#isStopped(): boolean {
+		return this.ctx.isStopped?.() === true;
+	}
+
+	#assertActive(): void {
+		if (this.#isStopped()) throw Object.assign(new Error("Interactive mode stopped"), { code: "cancelled" });
+	}
+
+	#guardMutations<T extends object>(target: T, mutationNames: ReadonlySet<PropertyKey>): T {
+		return new Proxy(target, {
+			get: (current, property, receiver) => {
+				const member = Reflect.get(current, property, receiver) as unknown;
+				if (!mutationNames.has(property) || typeof member !== "function") return member;
+				return (...args: unknown[]) => {
+					this.#assertActive();
+					return Reflect.apply(member, current, args);
+				};
+			},
+		});
+	}
+
 	/**
 	 * Initialize the hook system with TUI-based UI context.
 	 */
@@ -329,13 +398,19 @@ export class ExtensionUiController {
 			notify: (message, type) => this.showHookNotify(message, type),
 			onTerminalInput: handler => this.addExtensionTerminalInputListener(handler),
 			setStatus: (key, text) => this.setHookStatus(key, text),
-			setWorkingMessage: message => this.ctx.setWorkingMessage(message),
+			setWorkingMessage: message => {
+				if (!this.#isStopped()) this.ctx.setWorkingMessage(message);
+			},
 			setWidget: (key, content, options) => this.setHookWidget(key, content, options),
-			setTitle: title => setTerminalTitle(title),
+			setTitle: title => {
+				if (!this.#isStopped()) setTerminalTitle(title);
+			},
 			custom: (factory, options) => this.showHookCustom(factory, options),
-			setEditorText: text => this.ctx.editor.setText(text),
+			setEditorText: text => {
+				if (!this.#isStopped()) this.ctx.editor.setText(text);
+			},
 			pasteToEditor: text => {
-				this.ctx.editor.handleInput(`\x1b[200~${text}\x1b[201~`);
+				if (!this.#isStopped()) this.ctx.editor.handleInput(`\x1b[200~${text}\x1b[201~`);
 			},
 			getEditorText: () => this.ctx.editor.getText(),
 			editor: (title, prefill, dialogOptions, editorOptions) =>
@@ -346,17 +421,22 @@ export class ExtensionUiController {
 			getAllThemes: async () => (await getAvailableThemesWithPaths()).map(t => ({ name: t.name, path: t.path })),
 			getTheme: name => getThemeByName(name),
 			setTheme: async themeArg => {
+				if (this.#isStopped()) return { success: false, error: "Interactive mode stopped" };
 				if (typeof themeArg === "string") {
-					return await setTheme(themeArg, true);
+					return await setTheme(themeArg, true, { shouldApply: () => !this.#isStopped() });
 				}
 				// Theme object passed directly - not supported in current implementation
 				return Promise.resolve({ success: false, error: "Direct theme object not supported" });
 			},
 			setFooter: () => {},
 			setHeader: () => {},
-			setEditorComponent: factory => this.ctx.setEditorComponent(factory),
+			setEditorComponent: factory => {
+				if (!this.#isStopped()) this.ctx.setEditorComponent(factory);
+			},
 			getToolsExpanded: () => this.ctx.toolOutputExpanded,
-			setToolsExpanded: expanded => this.ctx.setToolsExpanded(expanded),
+			setToolsExpanded: expanded => {
+				if (!this.#isStopped()) this.ctx.setToolsExpanded(expanded);
+			},
 		};
 		this.ctx.setToolUIContext(uiContext, true);
 
@@ -370,8 +450,11 @@ export class ExtensionUiController {
 				const wasStreaming = this.ctx.session.isStreaming;
 				this.ctx.session
 					.sendCustomMessage(message, options)
-					.then(() => this.#applyCustomMessageDisplay(wasStreaming, message.display))
+					.then(() => {
+						if (!this.#isStopped()) this.#applyCustomMessageDisplay(wasStreaming, message.display);
+					})
 					.catch((err: unknown) => {
+						if (this.#isStopped()) return;
 						this.ctx.showError(
 							`Extension sendMessage failed: ${err instanceof Error ? err.message : String(err)}`,
 						);
@@ -416,7 +499,9 @@ export class ExtensionUiController {
 		const contextActions: ExtensionContextActions = {
 			getModel: () => this.ctx.session.model,
 			isIdle: () => !this.ctx.session.isStreaming,
+			getActivePromptHandle: () => this.ctx.session.activePromptHandle,
 			abort: () => this.ctx.session.abort(),
+			abortPromptAndWait: (handle, options) => this.ctx.session.abortPromptAndWait(handle, options),
 			hasPendingMessages: () => this.ctx.session.queuedMessageCount > 0,
 			getPendingMessageCounts: () => this.ctx.session.pendingMessageCounts,
 			getTranscript: () => this.ctx.session.getTranscript(),
@@ -468,6 +553,7 @@ export class ExtensionUiController {
 			getBranchCandidates: () => this.ctx.sessionManager.getTree(),
 			getExtensions: () => this.ctx.session.extensionRunner?.getExtensionPaths() ?? [],
 			setSdkPermissionProvider: provider => this.ctx.session.setSdkPermissionProvider(provider),
+			setSdkClientBridge: bridge => this.ctx.session.setClientBridge(bridge),
 			sdkControl: this.#sdkControl,
 		};
 		const commandActions: ExtensionCommandContextActions = {
@@ -476,10 +562,12 @@ export class ExtensionUiController {
 			reload: async () => {
 				const previousSessionId = this.ctx.sessionManager.getSessionId();
 				await this.ctx.session.reload();
+				if (this.#isStopped()) return;
 				const sessionIdentityChanged = previousSessionId !== this.ctx.sessionManager.getSessionId();
 				if (sessionIdentityChanged) this.ctx.resetIrcSidebarSession();
 				this.ctx.rebuildInitialMessages(sessionIdentityChanged ? "replace-identity" : "reconcile-same-transcript");
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return;
 				this.ctx.showStatus("Reloaded session");
 			},
 			newSession: async options => {
@@ -488,18 +576,17 @@ export class ExtensionUiController {
 				if (!success) {
 					return { cancelled: true };
 				}
+				if (this.#isStopped()) return { cancelled: true };
+				clearInteractiveActivityLoaders(this.ctx);
 				cleanupPreviousSessionUi();
 
-				if (this.ctx.loadingAnimation) {
-					this.ctx.loadingAnimation.stop();
-					this.ctx.loadingAnimation = undefined;
-				}
-				this.ctx.statusContainer.clear();
+				stopInteractiveActivityIndicator(this.ctx);
 				this.ctx.resetIrcSidebarSession();
 				setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
 
 				if (options?.setup) {
 					await options.setup(this.ctx.sessionManager);
+					if (this.#isStopped()) return { cancelled: true };
 				}
 
 				this.ctx.statusLine.invalidate();
@@ -519,12 +606,14 @@ export class ExtensionUiController {
 					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 0),
 				);
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return { cancelled: true };
 				this.ctx.ui.requestRender();
 
 				return { cancelled: false };
 			},
 			branch: async entryId => {
 				const result = await this.ctx.session.branch(entryId);
+				if (this.#isStopped()) return { cancelled: true };
 				if (result.cancelled) {
 					return { cancelled: true };
 				}
@@ -533,6 +622,7 @@ export class ExtensionUiController {
 				// Update UI
 				this.ctx.rebuildInitialMessages("replace-identity");
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return { cancelled: true };
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
 
@@ -540,6 +630,7 @@ export class ExtensionUiController {
 			},
 			navigateTree: async (targetId, options) => {
 				const result = await this.ctx.session.navigateTree(targetId, { summarize: options?.summarize });
+				if (this.#isStopped()) return { cancelled: true };
 				if (result.cancelled) {
 					return { cancelled: true };
 				}
@@ -547,6 +638,7 @@ export class ExtensionUiController {
 				// Update UI
 				this.ctx.rebuildInitialMessages("reconcile-same-transcript");
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return { cancelled: true };
 				if (result.editorText && !this.ctx.editor.getText().trim()) {
 					this.ctx.editor.setText(result.editorText);
 				}
@@ -560,9 +652,11 @@ export class ExtensionUiController {
 
 				this.clearHookWidgets();
 				const result = await this.ctx.session.switchSession(sessionPath);
+				if (this.#isStopped()) return { cancelled: true };
 				if (!result) {
 					return { cancelled: true };
 				}
+				clearInteractiveActivityLoaders(this.ctx);
 				const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();
 				if (switchingToDifferentSession) this.ctx.resetIrcSidebarSession();
 
@@ -571,15 +665,23 @@ export class ExtensionUiController {
 					switchingToDifferentSession ? "replace-identity" : "reconcile-same-transcript",
 				);
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return { cancelled: true };
+				syncInteractiveActivityIndicator(this.ctx);
 				return { cancelled: false };
 			},
 		};
 
-		extensionRunner.initialize(actions, contextActions, commandActions, uiContext);
+		extensionRunner.initialize(
+			this.#guardMutations(actions, EXTENSION_ACTION_MUTATIONS),
+			this.#guardMutations(contextActions, EXTENSION_CONTEXT_MUTATIONS),
+			this.#guardMutations(commandActions, EXTENSION_COMMAND_MUTATIONS),
+			uiContext,
+		);
 
 		// Subscribe to extension errors
-		extensionRunner.onError((error: ExtensionError) => {
-			this.showExtensionError(error.extensionPath, error.error);
+		this.#extensionErrorUnsubscribe?.();
+		this.#extensionErrorUnsubscribe = extensionRunner.onError((error: ExtensionError) => {
+			if (!this.#isStopped()) this.showExtensionError(error.extensionPath, error.error);
 		});
 
 		// Emit session_start event
@@ -589,6 +691,7 @@ export class ExtensionUiController {
 	}
 
 	setHookWidget(key: string, content: ExtensionWidgetContent, options?: ExtensionWidgetOptions): void {
+		if (this.#isStopped()) return;
 		const placement = options?.placement ?? "aboveEditor";
 		this.#removeHookWidget(this.#hookWidgetsAbove, key);
 		this.#removeHookWidget(this.#hookWidgetsBelow, key);
@@ -715,7 +818,9 @@ export class ExtensionUiController {
 		const contextActions: ExtensionContextActions = {
 			getModel: () => this.ctx.session.model,
 			isIdle: () => !this.ctx.session.isStreaming,
+			getActivePromptHandle: () => this.ctx.session.activePromptHandle,
 			abort: () => this.ctx.session.abort(),
+			abortPromptAndWait: (handle, options) => this.ctx.session.abortPromptAndWait(handle, options),
 			hasPendingMessages: () => this.ctx.session.queuedMessageCount > 0,
 			getPendingMessageCounts: () => this.ctx.session.pendingMessageCounts,
 			getTranscript: () => this.ctx.session.getTranscript(),
@@ -764,6 +869,7 @@ export class ExtensionUiController {
 			getBranchCandidates: () => this.ctx.sessionManager.getTree(),
 			getExtensions: () => this.ctx.session.extensionRunner?.getExtensionPaths() ?? [],
 			setSdkPermissionProvider: provider => this.ctx.session.setSdkPermissionProvider(provider),
+			setSdkClientBridge: bridge => this.ctx.session.setClientBridge(bridge),
 			sdkControl: this.#sdkControl,
 		};
 		const commandActions: ExtensionCommandContextActions = {
@@ -775,10 +881,12 @@ export class ExtensionUiController {
 				}
 				const previousSessionId = this.ctx.sessionManager.getSessionId();
 				await this.ctx.session.reload();
+				if (this.#isStopped()) return;
 				const sessionIdentityChanged = previousSessionId !== this.ctx.sessionManager.getSessionId();
 				if (sessionIdentityChanged) this.ctx.resetIrcSidebarSession();
 				this.ctx.rebuildInitialMessages(sessionIdentityChanged ? "replace-identity" : "reconcile-same-transcript");
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return;
 				this.ctx.showStatus("Reloaded session");
 			},
 			newSession: async options => {
@@ -790,17 +898,16 @@ export class ExtensionUiController {
 				if (!success) {
 					return { cancelled: true };
 				}
+				if (this.#isStopped()) return { cancelled: true };
+				clearInteractiveActivityLoaders(this.ctx);
 				cleanupPreviousSessionUi();
 
-				if (this.ctx.loadingAnimation) {
-					this.ctx.loadingAnimation.stop();
-					this.ctx.loadingAnimation = undefined;
-				}
-				this.ctx.statusContainer.clear();
+				stopInteractiveActivityIndicator(this.ctx);
 				this.ctx.resetIrcSidebarSession();
 
 				if (options?.setup) {
 					await options.setup(this.ctx.sessionManager);
+					if (this.#isStopped()) return { cancelled: true };
 				}
 
 				prepareTranscriptRebuild(this.ctx.ui, "replace-identity");
@@ -815,6 +922,7 @@ export class ExtensionUiController {
 					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 0),
 				);
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return { cancelled: true };
 				this.ctx.ui.requestRender();
 
 				return { cancelled: false };
@@ -824,6 +932,7 @@ export class ExtensionUiController {
 					return { cancelled: true };
 				}
 				const result = await this.ctx.session.branch(entryId);
+				if (this.#isStopped()) return { cancelled: true };
 				if (result.cancelled) {
 					return { cancelled: true };
 				}
@@ -832,6 +941,7 @@ export class ExtensionUiController {
 				// Update UI
 				this.ctx.rebuildInitialMessages("replace-identity");
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return { cancelled: true };
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
 
@@ -842,6 +952,7 @@ export class ExtensionUiController {
 					return { cancelled: true };
 				}
 				const result = await this.ctx.session.navigateTree(targetId, { summarize: options?.summarize });
+				if (this.#isStopped()) return { cancelled: true };
 				if (result.cancelled) {
 					return { cancelled: true };
 				}
@@ -849,6 +960,7 @@ export class ExtensionUiController {
 				// Update UI
 				this.ctx.rebuildInitialMessages("reconcile-same-transcript");
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return { cancelled: true };
 				if (result.editorText && !this.ctx.editor.getText().trim()) {
 					this.ctx.editor.setText(result.editorText);
 				}
@@ -865,20 +977,29 @@ export class ExtensionUiController {
 
 				this.clearHookWidgets();
 				const result = await this.ctx.session.switchSession(sessionPath);
+				if (this.#isStopped()) return { cancelled: true };
 				if (!result) {
 					return { cancelled: true };
 				}
+				clearInteractiveActivityLoaders(this.ctx);
 				const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();
 				if (switchingToDifferentSession) this.ctx.resetIrcSidebarSession();
 				this.ctx.rebuildInitialMessages(
 					switchingToDifferentSession ? "replace-identity" : "reconcile-same-transcript",
 				);
 				await this.ctx.reloadTodos();
+				if (this.#isStopped()) return { cancelled: true };
+				syncInteractiveActivityIndicator(this.ctx);
 				return { cancelled: false };
 			},
 		};
 
-		extensionRunner.initialize(actions, contextActions, commandActions, uiContext);
+		extensionRunner.initialize(
+			this.#guardMutations(actions, EXTENSION_ACTION_MUTATIONS),
+			this.#guardMutations(contextActions, EXTENSION_CONTEXT_MUTATIONS),
+			this.#guardMutations(commandActions, EXTENSION_COMMAND_MUTATIONS),
+			uiContext,
+		);
 	}
 
 	createBackgroundUiContext(): ExtensionUIContext {
@@ -935,6 +1056,7 @@ export class ExtensionUiController {
 						sessionManager: createReadonlySessionManager(this.ctx.session.sessionManager),
 						modelRegistry: this.ctx.session.modelRegistry,
 						model: this.ctx.session.model,
+						getActivePromptHandle: () => this.ctx.session.activePromptHandle,
 						isIdle: () => !this.ctx.session.isStreaming,
 						hasPendingMessages: () => this.ctx.session.queuedMessageCount > 0,
 						getPendingMessageCounts: () => this.ctx.session.pendingMessageCounts,
@@ -1022,7 +1144,7 @@ export class ExtensionUiController {
 	 * Set hook status text in the footer.
 	 */
 	setHookStatus(key: string, text: string | undefined): void {
-		if (this.ctx.isBackgrounded) {
+		if (this.#isStopped() || this.ctx.isBackgrounded) {
 			return;
 		}
 		this.ctx.statusLine.setHookStatus(key, text);
@@ -1037,6 +1159,7 @@ export class ExtensionUiController {
 		options: string[],
 		dialogOptions?: ExtensionUIDialogOptions,
 	): Promise<string | undefined> {
+		if (this.#isStopped()) return Promise.resolve(undefined);
 		const { promise, finish, attachAbort } = this.#createHookDialogState(
 			() => this.hideHookSelector(),
 			dialogOptions?.signal,
@@ -1141,8 +1264,9 @@ export class ExtensionUiController {
 	 */
 	hideHookSelector(): void {
 		this.ctx.hookSelector?.dispose();
-		this.#restoreComposerEditor();
 		this.ctx.hookSelector = undefined;
+		if (this.#isStopped()) return;
+		this.#restoreComposerEditor();
 		this.ctx.ui.setFocus(this.ctx.editor);
 		this.ctx.ui.requestRender();
 	}
@@ -1164,6 +1288,7 @@ export class ExtensionUiController {
 		dialogOptions?: ExtensionUIDialogOptions,
 		inputOptions?: { readonly initialValue?: string },
 	): Promise<string | undefined> {
+		if (this.#isStopped()) return Promise.resolve(undefined);
 		const { promise, finish, attachAbort } = this.#createHookDialogState(
 			() => this.hideHookInput(),
 			dialogOptions?.signal,
@@ -1202,8 +1327,9 @@ export class ExtensionUiController {
 	 */
 	hideHookInput(): void {
 		this.ctx.hookInput?.dispose();
-		this.#restoreComposerEditor();
 		this.ctx.hookInput = undefined;
+		if (this.#isStopped()) return;
+		this.#restoreComposerEditor();
 		this.ctx.ui.setFocus(this.ctx.editor);
 		this.ctx.ui.requestRender();
 	}
@@ -1217,6 +1343,7 @@ export class ExtensionUiController {
 		dialogOptions?: ExtensionUIDialogOptions,
 		editorOptions?: { promptStyle?: boolean },
 	): Promise<string | undefined> {
+		if (this.#isStopped()) return Promise.resolve(undefined);
 		const { promise, finish, attachAbort } = this.#createHookDialogState(
 			() => this.hideHookEditor(),
 			dialogOptions?.signal,
@@ -1251,6 +1378,11 @@ export class ExtensionUiController {
 	 * Hide the hook editor.
 	 */
 	hideHookEditor(): void {
+		if (this.#isStopped()) {
+			this.ctx.hookEditor?.dispose();
+			this.ctx.hookEditor = undefined;
+			return;
+		}
 		this.#restoreComposerEditor();
 		this.ctx.hookEditor = undefined;
 		this.ctx.ui.setFocus(this.ctx.editor);
@@ -1261,6 +1393,7 @@ export class ExtensionUiController {
 	 * Show a notification for hooks.
 	 */
 	showHookNotify(message: string, type?: "info" | "warning" | "error"): void {
+		if (this.#isStopped()) return;
 		if (type === "error") {
 			this.ctx.showError(message);
 		} else if (type === "warning") {
@@ -1282,6 +1415,7 @@ export class ExtensionUiController {
 		) => (Component & { dispose?(): void }) | Promise<Component & { dispose?(): void }>,
 		options?: { overlay?: boolean },
 	): Promise<T> {
+		if (this.#isStopped()) return undefined as T;
 		const savedText = this.ctx.editor.getText();
 		const keybindings = KeybindingsManager.inMemory();
 
@@ -1292,7 +1426,12 @@ export class ExtensionUiController {
 		const close = (result: T) => {
 			if (closed) return;
 			closed = true;
+			this.#activeHookCustomCancel = undefined;
 			this.#clearActiveHookCustom();
+			if (this.#isStopped()) {
+				resolve(result);
+				return;
+			}
 			if (!options?.overlay) {
 				this.#restoreComposerEditor();
 				this.ctx.editor.setText(savedText);
@@ -1302,10 +1441,16 @@ export class ExtensionUiController {
 			resolve(result);
 		};
 
+		this.#activeHookCustomCancel?.();
 		this.#clearActiveHookCustom();
+		this.#activeHookCustomCancel = () => close(undefined as T);
 		Promise.try(() => factory(this.ctx.ui, theme, keybindings, close)).then(c => {
-			if (closed) {
+			if (closed || this.#isStopped()) {
 				c.dispose?.();
+				if (!closed) {
+					closed = true;
+					resolve(undefined as T);
+				}
 				return;
 			}
 			component = c;
@@ -1334,6 +1479,7 @@ export class ExtensionUiController {
 	 * Show an extension error in the UI.
 	 */
 	addExtensionTerminalInputListener(handler: TerminalInputHandler): () => void {
+		if (this.#isStopped()) return () => {};
 		const unsubscribe = this.ctx.ui.addInputListener(handler);
 		this.#extensionTerminalInputUnsubscribers.add(unsubscribe);
 		return () => {
@@ -1362,7 +1508,17 @@ export class ExtensionUiController {
 		this.#extensionTerminalInputUnsubscribers.clear();
 	}
 
+	dispose(): void {
+		this.#extensionErrorUnsubscribe?.();
+		this.#extensionErrorUnsubscribe = undefined;
+		this.#activeHookCustomCancel?.();
+		this.#activeHookCustomCancel = undefined;
+		this.clearExtensionTerminalInputListeners();
+		this.clearHookWidgets();
+	}
+
 	showExtensionError(extensionPath: string, error: string): void {
+		if (this.#isStopped()) return;
 		const errorText = new Text(theme.fg("error", `Extension "${extensionPath}" error: ${error}`), 1, 0);
 		this.ctx.chatContainer.addChild(errorText);
 		this.ctx.ui.requestRender();
@@ -1388,6 +1544,7 @@ export class ExtensionUiController {
 	}
 
 	#sendExtensionUserMessage: SendUserMessageHandler = (content, options) => {
+		if (this.#isStopped()) return Promise.resolve();
 		// Compute queued BEFORE send: prompt() may flip session.isStreaming synchronously.
 		const queued = Boolean(options?.deliverAs) || this.ctx.session.isStreaming;
 		// Call send first so the busy/queued path finds the session queue populated
@@ -1395,6 +1552,7 @@ export class ExtensionUiController {
 		const send = this.ctx.session.sendUserMessage(content, options);
 		applyInjectedUserSubmission(this.ctx, { content, queued });
 		void send.catch((err: unknown) => {
+			if (this.#isStopped()) return;
 			this.ctx.showError(`Extension sendUserMessage failed: ${err instanceof Error ? err.message : String(err)}`);
 		});
 		return send;
@@ -1418,20 +1576,21 @@ export class ExtensionUiController {
 	} {
 		const { promise, resolve } = Promise.withResolvers<string | undefined>();
 		let settled = false;
-		const onAbort = () => {
-			hide();
-			if (!settled) {
-				settled = true;
-				resolve(undefined);
-			}
-		};
+		let unregisterStop: (() => void) | undefined;
 		const finish = (value: string | undefined) => {
 			if (settled) return;
 			settled = true;
 			signal?.removeEventListener("abort", onAbort);
+			unregisterStop?.();
 			resolve(value);
 		};
+		const onAbort = () => {
+			hide();
+			finish(undefined);
+		};
 		const attachAbort = () => {
+			unregisterStop = this.ctx.onStop?.(onAbort);
+			if (settled) unregisterStop?.();
 			if (!signal) return;
 			if (signal.aborted) {
 				onAbort();