@gajae-code/coding-agent 0.12.0 → 0.12.2

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

@@ -22,10 +22,12 @@ import type {
 	StatusLineSeparatorStyle,
 } from "../../config/settings-schema";
 import { SETTING_TABS, TAB_METADATA } from "../../config/settings-schema";
+import type { GjcRuntimeSnapshotProvider } from "../../extensibility/gjc-plugins/runtime-quarantine";
 import { getCurrentThemeName, getSelectListTheme, getSettingsListTheme, theme } from "../../modes/theme/theme";
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import { getTabBarTheme } from "../shared";
 import { DynamicBorder } from "./dynamic-border";
+import { GjcBundleSettingsComponent } from "./gjc-bundle-settings";
 import {
 	type NotificationsEditorOperations,
 	NotificationsSettingsEditorComponent,
@@ -650,6 +652,7 @@ function getSettingsTabs(): Tab[] {
 			return { id, label: `${icon} ${meta.label}` };
 		}),
 		{ id: "plugins", label: `${theme.icon.package} Plugins` },
+		{ id: "gjc-bundles", label: `${theme.icon.package} GJC Bundles` },
 	];
 }
 
@@ -672,6 +675,14 @@ export interface SettingsRuntimeContext {
 	petAvailable?: boolean;
 	/** Terminal environment used to select unavailable-pet guidance. Omitted in production to use Bun.env. */
 	terminalEnv?: NodeJS.ProcessEnv;
+	/**
+	 * Runtime evidence published by the session for the current activation
+	 * generation. Omitted when no session published one, in which case the GJC
+	 * Bundles tab honestly reports runtime status as unavailable.
+	 */
+	gjcRuntimeSnapshot?: GjcRuntimeSnapshotProvider;
+	/** Activation generation the published snapshot must match to be merged. */
+	gjcActivationGeneration?: number;
 }
 
 /** Status line settings subset for preview */
@@ -740,10 +751,11 @@ export class SettingsSelectorComponent extends Container {
 	#tabBar: TabBar;
 	#currentList: SettingsList | null = null;
 	#pluginComponent: PluginSettingsComponent | null = null;
+	#gjcBundleComponent: GjcBundleSettingsComponent | null = null;
 	#notificationsEditor: NotificationsSettingsEditorComponent | null = null;
 	#statusPreviewContainer: Container | null = null;
 	#statusPreviewText: Text | null = null;
-	#currentTabId: SettingTab | "plugins" = "appearance";
+	#currentTabId: SettingTab | "plugins" | "gjc-bundles" = "appearance";
 	#textInputActive = false;
 
 	constructor(
@@ -759,7 +771,7 @@ export class SettingsSelectorComponent extends Container {
 		// Tab bar
 		this.#tabBar = new TabBar("Settings", getSettingsTabs(), getTabBarTheme());
 		this.#tabBar.onTabChange = () => {
-			this.#switchToTab(this.#tabBar.getActiveTab().id as SettingTab | "plugins");
+			this.#switchToTab(this.#tabBar.getActiveTab().id as SettingTab | "plugins" | "gjc-bundles");
 		};
 
 		this.addChild(this.#tabBar);
@@ -774,7 +786,7 @@ export class SettingsSelectorComponent extends Container {
 		this.addChild(new DynamicBorder());
 	}
 
-	#switchToTab(tabId: SettingTab | "plugins"): void {
+	#switchToTab(tabId: SettingTab | "plugins" | "gjc-bundles"): void {
 		if (this.#currentTabId === "notifications" && tabId !== "notifications" && !this.#disposeNotificationsEditor()) {
 			return;
 		}
@@ -789,6 +801,11 @@ export class SettingsSelectorComponent extends Container {
 			this.removeChild(this.#pluginComponent);
 			this.#pluginComponent = null;
 		}
+		if (this.#gjcBundleComponent) {
+			this.removeChild(this.#gjcBundleComponent);
+			this.#gjcBundleComponent.dispose();
+			this.#gjcBundleComponent = null;
+		}
 		if (this.#statusPreviewContainer) {
 			this.removeChild(this.#statusPreviewContainer);
 			this.#statusPreviewContainer = null;
@@ -801,6 +818,8 @@ export class SettingsSelectorComponent extends Container {
 
 		if (tabId === "plugins") {
 			this.#showPluginsTab();
+		} else if (tabId === "gjc-bundles") {
+			this.#showGjcBundlesTab();
 		} else if (tabId === "notifications") {
 			this.#showNotificationsTab();
 		} else {
@@ -1224,7 +1243,7 @@ export class SettingsSelectorComponent extends Container {
 
 	/** Re-evaluate condition gates against the current settings and refresh the active list. */
 	#refreshCurrentTabItems(defs: SettingDef[]): void {
-		if (this.#currentTabId === "plugins" || !this.#currentList) return;
+		if (this.#currentTabId === "plugins" || this.#currentTabId === "gjc-bundles" || !this.#currentList) return;
 		this.#currentList.setItems(this.#buildItemsForTab(defs, this.#currentTabId));
 	}
 
@@ -1271,15 +1290,31 @@ export class SettingsSelectorComponent extends Container {
 		});
 		this.addChild(this.#pluginComponent);
 	}
+	#showGjcBundlesTab(): void {
+		this.#gjcBundleComponent = new GjcBundleSettingsComponent(
+			this.context.cwd,
+			{
+				onClose: () => this.callbacks.onCancel(),
+				onBundlesChanged: () => this.callbacks.onPluginsChanged?.(),
+			},
+			{
+				runtimeSnapshotProvider: this.context.gjcRuntimeSnapshot,
+				activationGeneration: this.context.gjcActivationGeneration,
+			},
+		);
+		this.addChild(this.#gjcBundleComponent);
+	}
 
 	getFocusComponent(): Component {
-		return (this.#currentList || this.#pluginComponent || this.#notificationsEditor)!;
+		return (this.#currentList || this.#pluginComponent || this.#gjcBundleComponent || this.#notificationsEditor)!;
 	}
 
 	override dispose(): void {
 		if (this.#notificationsEditor?.navigationLocked) return;
 		this.#notificationsEditor?.dispose();
 		this.#notificationsEditor = null;
+		this.#gjcBundleComponent?.dispose();
+		this.#gjcBundleComponent = null;
 		super.dispose();
 	}
 
@@ -1301,6 +1336,18 @@ export class SettingsSelectorComponent extends Container {
 			this.#notificationsEditor.handleInput(data);
 			return;
 		}
+		if (this.#gjcBundleComponent && this.#currentTabId === "gjc-bundles") {
+			if (tabNavigation) {
+				if (this.#gjcBundleComponent.navigationLocked) {
+					this.#gjcBundleComponent.handleInput(data);
+					return;
+				}
+				this.#tabBar.handleInput(data);
+				return;
+			}
+			this.#gjcBundleComponent.handleInput(data);
+			return;
+		}
 
 		// Handle tab switching — but NOT when a text input is active, since
 		// arrow keys must reach the cursor and Tab must not switch tabs.
@@ -1319,6 +1366,10 @@ export class SettingsSelectorComponent extends Container {
 			this.#pluginComponent.handleInput(data);
 			return;
 		}
+		if (this.#gjcBundleComponent) {
+			this.#gjcBundleComponent.handleInput(data);
+			return;
+		}
 
 		// Fallback for future top-level content that does not own cancellation.
 		if (matchesAppInterrupt(data)) {

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

@@ -0,0 +1,16 @@
+import { type RunGh, runGhDefault } from "../../../utils/gh";
+
+const STATUS_LINE_GH_TIMEOUT_MS = 5_000;
+
+export async function lookupCurrentPr(runGh: RunGh = runGhDefault): Promise<{ number: number; url: string } | null> {
+	try {
+		const result = await runGh(["pr", "view", "--json", "number,url"], { timeoutMs: STATUS_LINE_GH_TIMEOUT_MS });
+		if (result.exitCode !== 0 || result.timedOut) return null;
+
+		const pr = JSON.parse(result.stdout) as { number?: unknown; url?: unknown };
+		if (typeof pr.number !== "number" || typeof pr.url !== "string") return null;
+		return { number: pr.number, url: pr.url };
+	} catch {
+		return null;
+	}
+}

package/src/modes/components/tool-status-header.ts

@@ -2,7 +2,6 @@ import * as fs from "node:fs";
 
 import { type Component, truncateToWidth, visibleWidth } from "@gajae-code/tui";
 import { formatCount, getProjectDir } from "@gajae-code/utils";
-import { $ } from "bun";
 import {
 	type AppKeybinding,
 	KEYBINDINGS,
@@ -20,6 +19,7 @@ import type { ActionRegistry, FocusDomain } from "../action-registry";
 import { EMPTY_JOBS_SNAPSHOT, type JobsSnapshot } from "../jobs-observer";
 import { sanitizeStatusText } from "../shared";
 import { renderSkillHudBar } from "./skill-hud/render";
+import { lookupCurrentPr } from "./status-line/gh";
 import {
 	canReuseCachedPr,
 	createPrCacheContext,
@@ -206,7 +206,6 @@ export class StatusLineComponent implements Component {
 			separator: settings.get("statusLine.separator"),
 			showHookStatus: settings.get("statusLine.showHookStatus"),
 			showSkillHud: settings.get("statusLine.showSkillHud"),
-			showActionHints: settings.get("statusLine.showActionHints"),
 			segmentOptions: settings.getGroup("statusLine").segmentOptions,
 			sessionAccent: settings.get("statusLine.sessionAccent"),
 			maxRows: settings.get("statusLine.maxRows"),
@@ -416,19 +415,8 @@ export class StatusLineComponent implements Component {
 			};
 			try {
 				// Requires `gh repo set-default` to be configured; fails gracefully if not
-				const result = await $`gh pr view --json number,url`.quiet().nothrow();
-				if (result.exitCode !== 0) {
-					setCachedPr(null);
-					return;
-				}
-				const pr = JSON.parse(result.stdout.toString()) as { number: number; url: string };
-				if (typeof pr.number === "number") {
-					setCachedPr({ number: pr.number, url: pr.url });
-				} else {
-					setCachedPr(null);
-				}
-			} catch {
-				setCachedPr(null);
+				const pr = await lookupCurrentPr();
+				setCachedPr(pr);
 			} finally {
 				this.#prLookupInFlight = false;
 				if (this.#onBranchChange) {

package/src/modes/components/transcript-viewer-overlay.ts

@@ -54,6 +54,34 @@ export type TranscriptViewerOverlayOptions = {
 
 type RenderedEntry = { lineStart: number; lineCount: number };
 
+export const __transcriptViewerPerfCounters = {
+	enabled: false,
+	layoutCacheHits: 0,
+	layoutCacheMisses: 0,
+	refreshRuns: 0,
+	rebuildRuns: 0,
+	snapshot() {
+		return {
+			layoutCacheHits: this.layoutCacheHits,
+			layoutCacheMisses: this.layoutCacheMisses,
+			refreshRuns: this.refreshRuns,
+			rebuildRuns: this.rebuildRuns,
+		};
+	},
+	enable(): void {
+		this.enabled = true;
+	},
+	disable(): void {
+		this.enabled = false;
+	},
+	reset(): void {
+		this.layoutCacheHits = 0;
+		this.layoutCacheMisses = 0;
+		this.refreshRuns = 0;
+		this.rebuildRuns = 0;
+	},
+};
+
 /** Message-agnostic, modal transcript browser over resolved projection entries. */
 export class TranscriptViewerOverlay extends Container {
 	#options: TranscriptViewerOverlayOptions;
@@ -73,6 +101,7 @@ export class TranscriptViewerOverlay extends Container {
 	#followTailPending = false;
 	#skipFollowTailOnce = false;
 	#followTailActive = false;
+	#layoutCache = new Map<string, Map<string, string[]>>();
 
 	constructor(options: TranscriptViewerOverlayOptions) {
 		super();
@@ -87,7 +116,11 @@ export class TranscriptViewerOverlay extends Container {
 	get isFullscreen(): boolean {
 		return this.#fullscreen;
 	}
-	refresh(identityMap?: ReadonlyMap<string, string>): void {
+	refresh(identityMap?: ReadonlyMap<string, string>, preserveLayoutCache = false): void {
+		if (__transcriptViewerPerfCounters.enabled) __transcriptViewerPerfCounters.refreshRuns++;
+		// Incremental sources explicitly invalidate same-id payload patches before requesting a
+		// preserving refresh. Other source changes conservatively drop all layout variants.
+		if (!preserveLayoutCache) this.#layoutCache.clear();
 		const previous = this.selectedEntryId;
 		const previousPosition = this.#selected;
 		const reconciledPrevious = previous ? (identityMap?.get(previous) ?? previous) : undefined;
@@ -109,9 +142,15 @@ export class TranscriptViewerOverlay extends Container {
 		this.#initialized = true;
 		this.#rebuild();
 	}
+	invalidateLayoutEntries(entryIds: readonly string[]): void {
+		for (const id of entryIds) this.#layoutCache.delete(id);
+	}
 	override render(width: number): string[] {
-		this.#width = Math.max(1, width);
-		this.refresh();
+		const nextWidth = Math.max(1, width);
+		const widthChanged = nextWidth !== this.#width;
+		this.#width = nextWidth;
+		if (widthChanged) this.#layoutCache.clear();
+		if (widthChanged || getMarkdownTheme() !== this.#mdTheme) this.#rebuild();
 		const defaultHeader = this.#fullscreen
 			? [theme.fg("accent", "Transcript block")]
 			: [theme.fg("accent", sanitizeText(this.#options.title ?? "Transcript"))];
@@ -179,6 +218,7 @@ export class TranscriptViewerOverlay extends Container {
 			if (this.#fullscreen) {
 				this.#fullscreen = false;
 				this.#scrollOffset = 0;
+				this.#rebuild();
 				this.#requestRender();
 			} else this.#options.onClose();
 			return;
@@ -208,6 +248,7 @@ export class TranscriptViewerOverlay extends Container {
 			this.#followTailActive = false;
 			this.#followTailPending = false;
 			this.#selected = 0;
+			this.#rebuild();
 			this.#scrollOffset = 0;
 			this.#requestRender();
 			return;
@@ -216,6 +257,7 @@ export class TranscriptViewerOverlay extends Container {
 			this.#followTailActive = true;
 			this.#followTailPending = true;
 			this.#selected = Math.max(0, count - 1);
+			this.#rebuild();
 			this.#scrollOffset = this.#lines.length;
 			this.#requestRender();
 			return;
@@ -228,6 +270,7 @@ export class TranscriptViewerOverlay extends Container {
 			this.#followTailActive = false;
 			this.#fullscreen = true;
 			this.#scrollOffset = 0;
+			this.#rebuild();
 			this.#requestRender();
 			return;
 		}
@@ -243,6 +286,7 @@ export class TranscriptViewerOverlay extends Container {
 			const entry = this.#entries[this.#selected];
 			if (entry?.rawViewable !== false) {
 				this.#raw.has(entry.id) ? this.#raw.delete(entry.id) : this.#raw.add(entry.id);
+				this.#rebuild();
 				this.#requestRender();
 			}
 		}
@@ -284,6 +328,7 @@ export class TranscriptViewerOverlay extends Container {
 		this.#followTailActive = false;
 		this.#followTailPending = false;
 		this.#selected = Math.max(0, Math.min(this.#selected + direction * 5, this.#entries.length - 1));
+		this.#rebuild();
 		this.#scrollOffset += direction * PAGE_SIZE;
 		this.#requestRender();
 	}
@@ -327,32 +372,58 @@ export class TranscriptViewerOverlay extends Container {
 		this.#options.requestRender?.();
 	}
 	#rebuild(): void {
+		if (__transcriptViewerPerfCounters.enabled) __transcriptViewerPerfCounters.rebuildRuns++;
+		// Theme is tracked by reference outside the variant key; a reference change clears
+		// the whole cache so plain and markdown layouts pick up new markdown colors.
+		const currentMdTheme = getMarkdownTheme();
+		if (currentMdTheme !== this.#mdTheme) {
+			this.#mdTheme = currentMdTheme;
+			this.#layoutCache.clear();
+		}
 		const lines: string[] = [];
 		this.#renderedEntries = [];
 		const display = this.#fullscreen ? this.#entries.slice(this.#selected, this.#selected + 1) : this.#entries;
 		const contentWidth = Math.max(1, this.#width - INDENT.length - 1);
 		for (const entry of display) {
 			const start = lines.length;
-			const selected = entry.id === this.selectedEntryId;
-			const expanded = this.#fullscreen || this.#expanded.has(entry.id);
-			const raw = this.#raw.has(entry.id);
-			lines.push("");
-			lines.push(
-				`${selected ? theme.fg("accent", "▶") : " "} ${theme.fg("muted", `[${sanitizeText(entry.label ?? entry.kind)}]`)}`,
-			);
-			if (
-				!raw &&
-				expanded &&
-				selected &&
-				entry.kind === "tool" &&
-				entry.richRenderEligible === true &&
-				entry.renderDescriptor
-			) {
-				for (const line of renderToolDisplayLines(entry.renderDescriptor, contentWidth, theme))
-					lines.push(`${INDENT}${line}`);
-				this.#renderedEntries.push({ lineStart: start, lineCount: lines.length - start });
-				continue;
+			const entryLines = this.#renderEntryLines(entry, contentWidth);
+			lines.push(...entryLines);
+			// Cumulative positions are recomputed from cached line lengths on every rebuild
+			// so PR2c can later separate virtual coordinates from materialized lines.
+			this.#renderedEntries.push({ lineStart: start, lineCount: entryLines.length });
+		}
+		this.#lines = lines.length ? lines : [theme.fg("dim", "No transcript entries yet.")];
+	}
+	#renderEntryLines(entry: TranscriptViewerEntry, contentWidth: number): string[] {
+		const selected = entry.id === this.selectedEntryId;
+		const expanded = this.#fullscreen || this.#expanded.has(entry.id);
+		const raw = this.#raw.has(entry.id);
+		const variantKey = `${expanded ? 1 : 0}|${raw ? 1 : 0}|${selected ? 1 : 0}|${contentWidth}`;
+		let variants = this.#layoutCache.get(entry.id);
+		if (variants) {
+			const cached = variants.get(variantKey);
+			if (cached) {
+				if (__transcriptViewerPerfCounters.enabled) __transcriptViewerPerfCounters.layoutCacheHits++;
+				return cached;
 			}
+		}
+		if (__transcriptViewerPerfCounters.enabled) __transcriptViewerPerfCounters.layoutCacheMisses++;
+		const lines: string[] = [];
+		lines.push("");
+		lines.push(
+			`${selected ? theme.fg("accent", "▶") : " "} ${theme.fg("muted", `[${sanitizeText(entry.label ?? entry.kind)}]`)}`,
+		);
+		if (
+			!raw &&
+			expanded &&
+			selected &&
+			entry.kind === "tool" &&
+			entry.richRenderEligible === true &&
+			entry.renderDescriptor
+		) {
+			for (const line of renderToolDisplayLines(entry.renderDescriptor, contentWidth, theme))
+				lines.push(`${INDENT}${line}`);
+		} else {
 			const text = sanitizeText(
 				(raw
 					? entry.payload.text
@@ -375,9 +446,13 @@ export class TranscriptViewerOverlay extends Container {
 				for (const line of preview) lines.push(`${INDENT}${truncateToWidth(line, contentWidth)}`);
 				if (text.split("\n").length > PREVIEW_LINES) lines.push(`${INDENT}${theme.fg("dim", "... more (Space)")}`);
 			}
-			this.#renderedEntries.push({ lineStart: start, lineCount: lines.length - start });
 		}
-		this.#lines = lines.length ? lines : [theme.fg("dim", "No transcript entries yet.")];
+		if (!variants) {
+			variants = new Map();
+			this.#layoutCache.set(entry.id, variants);
+		}
+		variants.set(variantKey, lines);
+		return lines;
 	}
 	#markdown(text: string, width: number): string[] {
 		return new Markdown(text, 0, 0, this.#mdTheme).render(width).map(line => `${INDENT}${line.trimEnd()}`);

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

@@ -34,7 +34,12 @@ import { BorderedLoader } from "../../modes/components/bordered-loader";
 import { DynamicBorder } from "../../modes/components/dynamic-border";
 import { EvalExecutionComponent } from "../../modes/components/eval-execution";
 import { getMarkdownTheme, getSymbolTheme, theme } from "../../modes/theme/theme";
-import type { InteractiveModeContext } from "../../modes/types";
+import {
+	clearInteractiveActivityLoaders,
+	type InteractiveModeContext,
+	stopInteractiveActivityIndicator,
+	suspendInteractiveActivityIndicator,
+} from "../../modes/types";
 import { computeContextBreakdown, renderContextUsage } from "../../modes/utils/context-usage";
 import { buildHotkeysMarkdown, formatHotkeyMarkdownCode } from "../../modes/utils/hotkeys-markdown";
 import { buildToolsMarkdown } from "../../modes/utils/tools-markdown";
@@ -965,12 +970,10 @@ export class CommandController {
 
 	async #runNewSessionFlow(options?: NewSessionOptions, label: string = "New session started"): Promise<boolean> {
 		if (!(await this.ctx.session.newSession(options))) return false;
+		if (this.ctx.isStopped?.()) return false;
+		clearInteractiveActivityLoaders(this.ctx);
 
-		if (this.ctx.loadingAnimation) {
-			this.ctx.loadingAnimation.stop();
-			this.ctx.loadingAnimation = undefined;
-		}
-		this.ctx.statusContainer.clear();
+		stopInteractiveActivityIndicator(this.ctx);
 		this.ctx.resetIrcSidebarSession();
 		this.ctx.resetObserverRegistry();
 		setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
@@ -991,6 +994,7 @@ export class CommandController {
 
 		this.ctx.chatContainer.addChild(new Text(`${theme.fg("accent", `${theme.status.success} ${label}`)}`, 1, 0));
 		await this.ctx.reloadTodos();
+		if (this.ctx.isStopped?.()) return false;
 		this.ctx.ui.requestRender();
 		return true;
 	}
@@ -1000,19 +1004,18 @@ export class CommandController {
 	}
 
 	async handleContextClearCommand(): Promise<void> {
-		if (this.ctx.loadingAnimation) {
-			this.ctx.loadingAnimation.stop();
-			this.ctx.loadingAnimation = undefined;
-		}
-		this.ctx.statusContainer.clear();
-
+		if (this.ctx.isStopped?.()) return;
+		clearInteractiveActivityLoaders(this.ctx);
+		stopInteractiveActivityIndicator(this.ctx);
 		if (this.ctx.session.isCompacting) {
 			this.ctx.session.abortCompaction();
 			while (this.ctx.session.isCompacting) {
 				await Bun.sleep(10);
 			}
 		}
+		if (this.ctx.isStopped?.()) return;
 		if (!(await this.ctx.session.clearContext())) return;
+		if (this.ctx.isStopped?.()) return;
 		setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
 
 		this.ctx.statusLine.invalidate();
@@ -1033,6 +1036,7 @@ export class CommandController {
 			new Text(`${theme.fg("accent", `${theme.status.success} Context cleared`)}`, 1, 0),
 		);
 		await this.ctx.reloadTodos();
+		if (this.ctx.isStopped?.()) return;
 		this.ctx.ui.requestRender();
 	}
 
@@ -1049,17 +1053,15 @@ export class CommandController {
 			this.ctx.showWarning("Wait for the current response to finish or abort it before forking.");
 			return;
 		}
-		if (this.ctx.loadingAnimation) {
-			this.ctx.loadingAnimation.stop();
-			this.ctx.loadingAnimation = undefined;
-		}
-		this.ctx.statusContainer.clear();
 
 		const success = await this.ctx.session.fork();
+		if (this.ctx.isStopped?.()) return;
 		if (!success) {
 			this.ctx.showError("Fork failed (session not persisted or cancelled)");
 			return;
 		}
+		clearInteractiveActivityLoaders(this.ctx);
+		stopInteractiveActivityIndicator(this.ctx);
 		this.ctx.resetIrcSidebarSession();
 
 		this.ctx.statusLine.invalidate();
@@ -1175,6 +1177,10 @@ export class CommandController {
 			}
 			this.ctx.showError(`Bash command failed: ${error instanceof Error ? error.message : "Unknown error"}`);
 		}
+		const bashComponent = this.ctx.bashComponent;
+		if (isDeferred && bashComponent && this.ctx.pendingBashComponents.includes(bashComponent)) {
+			this.ctx.pendingMessagesContainer.detachChild(bashComponent);
+		}
 
 		this.ctx.bashComponent = undefined;
 		this.ctx.ui.requestRender();
@@ -1252,11 +1258,7 @@ export class CommandController {
 		customInstructionsOrOptions?: string | CompactOptions,
 		isAuto = false,
 	): Promise<CompactionOutcome> {
-		if (this.ctx.loadingAnimation) {
-			this.ctx.loadingAnimation.stop();
-			this.ctx.loadingAnimation = undefined;
-		}
-		this.ctx.statusContainer.clear();
+		const releaseActivityIndicator = suspendInteractiveActivityIndicator(this.ctx);
 
 		const originalOnEscape = this.ctx.editor.onEscape;
 		this.ctx.editor.onEscape = () => {
@@ -1283,24 +1285,28 @@ export class CommandController {
 					? customInstructionsOrOptions
 					: undefined;
 			await this.ctx.session.compact(instructions, options);
+			if (this.ctx.isStopped?.()) return outcome;
 
 			this.ctx.rebuildChatFromMessages("reconcile-same-transcript");
 
 			this.ctx.statusLine.invalidate();
 			this.ctx.updateEditorTopBorder();
 		} catch (error) {
-			if (error instanceof CompactionCancelledError) {
-				outcome = "cancelled";
+			outcome = error instanceof CompactionCancelledError ? "cancelled" : "failed";
+			if (this.ctx.isStopped?.()) return outcome;
+			if (outcome === "cancelled") {
 				this.ctx.showError("Compaction cancelled");
 			} else {
-				outcome = "failed";
 				const message = error instanceof Error ? error.message : String(error);
 				this.ctx.showError(`Compaction failed: ${message}`);
 			}
 		} finally {
 			compactingLoader.stop();
-			this.ctx.statusContainer.clear();
-			this.ctx.editor.onEscape = originalOnEscape;
+			if (!this.ctx.isStopped?.()) {
+				this.ctx.statusContainer.clear();
+				this.ctx.editor.onEscape = originalOnEscape;
+			}
+			releaseActivityIndicator();
 		}
 		await this.ctx.flushCompactionQueue({ willRetry: false });
 		return outcome;
@@ -1319,11 +1325,7 @@ export class CommandController {
 			return;
 		}
 
-		if (this.ctx.loadingAnimation) {
-			this.ctx.loadingAnimation.stop();
-			this.ctx.loadingAnimation = undefined;
-		}
-		this.ctx.statusContainer.clear();
+		const releaseActivityIndicator = suspendInteractiveActivityIndicator(this.ctx);
 
 		const originalOnEscape = this.ctx.editor.onEscape;
 		this.ctx.editor.onEscape = () => {
@@ -1343,6 +1345,7 @@ export class CommandController {
 		try {
 			// Handoff generation runs as a oneshot request; the new session is shown after it completes.
 			const result = await this.ctx.session.handoff(customInstructions);
+			if (this.ctx.isStopped?.()) return;
 
 			if (!result) {
 				this.ctx.showError("Handoff cancelled");
@@ -1357,6 +1360,7 @@ export class CommandController {
 			this.ctx.updateEditorTopBorder();
 			this.ctx.updateEditorBorderColor();
 			await this.ctx.reloadTodos();
+			if (this.ctx.isStopped?.()) return;
 
 			this.ctx.chatContainer.addChild(new Spacer(1));
 			this.ctx.chatContainer.addChild(
@@ -1366,6 +1370,7 @@ export class CommandController {
 				this.ctx.showStatus(`Handoff document saved to: ${result.savedPath}`);
 			}
 		} catch (error) {
+			if (this.ctx.isStopped?.()) return;
 			const message = error instanceof Error ? error.message : String(error);
 			if (message === "Handoff cancelled" || (error instanceof Error && error.name === "AbortError")) {
 				this.ctx.showError("Handoff cancelled");
@@ -1385,8 +1390,11 @@ export class CommandController {
 			}
 		} finally {
 			handoffLoader.stop();
-			this.ctx.statusContainer.clear();
-			this.ctx.editor.onEscape = originalOnEscape;
+			if (!this.ctx.isStopped?.()) {
+				this.ctx.statusContainer.clear();
+				this.ctx.editor.onEscape = originalOnEscape;
+			}
+			releaseActivityIndicator();
 		}
 	}