@gajae-code/coding-agent 0.17.2 → 0.17.5

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

@@ -39,6 +39,7 @@ export type SessionInspector = (sessionPath: string) => Promise<ResumeTailInspec
 
 type SelectorState =
 	| { kind: "browsing" }
+	| { kind: "starring"; token: number }
 	| { kind: "checking"; session: SessionInfo; token: number }
 	| { kind: "confirming"; session: SessionInfo; token: number; identity: ResumeSessionIdentity }
 	| { kind: "settled" };
@@ -52,12 +53,13 @@ class SessionList implements Component {
 	onCancel?: () => void;
 	onExit: () => void = () => {};
 	onDeleteRequest?: (session: SessionInfo) => void;
+	onToggleStarRequest?: (session: SessionInfo) => void;
 
 	constructor(
 		private readonly allSessions: SessionInfo[],
 		private readonly showCwd = false,
 	) {
-		this.#filteredSessions = allSessions;
+		this.#filteredSessions = prioritizeStarredSessions(allSessions);
 		this.#searchInput.onSubmit = () => {
 			const selected = this.#filteredSessions[this.#selectedIndex];
 			if (selected) this.onSelect?.(selected);
@@ -100,6 +102,17 @@ class SessionList implements Component {
 		this.#filterSessions(this.#searchInput.getValue());
 	}
 
+	setSessionStarred(sessionPath: string, starred: boolean): void {
+		const session = this.allSessions.find(session => session.path === sessionPath);
+		if (!session) return;
+		session.starred = starred;
+		this.#filterSessions(this.#searchInput.getValue());
+		this.#selectedIndex = Math.max(
+			0,
+			this.#filteredSessions.findIndex(session => session.path === sessionPath),
+		);
+	}
+
 	invalidate(): void {}
 
 	render(width: number): string[] {
@@ -155,6 +168,8 @@ class SessionList implements Component {
 		}
 		if (start > 0 || end < this.#filteredSessions.length)
 			lines.push(theme.fg("muted", `  (${this.#selectedIndex + 1}/${this.#filteredSessions.length})`));
+		if (this.onToggleStarRequest)
+			lines.push(theme.fg("muted", truncateToWidth("  [Ctrl+S to star/unstar selected session]", width)));
 		lines.push(
 			"",
 			theme.fg("muted", "  [Del to delete selected transcript/artifacts, Enter to select, Esc to cancel]"),
@@ -177,7 +192,10 @@ class SessionList implements Component {
 			this.#selectedIndex += delta;
 			this.#clampSelectedIndex();
 		};
-		if (matchesKey(keyData, "delete")) {
+		if (matchesKey(keyData, "ctrl+s")) {
+			const selected = this.#filteredSessions[this.#selectedIndex];
+			if (selected) this.onToggleStarRequest?.(selected);
+		} else if (matchesKey(keyData, "delete")) {
 			const selected = this.#filteredSessions[this.#selectedIndex];
 			if (selected) this.onDeleteRequest?.(selected);
 		} else if (matchesKey(keyData, "up")) move(-1);
@@ -194,7 +212,7 @@ class SessionList implements Component {
 	}
 }
 
-/** A one-shot resume consent selector. It never opens or mutates sessions. */
+/** A one-shot resume consent selector with host-owned deletion and star persistence. */
 export class SessionSelectorComponent extends Container {
 	#sessionList: SessionList;
 	#confirmationDialog: HookSelectorComponent | null = null;
@@ -211,6 +229,7 @@ export class SessionSelectorComponent extends Container {
 		private readonly onDelete?: (session: SessionInfo) => Promise<boolean>,
 		private readonly inspector?: SessionInspector,
 		private readonly onSelection?: (selection: SessionSelectionResult) => void,
+		private readonly onSetStarred?: (session: SessionInfo, starred: boolean) => Promise<void>,
 	) {
 		super();
 		this.addChild(new Spacer(1));
@@ -219,7 +238,7 @@ export class SessionSelectorComponent extends Container {
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
 		this.addChild(this.#messageContainer);
-		this.#sessionList = new SessionList(prioritizeStarredSessions(sessions));
+		this.#sessionList = new SessionList([...sessions]);
 		this.#sessionList.onSelect = session => {
 			if (this.inspector) void this.#inspect(session);
 			else this.#dispatchSelect(session.path);
@@ -227,6 +246,7 @@ export class SessionSelectorComponent extends Container {
 		this.#sessionList.onCancel = () => this.#cancel();
 		this.#sessionList.onExit = () => this.#exit();
 		this.#sessionList.onDeleteRequest = session => this.#showDeleteConfirmation(session);
+		if (this.onSetStarred) this.#sessionList.onToggleStarRequest = session => void this.#toggleStar(session);
 		this.addChild(this.#sessionList);
 		this.addChild(new Spacer(1));
 		this.addChild(new DynamicBorder());
@@ -294,6 +314,29 @@ export class SessionSelectorComponent extends Container {
 		this.#sessionList.setInputFrozen(true);
 		this.onExit();
 	}
+	async #toggleStar(session: SessionInfo): Promise<void> {
+		if (!this.onSetStarred || this.#state.kind !== "browsing" || this.#confirmationDialog) return;
+		const token = ++this.#nextToken;
+		const starred = !session.starred;
+		this.#state = { kind: "starring", token };
+		this.#sessionList.setInputFrozen(true);
+		this.#clearError();
+		this.#requestRender();
+		try {
+			await this.onSetStarred(session, starred);
+			if (this.#state.kind !== "starring" || this.#state.token !== token) return;
+			this.#sessionList.setSessionStarred(session.path, starred);
+		} catch (error) {
+			if (this.#state.kind !== "starring" || this.#state.token !== token) return;
+			this.#showError(error instanceof Error ? error.message : String(error));
+		} finally {
+			if (this.#state.kind === "starring" && this.#state.token === token) {
+				this.#state = { kind: "browsing" };
+				this.#sessionList.setInputFrozen(false);
+				this.#requestRender();
+			}
+		}
+	}
 	async #inspect(session: SessionInfo): Promise<void> {
 		const inspector = this.inspector;
 		if (!inspector || this.#state.kind !== "browsing") return;

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

@@ -41,6 +41,33 @@ import { getSeparator } from "./status-line/separators";
 import { calculateTokensPerSecond } from "./status-line/token-rate";
 import type { SeparatorDef } from "./status-line/types";
 
+function usageReportAccountId(report: unknown): string | undefined {
+	if (!report || typeof report !== "object") return undefined;
+	const record = report as {
+		metadata?: unknown;
+		limits?: unknown;
+	};
+	const metadata = record.metadata;
+	const rawMetadataAccountId =
+		metadata && typeof metadata === "object" ? (metadata as { accountId?: unknown }).accountId : undefined;
+	const metadataAccountId =
+		typeof rawMetadataAccountId === "string" && rawMetadataAccountId.trim() ? rawMetadataAccountId.trim() : undefined;
+	if (!Array.isArray(record.limits)) return metadataAccountId;
+
+	const scopeAccountIds = new Set<string>();
+	for (const limit of record.limits) {
+		if (!limit || typeof limit !== "object") continue;
+		const scope = (limit as { scope?: unknown }).scope;
+		if (!scope || typeof scope !== "object") continue;
+		const accountId = (scope as { accountId?: unknown }).accountId;
+		if (typeof accountId === "string" && accountId.trim()) scopeAccountIds.add(accountId.trim());
+	}
+	if (scopeAccountIds.size > 1) return undefined;
+	const [scopeAccountId] = scopeAccountIds;
+	if (metadataAccountId && scopeAccountId && metadataAccountId !== scopeAccountId) return undefined;
+	return metadataAccountId ?? scopeAccountId;
+}
+
 export interface StatusLineSegmentOptions {
 	model?: { showThinkingLevel?: boolean; showContextPercent?: boolean };
 	path?: { abbreviate?: boolean; maxLength?: number; stripWorkPrefix?: boolean };
@@ -218,6 +245,7 @@ export class StatusLineComponent implements Component {
 	#cachedUsage: SegmentContext["usage"] = null;
 	#cachedUsageReports: unknown = null;
 	#cachedUsageProvider: string | undefined;
+	#cachedUsageAccountId: string | undefined;
 	#usageFetchedAt = 0;
 	#usageInFlight = false;
 
@@ -702,7 +730,12 @@ export class StatusLineComponent implements Component {
 			.then(reports => {
 				this.#cachedUsageReports = reports;
 				this.#cachedUsageProvider = this.#activeUsageProvider();
-				this.#cachedUsage = this.#normalizeUsageReports(reports);
+				this.#cachedUsageAccountId = this.#activeCodexAccountId(this.#cachedUsageProvider);
+				this.#cachedUsage = this.#normalizeUsageReports(
+					reports,
+					this.#cachedUsageProvider,
+					this.#cachedUsageAccountId,
+				);
 				this.#usageFetchedAt = Date.now();
 				if (this.#onBranchChange) {
 					this.#onBranchChange();
@@ -720,10 +753,25 @@ export class StatusLineComponent implements Component {
 			});
 	}
 
-	#normalizeUsageReports(reports: unknown): SegmentContext["usage"] {
-		const activeProvider = this.#activeUsageProvider();
-
+	#normalizeUsageReports(
+		reports: unknown,
+		activeProvider = this.#activeUsageProvider(),
+		activeCodexAccountId = this.#activeCodexAccountId(activeProvider),
+	): SegmentContext["usage"] {
 		if (!activeProvider || !Array.isArray(reports)) return null;
+		const activeCodexReportCount =
+			activeProvider === "openai-codex" && activeCodexAccountId
+				? reports.filter(report => {
+						if (!report || typeof report !== "object") return false;
+						const provider = (report as { provider?: unknown }).provider;
+						return (
+							typeof provider === "string" &&
+							resolveOAuthStorageProvider(provider) === activeProvider &&
+							usageReportAccountId(report) === activeCodexAccountId
+						);
+					}).length
+				: 0;
+		const ambiguousActiveCodexReports = activeCodexReportCount > 1;
 		const windows: NonNullable<SegmentContext["usage"]>["windows"] = [];
 		const seen = new Set<string>();
 		const now = Date.now();
@@ -759,6 +807,14 @@ export class StatusLineComponent implements Component {
 			const provider = (report as { provider?: unknown }).provider;
 			const providerId = typeof provider === "string" ? resolveOAuthStorageProvider(provider) : undefined;
 			if (providerId !== activeProvider) continue;
+			// Codex usage fetches cover every OAuth account; fail closed unless this session's account matches uniquely.
+			if (
+				providerId === "openai-codex" &&
+				(!activeCodexAccountId ||
+					ambiguousActiveCodexReports ||
+					usageReportAccountId(report) !== activeCodexAccountId)
+			)
+				continue;
 			const limits = (report as { limits?: unknown }).limits;
 			if (!Array.isArray(limits)) continue;
 			for (const limit of limits) {
@@ -808,11 +864,21 @@ export class StatusLineComponent implements Component {
 		return typeof provider === "string" && provider.length > 0 ? resolveOAuthStorageProvider(provider) : undefined;
 	}
 
+	#activeCodexAccountId(activeProvider: string | undefined): string | undefined {
+		if (activeProvider !== "openai-codex") return undefined;
+		const modelRegistry = this.session.modelRegistry;
+		return modelRegistry.authStorage.getOAuthAccountId(activeProvider, this.session.credentialSessionId, {
+			owner: modelRegistry.getAuthStorageOwner(),
+		});
+	}
+
 	#syncCachedUsageForActiveProvider(): void {
 		const activeProvider = this.#activeUsageProvider();
-		if (this.#cachedUsageProvider === activeProvider) return;
+		const activeCodexAccountId = this.#activeCodexAccountId(activeProvider);
+		if (this.#cachedUsageProvider === activeProvider && this.#cachedUsageAccountId === activeCodexAccountId) return;
 		this.#cachedUsageProvider = activeProvider;
-		this.#cachedUsage = this.#normalizeUsageReports(this.#cachedUsageReports);
+		this.#cachedUsageAccountId = activeCodexAccountId;
+		this.#cachedUsage = this.#normalizeUsageReports(this.#cachedUsageReports, activeProvider, activeCodexAccountId);
 	}
 
 	#buildSegmentContext(

package/src/modes/components/user-message-selector.ts

@@ -14,9 +14,10 @@ interface UserMessageItem {
  */
 class UserMessageList implements Component {
 	#selectedIndex: number = 0;
+	#selectionInFlight = false;
 	onSelect?: (entryId: string) => void;
 	onCancel?: () => void;
-	#maxVisible: number = 10; // Max messages visible
+	#availableRows = Number.POSITIVE_INFINITY;
 
 	constructor(private readonly messages: UserMessageItem[]) {
 		// Store messages in chronological order (oldest to newest)
@@ -24,6 +25,10 @@ class UserMessageList implements Component {
 		this.#selectedIndex = Math.max(0, this.messages.length - 1);
 	}
 
+	setAvailableRows(rows: number): void {
+		this.#availableRows = Math.max(3, rows);
+	}
+
 	invalidate(): void {
 		// No cached state to invalidate currently
 	}
@@ -36,12 +41,15 @@ class UserMessageList implements Component {
 			return lines;
 		}
 
-		// Calculate visible range with scrolling
+		// Each entry uses two content rows plus a separator. Leave one row for
+		// the scroll position whenever the full history does not fit.
+		const needsScrollIndicator = this.messages.length * 3 > this.#availableRows;
+		const maxVisible = Math.max(1, Math.floor((this.#availableRows - (needsScrollIndicator ? 1 : 0)) / 3));
 		const startIndex = Math.max(
 			0,
-			Math.min(this.#selectedIndex - Math.floor(this.#maxVisible / 2), this.messages.length - this.#maxVisible),
+			Math.min(this.#selectedIndex - Math.floor(maxVisible / 2), this.messages.length - maxVisible),
 		);
-		const endIndex = Math.min(startIndex + this.#maxVisible, this.messages.length);
+		const endIndex = Math.min(startIndex + maxVisible, this.messages.length);
 
 		// Render visible messages (2 lines per message + blank line)
 		for (let i = startIndex; i < endIndex; i++) {
@@ -77,6 +85,7 @@ class UserMessageList implements Component {
 	}
 
 	handleInput(keyData: string): void {
+		if (this.#selectionInFlight) return;
 		// Up arrow - go to previous (older) message, wrap to bottom when at top
 		if (matchesKey(keyData, "up")) {
 			this.#selectedIndex = this.#selectedIndex === 0 ? this.messages.length - 1 : this.#selectedIndex - 1;
@@ -89,6 +98,7 @@ class UserMessageList implements Component {
 		else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selected = this.messages[this.#selectedIndex];
 			if (selected && this.onSelect) {
+				this.#selectionInFlight = true;
 				this.onSelect(selected.id);
 			}
 		}
@@ -102,21 +112,43 @@ class UserMessageList implements Component {
 }
 
 /**
- * Component that renders a user message selector for branching
+ * Component that renders a prompt selector for creating a new session
  */
 export class UserMessageSelectorComponent extends Container {
 	#messageList: UserMessageList;
-
-	constructor(messages: UserMessageItem[], onSelect: (entryId: string) => void, onCancel: () => void) {
+	#header: Container;
+	#footer: Container;
+
+	constructor(
+		messages: UserMessageItem[],
+		onSelect: (entryId: string) => void,
+		onCancel: () => void,
+		private readonly getViewportRows: () => number,
+	) {
 		super();
 
 		// Add header
-		this.addChild(new Spacer(1));
-		this.addChild(new Text(theme.bold("Branch from Message"), 1, 0));
-		this.addChild(new Text(theme.fg("muted", "Select a message to create a new branch from that point"), 1, 0));
-		this.addChild(new Spacer(1));
-		this.addChild(new DynamicBorder());
-		this.addChild(new Spacer(1));
+		this.#header = new Container();
+		this.#header.addChild(new Spacer(1));
+		this.#header.addChild(new Text(theme.bold("Fork from Prompt"), 1, 0));
+		this.#header.addChild(
+			new Text(
+				theme.fg(
+					"muted",
+					"Creates a new session with history before the prompt; shared files stay in the same cwd.",
+				),
+				1,
+				0,
+			),
+		);
+		this.#header.addChild(
+			new Text(theme.fg("muted", "The selected prompt is restored for editing, not submitted."), 1, 0),
+		);
+		this.#header.addChild(new Text(theme.fg("muted", "↑/↓ move · Enter select · Esc cancel"), 1, 0));
+		this.#header.addChild(new Spacer(1));
+		this.#header.addChild(new DynamicBorder());
+		this.#header.addChild(new Spacer(1));
+		this.addChild(this.#header);
 
 		// Create message list
 		this.#messageList = new UserMessageList(messages);
@@ -126,8 +158,10 @@ export class UserMessageSelectorComponent extends Container {
 		this.addChild(this.#messageList);
 
 		// Add bottom border
-		this.addChild(new Spacer(1));
-		this.addChild(new DynamicBorder());
+		this.#footer = new Container();
+		this.#footer.addChild(new Spacer(1));
+		this.#footer.addChild(new DynamicBorder());
+		this.addChild(this.#footer);
 
 		// Auto-cancel if no messages
 		if (messages.length === 0) {
@@ -135,6 +169,14 @@ export class UserMessageSelectorComponent extends Container {
 		}
 	}
 
+	render(width: number): string[] {
+		const chromeRows = this.#header.render(width).length + this.#footer.render(width).length;
+		// Reserve the pinned status/composer rows outside the overlay. Recompute
+		// against current terminal rows and wrapped header height on every render.
+		this.#messageList.setAvailableRows(this.getViewportRows() - chromeRows - 2);
+		return super.render(width);
+	}
+
 	getMessageList(): UserMessageList {
 		return this.#messageList;
 	}

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

@@ -38,7 +38,16 @@ import { replaceTabs } from "../../tools/render-utils";
 import { getDisplayChangelogEntries } from "../../utils/changelog";
 import { copyToClipboard } from "../../utils/clipboard";
 import { openPath } from "../../utils/open";
-import { setSessionTerminalTitle } from "../../utils/title-generator";
+import {
+	beginSessionTitleGeneration,
+	invalidateSessionTitleGeneration,
+	isSessionTitleGenerationCurrent,
+} from "../../utils/session-title-generation";
+import {
+	buildConversationTitleInput,
+	generateSessionTitle,
+	setSessionTerminalTitle,
+} from "../../utils/title-generator";
 import { addChatChild, prepareTranscriptRebuild, syncPendingExecutionComponents } from "../utils/ui-helpers";
 
 type HindsightModule = typeof import("../../hindsight");
@@ -84,6 +93,7 @@ export function buildHelpMarkdown(keybindings: Pick<KeybindingsManager, "getAcce
 		"| Resume another session | `/resume` |",
 		"| Show session details | `/session info` |",
 		"| Delete current session transcript/artifacts | `/session delete` |",
+		"| Fork from an earlier prompt into a new session | `/fork` |",
 		`| Select a model | \`/model\` or ${selectModelKey} |`,
 		`| Queue a message for the next turn | ${queueMessageKey} |`,
 		`| Select or edit a queued message | ${dequeueMessageKey} |`,
@@ -1109,31 +1119,7 @@ export class CommandController {
 	}
 
 	async handleForkCommand(): Promise<void> {
-		if (this.ctx.session.isStreaming) {
-			this.ctx.showWarning("Wait for the current response to finish or abort it before forking.");
-			return;
-		}
-
-		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, { foregroundSettled: true });
-		this.ctx.resetIrcSidebarSession();
-
-		this.ctx.statusLine.invalidate();
-		this.ctx.updateEditorTopBorder();
-
-		const sessionFile = this.ctx.session.sessionFile;
-		const shortPath = sessionFile ? sessionFile.split("/").pop() : "new session";
-		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(
-			new Text(`${theme.fg("accent", `${theme.status.success} Session forked to ${shortPath}`)}`, 1, 1),
-		);
-		this.ctx.ui.requestRender();
+		this.ctx.showUserMessageSelector();
 	}
 
 	async handleMoveCommand(targetPath: string): Promise<void> {
@@ -1186,23 +1172,63 @@ export class CommandController {
 		}
 	}
 
-	async handleRenameCommand(title: string): Promise<void> {
+	async handleRenameCommand(title?: string): Promise<void> {
 		try {
+			if (!title?.trim()) {
+				const generation = beginSessionTitleGeneration(this.ctx.sessionManager);
+				const input = buildConversationTitleInput(this.ctx.session.messages);
+				if (!input) {
+					this.ctx.showError("Nothing to summarize yet — pass a title: /rename <title>");
+					return;
+				}
+
+				const generated = await generateSessionTitle(
+					input,
+					this.ctx.session.modelRegistry,
+					this.ctx.settings,
+					this.ctx.session.credentialSessionId,
+					this.ctx.session.model,
+					provider => this.ctx.session.agent.metadataForProvider(provider),
+				);
+				if (
+					!isSessionTitleGenerationCurrent(this.ctx.sessionManager, generation) ||
+					buildConversationTitleInput(this.ctx.session.messages) !== input
+				)
+					return;
+				if (!generated) {
+					this.ctx.showError("Could not generate a session title — pass one: /rename <title>");
+					return;
+				}
+
+				const stored = await this.ctx.sessionManager.setSessionName(generated, "user");
+				if (!stored) {
+					this.ctx.showError("Session name cannot be empty.");
+					return;
+				}
+				this.#finishRename();
+				return;
+			}
+
+			invalidateSessionTitleGeneration(this.ctx.sessionManager);
 			const stored = await this.ctx.sessionManager.setSessionName(title, "user");
 			if (!stored) {
 				this.ctx.showError("Session name cannot be empty.");
 				return;
 			}
-			const name = this.ctx.sessionManager.getSessionName()!;
-			setSessionTerminalTitle(name, this.ctx.sessionManager.getCwd());
-			this.ctx.statusLine.invalidate();
-			this.ctx.updateEditorBorderColor();
-			this.ctx.showStatus(`Session renamed to "${name}".`);
+			this.#finishRename();
 		} catch (err) {
 			this.ctx.showError(`Rename failed: ${err instanceof Error ? err.message : String(err)}`);
 		}
 	}
 
+	#finishRename(): void {
+		const name = this.ctx.sessionManager.getSessionName()!;
+		setSessionTerminalTitle(name, this.ctx.sessionManager.getCwd());
+		this.ctx.statusLine.invalidate();
+		this.ctx.updateEditorBorderColor();
+		this.ctx.showStatus(`Session renamed to "${name}".`);
+	}
+
 	async handleBashCommand(command: string, excludeFromContext = false): Promise<void> {
 		const isDeferred = this.ctx.session.isStreaming;
 		const component = new BashExecutionComponent(command, this.ctx.ui, excludeFromContext);

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

@@ -146,31 +146,55 @@ export class ExtensionUiController {
 		const widgetsBelow = [...this.#hookWidgetsBelow.entries()];
 		const activeHookCustomComponent = this.#activeHookCustomComponent;
 		const activeHookCustomOverlay = this.#activeHookCustomOverlay;
+		const activeHookCustomCancel = this.#activeHookCustomCancel;
 		return () => {
+			const errors: unknown[] = [];
+			const attempt = (cleanup: () => void): void => {
+				try {
+					cleanup();
+				} catch (error) {
+					errors.push(error);
+				}
+			};
 			for (const unsubscribe of terminalInputUnsubscribers) {
-				unsubscribe();
-				this.#extensionTerminalInputUnsubscribers.delete(unsubscribe);
+				if (!this.#extensionTerminalInputUnsubscribers.delete(unsubscribe)) continue;
+				attempt(unsubscribe);
 			}
 			let widgetsChanged = false;
 			for (const [key, widget] of widgetsAbove) {
 				if (this.#hookWidgetsAbove.get(key) !== widget) continue;
 				this.#hookWidgetsAbove.delete(key);
-				widget.dispose?.();
+				attempt(() => widget.dispose?.());
 				widgetsChanged = true;
 			}
 			for (const [key, widget] of widgetsBelow) {
 				if (this.#hookWidgetsBelow.get(key) !== widget) continue;
 				this.#hookWidgetsBelow.delete(key);
-				widget.dispose?.();
+				attempt(() => widget.dispose?.());
 				widgetsChanged = true;
 			}
 			if (
 				this.#activeHookCustomComponent === activeHookCustomComponent &&
-				this.#activeHookCustomOverlay === activeHookCustomOverlay
+				this.#activeHookCustomOverlay === activeHookCustomOverlay &&
+				this.#activeHookCustomCancel === activeHookCustomCancel
 			) {
-				this.#clearActiveHookCustom();
+				this.#activeHookCustomComponent = undefined;
+				this.#activeHookCustomOverlay = undefined;
+				this.#activeHookCustomCancel = undefined;
+				attempt(() => activeHookCustomCancel?.());
+				attempt(() => activeHookCustomComponent?.dispose?.());
+				attempt(() => activeHookCustomOverlay?.hide());
+			}
+			if (widgetsChanged) {
+				attempt(() =>
+					this.#renderHookWidgetContainer(this.ctx.hookWidgetContainerAbove, this.#hookWidgetsAbove, true),
+				);
+				attempt(() =>
+					this.#renderHookWidgetContainer(this.ctx.hookWidgetContainerBelow, this.#hookWidgetsBelow, false),
+				);
+				attempt(() => this.ctx.ui.requestRender());
 			}
-			if (widgetsChanged) this.#rebuildHookWidgets();
+			if (errors.length > 0) throw new AggregateError(errors, "Previous session extension UI cleanup failed");
 		};
 	}
 
@@ -551,6 +575,7 @@ export class ExtensionUiController {
 			getCredentialSessionId: () => this.ctx.session.credentialSessionId,
 			isIdle: () => !this.ctx.session.isStreaming,
 			getActivePromptHandle: () => this.ctx.session.activePromptHandle,
+			getSessionWorkLease: () => this.ctx.session.sessionWorkLease,
 			abort: () => this.ctx.session.abort(),
 			abortPromptAndWait: (handle, options) => this.ctx.session.abortPromptAndWait(handle, options),
 			hasPendingMessages: () => this.ctx.session.queuedMessageCount > 0,
@@ -781,6 +806,7 @@ export class ExtensionUiController {
 			getCredentialSessionId: () => this.ctx.session.credentialSessionId,
 			isIdle: () => !this.ctx.session.isStreaming,
 			getActivePromptHandle: () => this.ctx.session.activePromptHandle,
+			getSessionWorkLease: () => this.ctx.session.sessionWorkLease,
 			abort: () => this.ctx.session.abort(),
 			abortPromptAndWait: (handle, options) => this.ctx.session.abortPromptAndWait(handle, options),
 			hasPendingMessages: () => this.ctx.session.queuedMessageCount > 0,

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

@@ -33,6 +33,7 @@ import {
 	locatePastedImageReferenceAroundCursor,
 	parsePastedImagePaths,
 } from "../../utils/pasted-image-path";
+import { invalidateSessionTitleGeneration } from "../../utils/session-title-generation";
 import { generateSessionTitle, setSessionTerminalTitle } from "../../utils/title-generator";
 import { ActionRegistry, APP_ACTION_METADATA } from "../action-registry";
 import { CommandPalette, type CommandPaletteAction, type CommandPaletteEntry } from "../components/command-palette";
@@ -1146,6 +1147,7 @@ export class InputController {
 
 		// Queue input during compaction
 		if (this.ctx.session.isCompacting) {
+			invalidateSessionTitleGeneration(this.ctx.sessionManager);
 			if ((inputImages?.length ?? 0) > 0) {
 				this.ctx.showStatus("Compaction in progress. Retry after it completes to send images.");
 				return;
@@ -1159,6 +1161,7 @@ export class InputController {
 		// prompt to run after the active turn completes (in submission order).
 		// This handles extension commands (execute immediately), prompt template expansion, and queueing
 		if (this.ctx.session.isStreaming) {
+			invalidateSessionTitleGeneration(this.ctx.sessionManager);
 			if (this.#canModifyComposer(composer)) {
 				this.ctx.editor.addToHistory(text);
 				this.ctx.editor.setText("");
@@ -1183,6 +1186,7 @@ export class InputController {
 		}
 
 		// Normal message submission
+		invalidateSessionTitleGeneration(this.ctx.sessionManager);
 		// First, move any pending bash components to chat
 		this.ctx.flushPendingBashComponents();
 

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

@@ -1606,7 +1606,7 @@ export class MCPCommandController {
 		if (!this.ctx.mcpManager) {
 			return;
 		}
-		if (this.ctx.mcpManager.isConnectionSetSealed()) {
+		if (this.ctx.mcpManager.isConnectionSetMutationBlocked()) {
 			throw new Error("This session's plugin-bundle MCP connections are fixed for its lifetime.");
 		}