@bastani/atomic 0.8.30 → 0.8.31-alpha.2

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

@@ -48,6 +48,9 @@ import { CustomMessageComponent } from "./components/custom-message.js";
 import { DaxnutsComponent } from "./components/daxnuts.js";
 import { renderAtomicAnsiBanner } from "./components/atomic-banner.js";
 import { DynamicBorder } from "./components/dynamic-border.js";
+import { ContextWindowSelectorComponent } from "./components/context-window-selector.js";
+import { formatContextWindow } from "../../core/context-window.js";
+import { copilotApiBaseUrlFromToken, copilotCatalogCacheHost, copilotCatalogCachePath, fetchCopilotModelCatalog, readCopilotCatalogCache, setActiveCopilotModelCatalog, writeCopilotCatalogCache, } from "../../core/copilot-model-catalog.js";
 import { EarendilAnnouncementComponent } from "./components/earendil-announcement.js";
 import { ExtensionEditorComponent } from "./components/extension-editor.js";
 import { ExtensionInputComponent } from "./components/extension-input.js";
@@ -68,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 &&
@@ -161,6 +166,8 @@ export class InteractiveMode {
     constructor(runtimeHost, options = {}) {
         this.autocompleteProviderWrappers = [];
         this.isInitialized = false;
+        // GitHub Copilot CAPI context-window catalog load state (gated on the Copilot provider).
+        this.copilotCatalogApplied = false;
         this.pendingUserInputs = [];
         this.loadingAnimation = undefined;
         this.workingMessage = undefined;
@@ -265,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) {
@@ -356,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) => ({
@@ -450,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);
@@ -478,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()) {
@@ -541,6 +533,9 @@ export class InteractiveMode {
      */
     async run() {
         await this.init();
+        // Load GitHub Copilot context-window tiers from CAPI early (gated on the Copilot provider) so
+        // the footer and /model picker reflect GitHub's real windows. Best-effort, never blocks startup.
+        void this.refreshCopilotModelCatalog();
         // Start version check asynchronously
         checkForNewPiVersion(this.version).then((newVersion) => {
             if (newVersion) {
@@ -1853,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;
             },
@@ -2619,6 +2609,11 @@ export class InteractiveMode {
                 this.refreshBuiltInHeader();
                 this.updateEditorBorderColor();
                 break;
+            case "context_window_changed":
+                this.footer.invalidate();
+                this.usageMeter.invalidate();
+                this.ui.requestRender();
+                break;
             case "message_start":
                 if (event.message.role === "custom") {
                     this.addMessageToChat(event.message);
@@ -3118,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);
@@ -3126,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();
@@ -3413,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));
@@ -3655,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(),
@@ -3720,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);
@@ -3832,6 +3820,7 @@ export class InteractiveMode {
         if (this.session.scopedModels.length > 0) {
             return this.session.scopedModels.map((scoped) => scoped.model);
         }
+        await this.refreshCopilotModelCatalog();
         this.session.modelRegistry.refresh();
         try {
             return await this.session.modelRegistry.getAvailable();
@@ -3840,6 +3829,51 @@ export class InteractiveMode {
             return [];
         }
     }
+    /**
+     * Load GitHub Copilot's context-window tiers from the live CAPI catalog, but only when the user
+     * actually has the GitHub Copilot provider authenticated. Cache-first (30-min TTL); on a
+     * successful load the model registry is refreshed so the /model context-window picker reflects
+     * GitHub's real tiers (e.g. gpt-5.5 1.05m, Claude/Gemini 1m). Best-effort and gated: offline,
+     * unauthenticated, or non-Copilot sessions silently keep no long-context options.
+     */
+    async refreshCopilotModelCatalog() {
+        if (this.copilotCatalogApplied)
+            return;
+        if (!this.copilotCatalogInFlight) {
+            this.copilotCatalogInFlight = this.loadCopilotModelCatalog();
+        }
+        try {
+            await this.copilotCatalogInFlight;
+        }
+        finally {
+            this.copilotCatalogInFlight = undefined;
+        }
+    }
+    async loadCopilotModelCatalog() {
+        const registry = this.session.modelRegistry;
+        const cred = registry.authStorage.get("github-copilot");
+        // Gate: do nothing unless the user has the GitHub Copilot provider.
+        if (!cred || cred.type !== "oauth")
+            return;
+        try {
+            const token = await registry.getApiKeyForProvider("github-copilot");
+            if (!token)
+                return;
+            const baseUrl = copilotApiBaseUrlFromToken(token);
+            const cachePath = copilotCatalogCachePath(getAgentDir());
+            let catalog = readCopilotCatalogCache(cachePath, { host: copilotCatalogCacheHost(baseUrl) });
+            if (!catalog) {
+                catalog = await fetchCopilotModelCatalog({ token, baseUrl });
+                writeCopilotCatalogCache(cachePath, baseUrl, catalog);
+            }
+            setActiveCopilotModelCatalog(catalog);
+            registry.refresh();
+            this.copilotCatalogApplied = true;
+        }
+        catch {
+            // Best-effort: leave the active catalog as-is on any failure (offline, auth, parse).
+        }
+    }
     /** Update the footer's available provider count from current model candidates */
     async updateAvailableProviderCount() {
         const models = await this.getModelCandidates();
@@ -3882,9 +3916,14 @@ export class InteractiveMode {
                     this.footer.invalidate();
                     this.updateEditorBorderColor();
                     done();
-                    this.showStatus(`Model: ${model.id}`);
                     void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
                     this.checkDaxnutsEasterEgg(model);
+                    if (this.session.supportsContextWindowSelection()) {
+                        this.showContextWindowSelector(model);
+                    }
+                    else {
+                        this.showStatus(`Model: ${model.id}`);
+                    }
                 }
                 catch (error) {
                     done();
@@ -3897,6 +3936,32 @@ export class InteractiveMode {
             return { component: selector, focus: selector };
         });
     }
+    showContextWindowSelector(model) {
+        const availableContextWindows = this.session.getAvailableContextWindows();
+        const currentContextWindow = this.session.model?.contextWindow ?? availableContextWindows[0] ?? 0;
+        this.showSelector((done) => {
+            const selector = new ContextWindowSelectorComponent(model.name ?? model.id, availableContextWindows, currentContextWindow, (contextWindow) => {
+                try {
+                    this.session.setContextWindow(contextWindow, {
+                        persistDefault: true,
+                    });
+                    this.footer.invalidate();
+                    this.usageMeter.invalidate();
+                    this.updateEditorBorderColor();
+                    done();
+                    this.showStatus(`Model: ${model.id} \u00b7 ${formatContextWindow(contextWindow)} context`);
+                }
+                catch (error) {
+                    done();
+                    this.showError(error instanceof Error ? error.message : String(error));
+                }
+            }, () => {
+                done();
+                this.showStatus(`Model: ${model.id}`);
+            });
+            return { component: selector, focus: selector };
+        });
+    }
     async showModelsSelector() {
         // Get all available models
         this.session.modelRegistry.refresh();
@@ -4602,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);
@@ -5189,6 +5248,7 @@ export class InteractiveMode {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
         }
+        this.themeController.disableAutoSync();
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();