@earendil-works/pi-coding-agent 0.79.6 → 0.79.8

package/dist/modes/interactive/interactive-mode.js

@@ -10,7 +10,7 @@ import { getProviders, } from "@earendil-works/pi-ai";
 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";
 }
@@ -216,6 +218,7 @@ export class InteractiveMode {
     customHeader = undefined;
     options;
     autoTrustOnReloadCwd;
+    themeController;
     // Convenience accessors
     get session() {
         return this.runtimeHost.session;
@@ -266,23 +269,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 +329,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) => ({
@@ -467,7 +455,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}`);
@@ -1636,16 +1624,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;
             },
@@ -2691,7 +2676,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 +2734,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 +2744,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();
@@ -3057,7 +3044,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) {
@@ -3089,7 +3075,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 +3282,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 +3349,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);
@@ -4231,11 +4208,7 @@ export class InteractiveMode {
             }
             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);
@@ -4782,12 +4755,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 +4775,7 @@ export class InteractiveMode {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
         }
+        this.themeController.disableAutoSync();
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();