@gajae-code/coding-agent 0.11.11 → 0.12.1

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

@@ -1175,6 +1175,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();

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

@@ -12,7 +12,7 @@ import {
 	readArgsTargetInternalUrl,
 } from "../../modes/components/read-tool-group";
 import { TodoReminderComponent } from "../../modes/components/todo-reminder";
-import { ToolExecutionComponent } from "../../modes/components/tool-execution";
+import { ToolExecutionComponent, type ToolExecutionHandle } from "../../modes/components/tool-execution";
 import { TtsrNotificationComponent } from "../../modes/components/ttsr-notification";
 import { getSymbolTheme, theme } from "../../modes/theme/theme";
 import type { InteractiveModeContext, TodoPhase } from "../../modes/types";
@@ -23,6 +23,7 @@ import type { AgentSessionEvent } from "../../session/agent-session";
 import { type CustomMessage, isSilentAbort, readPendingDisplayTag } from "../../session/messages";
 import { transferSessionMessageIdentity } from "../../session/session-manager";
 import type { ResolveToolDetails } from "../../tools/resolve";
+import { computeIrcSplitWidths, getIrcSidebarSemanticToken } from "../components/irc-sidebar";
 import type { IrcObservationRecord } from "../irc-observation-ledger";
 import { interruptHint } from "../shared";
 import { buildAbortDisplayMessage } from "../utils/abort-message";
@@ -36,7 +37,14 @@ type AgentSessionEventKind = AgentSessionEvent["type"];
 
 /** Test-only performance counters for advisory baseline tests. */
 export const __eventControllerPerfCounters = {
+	enabled: false,
 	messageUpdateContentVisits: 0,
+	enable(): void {
+		this.enabled = true;
+	},
+	disable(): void {
+		this.enabled = false;
+	},
 	reset(): void {
 		this.messageUpdateContentVisits = 0;
 	},
@@ -118,6 +126,9 @@ export class EventController {
 	#toolIntentCache = new Map<string, { args: unknown; intent: string | undefined }>();
 	#thinkingContentIndices = new Set<number>();
 	#handlers: AgentSessionEventHandlers;
+	#visibleTranscriptChanged = false;
+	#handlingEvent = false;
+	#eventQueue: Promise<void> = Promise.resolve();
 
 	constructor(private ctx: InteractiveModeContext) {
 		this.#handlers = {
@@ -162,6 +173,26 @@ export class EventController {
 		this.clearIrcExpiryTimers();
 	}
 
+	#recordVisibleTranscriptMutation(): void {
+		this.#visibleTranscriptChanged = true;
+	}
+
+	#observeVisibleTranscriptMutation(): void {
+		if (this.#handlingEvent) {
+			this.#recordVisibleTranscriptMutation();
+			return;
+		}
+		this.ctx.recordVisibleTranscriptMutation?.();
+	}
+
+	#consumeToolVisibleChange(handle: ToolExecutionHandle): void {
+		// Structural third-party renderers may not implement the optional exact-consume
+		// capability; preserve revision correctness conservatively until they opt in.
+		if (typeof handle.consumeVisibleTranscriptChange !== "function" || handle.consumeVisibleTranscriptChange()) {
+			this.#recordVisibleTranscriptMutation();
+		}
+	}
+
 	#resetReadGroup(): void {
 		this.#lastReadGroup = undefined;
 	}
@@ -228,17 +259,26 @@ export class EventController {
 		});
 	}
 
-	async handleEvent(event: AgentSessionEvent): Promise<void> {
-		if (!this.ctx.isInitialized) {
-			await this.ctx.init();
-		}
-
-		this.ctx.statusLine.invalidate();
-		this.ctx.updateEditorTopBorder();
+	handleEvent(event: AgentSessionEvent): Promise<void> {
+		const dispatch = this.#eventQueue.then(() => this.#dispatchEvent(event));
+		this.#eventQueue = dispatch.catch(() => {});
+		return dispatch;
+	}
 
-		const run = this.#handlers[event.type] as (e: AgentSessionEvent) => Promise<void>;
-		await run(event);
-		if (this.ctx.isTranscriptViewerOpen?.()) this.ctx.refreshTranscriptViewer?.();
+	async #dispatchEvent(event: AgentSessionEvent): Promise<void> {
+		if (!this.ctx.isInitialized) await this.ctx.init();
+		this.#visibleTranscriptChanged = false;
+		this.#handlingEvent = true;
+		try {
+			this.ctx.statusLine.invalidate();
+			this.ctx.updateEditorTopBorder();
+			const run = this.#handlers[event.type] as (e: AgentSessionEvent) => Promise<void>;
+			await run(event);
+			if (this.#visibleTranscriptChanged) this.ctx.recordVisibleTranscriptMutation?.();
+			if (this.ctx.isTranscriptViewerOpen?.()) this.ctx.refreshTranscriptViewer?.();
+		} finally {
+			this.#handlingEvent = false;
+		}
 	}
 
 	async #handleAgentStart(_event: Extract<AgentSessionEvent, { type: "agent_start" }>): Promise<void> {
@@ -268,8 +308,12 @@ export class EventController {
 		const parsed = parseIrcMessage(message);
 		if (!parsed) return;
 		const arrival = this.ctx.captureIrcArrivalSnapshot();
+		const rightWidth = arrival.panelVisible
+			? computeIrcSplitWidths(this.ctx.ui.terminal?.columns ?? 0).rightWidth
+			: 0;
+		const beforeToken = rightWidth > 0 ? getIrcSidebarSemanticToken(this.ctx.ircLedger, rightWidth) : "";
 		const record = this.ctx.ircLedger.observe(parsed, arrival.panelVisible);
-		this.#cleanupEvictedIrcObservations();
+		const evictedInlineRemoved = this.#cleanupIrcObservationIds(this.ctx.ircLedger.drainEvictedObservationIds());
 		if (!record) return;
 		const signature = `irc:${record.observationId}`;
 		if (this.#renderedCustomMessages.has(signature)) return;
@@ -279,9 +323,13 @@ export class EventController {
 		this.#renderedIrcComponents.set(record.observationId, components);
 		this.#scheduleIrcExpiry(record, components);
 		this.ctx.ui.requestRender();
+		const afterToken = rightWidth > 0 ? getIrcSidebarSemanticToken(this.ctx.ircLedger, rightWidth) : "";
+		if (components.length > 0 || evictedInlineRemoved || (rightWidth > 0 && beforeToken !== afterToken)) {
+			this.#recordVisibleTranscriptMutation();
+		}
 	}
 
-	#cleanupIrcObservationIds(observationIds: readonly string[]): void {
+	#cleanupIrcObservationIds(observationIds: readonly string[]): boolean {
 		const removedComponents = new Set<Component>();
 		for (const observationId of observationIds) {
 			const timer = this.#ircExpiryTimers.get(observationId);
@@ -294,23 +342,26 @@ export class EventController {
 			for (const component of this.ctx.removeRenderedIrcInlineComponents(observationId) ?? []) {
 				removedComponents.add(component);
 			}
-
 			this.#renderedCustomMessages.delete(`irc:${observationId}`);
 		}
 		for (const component of removedComponents) this.ctx.chatContainer.removeChild(component);
+		return removedComponents.size > 0;
 	}
 
 	#cleanupEvictedIrcObservations(): void {
-		this.#cleanupIrcObservationIds(this.ctx.ircLedger.drainEvictedObservationIds());
+		if (this.#cleanupIrcObservationIds(this.ctx.ircLedger.drainEvictedObservationIds())) {
+			this.#recordVisibleTranscriptMutation();
+		}
 	}
 
-	#cleanupExpiredIrcInlineComponents(observationId: string): void {
+	#cleanupExpiredIrcInlineComponents(observationId: string): boolean {
 		const removedComponents = new Set<Component>(this.#renderedIrcComponents.get(observationId));
 		this.#renderedIrcComponents.delete(observationId);
 		for (const component of this.ctx.removeRenderedIrcInlineComponents(observationId) ?? []) {
 			removedComponents.add(component);
 		}
 		for (const component of removedComponents) this.ctx.chatContainer.removeChild(component);
+		return removedComponents.size > 0;
 	}
 
 	async #handleMessageStart(event: Extract<AgentSessionEvent, { type: "message_start" }>): Promise<void> {
@@ -326,6 +377,7 @@ export class EventController {
 			this.#renderedCustomMessages.add(signature);
 			this.#resetReadGroup();
 			this.ctx.addMessageToChat(event.message);
+			if (event.message.display) this.#recordVisibleTranscriptMutation();
 			// Tag-keyed pending-bar refresh: when AgentSession.#handleAgentEvent
 			// spliced this dequeued custom message out of #steeringMessages /
 			// #followUpMessages (it ran before this emit), the array state is
@@ -373,10 +425,12 @@ export class EventController {
 				this.ctx.updatePendingMessagesDisplay();
 			}
 			this.ctx.ui.requestRender();
+			if (!wasOptimistic) this.#recordVisibleTranscriptMutation();
 		} else if (event.message.role === "fileMention") {
 			this.#resetReadGroup();
 			this.ctx.addMessageToChat(event.message);
 			this.ctx.ui.requestRender();
+			this.#recordVisibleTranscriptMutation();
 		} else if (event.message.role === "assistant") {
 			this.#lastThinkingCount = 0;
 			this.#resetReadGroup();
@@ -387,6 +441,7 @@ export class EventController {
 				this.ctx.hideThinkingBlock,
 				() => this.ctx.ui.requestRender(),
 				this.ctx.getAssistantViewportAnchorId?.(event.message),
+				() => this.#observeVisibleTranscriptMutation(),
 			);
 			this.ctx.streamingMessage = event.message;
 			addChatChild(this.ctx, this.ctx.streamingComponent);
@@ -429,15 +484,10 @@ export class EventController {
 		this.#cleanupEvictedIrcObservations();
 		const projectedObservationIds = new Set(inlineProjection.map(record => record.observationId));
 		for (const [observationId, components] of componentsByObservationId) {
-			const record = this.ctx.ircLedger.getRecord(observationId);
-			if (
-				!projectedObservationIds.has(observationId) ||
-				(record?.mode === "ephemeral" && record.expiresAt! - now <= 0)
-			) {
+			if (!projectedObservationIds.has(observationId)) {
 				for (const component of components) {
 					this.ctx.chatContainer.removeChild(component);
 				}
-				this.#renderedIrcComponents.delete(observationId);
 				componentsByObservationId.delete(observationId);
 			}
 		}
@@ -468,12 +518,12 @@ export class EventController {
 		}
 		const remainingMs = record.expiresAt! - Date.now();
 		if (remainingMs <= 0) {
-			this.#cleanupExpiredIrcInlineComponents(record.observationId);
+			if (this.#cleanupExpiredIrcInlineComponents(record.observationId)) this.#observeVisibleTranscriptMutation();
 			return false;
 		}
 		const timer = setTimeout(() => {
 			this.#ircExpiryTimers.delete(record.observationId);
-			this.#cleanupExpiredIrcInlineComponents(record.observationId);
+			if (this.#cleanupExpiredIrcInlineComponents(record.observationId)) this.#observeVisibleTranscriptMutation();
 			this.ctx.ui.requestRender();
 		}, remainingMs);
 		timer.unref?.();
@@ -496,6 +546,7 @@ export class EventController {
 		this.#resetReadGroup();
 		this.ctx.addMessageToChat(event.message);
 		this.ctx.ui.requestRender();
+		this.#recordVisibleTranscriptMutation();
 	}
 
 	async #handleModelFallbackSwitched(
@@ -549,19 +600,24 @@ export class EventController {
 			}
 
 			for (const content of contentsToProcess) {
-				__eventControllerPerfCounters.messageUpdateContentVisits += 1;
+				if (__eventControllerPerfCounters.enabled) __eventControllerPerfCounters.messageUpdateContentVisits += 1;
 				if (content.type !== "toolCall") continue;
 				if (content.name === "read") {
 					if (!readArgsHaveTarget(content.arguments)) continue;
 					if (!readArgsTargetInternalUrl(content.arguments)) {
 						this.#trackReadToolCall(content.id, content.arguments);
 						const component = this.ctx.pendingTools.get(content.id);
-						if (component) component.updateArgs(content.arguments, content.id);
-						else {
+						if (component) {
+							component.updateArgs(content.arguments, content.id);
+							this.#consumeToolVisibleChange(component);
+						} else {
 							const group = this.#getReadGroup();
 							group.updateArgs(content.arguments, content.id);
 							this.ctx.pendingTools.set(content.id, group);
+							this.#recordVisibleTranscriptMutation();
+							group.consumeVisibleTranscriptChange();
 						}
+
 						continue;
 					}
 				}
@@ -582,6 +638,7 @@ export class EventController {
 							editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
 							editAllowFuzzy: settings.get("edit.fuzzyMatch"),
 							hashlineAutoDropPureInsertDuplicates: settings.get("edit.hashlineAutoDropPureInsertDuplicates"),
+							onVisibleTranscriptMutation: () => this.#observeVisibleTranscriptMutation(),
 						},
 						tool,
 						this.ctx.ui,
@@ -591,8 +648,10 @@ export class EventController {
 					component.setExpanded(this.ctx.toolOutputExpanded);
 					this.ctx.pendingTools.set(content.id, component);
 					addChatChild(this.ctx, component);
+					this.#recordVisibleTranscriptMutation();
 				} else {
 					this.ctx.pendingTools.get(content.id)?.updateArgs(renderArgs, content.id);
+					this.#consumeToolVisibleChange(this.ctx.pendingTools.get(content.id)!);
 				}
 
 				const args = content.arguments;
@@ -659,6 +718,7 @@ export class EventController {
 			if (this.ctx.streamingMessage.stopReason !== "aborted" && this.ctx.streamingMessage.stopReason !== "error") {
 				for (const [toolCallId, component] of this.ctx.pendingTools.entries()) {
 					component.setArgsComplete(toolCallId);
+					this.#consumeToolVisibleChange(component);
 				}
 			}
 			this.#lastAssistantComponent = this.ctx.streamingComponent;
@@ -685,6 +745,8 @@ export class EventController {
 					this.ctx.pendingTools.set(event.toolCallId, group);
 				}
 				this.ctx.ui.requestRender();
+				this.#consumeToolVisibleChange(this.ctx.pendingTools.get(event.toolCallId)!);
+
 				return;
 			}
 
@@ -698,6 +760,7 @@ export class EventController {
 					editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
 					editAllowFuzzy: settings.get("edit.fuzzyMatch"),
 					hashlineAutoDropPureInsertDuplicates: settings.get("edit.hashlineAutoDropPureInsertDuplicates"),
+					onVisibleTranscriptMutation: () => this.#observeVisibleTranscriptMutation(),
 				},
 				tool,
 				this.ctx.ui,
@@ -707,6 +770,8 @@ export class EventController {
 			component.setExpanded(this.ctx.toolOutputExpanded);
 			this.ctx.pendingTools.set(event.toolCallId, component);
 			addChatChild(this.ctx, component);
+			this.#recordVisibleTranscriptMutation();
+
 			this.ctx.ui.requestRender();
 		}
 	}
@@ -723,6 +788,8 @@ export class EventController {
 				!isFinalAsyncState,
 				event.toolCallId,
 			);
+			this.#consumeToolVisibleChange(component);
+
 			if (isFinalAsyncState) {
 				this.ctx.pendingTools.delete(event.toolCallId);
 				this.#backgroundToolCallIds.delete(event.toolCallId);
@@ -737,6 +804,8 @@ export class EventController {
 				const component = this.ctx.pendingTools.get(event.toolCallId);
 				if (component) {
 					component.updateResult({ ...event.result, isError: event.isError }, false, event.toolCallId);
+					this.#consumeToolVisibleChange(component);
+
 					this.ctx.pendingTools.delete(event.toolCallId);
 				}
 				const asyncState = (event.result.details as { async?: { state?: string } } | undefined)?.async?.state;
@@ -761,6 +830,8 @@ export class EventController {
 				const asyncState = (event.result.details as { async?: { state?: string } } | undefined)?.async?.state;
 				const isBackgroundRunning = asyncState === "running";
 				component.updateResult({ ...event.result, isError: event.isError }, isBackgroundRunning, event.toolCallId);
+				this.#consumeToolVisibleChange(component);
+
 				if (isBackgroundRunning) {
 					this.#backgroundToolCallIds.add(event.toolCallId);
 				} else {
@@ -776,6 +847,8 @@ export class EventController {
 				const asyncState = (event.result.details as { async?: { state?: string } } | undefined)?.async?.state;
 				const isBackgroundRunning = asyncState === "running";
 				component.updateResult({ ...event.result, isError: event.isError }, isBackgroundRunning, event.toolCallId);
+				this.#consumeToolVisibleChange(component);
+
 				if (isBackgroundRunning) {
 					this.#backgroundToolCallIds.add(event.toolCallId);
 				} else {
@@ -893,6 +966,12 @@ export class EventController {
 			} else if (event.willRetry && !isHandoffAction) {
 				this.ctx.showStatus("Context overflow maintenance completed");
 			}
+		} else if (
+			event.skipped &&
+			event.errorMessage?.startsWith("Context overflow recovery skipped: nothing eligible to compact.") &&
+			!isHandoffAction
+		) {
+			this.ctx.showStatus(event.errorMessage);
 		} else if (event.errorMessage) {
 			this.ctx.showWarning(event.errorMessage);
 		} else if (isHandoffAction) {
@@ -999,12 +1078,15 @@ export class EventController {
 		const component = new TtsrNotificationComponent(event.rules);
 		component.setExpanded(this.ctx.toolOutputExpanded);
 		addChatChild(this.ctx, component);
+		this.#recordVisibleTranscriptMutation();
+
 		this.ctx.ui.requestRender();
 	}
 
 	async #handleTodoReminder(event: Extract<AgentSessionEvent, { type: "todo_reminder" }>): Promise<void> {
 		const component = new TodoReminderComponent(event.todos, event.attempt, event.maxAttempts);
 		addChatChild(this.ctx, component);
+		this.#recordVisibleTranscriptMutation();
 		this.ctx.ui.requestRender();
 	}
 

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

@@ -281,7 +281,24 @@ export class ExtensionUiController {
 				const disabled = [...(session.settings.get("disabledExtensions") ?? [])];
 				const on = input.on === true;
 				const next = on ? disabled.filter(value => value !== id) : [...new Set([...disabled, id])];
-				session.settings.set("disabledExtensions", next);
+				if (!session.settings.canWriteDurableConfig()) {
+					throw Object.assign(
+						new Error(
+							"Cannot change settings while config.yml has invalid YAML syntax. Repair config.yml and reload settings.",
+						),
+						{ code: "invalid_request" },
+					);
+				}
+				try {
+					session.settings.set("disabledExtensions", next);
+				} catch (error) {
+					if (!session.settings.canWriteDurableConfig()) {
+						throw Object.assign(new Error(error instanceof Error ? error.message : String(error)), {
+							code: "invalid_request",
+						});
+					}
+					throw error;
+				}
 				return { changed: true, enabled: on };
 			}
 			case "session.delete":
@@ -399,7 +416,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(),
@@ -442,7 +461,7 @@ export class ExtensionUiController {
 				}
 				return false;
 			},
-			invokeSkill: (name, args) => this.ctx.session.invokeSkill(name, args),
+			invokeSkill: (name, args, options) => this.ctx.session.invokeSkill(name, args, options),
 			setPlanMode: on => this.ctx.session.setSdkPlanMode(on),
 			operateGoal: (op, objective) => this.ctx.session.operateGoal(op, objective),
 			getSkillState: () =>
@@ -451,6 +470,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 = {
@@ -698,7 +718,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(),
@@ -747,6 +769,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 = {
@@ -918,6 +941,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,