@sayknow-cli/coding-agent 0.3.12 → 0.3.15

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

@@ -20,18 +20,20 @@ import { completionNotifyDisabledByEnv } from "../../notifications/config";
 import { summaryFromMessage } from "../../notifications/helpers";
 import type { PlanApprovalDetails } from "../../plan-mode/approved-plan";
 import type { AgentSessionEvent } from "../../session/agent-session";
-import { isSilentAbort, readPendingDisplayTag } from "../../session/messages";
+import { type CustomMessage, isSilentAbort, readPendingDisplayTag } from "../../session/messages";
+import { transferSessionMessageIdentity } from "../../session/session-manager";
 import type { ResolveToolDetails } from "../../tools/resolve";
+import type { IrcObservationRecord } from "../irc-observation-ledger";
 import { interruptHint } from "../shared";
 import { buildAbortDisplayMessage } from "../utils/abort-message";
 import { consumeInjectedOptimisticSignature } from "../utils/injected-user-submission";
+import { parseIrcMessage } from "../utils/irc-message";
 import { ringTerminalBell } from "../utils/terminal-bell";
+
 import { addChatChild, argsWithPartialJson } from "../utils/ui-helpers";
 
 type AgentSessionEventKind = AgentSessionEvent["type"];
 
-const IRC_MESSAGE_VISIBLE_TTL_MS = 10_000;
-
 /** Test-only performance counters for advisory baseline tests. */
 export const __eventControllerPerfCounters = {
 	messageUpdateContentVisits: 0,
@@ -112,6 +114,7 @@ export class EventController {
 	#lastAssistantComponent: AssistantMessageComponent | undefined = undefined;
 	#idleCompactionTimer?: NodeJS.Timeout;
 	#ircExpiryTimers = new Map<string, NodeJS.Timeout>();
+	#renderedIrcComponents = new Map<string, readonly Component[]>();
 	#toolIntentCache = new Map<string, { args: unknown; intent: string | undefined }>();
 	#thinkingContentIndices = new Set<number>();
 	#handlers: AgentSessionEventHandlers;
@@ -157,10 +160,7 @@ export class EventController {
 			this.ctx.retryLoader.stop();
 			this.ctx.retryLoader = undefined;
 		}
-		for (const timer of this.#ircExpiryTimers.values()) {
-			clearTimeout(timer);
-		}
-		this.#ircExpiryTimers.clear();
+		this.clearIrcExpiryTimers();
 	}
 
 	#resetReadGroup(): void {
@@ -263,8 +263,61 @@ export class EventController {
 		this.ctx.ui.requestRender();
 	}
 
+	#observeIrcMessage(message: CustomMessage): void {
+		const parsed = parseIrcMessage(message);
+		if (!parsed) return;
+		const arrival = this.ctx.captureIrcArrivalSnapshot();
+		const record = this.ctx.ircLedger.observe(parsed, arrival.panelVisible);
+		this.#cleanupEvictedIrcObservations();
+		if (!record) return;
+		const signature = `irc:${record.observationId}`;
+		if (this.#renderedCustomMessages.has(signature)) return;
+		this.#renderedCustomMessages.add(signature);
+		this.#resetReadGroup();
+		const components = this.ctx.addLiveIrcObservationToChat(record, arrival);
+		this.#renderedIrcComponents.set(record.observationId, components);
+		this.#scheduleIrcExpiry(record, components);
+		this.ctx.ui.requestRender();
+	}
+
+	#cleanupIrcObservationIds(observationIds: readonly string[]): void {
+		const removedComponents = new Set<Component>();
+		for (const observationId of observationIds) {
+			const timer = this.#ircExpiryTimers.get(observationId);
+			if (timer) clearTimeout(timer);
+			this.#ircExpiryTimers.delete(observationId);
+			for (const component of this.#renderedIrcComponents.get(observationId) ?? []) {
+				removedComponents.add(component);
+			}
+			this.#renderedIrcComponents.delete(observationId);
+			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);
+	}
+
+	#cleanupEvictedIrcObservations(): void {
+		this.#cleanupIrcObservationIds(this.ctx.ircLedger.drainEvictedObservationIds());
+	}
+
+	#cleanupExpiredIrcInlineComponents(observationId: string): void {
+		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);
+	}
+
 	async #handleMessageStart(event: Extract<AgentSessionEvent, { type: "message_start" }>): Promise<void> {
 		if (event.message.role === "hookMessage" || event.message.role === "custom") {
+			if (event.message.role === "custom" && parseIrcMessage(event.message)) {
+				this.#observeIrcMessage(event.message);
+				return;
+			}
 			const signature = `${event.message.role}:${event.message.customType}:${event.message.timestamp}`;
 			if (this.#renderedCustomMessages.has(signature)) {
 				return;
@@ -328,8 +381,11 @@ export class EventController {
 			this.#resetReadGroup();
 			this.#toolIntentCache.clear();
 			this.#thinkingContentIndices.clear();
-			this.ctx.streamingComponent = new AssistantMessageComponent(undefined, this.ctx.hideThinkingBlock, () =>
-				this.ctx.ui.requestRender(),
+			this.ctx.streamingComponent = new AssistantMessageComponent(
+				undefined,
+				this.ctx.hideThinkingBlock,
+				() => this.ctx.ui.requestRender(),
+				this.ctx.getAssistantViewportAnchorId?.(event.message),
 			);
 			this.ctx.streamingMessage = event.message;
 			addChatChild(this.ctx, this.ctx.streamingComponent);
@@ -339,15 +395,89 @@ export class EventController {
 	}
 
 	async #handleIrcMessage(event: Extract<AgentSessionEvent, { type: "irc_message" }>): Promise<void> {
-		const signature = `${event.message.role}:${event.message.customType}:${event.message.timestamp}`;
-		if (this.#renderedCustomMessages.has(signature)) {
-			return;
+		this.#observeIrcMessage(event.message);
+	}
+
+	clearIrcExpiryTimers(): void {
+		for (const timer of this.#ircExpiryTimers.values()) {
+			clearTimeout(timer);
+		}
+		this.#ircExpiryTimers.clear();
+	}
+
+	resetIrcObservations(): void {
+		this.clearIrcExpiryTimers();
+		const observationIds = new Set<string>(this.#renderedIrcComponents.keys());
+		for (const observationId of this.ctx.ircLedger.drainEvictedObservationIds()) observationIds.add(observationId);
+		this.#cleanupIrcObservationIds([...observationIds]);
+		for (const components of this.ctx.resetRenderedIrcInlineComponents()) {
+			for (const component of components) this.ctx.chatContainer.removeChild(component);
+		}
+		this.#renderedIrcComponents.clear();
+		for (const signature of this.#renderedCustomMessages) {
+			if (signature.startsWith("irc:")) this.#renderedCustomMessages.delete(signature);
+		}
+	}
+
+	reconcileIrcExpiryTimers(componentsByObservationId: Map<string, readonly Component[]>): void {
+		this.clearIrcExpiryTimers();
+		this.#renderedIrcComponents.clear();
+		const now = Date.now();
+		const inlineProjection = this.ctx.ircLedger.getInlineProjection(now);
+
+		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)
+			) {
+				for (const component of components) {
+					this.ctx.chatContainer.removeChild(component);
+				}
+				this.#renderedIrcComponents.delete(observationId);
+				componentsByObservationId.delete(observationId);
+			}
+		}
+		for (const record of inlineProjection) {
+			const components = componentsByObservationId.get(record.observationId);
+			if (!components) continue;
+			this.#renderedIrcComponents.set(record.observationId, components);
+			// #scheduleIrcExpiry owns the single expiry clock read: a record that
+			// crossed its deadline while projection/reconciliation ran above is
+			// cleaned up there (old timers were already cleared, so silently
+			// skipping the timer would leave the row inline indefinitely).
+			if (!this.#scheduleIrcExpiry(record, components)) {
+				componentsByObservationId.delete(record.observationId);
+			}
 		}
-		this.#renderedCustomMessages.add(signature);
-		this.#resetReadGroup();
-		const components = this.ctx.addMessageToChat(event.message);
-		this.#scheduleIrcExpiry(signature, components);
-		this.ctx.ui.requestRender();
+	}
+
+	/**
+	 * Arms the removal timer for an ephemeral record using a single clock read.
+	 * Returns false when the record's deadline has already elapsed — in that
+	 * case the rendered components are removed from the chat container and
+	 * {@link #renderedIrcComponents} here, and the caller must drop its own
+	 * bookkeeping entry. Persistent records always return true (no timer).
+	 */
+	#scheduleIrcExpiry(record: IrcObservationRecord, components: readonly Component[]): boolean {
+		if (record.mode !== "ephemeral" || components.length === 0 || this.#ircExpiryTimers.has(record.observationId)) {
+			return true;
+		}
+		const remainingMs = record.expiresAt! - Date.now();
+		if (remainingMs <= 0) {
+			this.#cleanupExpiredIrcInlineComponents(record.observationId);
+			return false;
+		}
+		const timer = setTimeout(() => {
+			this.#ircExpiryTimers.delete(record.observationId);
+			this.#cleanupExpiredIrcInlineComponents(record.observationId);
+			this.ctx.ui.requestRender();
+		}, remainingMs);
+		timer.unref?.();
+		this.#ircExpiryTimers.set(record.observationId, timer);
+		return true;
 	}
 
 	async #handleSubagentSteerMessage(
@@ -360,28 +490,13 @@ export class EventController {
 		const signature = obsId
 			? `steer:${obsId}`
 			: `${event.message.role}:${event.message.customType}:${event.message.timestamp}:${details?.from}:${details?.to}:${details?.state}:${details?.body}`;
-		if (this.#renderedCustomMessages.has(signature)) {
-			return;
-		}
+		if (this.#renderedCustomMessages.has(signature)) return;
 		this.#renderedCustomMessages.add(signature);
 		this.#resetReadGroup();
 		this.ctx.addMessageToChat(event.message);
 		this.ctx.ui.requestRender();
 	}
 
-	#scheduleIrcExpiry(signature: string, components: Component[]): void {
-		if (components.length === 0 || this.#ircExpiryTimers.has(signature)) return;
-		const timer = setTimeout(() => {
-			this.#ircExpiryTimers.delete(signature);
-			for (const component of components) {
-				this.ctx.chatContainer.removeChild(component);
-			}
-			this.ctx.ui.requestRender();
-		}, IRC_MESSAGE_VISIBLE_TTL_MS);
-		timer.unref?.();
-		this.#ircExpiryTimers.set(signature, timer);
-	}
-
 	async #handleNotice(event: Extract<AgentSessionEvent, { type: "notice" }>): Promise<void> {
 		const message = event.source ? `${event.source}: ${event.message}` : event.message;
 		if (event.level === "error") {
@@ -395,6 +510,9 @@ export class EventController {
 
 	async #handleMessageUpdate(event: Extract<AgentSessionEvent, { type: "message_update" }>): Promise<void> {
 		if (this.ctx.streamingComponent && event.message.role === "assistant") {
+			if (this.ctx.streamingMessage?.role === "assistant") {
+				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;
@@ -498,6 +616,9 @@ export class EventController {
 	async #handleMessageEnd(event: Extract<AgentSessionEvent, { type: "message_end" }>): Promise<void> {
 		if (event.message.role === "user") return;
 		if (this.ctx.streamingComponent && event.message.role === "assistant") {
+			if (this.ctx.streamingMessage?.role === "assistant") {
+				transferSessionMessageIdentity([this.ctx.streamingMessage], [event.message]);
+			}
 			this.ctx.streamingMessage = event.message;
 			let errorMessage: string | undefined;
 			const aborted = this.ctx.streamingMessage.stopReason === "aborted";
@@ -750,7 +871,7 @@ export class EventController {
 		if (event.aborted) {
 			this.ctx.showStatus(isHandoffAction ? "Auto-handoff cancelled" : "Auto context-full maintenance cancelled");
 		} else if (event.result) {
-			this.ctx.rebuildChatFromMessages();
+			this.ctx.rebuildChatFromMessages("reconcile-same-transcript");
 			this.ctx.statusLine.invalidate();
 			this.ctx.updateEditorTopBorder();
 			if (continuationDisabled && !isHandoffAction) {
@@ -761,8 +882,10 @@ export class EventController {
 		} else if (event.errorMessage) {
 			this.ctx.showWarning(event.errorMessage);
 		} else if (isHandoffAction) {
-			this.ctx.chatContainer.clear();
-			this.ctx.rebuildChatFromMessages();
+			// Reset BEFORE rebuild so the new session's transcript is not replayed
+			// from the old ledger and then cleared out from under its timers.
+			this.ctx.resetIrcSidebarSession();
+			this.ctx.rebuildChatFromMessages("replace-identity");
 			this.ctx.statusLine.invalidate();
 			this.ctx.updateEditorTopBorder();
 			await this.ctx.reloadTodos();

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

@@ -26,6 +26,7 @@ import type { InteractiveModeContext } from "../../modes/types";
 import { setSessionTerminalTitle, setTerminalTitle } from "../../utils/title-generator";
 import { applyInjectedUserSubmission } from "../utils/injected-user-submission";
 import { classifyHookSelectorBellEvent, ringTerminalBell } from "../utils/terminal-bell";
+import { prepareTranscriptRebuild } from "../utils/ui-helpers";
 
 const MAX_WIDGET_LINES = 10;
 const HOOK_SELECTOR_CHROME_ROWS = 7;
@@ -151,9 +152,11 @@ export class ExtensionUiController {
 			getContextUsage: () => this.ctx.session.getContextUsage(),
 			waitForIdle: () => this.ctx.session.agent.waitForIdle(),
 			reload: async () => {
+				const previousSessionId = this.ctx.sessionManager.getSessionId();
 				await this.ctx.session.reload();
-				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				const sessionIdentityChanged = previousSessionId !== this.ctx.sessionManager.getSessionId();
+				if (sessionIdentityChanged) this.ctx.resetIrcSidebarSession();
+				this.ctx.rebuildInitialMessages(sessionIdentityChanged ? "replace-identity" : "reconcile-same-transcript");
 				await this.ctx.reloadTodos();
 				this.ctx.showStatus("Reloaded session");
 			},
@@ -172,6 +175,8 @@ export class ExtensionUiController {
 				if (!success) {
 					return { cancelled: true };
 				}
+				this.ctx.resetIrcSidebarSession();
+
 				setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
 
 				// Call setup callback if provided
@@ -186,6 +191,7 @@ export class ExtensionUiController {
 				this.ctx.ui.requestRender();
 
 				// Clear UI state
+				prepareTranscriptRebuild(this.ctx.ui, "replace-identity");
 				this.ctx.chatContainer.clear();
 				this.ctx.pendingMessagesContainer.clear();
 				this.ctx.compactionQueuedMessages = [];
@@ -206,10 +212,10 @@ export class ExtensionUiController {
 				if (result.cancelled) {
 					return { cancelled: true };
 				}
+				this.ctx.resetIrcSidebarSession();
 
 				// Update UI
-				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.rebuildInitialMessages("replace-identity");
 				await this.ctx.reloadTodos();
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
@@ -223,8 +229,7 @@ export class ExtensionUiController {
 				}
 
 				// Update UI
-				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.rebuildInitialMessages("reconcile-same-transcript");
 				await this.ctx.reloadTodos();
 				if (result.editorText && !this.ctx.editor.getText().trim()) {
 					this.ctx.editor.setText(result.editorText);
@@ -235,14 +240,20 @@ export class ExtensionUiController {
 			},
 			compact: async instructionsOrOptions => this.#handleInteractiveCompact(instructionsOrOptions),
 			switchSession: async sessionPath => {
+				const previousSessionId = this.ctx.sessionManager.getSessionId();
+
 				this.clearHookWidgets();
 				const result = await this.ctx.session.switchSession(sessionPath);
 				if (!result) {
 					return { cancelled: true };
 				}
+				const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();
+				if (switchingToDifferentSession) this.ctx.resetIrcSidebarSession();
+
 				setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
-				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.rebuildInitialMessages(
+					switchingToDifferentSession ? "replace-identity" : "reconcile-same-transcript",
+				);
 				await this.ctx.reloadTodos();
 				return { cancelled: false };
 			},
@@ -393,9 +404,11 @@ export class ExtensionUiController {
 				if (this.ctx.isBackgrounded) {
 					return;
 				}
+				const previousSessionId = this.ctx.sessionManager.getSessionId();
 				await this.ctx.session.reload();
-				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				const sessionIdentityChanged = previousSessionId !== this.ctx.sessionManager.getSessionId();
+				if (sessionIdentityChanged) this.ctx.resetIrcSidebarSession();
+				this.ctx.rebuildInitialMessages(sessionIdentityChanged ? "replace-identity" : "reconcile-same-transcript");
 				await this.ctx.reloadTodos();
 				this.ctx.showStatus("Reloaded session");
 			},
@@ -417,6 +430,7 @@ export class ExtensionUiController {
 				if (!success) {
 					return { cancelled: true };
 				}
+				this.ctx.resetIrcSidebarSession();
 
 				// Call setup callback if provided
 				if (options?.setup) {
@@ -424,6 +438,7 @@ export class ExtensionUiController {
 				}
 
 				// Clear UI state
+				prepareTranscriptRebuild(this.ctx.ui, "replace-identity");
 				this.ctx.chatContainer.clear();
 				this.ctx.pendingMessagesContainer.clear();
 				this.ctx.compactionQueuedMessages = [];
@@ -447,10 +462,10 @@ export class ExtensionUiController {
 				if (result.cancelled) {
 					return { cancelled: true };
 				}
+				this.ctx.resetIrcSidebarSession();
 
 				// Update UI
-				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.rebuildInitialMessages("replace-identity");
 				await this.ctx.reloadTodos();
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
@@ -467,8 +482,7 @@ export class ExtensionUiController {
 				}
 
 				// Update UI
-				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.rebuildInitialMessages("reconcile-same-transcript");
 				await this.ctx.reloadTodos();
 				if (result.editorText && !this.ctx.editor.getText().trim()) {
 					this.ctx.editor.setText(result.editorText);
@@ -482,13 +496,18 @@ export class ExtensionUiController {
 				if (this.ctx.isBackgrounded) {
 					return { cancelled: true };
 				}
+				const previousSessionId = this.ctx.sessionManager.getSessionId();
+
 				this.clearHookWidgets();
 				const result = await this.ctx.session.switchSession(sessionPath);
 				if (!result) {
 					return { cancelled: true };
 				}
-				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();
+				if (switchingToDifferentSession) this.ctx.resetIrcSidebarSession();
+				this.ctx.rebuildInitialMessages(
+					switchingToDifferentSession ? "replace-identity" : "reconcile-same-transcript",
+				);
 				await this.ctx.reloadTodos();
 				return { cancelled: false };
 			},
@@ -560,7 +579,7 @@ export class ExtensionUiController {
 						shutdown: () => {
 							// Signal shutdown request
 						},
-						getSystemPrompt: () => this.ctx.session.systemPrompt,
+						getSystemPrompt: () => [...this.ctx.session.systemPrompt],
 					});
 				} catch (err) {
 					this.showToolError(registeredTool.definition.name, err instanceof Error ? err.message : String(err));
@@ -970,7 +989,7 @@ export class ExtensionUiController {
 		// For non-streaming cases with display=true, update UI
 		// (streaming cases update via message_end event)
 		if (!this.ctx.isBackgrounded && !wasStreaming && shouldDisplay) {
-			this.ctx.rebuildChatFromMessages();
+			this.ctx.rebuildChatFromMessages("reconcile-same-transcript");
 		}
 	}
 

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

@@ -331,6 +331,13 @@ export class InputController {
 		// Wire up extension shortcuts
 		this.registerExtensionShortcuts();
 
+		for (const key of this.ctx.keybindings.getKeys("app.irc.sidebar.toggle")) {
+			this.ctx.editor.setCustomKeyHandler(key, () => {
+				this.ctx.toggleIrcSidebar();
+				return true;
+			});
+		}
+
 		const planModeKeys = this.ctx.keybindings.getKeys("app.plan.toggle");
 		for (const key of planModeKeys) {
 			this.ctx.editor.setCustomKeyHandler(key, () => void this.ctx.handlePlanModeCommand());
@@ -1344,8 +1351,7 @@ export class InputController {
 		if (this.ctx.streamingComponent) {
 			this.ctx.chatContainer.detachChild(this.ctx.streamingComponent);
 		}
-		this.ctx.chatContainer.clear();
-		this.ctx.rebuildChatFromMessages();
+		this.ctx.rebuildChatFromMessages("reconcile-same-transcript");
 
 		// If streaming, re-add the streaming component with updated visibility and re-render
 		if (this.ctx.streamingComponent && this.ctx.streamingMessage) {

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

@@ -2,7 +2,7 @@ import { ThinkingLevel } from "@sayknow-cli/agent-core";
 import { getOAuthProviders } from "@sayknow-cli/ai/utils/oauth";
 import type { OAuthProvider } from "@sayknow-cli/ai/utils/oauth/types";
 import type { Component, OverlayHandle } from "@sayknow-cli/tui";
-import { Input, Loader, Spacer, Text } from "@sayknow-cli/tui";
+import { Input, isPetMode, Loader, Spacer, Text } from "@sayknow-cli/tui";
 import { getAgentDbPath, getProjectDir } from "@sayknow-cli/utils";
 import {
 	activateModelProfile,
@@ -71,11 +71,13 @@ import { HistorySearchComponent } from "../components/history-search";
 import { JobsOverlayComponent } from "../components/jobs-overlay";
 import { ModelSelectorComponent } from "../components/model-selector";
 import { OAuthSelectorComponent } from "../components/oauth-selector";
+import { PetSelectorComponent } from "../components/pet-selector";
 import { PluginSelectorComponent } from "../components/plugin-selector";
 import {
 	type ProviderOnboardingAction,
 	ProviderOnboardingSelectorComponent,
 } from "../components/provider-onboarding-selector";
+import type { PetMode } from "../components/sayknow-pet-widget";
 import { SessionObserverOverlayComponent } from "../components/session-observer-overlay";
 import { SessionSelectorComponent } from "../components/session-selector";
 import { SettingsSelectorComponent } from "../components/settings-selector";
@@ -155,9 +157,15 @@ export class SelectorController {
 	 */
 	showSelector(create: (done: () => void) => { component: Component; focus: Component }): void {
 		const done = () => {
-			this.ctx.editorContainer.clear();
-			this.ctx.editorContainer.addChild(this.ctx.editor);
-			this.ctx.ui.setFocus(this.ctx.editor);
+			// Prefer the pet-aware composer restore (InteractiveMode.restoreComposer); fall back
+			// to a plain editor swap for contexts that predate it (e.g. lightweight test doubles).
+			if (typeof this.ctx.restoreComposer === "function") {
+				this.ctx.restoreComposer();
+			} else {
+				this.ctx.editorContainer.clear();
+				this.ctx.editorContainer.addChild(this.ctx.editor);
+				this.ctx.ui.setFocus(this.ctx.editor);
+			}
 		};
 		const { component, focus } = create(done);
 		this.ctx.editorContainer.clear();
@@ -400,6 +408,9 @@ export class SelectorController {
 								this.#refreshThemeUi();
 							});
 						},
+						onPetPreview: mode => {
+							this.ctx.previewPetMode(mode as PetMode);
+						},
 						onStatusLinePreview: previewSettings => {
 							// Update status line with preview settings
 							this.ctx.statusLine.updateSettings({
@@ -474,6 +485,29 @@ export class SelectorController {
 		});
 	}
 
+	showPetSelector(): void {
+		const stored = settings.get("pet.mode");
+		const initial: PetMode = isPetMode(stored) ? stored : "off";
+		this.showSelector(done => {
+			// Live-preview via previewMode (no editor re-mount, so the overlay stays);
+			// Enter commits + persists, Esc restores the initial skin.
+			const selector = new PetSelectorComponent(
+				initial,
+				mode => {
+					this.ctx.setPetMode(mode);
+					done();
+				},
+				() => {
+					this.ctx.previewPetMode(initial);
+					done();
+				},
+				mode => {
+					this.ctx.previewPetMode(mode);
+				},
+			);
+			return { component: selector, focus: selector.getSelectList() };
+		});
+	}
 	showHistorySearch(): void {
 		const historyStorage = this.ctx.historyStorage;
 		if (!historyStorage) return;
@@ -612,8 +646,7 @@ export class SelectorController {
 						child.setHideThinkingBlock(value as boolean);
 					}
 				}
-				this.ctx.chatContainer.clear();
-				this.ctx.rebuildChatFromMessages();
+				this.ctx.rebuildChatFromMessages("reconcile-same-transcript");
 				break;
 			case "theme": {
 				setTheme(value as string, true).then(result => {
@@ -626,6 +659,12 @@ export class SelectorController {
 				});
 				break;
 			}
+			case "pet.mode":
+				// The settings submenu already persisted the value; apply it to the live
+				// widget via previewMode (the settings overlay is still open, so a full
+				// re-mount would tear it down — restoreComposer re-mounts on close).
+				this.ctx.previewPetMode(value as PetMode);
+				break;
 			case "symbolPreset": {
 				setSymbolPreset(value as "unicode" | "nerd" | "ascii").then(() => {
 					this.ctx.statusLine.invalidate();
@@ -697,6 +736,12 @@ export class SelectorController {
 				this.ctx.ui.requestRender();
 				break;
 			}
+			case "irc.enabled":
+			case "irc.sidebar.enabled":
+				this.ctx.applyIrcSidebarAvailability(
+					this.ctx.settings.get("irc.enabled") === true && this.ctx.settings.get("irc.sidebar.enabled") === true,
+				);
+				break;
 
 			// Provider settings - update runtime preferences
 			case "providers.webSearch":
@@ -1075,9 +1120,9 @@ export class SelectorController {
 						this.ctx.ui.requestRender();
 						return;
 					}
+					this.ctx.resetIrcSidebarSession();
 
-					this.ctx.chatContainer.clear();
-					this.ctx.renderInitialMessages();
+					this.ctx.rebuildInitialMessages("replace-identity");
 					this.ctx.editor.setText(result.selectedText);
 					done();
 					this.ctx.showStatus("Branched to new session");
@@ -1187,8 +1232,7 @@ export class SelectorController {
 						}
 
 						// Update UI — pass the context built by navigateTree to skip a second O(N) walk.
-						this.ctx.chatContainer.clear();
-						this.ctx.renderInitialMessages(result.sessionContext);
+						this.ctx.rebuildInitialMessages("reconcile-same-transcript", result.sessionContext);
 						await this.ctx.reloadTodos();
 						if (result.editorText && !this.ctx.editor.getText().trim()) {
 							this.ctx.editor.setText(result.editorText);
@@ -1289,6 +1333,8 @@ export class SelectorController {
 		if (!detached) {
 			return false;
 		}
+		this.ctx.resetIrcSidebarSession();
+
 		this.#refreshSessionTerminalTitle();
 
 		this.#clearTransientSessionUi();
@@ -1296,23 +1342,24 @@ export class SelectorController {
 		this.ctx.statusLine.setSessionStartTime(Date.now());
 		this.ctx.updateEditorTopBorder();
 		this.ctx.updateEditorBorderColor();
-		this.ctx.renderInitialMessages();
+		this.ctx.rebuildInitialMessages("replace-identity");
 		await this.ctx.reloadTodos();
 		this.ctx.ui.requestRender();
 		return true;
 	}
 
 	async handleResumeSession(sessionPath: string): Promise<void> {
+		const previousSessionId = this.ctx.sessionManager.getSessionId();
 		this.#clearTransientSessionUi();
 
 		// Switch session via AgentSession (emits hook and tool session events)
-		await this.ctx.session.switchSession(sessionPath);
+		if (!(await this.ctx.session.switchSession(sessionPath))) return;
+		const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();
+		if (switchingToDifferentSession) this.ctx.resetIrcSidebarSession();
 		this.#refreshSessionTerminalTitle();
 		this.ctx.updateEditorBorderColor();
 
-		// Clear and re-render the chat
-		this.ctx.chatContainer.clear();
-		this.ctx.renderInitialMessages();
+		this.ctx.rebuildInitialMessages(switchingToDifferentSession ? "replace-identity" : "reconcile-same-transcript");
 		await this.ctx.reloadTodos();
 		this.ctx.showStatus("Resumed session");
 	}