@gajae-code/coding-agent 0.16.3 → 0.16.6

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

@@ -16,6 +16,7 @@ import { ToolExecutionComponent, type ToolExecutionHandle } from "../../modes/co
 import { TtsrNotificationComponent } from "../../modes/components/ttsr-notification";
 import { getSymbolTheme, theme } from "../../modes/theme/theme";
 import {
+	clearInteractiveActivityIndicator,
 	type InteractiveModeContext,
 	stopInteractiveActivityIndicator,
 	syncInteractiveActivityIndicator,
@@ -128,6 +129,15 @@ type AgentSessionEventHandlers = {
 	[E in AgentSessionEventKind]: (event: Extract<AgentSessionEvent, { type: E }>) => Promise<void>;
 };
 
+interface AssistantTextPresentation {
+	component: AssistantMessageComponent;
+	latestMessage: AssistantMessage;
+	sessionIdentity: InteractiveModeContext["session"];
+	sessionEpoch: number;
+	paintEpoch: number;
+	cancel: () => void;
+}
+
 export class EventController {
 	#lastReadGroup: ReadToolGroupComponent | undefined = undefined;
 	#lastThinkingCount = 0;
@@ -146,6 +156,16 @@ export class EventController {
 	#visibleTranscriptChanged = false;
 	#handlingEvent = false;
 	#eventQueue: Promise<void> = Promise.resolve();
+	#disposed = false;
+	#assistantTextSuspended = false;
+	#sessionPresentationEpoch = 0;
+	#paintEpoch = 0;
+	#pendingAssistantText: AssistantTextPresentation | undefined;
+	#assistantTextMutationScope: AssistantTextPresentation | undefined;
+	#assistantLifetimes = new WeakMap<
+		AssistantMessageComponent,
+		{ sessionIdentity: InteractiveModeContext["session"]; sessionEpoch: number }
+	>();
 
 	constructor(private ctx: InteractiveModeContext) {
 		this.#handlers = {
@@ -177,6 +197,8 @@ export class EventController {
 	}
 
 	dispose(): void {
+		this.#disposed = true;
+		this.resetAssistantTextPresentation();
 		this.#cancelIdleCompaction();
 		this.#clearRetryCountdown();
 		if (this.ctx.retryEscapeHandler) {
@@ -199,6 +221,104 @@ export class EventController {
 		this.clearIrcExpiryTimers();
 	}
 
+	#cancelAssistantTextPresentation(): void {
+		const pending = this.#pendingAssistantText;
+		this.#pendingAssistantText = undefined;
+		pending?.cancel();
+	}
+
+	/** Temporary TUI stop discards scheduling, not historical assistant callback lifetimes. */
+	suspendAssistantTextPresentation(): void {
+		this.#assistantTextSuspended = true;
+		this.#paintEpoch += 1;
+		this.#cancelAssistantTextPresentation();
+	}
+
+	/** Rearm before the first restarted frame, even without a new provider event. */
+	resumeAssistantTextPresentation(): void {
+		this.#cancelAssistantTextPresentation();
+		this.#assistantTextSuspended = false;
+		const component = this.ctx.streamingComponent;
+		const message = this.ctx.streamingMessage;
+		if (component && message && this.#isLiveAssistant(component)) {
+			this.#queueAssistantText(component, message);
+		}
+	}
+
+	/** Session/transcript replacement invalidates callbacks before removing old children. */
+	resetAssistantTextPresentation(): void {
+		this.#sessionPresentationEpoch += 1;
+		this.#cancelAssistantTextPresentation();
+	}
+
+	#isLiveAssistant(component: AssistantMessageComponent): boolean {
+		const lifetime = this.#assistantLifetimes.get(component);
+		return (
+			!this.#disposed &&
+			!this.ctx.isStopped?.() &&
+			lifetime !== undefined &&
+			lifetime.sessionIdentity === this.ctx.session &&
+			lifetime.sessionEpoch === this.#sessionPresentationEpoch &&
+			this.ctx.chatContainer.hasLiveChild(component)
+		);
+	}
+
+	#isValidAssistantText(record: AssistantTextPresentation): boolean {
+		return (
+			!this.#assistantTextSuspended &&
+			this.#isLiveAssistant(record.component) &&
+			record.sessionIdentity === this.ctx.session &&
+			record.sessionEpoch === this.#sessionPresentationEpoch &&
+			record.paintEpoch === this.#paintEpoch &&
+			record.component === this.ctx.streamingComponent
+		);
+	}
+
+	#queueAssistantText(component: AssistantMessageComponent, latestMessage: AssistantMessage): void {
+		if (this.#assistantTextSuspended || !this.#isLiveAssistant(component)) return;
+		const pending = this.#pendingAssistantText;
+		if (pending && this.#isValidAssistantText(pending)) {
+			pending.latestMessage = latestMessage;
+			return;
+		}
+		this.#cancelAssistantTextPresentation();
+		const record: AssistantTextPresentation = {
+			component,
+			latestMessage,
+			sessionIdentity: this.ctx.session,
+			sessionEpoch: this.#sessionPresentationEpoch,
+			paintEpoch: this.#paintEpoch,
+			cancel: () => {},
+		};
+		this.#pendingAssistantText = record;
+		record.cancel = this.ctx.ui.enqueueBeforeRender(() => this.#flushAssistantText(record));
+	}
+
+	#flushAssistantText(record = this.#pendingAssistantText): void {
+		if (!record || this.#pendingAssistantText !== record) return;
+		this.#cancelAssistantTextPresentation();
+		if (!this.#isValidAssistantText(record)) return;
+		const previousScope = this.#assistantTextMutationScope;
+		this.#assistantTextMutationScope = record;
+		try {
+			record.component.updateContent(record.latestMessage, { streaming: true });
+		} finally {
+			this.#assistantTextMutationScope = previousScope;
+		}
+	}
+
+	#observeAssistantMutation(component: AssistantMessageComponent): void {
+		if (!this.#isLiveAssistant(component)) return;
+		const scope = this.#assistantTextMutationScope;
+		if (scope?.component === component && this.#isValidAssistantText(scope)) {
+			// Only this synchronous projection publishes before frame source selection.
+			// An unrelated awaited event retains its own dirty flag and settlement semantics.
+			this.ctx.recordVisibleTranscriptMutation?.();
+			return;
+		}
+		this.#observeVisibleTranscriptMutation();
+	}
+
 	#recordVisibleTranscriptMutation(): void {
 		this.#visibleTranscriptChanged = true;
 	}
@@ -292,9 +412,10 @@ export class EventController {
 	}
 
 	async #dispatchEvent(event: AgentSessionEvent): Promise<void> {
+		if (this.#disposed) return;
 		if (this.ctx.isStopped?.()) return;
 		if (!this.ctx.isInitialized) await this.ctx.init();
-		if (this.ctx.isStopped?.()) return;
+		if (this.#disposed || this.ctx.isStopped?.()) return;
 		this.#visibleTranscriptChanged = false;
 		this.#handlingEvent = true;
 		try {
@@ -462,18 +583,26 @@ export class EventController {
 			this.ctx.ui.requestRender();
 			this.#recordVisibleTranscriptMutation();
 		} else if (event.message.role === "assistant") {
+			this.#cancelAssistantTextPresentation();
 			this.#lastThinkingCount = 0;
 			this.#resetReadGroup();
 			this.#toolIntentCache.clear();
 			this.#thinkingContentIndices.clear();
-			this.ctx.streamingComponent = new AssistantMessageComponent(
+			const component: AssistantMessageComponent = new AssistantMessageComponent(
 				undefined,
 				this.ctx.hideThinkingBlock,
-				() => this.ctx.ui.requestRender(),
+				() => {
+					if (this.#isLiveAssistant(component)) this.ctx.ui.requestRender();
+				},
 				this.ctx.getAssistantViewportAnchorId?.(event.message),
-				() => this.#observeVisibleTranscriptMutation(),
+				() => this.#observeAssistantMutation(component),
 				this.ctx.session,
 			);
+			this.#assistantLifetimes.set(component, {
+				sessionIdentity: this.ctx.session,
+				sessionEpoch: this.#sessionPresentationEpoch,
+			});
+			this.ctx.streamingComponent = component;
 			this.ctx.streamingMessage = event.message;
 			addChatChild(this.ctx, this.ctx.streamingComponent);
 			this.ctx.streamingComponent.updateContent(this.ctx.streamingMessage, { streaming: true });
@@ -605,8 +734,20 @@ export class EventController {
 				transferSessionMessageIdentity([this.ctx.streamingMessage], [event.message]);
 			}
 			this.ctx.streamingMessage = event.message;
-			this.ctx.streamingComponent.updateContent(this.ctx.streamingMessage, { streaming: true });
 			const contentIndex = event.assistantMessageEvent?.contentIndex;
+			if (
+				event.assistantMessageEvent?.type === "text_delta" &&
+				typeof contentIndex === "number" &&
+				Number.isInteger(contentIndex) &&
+				contentIndex >= 0 &&
+				contentIndex < event.message.content.length &&
+				event.message.content[contentIndex]?.type === "text"
+			) {
+				this.#queueAssistantText(this.ctx.streamingComponent, event.message);
+			} else {
+				this.#cancelAssistantTextPresentation();
+				this.ctx.streamingComponent.updateContent(this.ctx.streamingMessage, { streaming: true });
+			}
 			const changedContent =
 				typeof contentIndex === "number" && contentIndex >= 0
 					? this.ctx.streamingMessage.content[contentIndex]
@@ -714,6 +855,7 @@ export class EventController {
 
 	async #handleMessageEnd(event: Extract<AgentSessionEvent, { type: "message_end" }>): Promise<void> {
 		if (event.message.role === "user") return;
+		if (event.message.role === "assistant") this.#cancelAssistantTextPresentation();
 		if (this.ctx.streamingComponent && event.message.role === "assistant") {
 			if (this.ctx.streamingMessage?.role === "assistant") {
 				transferSessionMessageIdentity([this.ctx.streamingMessage], [event.message]);
@@ -916,6 +1058,8 @@ export class EventController {
 	}
 
 	async #handleAgentEnd(event: Extract<AgentSessionEvent, { type: "agent_end" }>): Promise<void> {
+		this.#flushAssistantText();
+		this.#cancelAssistantTextPresentation();
 		this.ctx.setWorkingMessage(undefined);
 		stopInteractiveActivityIndicator(this.ctx, { foregroundSettled: true });
 		if (this.ctx.streamingComponent) {
@@ -961,7 +1105,7 @@ export class EventController {
 		this.ctx.editor.onEscape = () => {
 			this.ctx.session.abortCompaction();
 		};
-		stopInteractiveActivityIndicator(this.ctx, { restoreBackground: false, foregroundSettled: true });
+		clearInteractiveActivityIndicator(this.ctx);
 		const reasonText =
 			event.reason === "overflow" ? "Context overflow detected, " : event.reason === "idle" ? "Idle " : "";
 		const actionLabel = event.action === "handoff" ? "Auto-handoff" : "Auto context-full maintenance";
@@ -1062,7 +1206,7 @@ export class EventController {
 				this.ctx.session.abortRetry();
 			}
 		};
-		stopInteractiveActivityIndicator(this.ctx, { restoreBackground: false, foregroundSettled: true });
+		clearInteractiveActivityIndicator(this.ctx);
 		// Stop any prior retry loader/timer before installing a new one.
 		this.ctx.retryLoader?.stop();
 		this.#clearRetryCountdown();

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

@@ -292,6 +292,7 @@ export class ExtensionUiController {
 				const result = await session.executeBash(input.cmd, undefined, { excludeFromContext: true });
 				return {
 					exitCode: result.exitCode,
+					signal: result.signal,
 					cancelled: result.cancelled,
 					output: result.output,
 					truncated: result.truncated,

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

@@ -273,16 +273,19 @@ export class InputController {
 
 	#syncTranscriptTurnPosition(): readonly string[] {
 		const anchorIds = getUserMessageViewportAnchorIds(this.ctx.session.messages);
+		const previousAnchorIds = new Set(this.#transcriptTurnAnchorIds);
 		if (
 			anchorIds.length !== this.#transcriptTurnAnchorIds.length ||
-			anchorIds.some(id => !this.#transcriptTurnAnchorIds.includes(id))
+			anchorIds.some(id => !previousAnchorIds.has(id))
 		) {
 			const hadAnchors = this.#transcriptTurnAnchorIds.length > 0;
 			const currentAnchorId = this.#transcriptTurnAnchorIds[this.#transcriptTurnPosition];
-			const retainedAnchorIds = this.#transcriptTurnAnchorIds.filter(id => anchorIds.includes(id));
+			const incomingAnchorIds = new Set(anchorIds);
+			const retainedAnchorIds = this.#transcriptTurnAnchorIds.filter(id => incomingAnchorIds.has(id));
+			const retainedAnchorIdSet = new Set(retainedAnchorIds);
 			this.#transcriptTurnAnchorIds = [
 				...retainedAnchorIds,
-				...anchorIds.filter(id => !retainedAnchorIds.includes(id)),
+				...anchorIds.filter(id => !retainedAnchorIdSet.has(id)),
 			];
 			const currentPosition = currentAnchorId ? this.#transcriptTurnAnchorIds.indexOf(currentAnchorId) : -1;
 			this.#transcriptTurnPosition =

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

@@ -1976,6 +1976,22 @@ export class SelectorController {
 								width ?? this.ctx.editor.getTopBorderAvailableWidth(this.ctx.ui.terminal.columns);
 							return this.ctx.statusLine.getPreviewContent(availableWidth);
 						},
+						getStatusLinePreviewForSettings: (previewSettings, width?: number) => {
+							const availableWidth =
+								width ?? this.ctx.editor.getTopBorderAvailableWidth(this.ctx.ui.terminal.columns);
+							return this.ctx.statusLine.getPreviewContentForSettings(availableWidth, {
+								...buildStatusLineSettings(settings),
+								...previewSettings,
+							});
+						},
+						getStatusLinePreviewPartsForSettings: (previewSettings, width?: number) => {
+							const availableWidth =
+								width ?? this.ctx.editor.getTopBorderAvailableWidth(this.ctx.ui.terminal.columns);
+							return this.ctx.statusLine.getPreviewPartsForSettings(availableWidth, {
+								...buildStatusLineSettings(settings),
+								...previewSettings,
+							});
+						},
 						onPluginsChanged: () => {
 							this.ctx.ui.requestRender();
 						},
@@ -2982,6 +2998,8 @@ export class SelectorController {
 						this.ctx.ui.requestRender();
 						try {
 							await mgr.uninstallPlugin(pluginId, scope);
+							await this.ctx.session.reloadSkills();
+							await this.ctx.refreshSlashCommandState();
 							this.ctx.showStatus(`Uninstalled ${pluginId}`);
 						} catch (err) {
 							this.ctx.showStatus(`Uninstall failed: ${err}`);
@@ -3019,6 +3037,8 @@ export class SelectorController {
 					try {
 						const force = installedIds.has(`${name}@${marketplace}`);
 						await mgr.installPlugin(name, marketplace, { force });
+						await this.ctx.session.reloadSkills();
+						await this.ctx.refreshSlashCommandState();
 						this.ctx.showStatus(`Installed ${name} from ${marketplace}`);
 					} catch (err) {
 						this.ctx.showStatus(`Install failed: ${err}`);
@@ -3245,6 +3265,7 @@ export class SelectorController {
 	}
 
 	#clearTransientSessionUi(options?: { restoreBackground?: boolean; clearSpecializedLoaders?: boolean }): void {
+		this.ctx.resetAssistantTextPresentation();
 		if (options?.clearSpecializedLoaders) clearInteractiveActivityLoaders(this.ctx);
 		stopInteractiveActivityIndicator(this.ctx, {
 			restoreBackground: options?.restoreBackground,

package/src/modes/interactive-mode.ts

@@ -13,7 +13,7 @@ import {
 	Text,
 	TUI,
 } from "@gajae-code/tui";
-import { APP_NAME, adjustHsv, getProjectDir, logger, postmortem, sanitizeText } from "@gajae-code/utils";
+import { APP_NAME, adjustHsv, getAgentDir, getProjectDir, logger, postmortem, sanitizeText } from "@gajae-code/utils";
 import chalk from "chalk";
 import { AsyncJobManager } from "../async";
 import {
@@ -49,6 +49,7 @@ import type { AgentSession, AgentSessionEvent, AsyncJobSnapshotItem } from "../s
 import type { HistoryStorage } from "../session/history-storage";
 import type { SessionContext, SessionManager } from "../session/session-manager";
 import { getRecentSessions, getSessionMessageEntryId } from "../session/session-manager";
+import { createDefaultPaseoAnnounceDependencies, startPaseoAnnouncement } from "../setup/paseo/announce";
 import type { LspStartupServerInfo } from "../tools";
 import { formatPhaseDisplayName } from "../tools/todo-write";
 import { copyToClipboard } from "../utils/clipboard";
@@ -745,6 +746,10 @@ export class InteractiveMode implements InteractiveModeContext {
 			version: this.#version,
 			focusDomain: "composer",
 			keyDisplayContext: this.#keyDisplayContext,
+			onUpdate: () => {
+				this.updateEditorChrome();
+				this.ui.requestRender();
+			},
 		});
 		this.statusLine.setAutoCompactEnabled(session.autoCompactionEnabled);
 
@@ -776,6 +781,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#btwController = new BtwController(this);
 		this.#extensionUiController = new ExtensionUiController(this);
 		this.#eventController = new EventController(this);
+		this.ui.setRenderPreparationLifecycleCallbacks({
+			invalidate: () => this.#eventController.suspendAssistantTextPresentation(),
+			beforeStart: () => this.#eventController.resumeAssistantTextPresentation(),
+		});
 		this.#commandController = new CommandController(this);
 		this.#todoCommandController = new TodoCommandController(this);
 		this.#selectorController = new SelectorController(this);
@@ -1065,6 +1074,37 @@ export class InteractiveMode implements InteractiveModeContext {
 			crashRelayTimer.unref?.();
 		}
 
+		// Make this session visible in Paseo. Interactive-only by construction: a
+		// `gjc acp` provider process never builds an InteractiveMode, so an imported
+		// session can never announce itself back into Paseo.
+		if (this.settings.getGlobal("paseo.autoImport") === true) {
+			const sessionId = this.sessionManager.getSessionId();
+			const announcement = startPaseoAnnouncement(
+				{
+					sessionId,
+					cwd: this.sessionManager.getCwd(),
+					isEnabled: () => this.settings.getGlobal("paseo.autoImport") === true,
+					onOutcome: outcome => {
+						if (this.#stopped || outcome.kind === "skipped") return;
+						this.showStatus(
+							outcome.kind === "failed"
+								? `Paseo import failed: ${outcome.detail}`
+								: `Controllable in Paseo as ${outcome.providerKey}`,
+							{ dim: true },
+						);
+					},
+				},
+				createDefaultPaseoAnnounceDependencies(getAgentDir()),
+			);
+			const stopWatchingSettings = this.settings.onChanged(path => {
+				if (path === "paseo.autoImport" && this.settings.getGlobal(path) !== true) announcement.cancel();
+			});
+			this.#stopListeners.add(() => {
+				stopWatchingSettings();
+				announcement.cancel();
+			});
+		}
+
 		if (starReminderGate.schedule) {
 			scheduleLaunchStarReminderAfterFirstRender({
 				confirm: (title, message) =>
@@ -1517,6 +1557,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 	rebuildChatFromMessages(policy: TranscriptRebuildPolicy): void {
 		prepareTranscriptRebuild(this.ui, policy);
+		this.resetAssistantTextPresentation();
 		this.chatContainer.clear();
 		const context = this.session.buildDisplaySessionContext();
 		this.renderSessionContext(context);
@@ -1649,6 +1690,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	stop(): void {
 		const wasInitialized = this.isInitialized;
 		this.#stopped = true;
+		this.ui.setRenderPreparationLifecycleCallbacks(undefined);
 		this.#inputController.discardDeferredSubmission();
 		for (const listener of this.#stopListeners) {
 			try {
@@ -1658,7 +1700,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			}
 		}
 		this.#stopListeners.clear();
-		this.#stopLoadingAnimation();
+		this.clearLoadingAnimation();
 		this.#suspendedActivityIndicator = undefined;
 		this.#petProtocolUnsubscribe?.();
 		this.#petProtocolUnsubscribe = undefined;
@@ -1954,7 +1996,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		return tallyBackgroundActivity(this.session.getAsyncJobSnapshot()?.running ?? []);
 	}
 
-	#stopLoadingAnimation(): void {
+	/** Clear the status display without settling the foreground run during maintenance/retry. */
+	clearLoadingAnimation(): void {
 		this.loadingAnimation?.stop();
 		this.loadingAnimation = undefined;
 		this.statusContainer.clear();
@@ -1965,7 +2008,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		const foregroundActive = this.#foregroundActivity || (!this.#foregroundTurnSettled && this.session.isStreaming);
 		if (!this.isInitialized && !foregroundActive) {
-			this.#stopLoadingAnimation();
+			this.clearLoadingAnimation();
 			return;
 		}
 		const message = resolveActivityIndicatorMessage(
@@ -1974,7 +2017,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.#pendingWorkingMessage ?? this.#defaultWorkingMessage,
 		);
 		if (!message) {
-			this.#stopLoadingAnimation();
+			this.clearLoadingAnimation();
 			return;
 		}
 		if (!this.loadingAnimation) {
@@ -2005,7 +2048,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#foregroundActivity = false;
 		if (options?.foregroundSettled) this.#foregroundTurnSettled = true;
 		if (options?.restoreBackground === false) {
-			this.#stopLoadingAnimation();
+			this.clearLoadingAnimation();
 			return;
 		}
 		this.syncActivityIndicator();
@@ -2077,6 +2120,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#uiHelpers.isKnownSlashCommand(text);
 	}
 
+	resetAssistantTextPresentation(): void {
+		this.#eventController.resetAssistantTextPresentation();
+	}
+
 	/** Advances the sticky-viewport source only for semantic transcript output. */
 	recordVisibleTranscriptMutation(): void {
 		const identity = `session:${this.sessionManager.getSessionId()}`;

package/src/modes/print-mode.ts

@@ -10,6 +10,7 @@ import { type AssistantMessage, type ImageContent, isContextOverflow } from "@ga
 import { isKnownSinkPeerClosedError, logger, sanitizeText } from "@gajae-code/utils";
 import { loadSlashCommands } from "../extensibility/slash-commands";
 import type { AgentSession } from "../session/agent-session";
+import { ManagedAppendIdentityMismatchError } from "../session/internal/managed-session-storage";
 import { isSilentAbort } from "../session/messages";
 import { resolveProviderSafetyStopHint } from "../session/provider-safety-stop-hint";
 import { executeLocalHeadlessBuiltinSlashCommand } from "../slash-commands/builtin-registry";
@@ -388,7 +389,10 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 		// Observe callback and stream errors from every preceding print-mode write.
 		await stdout.flush();
 	} catch (error) {
-		failures.push(error);
+		if (error instanceof ManagedAppendIdentityMismatchError) {
+			process.exitCode = 1;
+			await writeStderrAndQuiesce(`${error.operatorMessage}\n`);
+		} else failures.push(error);
 	} finally {
 		// The JSON subscriber remains live while disposal emits its final events.
 		try {

package/src/modes/prompt-action-autocomplete.ts

@@ -89,23 +89,37 @@ function getSlashCommandPriority(command: SlashCommand | undefined, item: Autoco
 	return ADVANCED_SLASH_COMMAND_PRIORITIES.get(item.value) ?? 0;
 }
 
+interface SlashCommandMetadata {
+	command: SlashCommand;
+	index: number;
+	lowerName: string;
+	normalizedName: string;
+	normalizedDescription: string | undefined;
+}
+
+interface SkillCommandMetadata {
+	command: SlashCommand;
+	lowerSkillName: string;
+	searchTargets: string[];
+	collisionSearchTargets: string[];
+}
+
 function sortSlashCommandSuggestions(
 	suggestions: { items: AutocompleteItem[]; prefix: string } | null,
-	commands: SlashCommand[],
+	commandMetadata: ReadonlyMap<string, SlashCommandMetadata>,
 ): { items: AutocompleteItem[]; prefix: string } | null {
 	if (!suggestions) return null;
 	const query = suggestions.prefix.slice(1).toLowerCase();
 	const normalizedQuery = normalizeFuzzyText(query);
-	const commandIndexes = new Map(commands.map((command, index) => [command.name, index]));
-	const commandByName = new Map(commands.map(command => [command.name, command]));
 	const items = suggestions.items
 		.map((item, index) => {
-			const command = commandByName.get(item.value);
-			const commandIndex = commandIndexes.get(item.value) ?? index;
-			const lowerName = item.value.toLowerCase();
-			const lowerDesc = command?.description?.toLowerCase() ?? item.description?.toLowerCase() ?? "";
-			const normalizedName = normalizeFuzzyText(item.value);
-			const normalizedDesc = normalizeFuzzyText(lowerDesc);
+			const metadata = commandMetadata.get(item.value);
+			const command = metadata?.command;
+			const commandIndex = metadata?.index ?? index;
+			const lowerName = metadata?.lowerName ?? item.value.toLowerCase();
+			const normalizedName = metadata?.normalizedName ?? normalizeFuzzyText(item.value);
+			const normalizedDesc =
+				metadata?.normalizedDescription ?? normalizeFuzzyText(item.description?.toLowerCase() ?? "");
 			const nameScore = autocompleteFuzzyMatch(normalizedQuery, normalizedName)
 				? autocompleteFuzzyScore(normalizedQuery, normalizedName)
 				: 0;
@@ -180,7 +194,8 @@ function isSlashTokenInsideInlineCodeSpan(
 export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 	#baseProvider: CombinedAutocompleteProvider;
 	#actions: PromptActionDefinition[];
-	#commands: SlashCommand[];
+	#commandMetadata = new Map<string, SlashCommandMetadata>();
+	#skillCommandMetadata: SkillCommandMetadata[] = [];
 	#getPromptSuggestion: (() => string | null) | undefined;
 
 	constructor(
@@ -191,7 +206,28 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 	) {
 		this.#baseProvider = new CombinedAutocompleteProvider(commands, basePath);
 		this.#actions = actions;
-		this.#commands = commands;
+		for (const [index, command] of commands.entries()) {
+			this.#commandMetadata.set(command.name, {
+				command,
+				index,
+				lowerName: command.name.toLowerCase(),
+				normalizedName: normalizeFuzzyText(command.name),
+				normalizedDescription:
+					command.description === undefined ? undefined : normalizeFuzzyText(command.description.toLowerCase()),
+			});
+			if (command.name.startsWith("skill:")) {
+				const skillName = command.name.slice("skill:".length);
+				const name = normalizeFuzzyText(command.name);
+				const alias = normalizeFuzzyText(`skill-${skillName}`);
+				const description = normalizeFuzzyText(command.description ?? "");
+				this.#skillCommandMetadata.push({
+					command,
+					lowerSkillName: skillName.toLowerCase(),
+					searchTargets: [name, alias, normalizeFuzzyText(skillName), description],
+					collisionSearchTargets: [name, alias, description],
+				});
+			}
+		}
 		this.#getPromptSuggestion = getPromptSuggestion;
 	}
 
@@ -244,7 +280,7 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 			});
 			return sortSlashCommandSuggestions(
 				mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions),
-				this.#commands,
+				this.#commandMetadata,
 			);
 		}
 		if (rawSlashPrefix && slashTokenInsideCode) {
@@ -334,7 +370,7 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 		const skillCommandSuggestions = this.#getSkillCommandSuggestions(textBeforeCursor, { includeEmpty: false });
 		return sortSlashCommandSuggestions(
 			mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions),
-			this.#commands,
+			this.#commandMetadata,
 		);
 	}
 	trySyncInlineReplace(textBeforeCursor: string): { replaceLen: number; insert: string } | null {
@@ -354,20 +390,11 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 			query.startsWith("skill-") ? `skill:${query.slice("skill-".length)}` : query,
 		);
 		if (query.length > 0 && normalizedQuery.length === 0) return null;
-		const exactNonSkillCommand = this.#commands.some(
-			command => command.name === query && !command.name.startsWith("skill:"),
-		);
-		const items = this.#commands
-			.filter(command => command.name.startsWith("skill:"))
-			.map(command => {
-				const skillName = command.name.slice("skill:".length);
-				if (exactNonSkillCommand && query === skillName.toLowerCase()) return null;
-				const searchTargets = [
-					command.name,
-					`skill-${skillName}`,
-					...(exactNonSkillCommand ? [] : [skillName]),
-					command.description ?? "",
-				].map(target => normalizeFuzzyText(target));
+		const exactNonSkillCommand = this.#commandMetadata.has(query) && !query.startsWith("skill:");
+		const items = this.#skillCommandMetadata
+			.map(({ command, lowerSkillName, searchTargets: allSearchTargets, collisionSearchTargets }) => {
+				if (exactNonSkillCommand && query === lowerSkillName) return null;
+				const searchTargets = exactNonSkillCommand ? collisionSearchTargets : allSearchTargets;
 				if (
 					!searchTargets.some(
 						target => autocompleteFuzzyMatch(normalizedQuery, target) || target.includes(normalizedQuery),

package/src/modes/runtime-init.ts

@@ -201,6 +201,7 @@ export async function initializeExtensions(session: AgentSession, options: Initi
 			},
 			getJobs: () => session.getAsyncJobSnapshot(),
 			onJobFold: listener => session.onJobFold(listener),
+			onSessionEvent: listener => session.subscribe(listener),
 			setSdkPermissionProvider: provider => session.setSdkPermissionProvider(provider),
 			setSdkClientBridge: bridge => session.setClientBridge(bridge),
 			sdkControl: async (operation, input) => {
@@ -325,6 +326,7 @@ export async function initializeExtensions(session: AgentSession, options: Initi
 						const result = await session.executeBash(input.cmd, undefined, { excludeFromContext: true });
 						return {
 							exitCode: result.exitCode,
+							signal: result.signal,
 							cancelled: result.cancelled,
 							output: result.output,
 							truncated: result.truncated,