@gajae-code/coding-agent 0.9.6 → 0.10.0

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

@@ -25,6 +25,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;
@@ -150,9 +151,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");
 			},
@@ -171,6 +174,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
@@ -185,6 +190,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 = [];
@@ -205,10 +211,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");
@@ -222,8 +228,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);
@@ -234,14 +239,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 };
 			},
@@ -392,9 +403,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");
 			},
@@ -416,6 +429,7 @@ export class ExtensionUiController {
 				if (!success) {
 					return { cancelled: true };
 				}
+				this.ctx.resetIrcSidebarSession();
 
 				// Call setup callback if provided
 				if (options?.setup) {
@@ -423,6 +437,7 @@ export class ExtensionUiController {
 				}
 
 				// Clear UI state
+				prepareTranscriptRebuild(this.ctx.ui, "replace-identity");
 				this.ctx.chatContainer.clear();
 				this.ctx.pendingMessagesContainer.clear();
 				this.ctx.compactionQueuedMessages = [];
@@ -446,10 +461,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");
@@ -466,8 +481,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);
@@ -481,13 +495,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 };
 			},
@@ -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 "@gajae-code/agent-core";
 import { getOAuthProviders } from "@gajae-code/ai/utils/oauth";
 import type { OAuthProvider } from "@gajae-code/ai/utils/oauth/types";
 import type { Component, OverlayHandle } from "@gajae-code/tui";
-import { Input, Loader, Spacer, Text } from "@gajae-code/tui";
+import { Input, isPetMode, Loader, Spacer, Text } from "@gajae-code/tui";
 import { getAgentDbPath, getProjectDir } from "@gajae-code/utils";
 import {
 	activateModelProfile,
@@ -74,10 +74,12 @@ import {
 } from "../components/custom-model-preset-wizard";
 import { CustomProviderWizardComponent, type CustomProviderWizardSubmit } from "../components/custom-provider-wizard";
 import { ExtensionDashboard } from "../components/extensions";
+import type { PetMode } from "../components/gajae-pet-widget";
 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,
@@ -158,9 +160,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();
@@ -503,6 +511,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({
@@ -577,6 +588,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;
@@ -715,8 +749,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 => {
@@ -729,6 +762,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();
@@ -800,6 +839,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":
@@ -1173,9 +1218,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");
@@ -1285,8 +1330,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);
@@ -1387,6 +1431,8 @@ export class SelectorController {
 		if (!detached) {
 			return false;
 		}
+		this.ctx.resetIrcSidebarSession();
+
 		this.#refreshSessionTerminalTitle();
 
 		this.#clearTransientSessionUi();
@@ -1394,23 +1440,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");
 	}