@leanandmean/coding-agent 0.74.1-scramjet.16 → 0.74.1-scramjet.17

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

@@ -58,7 +58,7 @@ import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
 import { NspellProvider } from "./spellcheck.js";
-import { classifyBackgroundColor, detectThemeFromEnvironment, getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
+import { classifyBackgroundColor, detectThemeFromEnvironment, getAvailableThemes, getAvailableThemesWithPaths, getCurrentThemeName, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, resolveThemeName, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -129,6 +129,9 @@ export class InteractiveMode {
     workingVisible = true;
     // SCRAMJET-DIVERGENCE: title provider for extension-owned terminal titles.
     titleProvider = undefined;
+    // SCRAMJET-DIVERGENCE: captured terminal classification (env-seeded in the constructor, updated
+    // by the OSC 11 query) used to re-resolve the default theme once extension themes register.
+    detectedClassification = undefined;
     workingIndicatorOptions = undefined;
     defaultWorkingMessage = "Working...";
     defaultHiddenThinkingLabel = "Thinking...";
@@ -240,8 +243,32 @@ export class InteractiveMode {
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
         // Register themes from resource loader and initialize
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
+        // SCRAMJET-DIVERGENCE: capture the env classification so the post-extension-bind reapplication
+        // can honor COLORFGBG/Apple-Terminal-detected (never-OSC) terminals. Without this seed, those
+        // terminals would resolve the dark branch and clobber light terminals to scramjet-dark.
+        this.detectedClassification = detectThemeFromEnvironment()?.theme;
         initTheme(this.settingsManager.getTheme(), true);
     }
+    // SCRAMJET-DIVERGENCE: re-resolve the theme after extension themes register (or after a reload),
+    // so scramjet-dark can take effect once it becomes available. An explicit user setting still wins
+    // via the resolver; the captured classification (env-seeded + OSC-updated) drives auto-detection.
+    // Skips the apply when the resolved name already matches the active theme, unless `force` is set:
+    // the reload path forces a re-read from disk (registered extension themes have no file watcher, so
+    // /reload is their only refresh path even when the active theme's name is unchanged).
+    reapplyResolvedTheme(force = false) {
+        const name = resolveThemeName({
+            explicitSetting: this.settingsManager.getTheme(),
+            detectedClassification: this.detectedClassification,
+            hasScramjetDark: getAvailableThemes().includes("scramjet-dark"),
+        });
+        if (!force && name === getCurrentThemeName()) {
+            return;
+        }
+        const result = setTheme(name, true);
+        if (!result.success) {
+            this.showError(`Failed to load theme "${name}": ${result.error}\nFell back to pi-dark theme.`);
+        }
+    }
     getAutocompleteSourceTag(sourceInfo) {
         if (!sourceInfo) {
             return undefined;
@@ -427,10 +454,11 @@ export class InteractiveMode {
         if (!this.settingsManager.getTheme() && !detectThemeFromEnvironment()) {
             const rgb = await this.ui.queryTerminalBackgroundColor({ timeoutMs: 100 });
             if (rgb) {
-                const detected = classifyBackgroundColor(rgb);
-                if (detected !== "dark") {
-                    setTheme(detected);
-                }
+                // SCRAMJET-DIVERGENCE: capture the OSC 11 classification and resolve through the shared
+                // resolver so a dark terminal maps to scramjet-dark (when available) and a light one to
+                // pi-light. Skips the apply when the resolved name is already active.
+                this.detectedClassification = classifyBackgroundColor(rgb);
+                this.reapplyResolvedTheme();
             }
         }
         // Build themed header content (after theme detection so colors are correct)
@@ -1167,6 +1195,9 @@ export class InteractiveMode {
             },
         });
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
+        // SCRAMJET-DIVERGENCE: extension themes (e.g. scramjet-dark) register after the constructor's
+        // initTheme, so re-resolve now that they are available.
+        this.reapplyResolvedTheme();
         this.setupAutocompleteProvider();
         const extensionRunner = this.session.extensionRunner;
         this.setupExtensionShortcuts(extensionRunner);
@@ -3189,7 +3220,8 @@ export class InteractiveMode {
                 transport: this.settingsManager.getTransport(),
                 thinkingLevel: this.session.thinkingLevel,
                 availableThinkingLevels: this.session.getAvailableThinkingLevels(),
-                currentTheme: this.settingsManager.getTheme() || "dark",
+                // SCRAMJET-DIVERGENCE: display fallback routed to the renamed builtin.
+                currentTheme: this.settingsManager.getTheme() || "pi-dark",
                 availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
@@ -3254,7 +3286,8 @@ export class InteractiveMode {
                     this.settingsManager.setTheme(themeName);
                     this.ui.invalidate();
                     if (!result.success) {
-                        this.showError(`Failed to load theme "${themeName}": ${result.error}\nFell back to dark theme.`);
+                        // SCRAMJET-DIVERGENCE: fallback message names the renamed builtin.
+                        this.showError(`Failed to load theme "${themeName}": ${result.error}\nFell back to pi-dark theme.`);
                     }
                 },
                 onThemePreview: (themeName) => {
@@ -4065,11 +4098,10 @@ 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.`);
-            }
+            // SCRAMJET-DIVERGENCE: re-resolve through the resolver after reload so newly registered
+            // themes (and the captured classification) are honored; force a re-read since reload's purpose
+            // is to pick up on-disk theme edits even when the active theme's name is unchanged.
+            this.reapplyResolvedTheme(true);
             const editorPaddingX = this.settingsManager.getEditorPaddingX();
             const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
             this.defaultEditor.setPaddingX(editorPaddingX);