@psnext/slingcli 2.5.20260621-1 → 2.5.20260629-1

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/interactive-mode.js

@@ -6,11 +6,11 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { getProviders, } from "@earendil-works/pi-ai";
+import { getProviders, } from "@earendil-works/pi-ai/compat";
 import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
-import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
+import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
@@ -63,7 +63,9 @@ import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { TrustSelectorComponent } from "./components/trust-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
-import { detectTerminalBackgroundTheme, getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
+import { getModelSearchText } from "./model-search.js";
+import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, onThemeChange, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
+import { InteractiveThemeController } from "./theme/theme-controller.js";
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -132,6 +134,7 @@ export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProvi
 export class InteractiveMode {
     runtimeHost;
     ui;
+    loadedResourcesContainer;
     chatContainer;
     pendingMessagesContainer;
     statusContainer;
@@ -216,6 +219,7 @@ export class InteractiveMode {
     customHeader = undefined;
     options;
     autoTrustOnReloadCwd;
+    themeController;
     // Convenience accessors
     get session() {
         return this.runtimeHost.session;
@@ -237,12 +241,13 @@ export class InteractiveMode {
             this.resetExtensionUI();
         });
         this.runtimeHost.setRebindSession(async () => {
-            await this.rebindCurrentSession();
+            await this.rebindCurrentSession({ renderBeforeBind: true });
         });
         this.version = VERSION;
         this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         this.headerContainer = new Container();
+        this.loadedResourcesContainer = new Container();
         this.chatContainer = new Container();
         this.pendingMessagesContainer = new Container();
         this.statusContainer = new Container();
@@ -266,23 +271,7 @@ export class InteractiveMode {
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
         // Register themes from resource loader and initialize
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-        initTheme(this.settingsManager.getTheme(), true);
-    }
-    async detectThemeIfUnset() {
-        if (this.settingsManager.getTheme()) {
-            return;
-        }
-        const detection = await detectTerminalBackgroundTheme({ ui: this.ui, timeoutMs: 100 });
-        const result = setTheme(detection.theme, true);
-        if (!result.success) {
-            return;
-        }
-        if (detection.confidence === "high") {
-            this.settingsManager.setTheme(detection.theme);
-            await this.settingsManager.flush();
-        }
-        this.updateEditorBorderColor();
-        this.ui.requestRender();
+        this.themeController = new InteractiveThemeController(this.ui, this.settingsManager, (message) => this.showError(message), () => this.updateEditorBorderColor());
     }
     getAutocompleteSourceTag(sourceInfo) {
         if (!sourceInfo) {
@@ -342,10 +331,11 @@ export class InteractiveMode {
                 const items = models.map((m) => ({
                     id: m.id,
                     provider: m.provider,
+                    name: m.name,
                     label: `${m.provider}/${m.id}`,
                 }));
-                // Fuzzy filter by model ID + provider (allows "opus anthropic" to match)
-                const filtered = fuzzyFilter(items, prefix, (item) => `${item.id} ${item.provider}`);
+                // Fuzzy filter by model ID + provider in either order.
+                const filtered = fuzzyFilter(items, prefix, getModelSearchText);
                 if (filtered.length === 0)
                     return null;
                 return filtered.map((item) => ({
@@ -451,8 +441,10 @@ export class InteractiveMode {
                 : "";
             console.log(theme.fg("dim", `Model scope: ${modelList}${cycleHint}`));
         }
-        // Add header container as first child. Populate it after detectThemeIfUnset.
+        // Add header container as first child. Populate it after applying theme settings.
+        // Keep loaded resources before chat so restored session messages never precede them.
         this.ui.addChild(this.headerContainer);
+        this.ui.addChild(this.loadedResourcesContainer);
         this.ui.addChild(this.chatContainer);
         this.ui.addChild(this.pendingMessagesContainer);
         this.ui.addChild(this.statusContainer);
@@ -467,7 +459,7 @@ export class InteractiveMode {
         // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
         this.ui.start();
         this.isInitialized = true;
-        await this.detectThemeIfUnset();
+        await this.themeController.applyFromSettings();
         // Add header with keybindings from config (unless silenced)
         if (this.options.verbose || !this.settingsManager.getQuietStartup()) {
             const logo = theme.bold(theme.fg("accent", APP_NAME)) + theme.fg("dim", ` v${this.version}`);
@@ -1002,6 +994,8 @@ export class InteractiveMode {
         return lines.join("\n");
     }
     showLoadedResources(options) {
+        // Resource rendering is idempotent; chat clears no longer clear this separate container.
+        this.loadedResourcesContainer.clear();
         const showListing = options?.force || this.options.verbose || !this.settingsManager.getQuietStartup();
         const showDiagnostics = showListing || options?.showDiagnosticsWhenQuiet === true;
         if (!showListing && !showDiagnostics) {
@@ -1017,8 +1011,8 @@ export class InteractiveMode {
         };
         const addLoadedSection = (name, collapsedBody, expandedBody = collapsedBody, color = "mdHeading") => {
             const section = new ExpandableText(() => `${sectionHeader(name, color)}\n${collapsedBody}`, () => `${sectionHeader(name, color)}\n${expandedBody}`, this.getStartupExpansionState(), 0, 0);
-            this.chatContainer.addChild(section);
-            this.chatContainer.addChild(new Spacer(1));
+            this.loadedResourcesContainer.addChild(section);
+            this.loadedResourcesContainer.addChild(new Spacer(1));
         };
         const skillsResult = this.session.resourceLoader.getSkills();
         const promptsResult = this.session.resourceLoader.getPrompts();
@@ -1052,7 +1046,7 @@ export class InteractiveMode {
         if (showListing) {
             const contextFiles = this.session.resourceLoader.getAgentsFiles().agentsFiles;
             if (contextFiles.length > 0) {
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
                 const contextList = contextFiles
                     .map((f) => theme.fg("dim", `  ${this.formatDisplayPath(f.path)}`))
                     .join("\n");
@@ -1115,14 +1109,14 @@ export class InteractiveMode {
             const skillDiagnostics = skillsResult.diagnostics;
             if (skillDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(skillDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const promptDiagnostics = promptsResult.diagnostics;
             if (promptDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(promptDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const extensionDiagnostics = [];
             const extensionErrors = this.session.resourceLoader.getExtensions().errors;
@@ -1138,14 +1132,14 @@ export class InteractiveMode {
             extensionDiagnostics.push(...shortcutDiagnostics);
             if (extensionDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(extensionDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const themeDiagnostics = themesResult.diagnostics;
             if (themeDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(themeDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
         }
     }
@@ -1169,12 +1163,7 @@ export class InteractiveMode {
                     }
                     this.statusContainer.clear();
                     try {
-                        const result = await this.runtimeHost.newSession(options);
-                        if (!result.cancelled) {
-                            this.renderCurrentSessionState();
-                            this.ui.requestRender();
-                        }
-                        return result;
+                        return await this.runtimeHost.newSession(options);
                     }
                     catch (error) {
                         return this.handleFatalRuntimeError("Failed to create session", error);
@@ -1184,7 +1173,6 @@ export class InteractiveMode {
                     try {
                         const result = await this.runtimeHost.fork(entryId, options);
                         if (!result.cancelled) {
-                            this.renderCurrentSessionState();
                             this.editor.setText(result.selectedText ?? "");
                             this.showStatus("Forked to new session");
                         }
@@ -1254,12 +1242,19 @@ export class InteractiveMode {
             this.editor.setAutocompleteMaxVisible?.(autocompleteMaxVisible);
         }
     }
-    async rebindCurrentSession() {
+    async rebindCurrentSession(options = {}) {
         this.unsubscribe?.();
         this.unsubscribe = undefined;
         this.applyRuntimeSettings();
-        await this.bindCurrentSessionExtensions();
-        this.subscribeToAgent();
+        if (options.renderBeforeBind) {
+            this.renderCurrentSessionState();
+            this.subscribeToAgent();
+            await this.bindCurrentSessionExtensions();
+        }
+        else {
+            await this.bindCurrentSessionExtensions();
+            this.subscribeToAgent();
+        }
         await this.updateAvailableProviderCount();
         this.updateEditorBorderColor();
         this.updateTerminalTitle();
@@ -1272,6 +1267,7 @@ export class InteractiveMode {
         process.exit(1);
     }
     renderCurrentSessionState() {
+        this.loadedResourcesContainer.clear();
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];
@@ -1636,16 +1632,13 @@ export class InteractiveMode {
             getTheme: (name) => getThemeByName(name),
             setTheme: (themeOrName) => {
                 if (themeOrName instanceof Theme) {
-                    setThemeInstance(themeOrName);
-                    this.ui.requestRender();
-                    return { success: true };
+                    return this.themeController.setThemeInstance(themeOrName);
                 }
-                const result = setTheme(themeOrName, true);
+                const result = this.themeController.setThemeName(themeOrName);
                 if (result.success) {
                     if (this.settingsManager.getTheme() !== themeOrName) {
                         this.settingsManager.setTheme(themeOrName);
                     }
-                    this.ui.requestRender();
                 }
                 return result;
             },
@@ -1755,7 +1748,7 @@ export class InteractiveMode {
             }, () => {
                 this.hideExtensionEditor();
                 resolve(undefined);
-            });
+            }, undefined, this.settingsManager.getExternalEditorCommand());
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionEditor);
             this.ui.setFocus(this.extensionEditor);
@@ -2691,7 +2684,7 @@ export class InteractiveMode {
         if (this.chatContainer.children.length > 0) {
             this.chatContainer.addChild(new Spacer(1));
         }
-        this.chatContainer.addChild(new Text(theme.fg("warning", "This project is not trusted. Project .pi resources and packages are ignored. Use /trust to save a trust decision, then restart pi."), 1, 0));
+        this.chatContainer.addChild(new Text(theme.fg("warning", `This project is not trusted. Project ${CONFIG_DIR_NAME} resources and packages are ignored. Use /trust to save a trust decision, then restart pi.`), 1, 0));
     }
     async getUserInput() {
         const queuedInput = this.pendingUserInputs.shift();
@@ -2749,6 +2742,7 @@ export class InteractiveMode {
             // which the stdout/stderr error handler turns into emergencyTerminalExit;
             // the render loop is already idle, so this cannot hot-spin (see #4144).
             await this.runtimeHost.dispose();
+            this.themeController.disableAutoSync();
             await this.ui.terminal.drainInput(1000);
             this.stop();
             process.exit(0);
@@ -2758,6 +2752,7 @@ export class InteractiveMode {
         // the final frame while the process is exiting.
         // Drain any in-flight Kitty key release events before stopping.
         // This prevents escape sequences from leaking to the parent shell over slow SSH.
+        this.themeController.disableAutoSync();
         await this.ui.terminal.drainInput(1000);
         this.stop();
         await this.runtimeHost.dispose();
@@ -2977,9 +2972,11 @@ export class InteractiveMode {
         if (isExpandable(activeHeader)) {
             activeHeader.setExpanded(expanded);
         }
-        for (const child of this.chatContainer.children) {
-            if (isExpandable(child)) {
-                child.setExpanded(expanded);
+        for (const container of [this.loadedResourcesContainer, this.chatContainer]) {
+            for (const child of container.children) {
+                if (isExpandable(child)) {
+                    child.setExpanded(expanded);
+                }
             }
         }
         this.ui.requestRender();
@@ -2999,10 +2996,9 @@ export class InteractiveMode {
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
     async openExternalEditor() {
-        // Determine editor (respect $VISUAL, then $EDITOR)
-        const editorCmd = process.env.VISUAL || process.env.EDITOR;
+        const editorCmd = this.settingsManager.getExternalEditorCommand();
         if (!editorCmd) {
-            this.showWarning("No editor configured. Set $VISUAL or $EDITOR environment variable.");
+            this.showWarning("No editor configured. Set externalEditor in settings.json or $VISUAL/$EDITOR.");
             return;
         }
         const currentText = this.editor.getExpandedText?.() ?? this.editor.getText();
@@ -3057,7 +3053,6 @@ export class InteractiveMode {
     showError(errorMessage) {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0));
-        this.chatContainer.addChild(new Spacer(1));
         this.ui.requestRender();
     }
     showWarning(warningMessage) {
@@ -3070,7 +3065,7 @@ export class InteractiveMode {
         const updateInstruction = theme.fg("muted", `New version ${release.version} is available. Run `) + action;
         const changelogUrl = "https://pi.dev/changelog";
         const changelogLink = getCapabilities().hyperlinks
-            ? hyperlink(theme.fg("accent", "open changelog"), changelogUrl)
+            ? hyperlink(theme.fg("accent", changelogUrl), changelogUrl)
             : theme.fg("accent", changelogUrl);
         const changelogLine = theme.fg("muted", "Changelog: ") + changelogLink;
         const note = release.note?.trim();
@@ -3089,7 +3084,7 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     showPackageUpdateNotification(packages) {
-        const action = theme.fg("accent", `${APP_NAME} update`);
+        const action = theme.fg("accent", `${APP_NAME} update --extensions`);
         const updateInstruction = theme.fg("muted", "Package updates are available. Run ") + action;
         const packageLines = packages.map((pkg) => `- ${pkg}`).join("\n");
         this.chatContainer.addChild(new Spacer(1));
@@ -3296,7 +3291,8 @@ export class InteractiveMode {
                 httpIdleTimeoutMs: this.settingsManager.getHttpIdleTimeoutMs(),
                 thinkingLevel: this.session.thinkingLevel,
                 availableThinkingLevels: this.session.getAvailableThinkingLevels(),
-                currentTheme: this.settingsManager.getTheme() || "dark",
+                currentTheme: this.settingsManager.getThemeSetting() || "dark",
+                terminalTheme: this.themeController.getTerminalTheme(),
                 availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
@@ -3362,21 +3358,11 @@ export class InteractiveMode {
                     this.footer.invalidate();
                     this.updateEditorBorderColor();
                 },
-                onThemeChange: (themeName) => {
-                    const result = setTheme(themeName, true);
-                    this.settingsManager.setTheme(themeName);
-                    this.ui.invalidate();
-                    if (!result.success) {
-                        this.showError(`Failed to load theme "${themeName}": ${result.error}\nFell back to dark theme.`);
-                    }
-                },
-                onThemePreview: (themeName) => {
-                    const result = setTheme(themeName, true);
-                    if (result.success) {
-                        this.ui.invalidate();
-                        this.ui.requestRender();
-                    }
+                onThemeChange: (themeSetting) => {
+                    this.settingsManager.setTheme(themeSetting);
+                    void this.themeController.applyFromSettings();
                 },
+                onThemePreview: (themeName) => this.themeController.preview(themeName),
                 onHideThinkingBlockChange: (hidden) => {
                     this.hideThinkingBlock = hidden;
                     this.settingsManager.setHideThinkingBlock(hidden);
@@ -3664,7 +3650,6 @@ export class InteractiveMode {
                         this.ui.requestRender();
                         return;
                     }
-                    this.renderCurrentSessionState();
                     this.editor.setText(result.selectedText ?? "");
                     done();
                     this.showStatus("Forked to new session");
@@ -3692,7 +3677,6 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 return;
             }
-            this.renderCurrentSessionState();
             this.editor.setText("");
             this.showStatus("Cloned to new session");
         }
@@ -3842,7 +3826,6 @@ export class InteractiveMode {
             if (result.cancelled) {
                 return result;
             }
-            this.renderCurrentSessionState();
             this.showStatus("Resumed session");
             return result;
         }
@@ -3861,7 +3844,6 @@ export class InteractiveMode {
                 if (result.cancelled) {
                     return result;
                 }
-                this.renderCurrentSessionState();
                 this.showStatus("Resumed session in current cwd");
                 return result;
             }
@@ -4221,8 +4203,19 @@ export class InteractiveMode {
             this.ui.setFocus(editor);
             this.ui.requestRender();
         };
+        let chatRestoredBeforeSessionStart = false;
+        let reloadBoxDismissed = false;
+        const restoreChatBeforeSessionStart = () => {
+            if (chatRestoredBeforeSessionStart) {
+                return;
+            }
+            this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+            this.rebuildChatFromMessages();
+            chatRestoredBeforeSessionStart = true;
+        };
         try {
-            await this.session.reload();
+            await this.session.reload({ beforeSessionStart: restoreChatBeforeSessionStart });
+            restoreChatBeforeSessionStart();
             configureHttpDispatcher(this.settingsManager.getHttpIdleTimeoutMs());
             this.keybindings.reload();
             const activeHeader = this.customHeader ?? this.builtInHeader;
@@ -4230,12 +4223,7 @@ export class InteractiveMode {
                 activeHeader.setExpanded(this.toolOutputExpanded);
             }
             setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-            this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
-            const themeName = this.settingsManager.getTheme();
-            const themeResult = themeName ? setTheme(themeName, true) : { success: true };
-            if (!themeResult.success) {
-                this.showError(`Failed to load theme "${themeName}": ${themeResult.error}\nFell back to dark theme.`);
-            }
+            await this.themeController.applyFromSettings();
             const editorPaddingX = this.settingsManager.getEditorPaddingX();
             const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
             this.defaultEditor.setPaddingX(editorPaddingX);
@@ -4249,8 +4237,6 @@ export class InteractiveMode {
             this.setupAutocompleteProvider();
             const runner = this.session.extensionRunner;
             this.setupExtensionShortcuts(runner);
-            this.rebuildChatFromMessages();
-            dismissReloadBox(this.editor);
             this.showLoadedResources({
                 force: false,
                 showDiagnosticsWhenQuiet: true,
@@ -4263,9 +4249,13 @@ export class InteractiveMode {
             this.showStatus(savedImplicitProjectTrust
                 ? "Reloaded keybindings, extensions, skills, prompts, themes; saved project trust"
                 : "Reloaded keybindings, extensions, skills, prompts, themes");
+            dismissReloadBox(this.editor);
+            reloadBoxDismissed = true;
         }
         catch (error) {
-            dismissReloadBox(previousEditor);
+            if (!reloadBoxDismissed) {
+                dismissReloadBox(previousEditor);
+            }
             this.showError(`Reload failed: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
@@ -4332,7 +4322,6 @@ export class InteractiveMode {
                 this.showStatus("Import cancelled");
                 return;
             }
-            this.renderCurrentSessionState();
             this.showStatus(`Session imported from: ${inputPath}`);
         }
         catch (error) {
@@ -4347,7 +4336,6 @@ export class InteractiveMode {
                     this.showStatus("Import cancelled");
                     return;
                 }
-                this.renderCurrentSessionState();
                 this.showStatus(`Session imported from: ${inputPath}`);
                 return;
             }
@@ -4474,8 +4462,12 @@ export class InteractiveMode {
             return;
         }
         this.session.setSessionName(name);
+        const sessionName = this.sessionManager.getSessionName();
+        if (sessionName !== name) {
+            this.showWarning(`Session name was normalized from ${JSON.stringify(name)} to ${JSON.stringify(sessionName)}`);
+        }
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${name}`), 1, 0));
+        this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${sessionName ?? name}`), 1, 0));
         this.ui.requestRender();
     }
     handleSessionCommand() {
@@ -4660,7 +4652,6 @@ export class InteractiveMode {
             if (result.cancelled) {
                 return;
             }
-            this.renderCurrentSessionState();
             this.chatContainer.addChild(new Spacer(1));
             this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ New session started")}`, 1, 1));
             this.ui.requestRender();
@@ -4782,12 +4773,6 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     async handleCompactCommand(customInstructions) {
-        const entries = this.sessionManager.getEntries();
-        const messageCount = entries.filter((e) => e.type === "message").length;
-        if (messageCount < 2) {
-            this.showWarning("Nothing to compact (no messages yet)");
-            return;
-        }
         if (this.loadingAnimation) {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
@@ -4808,6 +4793,7 @@ export class InteractiveMode {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
         }
+        this.themeController.disableAutoSync();
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/model-search.js

@@ -0,0 +1,15 @@
+export function getModelSearchText(item) {
+    const { id, provider } = item;
+    const name = item.name ? ` ${item.name}` : "";
+    return `${id} ${provider} ${provider}/${id} ${provider} ${id}${name}`;
+}
+/**
+ * The /model selector search should rank exact provider-prefixed queries before proxy-provider IDs
+ * like openrouter/openai/gpt-5, so keep the bare model ID out of the leading position.
+ */
+export function getModelSelectorSearchText(item) {
+    const { id, provider } = item;
+    const name = item.name ? ` ${item.name}` : "";
+    return `${provider} ${provider}/${id} ${provider} ${id}${name}`;
+}
+//# sourceMappingURL=model-search.js.map

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/theme/theme-controller.js

@@ -0,0 +1,102 @@
+import { detectTerminalBackgroundFromEnv, detectTerminalBackgroundTheme, detectTerminalThemeForAuto, initTheme, parseAutoThemeSetting, resolveThemeSetting, setTheme, setThemeInstance, } from "./theme.js";
+export class InteractiveThemeController {
+    ui;
+    settingsManager;
+    showError;
+    onChanged;
+    terminalTheme = detectTerminalBackgroundFromEnv().theme;
+    activeThemeName;
+    autoSyncEnabled = false;
+    constructor(ui, settingsManager, showError, onChanged) {
+        this.ui = ui;
+        this.settingsManager = settingsManager;
+        this.showError = showError;
+        this.onChanged = onChanged;
+        this.activeThemeName = resolveThemeSetting(this.settingsManager.getThemeSetting(), this.terminalTheme);
+        initTheme(this.activeThemeName, true);
+        this.ui.onTerminalColorSchemeChange((terminalTheme) => this.applyTerminalTheme(terminalTheme));
+    }
+    async applyFromSettings() {
+        const themeSetting = this.settingsManager.getThemeSetting();
+        const autoTheme = parseAutoThemeSetting(themeSetting);
+        if (autoTheme) {
+            this.terminalTheme = await detectTerminalThemeForAuto({ ui: this.ui, timeoutMs: 100 });
+            this.setAutoSync(true);
+            this.applyThemeName(this.terminalTheme === "light" ? autoTheme.lightTheme : autoTheme.darkTheme, true);
+            return;
+        }
+        this.setAutoSync(false);
+        if (themeSetting !== undefined) {
+            this.applyThemeName(themeSetting, true);
+            return;
+        }
+        const detection = await detectTerminalBackgroundTheme({ ui: this.ui, timeoutMs: 100 });
+        this.terminalTheme = detection.theme;
+        if (!this.applyThemeName(detection.theme).success)
+            return;
+        if (detection.confidence === "high") {
+            this.settingsManager.setTheme(detection.theme);
+            await this.settingsManager.flush();
+        }
+    }
+    setThemeName(themeName, showError = false) {
+        this.setAutoSync(false);
+        return this.applyThemeName(themeName, showError);
+    }
+    setThemeInstance(themeInstance) {
+        this.setAutoSync(false);
+        setThemeInstance(themeInstance);
+        this.activeThemeName = "<in-memory>";
+        this.notifyChanged();
+        return { success: true };
+    }
+    preview(themeSettingOrName) {
+        const themeName = resolveThemeSetting(themeSettingOrName, this.terminalTheme) ?? this.activeThemeName;
+        if (!themeName)
+            return;
+        if (setTheme(themeName, true).success) {
+            this.ui.invalidate();
+            this.ui.requestRender();
+        }
+    }
+    disableAutoSync() {
+        this.setAutoSync(false);
+    }
+    getTerminalTheme() {
+        return this.terminalTheme;
+    }
+    applyThemeName(themeName, showError = false) {
+        const result = setTheme(themeName, true);
+        this.activeThemeName = result.success ? themeName : "dark";
+        this.notifyChanged();
+        if (!result.success && showError) {
+            this.showError(`Failed to load theme "${themeName}": ${result.error}\nFell back to dark theme.`);
+        }
+        return result;
+    }
+    notifyChanged() {
+        this.ui.invalidate();
+        this.onChanged();
+    }
+    setAutoSync(enabled) {
+        if (this.autoSyncEnabled === enabled)
+            return;
+        this.autoSyncEnabled = enabled;
+        this.ui.setTerminalColorSchemeNotifications(enabled);
+    }
+    applyTerminalTheme(terminalTheme) {
+        if (!this.autoSyncEnabled)
+            return;
+        this.terminalTheme = terminalTheme;
+        const autoTheme = parseAutoThemeSetting(this.settingsManager.getThemeSetting());
+        if (!autoTheme) {
+            this.setAutoSync(false);
+            return;
+        }
+        const themeName = terminalTheme === "light" ? autoTheme.lightTheme : autoTheme.darkTheme;
+        if (themeName !== this.activeThemeName) {
+            this.applyThemeName(themeName);
+        }
+    }
+}
+//# sourceMappingURL=theme-controller.js.map

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/theme/theme-schema.json

@@ -11,7 +11,8 @@
 		},
 		"name": {
 			"type": "string",
-			"description": "Theme name"
+			"pattern": "^[^/]+$",
+			"description": "Theme name. Must not contain '/' because it is reserved for automatic light/dark theme settings."
 		},
 		"vars": {
 			"type": "object",