@gajae-code/coding-agent 0.13.3 → 0.14.0

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

@@ -18,7 +18,7 @@ import {
 	setServerDisabled,
 	updateMCPServer,
 } from "../../runtime-mcp/config-writer";
-import { MCPOAuthFlow } from "../../runtime-mcp/oauth-flow";
+import { canonicalMCPResourceUri, MCPOAuthFlow } from "../../runtime-mcp/oauth-flow";
 import {
 	clearSmitheryApiKey,
 	createSmitheryCliAuthSession,
@@ -434,6 +434,7 @@ export class MCPCommandController {
 								finalConfig.oauth?.callbackPort,
 								finalConfig.oauth?.callbackPath,
 								finalConfig.oauth?.redirectUri,
+								{ issuer: oauth.issuer, issuerResponseIssSupported: oauth.authorizationResponseIssSupported },
 							);
 							const persistedClientId = oauthResult.clientId ?? oauth.clientId ?? finalConfig.oauth?.clientId;
 							const persistedClientSecret = oauthResult.clientSecret ?? finalConfig.oauth?.clientSecret;
@@ -522,6 +523,7 @@ export class MCPCommandController {
 		callbackPort?: number,
 		callbackPath?: string,
 		redirectUri?: string,
+		oauthMeta?: { issuer?: string; issuerResponseIssSupported?: boolean },
 	): Promise<OAuthFlowResult> {
 		const authStorage = this.ctx.session.modelRegistry.authStorage;
 		let parsedAuthUrl: URL;
@@ -553,6 +555,13 @@ export class MCPCommandController {
 					redirectUri,
 					callbackPort,
 					callbackPath,
+					// RFC 8707 canonical MCP server resource on auth + token requests.
+					...(canonicalMCPResourceUri(endpointUrl) ? { resource: canonicalMCPResourceUri(endpointUrl) } : {}),
+					// RFC 9207 issuer validation (recorded from validated discovery metadata).
+					...(oauthMeta?.issuer ? { issuer: oauthMeta.issuer } : {}),
+					...(oauthMeta?.issuerResponseIssSupported !== undefined
+						? { issuerResponseIssSupported: oauthMeta.issuerResponseIssSupported }
+						: {}),
 				},
 				{
 					onAuth: (info: { url: string; instructions?: string }) => {
@@ -738,6 +747,8 @@ export class MCPCommandController {
 		tokenUrl: string;
 		clientId?: string;
 		scopes?: string;
+		issuer?: string;
+		authorizationResponseIssSupported?: boolean;
 	}> {
 		// First test if server actually needs auth by connecting without OAuth
 		let connectionSucceeded = false;
@@ -1358,6 +1369,7 @@ export class MCPCommandController {
 				found.config.oauth?.callbackPort,
 				found.config.oauth?.callbackPath,
 				found.config.oauth?.redirectUri,
+				{ issuer: oauth.issuer, issuerResponseIssSupported: oauth.authorizationResponseIssSupported },
 			);
 
 			const persistedClientId = oauthResult.clientId ?? oauth.clientId ?? found.config.oauth?.clientId;
@@ -1466,8 +1478,9 @@ export class MCPCommandController {
 		// Disconnect all existing servers
 		await this.ctx.mcpManager.disconnectAll();
 
-		// Rediscover and connect
-		const result = await this.ctx.mcpManager.discoverAndConnect();
+		// Rediscover and connect (native `.gjc` scopes only: Claude Code/Codex
+		// MCP files are explicit import sources, not runtime authorities).
+		const result = await this.ctx.mcpManager.discoverAndConnect({ nativeOnly: true });
 		await this.ctx.session.refreshMCPTools(this.ctx.mcpManager.getTools());
 
 		// Show any connection errors

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

@@ -1,6 +1,12 @@
 import * as path from "node:path";
 import { ThinkingLevel } from "@gajae-code/agent-core";
-import type { Api, Model } from "@gajae-code/ai/core";
+import {
+	type Api,
+	type AuthCredentialSelector,
+	type CredentialRemovalTarget,
+	type Model,
+	resolveOAuthStorageProvider,
+} from "@gajae-code/ai/core";
 import { getOAuthProviders } from "@gajae-code/ai/utils/oauth";
 import type { OAuthProvider } from "@gajae-code/ai/utils/oauth/types";
 import type { Component, OverlayHandle, SlashCommand } from "@gajae-code/tui";
@@ -85,19 +91,13 @@ import {
 	sendNotificationTest,
 } from "../../sdk/bus/notification-service";
 import type { NotificationSessionStatus } from "../../sdk/bus/session-control";
-import {
-	ensureTelegramDaemonRunningDetailed,
-	readNotificationRootRegistration,
-	resolveTelegramSetupPreflight,
-	unregisterNotificationRoot,
-	withNotificationRootRegistryFence,
-} from "../../sdk/bus/telegram-daemon";
+import { ensureTelegramDaemonRunningDetailed, resolveTelegramSetupPreflight } from "../../sdk/bus/telegram-daemon";
 import { TelegramDaemonController } from "../../sdk/bus/telegram-daemon-control";
 import { runTelegramSetup, type TelegramSetupPreflight } from "../../sdk/bus/telegram-setup";
+import { clearPersistentPinForRemovedRows } from "../../session/account-inventory";
 import type { DefaultFallbackRuntimeState } from "../../session/agent-session";
 import { type SessionInfo, SessionManager } from "../../session/session-manager";
 import { getTreeForInternalRead } from "../../session/session-manager-internal";
-
 import { FileSessionStorage } from "../../session/session-storage";
 import {
 	CREDENTIAL_AUTO_IMPORT_DISCOVERY_WARNING,
@@ -147,6 +147,7 @@ import {
 	type CustomModelPresetWizardSubmit,
 } from "../components/custom-model-preset-wizard";
 import { CustomProviderWizardComponent, type CustomProviderWizardSubmit } from "../components/custom-provider-wizard";
+import { CustomizationDashboard } from "../components/customization";
 import { ExtensionDashboard } from "../components/extensions";
 import type { PetMode } from "../components/gajae-pet-widget";
 import { HistorySearchComponent } from "../components/history-search";
@@ -270,13 +271,6 @@ export interface NotificationsEditorOperationDependencies {
 	reconcileCommittedTelegramConfiguration: typeof reconcileCommittedTelegramConfiguration;
 	saveTelegramInactive: typeof saveTelegramInactive;
 	removeTelegramConfiguration: typeof removeTelegramConfiguration;
-	readNotificationRootRegistration: typeof readNotificationRootRegistration;
-	unregisterNotificationRoot: typeof unregisterNotificationRoot;
-	stopTelegramDaemonIfRootRegistryFenceMatches(input: {
-		settings: Settings;
-		registryFingerprint: string;
-		stop: () => Promise<TelegramDaemonStopResult>;
-	}): Promise<boolean>;
 
 	reloadTelegramDaemon(settings: Settings): Promise<{ ok: boolean; message: string }>;
 	restartTelegramDaemon(settings: Settings): Promise<{ ok: boolean; message: string }>;
@@ -300,17 +294,6 @@ const notificationEditorOperationDependencies: NotificationsEditorOperationDepen
 	reconcileCommittedTelegramConfiguration,
 	saveTelegramInactive,
 	removeTelegramConfiguration,
-	readNotificationRootRegistration,
-	unregisterNotificationRoot,
-	stopTelegramDaemonIfRootRegistryFenceMatches: async input =>
-		await withNotificationRootRegistryFence({
-			settings: input.settings,
-			registryFingerprint: input.registryFingerprint,
-			action: async () => {
-				const stopped = await input.stop();
-				if (!stopped.ok) throw new Error(stopped.message);
-			},
-		}),
 
 	reloadTelegramDaemon: async settings =>
 		await new TelegramDaemonController(settings).reload({ spawnIfStopped: false }),
@@ -361,12 +344,7 @@ export function createNotificationsEditorOperations(
 	const notifyAfterDurableCommit = async (): Promise<void> => {
 		await ctx.notifyConfigChanged?.();
 	};
-	const reconnect = async () =>
-		await services.ensureTelegramDaemonRunningDetailed({
-			settings: ctx.settings,
-			cwd: ctx.sessionManager.getCwd(),
-			sessionId: ctx.sessionManager.getSessionId(),
-		});
+	const reconnect = async () => await services.ensureTelegramDaemonRunningDetailed({ settings: ctx.settings });
 	const telegramSetupPreflight = async (): Promise<TelegramSetupPreflight> =>
 		await services.resolveTelegramSetupPreflight(ctx.settings);
 	const providerRuntime: NotificationProviderRuntimeAuthority = services.providerRuntime ?? {
@@ -1041,23 +1019,8 @@ export function createNotificationsEditorOperations(
 						stopAndUnregister: async () => {
 							if (controller) await controller.enterBlockedRuntime(sessionContext());
 							runtimePrepared = true;
-							const registration = await services.readNotificationRootRegistration({
-								settings: ctx.settings,
-								sessionId: ctx.sessionManager.getSessionId(),
-							});
-							const unregistered = await services.unregisterNotificationRoot({
-								settings: ctx.settings,
-								cwd: ctx.sessionManager.getCwd(),
-								sessionId: ctx.sessionManager.getSessionId(),
-								registrationToken: registration.token,
-							});
-							if (unregistered.registryFingerprint !== undefined) {
-								await services.stopTelegramDaemonIfRootRegistryFenceMatches({
-									settings: ctx.settings,
-									registryFingerprint: unregistered.registryFingerprint,
-									stop: () => services.stopTelegramDaemon(ctx.settings),
-								});
-							}
+							const stopped = await services.stopTelegramDaemon(ctx.settings);
+							if (!stopped.ok) throw new Error(stopped.message);
 						},
 					},
 				});
@@ -2011,6 +1974,31 @@ export class SelectorController {
 		});
 	}
 
+	/**
+	 * Show the `/extensions` umbrella local-customization dashboard (skills,
+	 * hooks, MCPs, import) — a separate surface from the provider-focused
+	 * Extension Control Center above (issue #4291).
+	 */
+	async showCustomizationDashboard(): Promise<void> {
+		let dashboard: CustomizationDashboard;
+		try {
+			dashboard = await CustomizationDashboard.create(getProjectDir(), this.ctx.settings);
+		} catch (error) {
+			this.ctx.showError(`Failed to open /extensions: ${error instanceof Error ? error.message : String(error)}`);
+			return;
+		}
+		this.showSelector(done => {
+			dashboard.onClose = () => {
+				done();
+				this.ctx.ui.requestRender();
+			};
+			dashboard.onRequestRender = () => {
+				this.ctx.ui.requestRender();
+			};
+			return { component: dashboard, focus: dashboard };
+		});
+	}
+
 	/**
 	 * Show the Agent Control Center dashboard.
 	 */
@@ -3210,18 +3198,60 @@ export class SelectorController {
 		}
 	}
 
-	async #handleOAuthLogout(providerId: string): Promise<void> {
+	async #handleOAuthLogout(providerId: string, targets?: readonly CredentialRemovalTarget[]): Promise<void> {
 		try {
-			await this.ctx.session.modelRegistry.authStorage.logout(providerId);
-			await this.ctx.session.modelRegistry.refresh();
-			this.ctx.chatContainer.addChild(new Spacer(1));
-			this.ctx.chatContainer.addChild(
-				new Text(theme.fg("success", `${theme.status.success} Successfully logged out of ${providerId}`), 1, 0),
+			const authStorage = this.ctx.session.modelRegistry.authStorage;
+			const inventory = authStorage.listCredentialInventory(providerId);
+			const oauthRows = inventory.filter(row => row.provider === providerId && row.credentialKind === "oauth");
+			const removalTargetsById = new Map(
+				authStorage.listCredentialRemovalTargets(providerId).map(target => [target.id, target]),
 			);
-			this.ctx.chatContainer.addChild(
-				new Text(theme.fg("dim", `Credentials removed from ${getAgentDbPath()}`), 1, 0),
+			const oauthRemovalTargets = oauthRows
+				.map(row => removalTargetsById.get(row.id))
+				.filter((target): target is CredentialRemovalTarget => target !== undefined);
+			if (oauthRows.length > 0 && oauthRemovalTargets.length === 0) {
+				this.ctx.showError(
+					`Logout is broker-managed for ${providerId}; run \`gjc auth-broker logout ${providerId}\` on the broker host.`,
+				);
+				return;
+			}
+			if (targets) {
+				if (targets.length === 0) {
+					this.ctx.showError(
+						`No OAuth accounts to remove for ${providerId}; API-key credentials are not managed here.`,
+					);
+					return;
+				}
+				const result = authStorage.removeAuthCredentialsHard(providerId, targets);
+				if (result.kind !== "removed") {
+					this.ctx.showError(
+						"Logout failed: account inventory changed; no credentials were removed. Retry /logout.",
+					);
+					return;
+				}
+				await clearPersistentPinForRemovedRows(this.ctx.settings, providerId, inventory, result.ids);
+				await this.ctx.session.modelRegistry.refresh();
+				this.ctx.showStatus(
+					`Successfully removed ${result.ids.length} OAuth account${result.ids.length === 1 ? "" : "s"} from ${providerId}.`,
+				);
+				return;
+			}
+			if (oauthRemovalTargets.length === 0) {
+				this.ctx.showError(
+					`No OAuth accounts to remove for ${providerId}; API-key credentials are not managed here.`,
+				);
+				return;
+			}
+			const result = authStorage.removeAuthCredentialsHard(providerId, oauthRemovalTargets);
+			if (result.kind !== "removed") {
+				this.ctx.showError("Logout failed: account inventory changed; no credentials were removed. Retry /logout.");
+				return;
+			}
+			await clearPersistentPinForRemovedRows(this.ctx.settings, providerId, inventory, result.ids);
+			await this.ctx.session.modelRegistry.refresh();
+			this.ctx.showStatus(
+				`Successfully removed ${result.ids.length} OAuth account${result.ids.length === 1 ? "" : "s"} from ${providerId}.`,
 			);
-			this.ctx.ui.requestRender();
 		} catch (error: unknown) {
 			this.ctx.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
 		}
@@ -3233,16 +3263,95 @@ export class SelectorController {
 		options?: OAuthSelectorOptions,
 	): Promise<void> {
 		if (providerId) {
-			const oauthProvider = getOAuthProviders().find(provider => provider.id === providerId);
-			if (!oauthProvider && !this.ctx.session.modelRegistry.getModelProfiles().has(providerId)) {
-				this.ctx.showError(`Unknown OAuth provider: ${providerId}`);
+			const selectedProviderId = mode === "logout" ? resolveOAuthStorageProvider(providerId) : providerId;
+			const oauthProvider = getOAuthProviders().find(provider => provider.id === selectedProviderId);
+			if (!oauthProvider && !this.ctx.session.modelRegistry.getModelProfiles().has(selectedProviderId)) {
+				this.ctx.showError(`Unknown OAuth provider: ${selectedProviderId}`);
+				return;
+			}
+			const authStorage = this.ctx.session.modelRegistry.authStorage;
+			const hasOAuthInventory = authStorage
+				.listCredentialInventory(selectedProviderId)
+				.some(row => row.provider === selectedProviderId && row.credentialKind === "oauth");
+			const hasRemovableOAuth = authStorage
+				.listCredentialRemovalTargets(selectedProviderId)
+				.some(target => target.provider === selectedProviderId);
+			if (mode === "logout" && hasOAuthInventory && !hasRemovableOAuth) {
+				await this.#handleOAuthLogout(selectedProviderId);
+				return;
+			}
+			if (hasOAuthInventory && !options?.manualCode) {
+				this.showSelector(done => {
+					let selector: OAuthSelectorComponent;
+					selector = new OAuthSelectorComponent(
+						mode,
+						authStorage,
+						() => undefined,
+						() => {
+							selector.stopValidation();
+							done();
+							this.ctx.ui.requestRender();
+						},
+						{
+							accountProviderId: selectedProviderId,
+							onAccountSelect: async (selectorValue: AuthCredentialSelector) => {
+								await this.ctx.session.setCredentialPin(selectedProviderId, selectorValue);
+								selector.stopValidation();
+								done();
+								this.ctx.showStatus(`Pinned OAuth account for ${selectedProviderId} to this session.`);
+							},
+							onAutoSelect: async () => {
+								await this.ctx.session.setCredentialAuto(selectedProviderId);
+								selector.stopValidation();
+								done();
+								this.ctx.showStatus(`Using AUTO (ranked) OAuth accounts for ${selectedProviderId}.`);
+							},
+							onAddAccount: async () => {
+								selector.stopValidation();
+								done();
+								await this.#handleOAuthLogin(selectedProviderId, options);
+							},
+							onAccountRemove: async targets => {
+								await this.#handleOAuthLogout(selectedProviderId, targets);
+								selector.stopValidation();
+								done();
+							},
+						},
+					);
+					return { component: selector, focus: selector };
+				});
 				return;
 			}
 			if (mode === "login") {
-				await this.#handleOAuthLogin(providerId, options);
-			} else {
-				await this.#handleOAuthLogout(providerId);
+				await this.#handleOAuthLogin(selectedProviderId, options);
+				return;
+			}
+			if (!hasRemovableOAuth) {
+				await this.#handleOAuthLogout(selectedProviderId);
+				return;
 			}
+			this.showSelector(done => {
+				let selector: OAuthSelectorComponent;
+				selector = new OAuthSelectorComponent(
+					"logout",
+					authStorage,
+					() => undefined,
+					() => {
+						selector.stopValidation();
+						done();
+						this.ctx.ui.requestRender();
+					},
+					{
+						accountProviderId: selectedProviderId,
+						onAccountRemove: async targets => {
+							await this.#handleOAuthLogout(selectedProviderId, targets);
+							selector.stopValidation();
+							done();
+						},
+					},
+				);
+				return { component: selector, focus: selector };
+			});
 			return;
 		}
 
@@ -3384,16 +3493,12 @@ export class SelectorController {
 				async (selectedProviderId: string) => {
 					selector.stopValidation();
 					done();
-					if (mode === "login") {
-						await this.#handleOAuthLogin(selectedProviderId);
-					} else {
-						await this.#handleOAuthLogout(selectedProviderId);
-					}
+					await this.showOAuthSelector(mode, selectedProviderId);
 				},
 				() => {
 					selector.stopValidation();
 					done();
-					this.ctx.ui.requestRender();
+					this.ctx.ui.requestLayoutRender("oauth-selector-close");
 				},
 				{
 					validateAuth: async (selectedProviderId: string) => {
@@ -3404,7 +3509,7 @@ export class SelectorController {
 						return !!apiKey;
 					},
 					requestRender: () => {
-						this.ctx.ui.requestRender();
+						this.ctx.ui.requestLayoutRender("oauth-selector-spinner");
 					},
 					externalCredentialCandidates,
 				},

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

@@ -12,7 +12,7 @@ interface SttEditor {
 
 interface SttUi {
 	getShowHardwareCursor(): boolean;
-	requestRender(): void;
+	requestLayoutRender(source?: string): void;
 	setShowHardwareCursor(enabled: boolean): void;
 }
 
@@ -59,7 +59,7 @@ export class SttModeController {
 			this.#cleanupAnimation(ctx);
 		}
 		ctx.updateEditorChrome();
-		ctx.ui.requestRender();
+		ctx.ui.requestLayoutRender("stt-state");
 	}
 
 	#setMicCursor(editor: SttEditor, color: { r: number; g: number; b: number }): void {
@@ -74,7 +74,7 @@ export class SttModeController {
 		this.#animationInterval = setInterval(() => {
 			this.#hue = (this.#hue + 8) % 360;
 			this.#updateMicIcon(ctx.editor);
-			ctx.ui.requestRender();
+			ctx.ui.requestLayoutRender("stt-animation");
 		}, 60);
 	}
 

package/src/modes/interactive-mode.ts

@@ -25,6 +25,8 @@ import {
 	type KeyDisplayContext,
 } from "../config/keybindings";
 import { isSettingsInitialized, type Settings, settings } from "../config/settings";
+import { compactCrashIndex, resolveCrashStatePaths } from "../crash/index-store";
+import { crashNudgeGate, maybeShowCrashNudge } from "../crash/nudge";
 import { DEFAULT_GJC_DEFINITION_NAMES } from "../defaults/gjc-defaults";
 import type {
 	ExtensionUIContext,
@@ -67,10 +69,14 @@ import {
 	IrcLeftLaneComponent,
 	IrcSplitViewComponent,
 } from "./components/irc-sidebar";
+import { createNativePetTransport, type ItermPetTransport } from "./components/iterm-pet-transport";
 import {
+	getItermPetAvailability,
+	getItermPetUnavailableReason,
 	getPetUnavailableWarning,
 	isPetAvailable,
 	isPetCapabilityProbePending,
+	setVerifiedItermPetAvailability,
 	warnWhenPetCapabilitySettled,
 } from "./components/pet-capability";
 import type { ToolExecutionHandle } from "./components/tool-execution";
@@ -432,6 +438,20 @@ export class InteractiveMode implements InteractiveModeContext {
 	#resolvedSlashCommands: SlashCommand[] = [];
 	#baseReservedSlashCommandNames: Set<string> = new Set();
 	#cleanupUnsubscribe?: () => void;
+	#itermPetTransport?: ItermPetTransport;
+
+	/**
+	 * Pet-unavailable warning text. The iTerm transport reason is parenthesized
+	 * only when a transport actually reported one; non-iTerm terminals and a
+	 * probe still in flight keep the plain warning instead of "(unknown)".
+	 */
+	#petUnavailableStatusText(): string {
+		if (!this.#itermPetTransport || getItermPetAvailability() === undefined) return getPetUnavailableWarning();
+		const reason = getItermPetUnavailableReason();
+		return reason === undefined ? getPetUnavailableWarning() : `${getPetUnavailableWarning()} (${reason})`;
+	}
+
+	#petTransportAvailabilityUnsubscribe?: () => void;
 	#subprocessTeardownUnsubscribe?: () => void;
 	#petProtocolUnsubscribe?: () => void;
 	/** Cancels a startup pet-unavailable warning still awaiting probe settlement. */
@@ -618,6 +638,18 @@ export class InteractiveMode implements InteractiveModeContext {
 				}
 			},
 		});
+		this.#itermPetTransport = createNativePetTransport({ ui: this.ui });
+		if (this.#itermPetTransport) {
+			this.#petTransportAvailabilityUnsubscribe = this.#itermPetTransport.subscribe(availability => {
+				if (!availability.available) void this.petWidget?.suspendItermCapability();
+				setVerifiedItermPetAvailability(availability);
+				if (availability.available) {
+					if (availability.mode === "managed") this.ui.refreshImageCellSize();
+					const saved = settings.get("pet.mode");
+					if (saved !== "off" && this.petWidget && this.petWidget.mode === "off") this.petWidget.setMode(saved);
+				}
+			});
+		}
 		this.ui.setClearOnShrink(settings.get("clearOnShrink"));
 		this.chatContainer = new Container();
 		this.#ircSplitView = new IrcSplitViewComponent(this.chatContainer, this.ircLedger, () => theme);
@@ -810,26 +842,15 @@ export class InteractiveMode implements InteractiveModeContext {
 		// appears without the user re-running /pet.
 		this.#petProtocolUnsubscribe?.();
 		this.#petProtocolUnsubscribe = onImageProtocolChanged(protocol => {
-			if (!protocol) return;
+			if (!protocol) {
+				void this.petWidget?.suspendItermCapability();
+				return;
+			}
 			const saved = settings.get("pet.mode");
 			if (saved !== "off" && this.petWidget && this.petWidget.mode === "off") {
 				this.petWidget.setMode(saved);
 			}
 		});
-		if (configuredPetMode !== "off" && !isPetAvailable()) {
-			// The async Sixel capability probe (started by TUI.start()) may still
-			// enable graphics; warn only once the capability question is settled
-			// so a supported terminal is never told it is incompatible.
-			this.#petUnavailableWarningDisposer?.();
-			this.#petUnavailableWarningDisposer = warnWhenPetCapabilitySettled({
-				probePending: isPetCapabilityProbePending(),
-				onUnavailable: () => {
-					this.showStatus(theme.fg("warning", getPetUnavailableWarning()), { dim: false });
-					this.ui.requestRender();
-				},
-			});
-		}
-
 		this.#inputController.setupKeyHandlers();
 		this.#inputController.setupEditorSubmitHandler();
 		this.editor.onViewportPageScroll = direction => {
@@ -878,6 +899,23 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		// Start the UI
 		this.ui.start();
+		if (this.#itermPetTransport) {
+			if (this.#itermPetTransport.availability.mode === "direct") void this.#itermPetTransport.probe();
+			else this.#itermPetTransport.startManagedPolling();
+		}
+		if (configuredPetMode !== "off" && !isPetAvailable()) {
+			// An async terminal capability probe may still enable graphics; warn only once
+			// the capability question is settled so a supported terminal is never told it
+			// is incompatible.
+			this.#petUnavailableWarningDisposer?.();
+			this.#petUnavailableWarningDisposer = warnWhenPetCapabilitySettled({
+				probePending: this.#itermPetTransport !== undefined || isPetCapabilityProbePending(),
+				onUnavailable: () => {
+					this.showStatus(theme.fg("warning", this.#petUnavailableStatusText()), { dim: false });
+					this.ui.requestRender();
+				},
+			});
+		}
 		pushTerminalTitle();
 		setSessionTerminalTitle(this.sessionManager.getSessionName(), this.sessionManager.getCwd());
 		this.updateEditorChrome();
@@ -928,6 +966,26 @@ export class InteractiveMode implements InteractiveModeContext {
 				}),
 			);
 		}
+		// Crash nudge (interactive-only, local-only). Runs after the first render
+		// and routes through the centralized status surface — never `console.*`.
+		if (crashNudgeGate({ enabled: settings.get("crashReport.nudge"), interactive: true, quiet: startupQuiet })) {
+			const crashNudgeTimer = setTimeout(() => {
+				void (async () => {
+					try {
+						const paths = resolveCrashStatePaths();
+						const index = await compactCrashIndex({ paths });
+						if (this.#stopped) return;
+						await maybeShowCrashNudge(message => this.showStatus(message, { dim: true }), { paths, index });
+					} catch (error) {
+						logger.debug("Crash nudge skipped", {
+							error: error instanceof Error ? error.message : String(error),
+						});
+					}
+				})();
+			}, 0);
+			crashNudgeTimer.unref?.();
+		}
+
 		if (starReminderGate.schedule) {
 			scheduleLaunchStarReminderAfterFirstRender({
 				confirm: (title, message) =>
@@ -1301,7 +1359,8 @@ export class InteractiveMode implements InteractiveModeContext {
 	 */
 	#commitPetMode(mode: PetMode, apply: (mode: PetMode) => void): boolean {
 		if (mode !== "off" && !isPetAvailable()) {
-			this.showStatus(theme.fg("warning", getPetUnavailableWarning()), { dim: false });
+			void this.#itermPetTransport?.retry();
+			this.showStatus(theme.fg("warning", this.#petUnavailableStatusText()), { dim: false });
 			this.ui.requestRender();
 			return false;
 		}
@@ -1362,6 +1421,8 @@ export class InteractiveMode implements InteractiveModeContext {
 			getComposerBottomOffset: () =>
 				this.petFloorContainer.render(this.ui.terminal.columns).length +
 				this.hookWidgetContainerBelow.render(this.ui.terminal.columns).length,
+			syncManagedItermCursor: (row, column) =>
+				this.#itermPetTransport?.refreshManagedClient(row, column) ?? Promise.resolve(false),
 		});
 	}
 
@@ -1515,6 +1576,11 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#petUnavailableWarningDisposer = undefined;
 		this.petWidget?.dispose();
 		this.petWidget = undefined;
+		this.#petTransportAvailabilityUnsubscribe?.();
+		this.#petTransportAvailabilityUnsubscribe = undefined;
+		void this.#itermPetTransport?.dispose();
+		this.#itermPetTransport = undefined;
+		setVerifiedItermPetAvailability(undefined);
 		this.#welcomeComponent?.dispose();
 		this.#welcomeComponent = undefined;
 		if (this.#sttController) {
@@ -1585,6 +1651,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		// This prevents escape sequences from leaking to the parent shell over slow SSH.
 		await this.ui.terminal.drainInput(1000);
 		popTerminalTitle();
+		await this.petWidget?.disposeAsync();
+		await this.#itermPetTransport?.dispose();
 		this.stop();
 
 		// Print resumption hint if this is a persisted session
@@ -2249,6 +2317,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		void this.#selectorController.showExtensionsDashboard();
 	}
 
+	showCustomizationDashboard(): void {
+		void this.#selectorController.showCustomizationDashboard();
+	}
+
 	showAgentsDashboard(): void {
 		void this.#selectorController.showAgentsDashboard();
 	}