@bastani/atomic 0.8.31-alpha.1 → 0.8.31-alpha.3

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

@@ -71,7 +71,9 @@ import { TrustSelectorComponent } from "./components/trust-selector.js";
 import { hasProjectConfigDir, ProjectTrustStore } from "../../core/trust-manager.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 &&
@@ -270,23 +272,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) {
@@ -361,10 +347,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) => ({
@@ -455,7 +442,7 @@ export class InteractiveMode {
         this.registerSignalHandlers();
         // Load changelog (only show new entries, skip for resumed sessions)
         this.changelogMarkdown = this.getChangelogForDisplay();
-        // Add header container as first child. Populate it after detectThemeIfUnset.
+        // Add header container as first child. Populate it after theme initialization.
         this.ui.addChild(this.headerContainer);
         this.ui.addChild(this.chatContainer);
         this.ui.addChild(this.pendingMessagesContainer);
@@ -483,7 +470,7 @@ export class InteractiveMode {
         this.ui.start();
         recordTimeSinceReset("time-to-first-frame");
         this.isInitialized = true;
-        await this.detectThemeIfUnset();
+        await this.themeController.applyFromSettings();
         // Add the quiet startup identity (unless silenced). Resource details are
         // disclosed separately in the chat canvas via the tools/resources toggle.
         if (this.options.verbose || !this.settingsManager.getQuietStartup()) {
@@ -1861,16 +1848,11 @@ 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);
-                if (result.success) {
-                    if (this.settingsManager.getTheme() !== themeOrName) {
-                        this.settingsManager.setTheme(themeOrName);
-                    }
-                    this.ui.requestRender();
+                const result = this.themeController.setThemeName(themeOrName);
+                if (result.success && this.settingsManager.getThemeSetting() !== themeOrName) {
+                    this.settingsManager.setTheme(themeOrName);
                 }
                 return result;
             },
@@ -3131,6 +3113,7 @@ export class InteractiveMode {
         // dispatch and re-sends the signal if only its own listeners remain.
         if (options?.fromSignal) {
             await this.runtimeHost.dispose();
+            this.themeController.disableAutoSync();
             // Drain any in-flight Kitty key release events before stopping.
             // This prevents escape sequences from leaking to the parent shell over slow SSH.
             await this.ui.terminal.drainInput(1000);
@@ -3139,6 +3122,7 @@ export class InteractiveMode {
         }
         // 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();
@@ -3426,7 +3410,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));
@@ -3668,7 +3652,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(),
@@ -3733,21 +3718,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);
@@ -4692,13 +4667,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);
@@ -5279,6 +5248,7 @@ export class InteractiveMode {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
         }
+        this.themeController.disableAutoSync();
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();