@selesai/code 0.8.7 → 0.8.9

package/dist/index.d.ts

@@ -18,7 +18,7 @@ export type { ResourceCollision, ResourceDiagnostic, ResourceLoader } from "./co
 export { DefaultResourceLoader, loadProjectContextFiles } from "./core/resource-loader.ts";
 export { AgentSessionRuntime, type AgentSessionRuntimeDiagnostic, type AgentSessionServices, type CreateAgentSessionFromServicesOptions, type CreateAgentSessionOptions, type CreateAgentSessionResult, type CreateAgentSessionRuntimeFactory, type CreateAgentSessionRuntimeResult, type CreateAgentSessionServicesOptions, createAgentSession, createAgentSessionFromServices, createAgentSessionRuntime, createAgentSessionServices, createBashTool, createCodingTools, createEditTool, createFindTool, createGrepTool, createLsTool, createReadOnlyTools, createReadTool, createWriteTool, type PromptTemplate, } from "./core/sdk.ts";
 export { type BranchSummaryEntry, buildContextEntries, buildSessionContext, type CompactionEntry, CURRENT_SESSION_VERSION, type CustomEntry, type CustomMessageEntry, type FileEntry, getLatestCompactionEntry, type ModelChangeEntry, migrateSessionEntries, type NewSessionOptions, parseSessionEntries, type SessionContext, type SessionEntry, type SessionEntryBase, type SessionHeader, type SessionInfo, type SessionInfoEntry, SessionManager, type SessionMessageEntry, type SessionTreeNode, sessionEntryToContextMessages, type ThinkingLevelChangeEntry, } from "./core/session-manager.ts";
-export { type AutoHandoffSettings, type CompactionSettings, type DefaultProjectTrust, type ImageSettings, type PackageSource, type RetrySettings, SettingsManager, type SettingsManagerCreateOptions, type TuiMode, } from "./core/settings-manager.ts";
+export { type AutoHandoffSettings, type CompactionSettings, type DefaultProjectTrust, type FullscreenExitOutput, type ImageSettings, type PackageSource, type RetrySettings, SettingsManager, type SettingsManagerCreateOptions, type TuiMode, } from "./core/settings-manager.ts";
 export { formatSkillsForPrompt, type LoadSkillsFromDirOptions, type LoadSkillsResult, loadSkills, loadSkillsFromDir, type Skill, type SkillFrontmatter, } from "./core/skills.ts";
 export { createSyntheticSourceInfo } from "./core/source-info.ts";
 export { type EditDiffResult, generateDiffString, generateUnifiedPatch } from "./core/tools/edit-diff.ts";

package/dist/main.js

@@ -491,6 +491,9 @@ export async function main(args, options) {
         await showFirstTimeSetup(startupSettingsManager);
         time("firstTimeSetup");
     }
+    if (appMode === "interactive" && parsed.useTheme !== undefined) {
+        startupSettingsManager.applyOverrides({ theme: parsed.useTheme });
+    }
     // Decide the final runtime cwd before creating cwd-bound runtime services.
     // --session and --resume may select a session from another project, so project-local
     // settings, resources, provider registrations, and models must be resolved only after
@@ -723,6 +726,7 @@ export async function main(args, options) {
             initialMessages: parsed.messages,
             verbose: parsed.verbose,
             tuiMode: parsed.tuiMode,
+            initialThemeSetting: parsed.useTheme,
         });
         if (startupBenchmark) {
             await interactiveMode.init();

package/dist/modes/interactive/components/model-selector.js

@@ -1,6 +1,7 @@
 import { modelsAreEqual } from "@earendil-works/pi-ai";
 import { Container, fuzzyFilter, getKeybindings, Input, Spacer, Text, } from "@earendil-works/pi-tui";
 import { getModelSelectorSearchText } from "../model-search.js";
+import { refreshModelCatalogs } from "../model-catalog-refresh.js";
 import { theme } from "../theme/theme.js";
 import { DynamicBorder } from "./dynamic-border.js";
 import { keyHint } from "./keybinding-hints.js";
@@ -123,7 +124,7 @@ export class ModelSelectorComponent extends Container {
             this.refreshAbortController.abort();
         }, timeoutMs);
         try {
-            const result = await this.modelRuntime.refresh({ signal: this.refreshAbortController.signal });
+            const result = await refreshModelCatalogs(this.modelRuntime, this.refreshAbortController.signal);
             if (this.closed)
                 return;
             this.refreshStatusMessage = "";

package/dist/modes/interactive/components/settings-selector.d.ts

@@ -1,7 +1,7 @@
 import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
 import type { Transport } from "@earendil-works/pi-ai";
 import { Container, type ScrollViewScrollbar, SettingsList } from "@earendil-works/pi-tui";
-import type { DefaultProjectTrust, TuiMode, WarningSettings } from "../../../core/settings-manager.ts";
+import type { DefaultProjectTrust, FullscreenExitOutput, TuiMode, WarningSettings } from "../../../core/settings-manager.ts";
 import { type TerminalTheme } from "../theme/theme.ts";
 export interface SettingsConfig {
     autoCompact: boolean;
@@ -35,6 +35,7 @@ export interface SettingsConfig {
     clearOnShrink: boolean;
     showTerminalProgress: boolean;
     tuiMode: TuiMode;
+    fullscreenExitOutput: FullscreenExitOutput;
     fullscreenScrollbar: ScrollViewScrollbar;
     warnings: WarningSettings;
 }
@@ -68,6 +69,7 @@ export interface SettingsCallbacks {
     onClearOnShrinkChange: (enabled: boolean) => void;
     onShowTerminalProgressChange: (enabled: boolean) => void;
     onTuiModeChange: (mode: TuiMode) => void;
+    onFullscreenExitOutputChange: (output: FullscreenExitOutput) => void;
     onFullscreenScrollbarChange: (mode: ScrollViewScrollbar) => void;
     onWarningsChange: (warnings: WarningSettings) => void;
     onCancel: () => void;

package/dist/modes/interactive/components/settings-selector.js

@@ -409,6 +409,13 @@ export class SettingsSelectorComponent extends Container {
                 currentValue: config.tuiMode,
                 values: ["fullscreen", "regular"],
             },
+            {
+                id: "fullscreen-exit-output",
+                label: "Fullscreen exit output",
+                description: "Print the transcript or only a session resume hint when exiting fullscreen mode",
+                currentValue: config.fullscreenExitOutput,
+                values: ["transcript", "resume-hint"],
+            },
             {
                 id: "fullscreen-scrollbar",
                 label: "Fullscreen scrollbar",
@@ -603,6 +610,9 @@ export class SettingsSelectorComponent extends Container {
                 case "tui-mode":
                     callbacks.onTuiModeChange(newValue);
                     break;
+                case "fullscreen-exit-output":
+                    callbacks.onFullscreenExitOutputChange(newValue);
+                    break;
                 case "fullscreen-scrollbar":
                     callbacks.onFullscreenScrollbarChange(newValue);
                     break;

package/dist/modes/interactive/components/tool-execution.js

@@ -2,7 +2,9 @@ import { Box, Container, getCapabilities, Image, Spacer, Text } from "@earendil-
 import { createAllToolDefinitions } from "../../../core/tools/index.js";
 import { getTextOutput as getRenderedTextOutput } from "../../../core/tools/render-utils.js";
 import { convertToPng } from "../../../utils/image-convert.js";
+import { keyHint } from "./keybinding-hints.js";
 import { theme } from "../theme/theme.js";
+const FALLBACK_PREVIEW_LINES = 10;
 export class ToolExecutionComponent extends Container {
     contentBox;
     contentText;
@@ -111,7 +113,14 @@ export class ToolExecutionComponent extends Container {
         if (!output) {
             return undefined;
         }
-        return new Text(theme.fg("toolOutput", output), 0, 0);
+        const lines = output.split("\n");
+        const displayLines = this.expanded ? lines : lines.slice(0, FALLBACK_PREVIEW_LINES);
+        const remaining = lines.length - displayLines.length;
+        let text = displayLines.map((line) => theme.fg("toolOutput", line)).join("\n");
+        if (remaining > 0) {
+            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")}${theme.fg("muted", ")")}`;
+        }
+        return new Text(text, 0, 0);
     }
     updateArgs(args) {
         this.args = args;

package/dist/modes/interactive/interactive-mode.d.ts

@@ -7,7 +7,7 @@ import type { Terminal } from "@earendil-works/pi-tui";
 import { type TUI, TuiAltScreen, TuiMainScreen } from "@earendil-works/pi-tui";
 import { type AgentSessionRuntime } from "../../core/agent-session-runtime.ts";
 import { SessionManager } from "../../core/session-manager.ts";
-import type { TuiMode } from "../../core/settings-manager.ts";
+import type { FullscreenExitOutput, TuiMode } from "../../core/settings-manager.ts";
 import { type LatestPiRelease } from "../../utils/version-check.ts";
 type PendingUserInput = {
     text: string;
@@ -34,6 +34,8 @@ export interface InteractiveModeOptions {
     verbose?: boolean;
     /** TUI layout mode. */
     tuiMode?: TuiMode;
+    /** Initial interactive theme setting for this invocation. */
+    initialThemeSetting?: string;
 }
 interface InteractiveTuiOptions {
     tuiMode: TuiMode;
@@ -93,6 +95,7 @@ export declare class InteractiveMode {
     private streamingMessage;
     private pendingTools;
     private toolOutputExpanded;
+    private managedToolStatusStarted;
     private hideThinkingBlock;
     private outputPad;
     private unsubscribe?;
@@ -271,11 +274,14 @@ export declare class InteractiveMode {
     private handleClipboardPaste;
     private consumePendingInputImages;
     private handleGitCommand;
+    private handleStartupSubmit;
     private setupEditorSubmitHandler;
     private subscribeToAgent;
     private handleEvent;
     /** Extract text content from a user message */
     private getUserMessageText;
+    /** Show a managed-tool status update in the chat. */
+    private showManagedToolStatus;
     /**
      * Show a status message in the chat.
      *
@@ -425,6 +431,6 @@ export declare class InteractiveMode {
     private checkDaxnutsEasterEgg;
     private handleBashCommand;
     private handleCompactCommand;
-    stop(): void;
+    stop(fullscreenExitOutput?: FullscreenExitOutput): void;
 }
 export {};

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

@@ -69,6 +69,7 @@ import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
 import { editInExternalEditor } from "./external-editor.js";
 import { getModelSearchText } from "./model-search.js";
+import { refreshModelCatalogs } from "./model-catalog-refresh.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) {
@@ -168,9 +169,21 @@ function formatLoginProviderCompletionDescription(provider) {
 export function createInteractiveTui(options) {
     const terminal = options.terminal ?? new ProcessTerminal();
     if (options.tuiMode === "fullscreen") {
+        const styleSearchMatch = (text) => theme.bg("searchMatchBg", theme.fg("searchMatchText", text));
         return new TuiAltScreen(terminal, options.showHardwareCursor, options.logDirectory, {
+            searchMatchStyle: (text) => theme.underline(styleSearchMatch(text)),
+            searchCurrentMatchStyle: (text) => theme.bold(theme.inverse(styleSearchMatch(text))),
             openUrl: openBrowser,
             onRightClickPaste: options.onRightClickPaste,
+            copySelection: async (text) => {
+                try {
+                    await copyToClipboard(text);
+                    return true;
+                }
+                catch {
+                    return false;
+                }
+            },
         });
     }
     return new TuiMainScreen(terminal, options.showHardwareCursor, options.logDirectory);
@@ -258,6 +271,7 @@ export class InteractiveMode {
     pendingTools = new Map();
     // Tool output expansion state
     toolOutputExpanded = false;
+    managedToolStatusStarted = false;
     // Thinking block visibility state
     hideThinkingBlock = false;
     outputPad = 1;
@@ -369,7 +383,12 @@ export class InteractiveMode {
         this.outputPad = this.settingsManager.getOutputPad();
         // Register themes from resource loader and initialize
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-        this.themeController = new InteractiveThemeController(this.ui, this.settingsManager, (message) => this.showError(message), () => this.updateEditorBorderColor());
+        this.themeController = new InteractiveThemeController(this.ui, {
+            getSettingsManager: () => this.settingsManager,
+            showError: (message) => this.showError(message),
+            onChanged: () => this.updateEditorBorderColor(),
+            initialThemeSetting: options.initialThemeSetting,
+        });
     }
     getAutocompleteSourceTag(sourceInfo) {
         if (!sourceInfo) {
@@ -530,14 +549,14 @@ export class InteractiveMode {
             tui.setLayoutRoot(this.fullscreenLayoutRoot);
         }
     }
-    stopInteractiveTui() {
-        if (this.renderer.mode === "fullscreen") {
+    stopInteractiveTui(fullscreenExitOutput) {
+        if (this.renderer.mode === "fullscreen" && fullscreenExitOutput === "transcript") {
             while (this.renderer.hasOverlayEntries)
                 this.renderer.hideOverlay();
             this.switchTuiMode("regular", false, false);
             this.renderer.renderNow();
         }
-        this.ui.stop();
+        this.ui.stop({ preserveScreen: this.renderer.mode === "fullscreen" });
     }
     switchTuiMode(mode, restoreProgress = true, startRenderer = true) {
         const previousUi = this.renderer;
@@ -594,10 +613,6 @@ export class InteractiveMode {
         this.registerSignalHandlers();
         // Load changelog (only show new entries, skip for resumed sessions)
         this.changelogMarkdown = this.getChangelogForDisplay();
-        // Ensure fd and rg are available (downloads if missing, adds to PATH via getBinDir)
-        // Both are needed: fd for autocomplete, rg for grep tool and bash commands
-        const [fdPath] = await Promise.all([ensureTool("fd"), ensureTool("rg")]);
-        this.fdPath = fdPath;
         if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
             const modelList = this.session.scopedModels
                 .map((sm) => {
@@ -641,9 +656,11 @@ export class InteractiveMode {
             this.widgetContainerBelow,
             this.footerContainer,
         ]);
+        // Accept text while startup completes, but only enable interrupt, exit, and submission feedback.
+        this.defaultEditor.onAction("app.clear", () => this.handleCtrlC());
+        this.defaultEditor.onCtrlD = () => this.handleCtrlD();
+        this.defaultEditor.onSubmit = (text) => this.handleStartupSubmit(text);
         this.ui.setFocus(this.editor);
-        this.setupKeyHandlers();
-        this.setupEditorSubmitHandler();
         // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
         this.ui.start();
         this.isInitialized = true;
@@ -695,6 +712,18 @@ export class InteractiveMode {
             this.headerContainer.addChild(this.builtInHeader);
         }
         this.ui.requestRender();
+        // Ensure fd and rg are available after mounting the TUI (downloads if missing, adds to PATH via getBinDir)
+        // so slow downloads do not make startup appear frozen.
+        // Both are needed: fd for autocomplete, rg for grep tool and bash commands.
+        const [fdPath] = await Promise.all([
+            ensureTool("fd", (status) => this.showManagedToolStatus(status)),
+            ensureTool("rg", (status) => this.showManagedToolStatus(status)),
+        ]);
+        this.fdPath = fdPath;
+        // Enable the remaining input handlers only after managed-tool setup completes.
+        this.setupKeyHandlers();
+        this.setupEditorSubmitHandler();
+        this.ui.requestRender();
         // Initialize extensions first so resources are shown before messages
         await this.rebindCurrentSession();
         // Render initial messages AFTER showing loaded resources
@@ -732,10 +761,12 @@ export class InteractiveMode {
     async run() {
         await this.init();
         if (!process.env.PI_OFFLINE) {
-            void this.session.modelRuntime
-                .refresh()
+            const controller = new AbortController();
+            const timeout = setTimeout(() => controller.abort(), 15_000);
+            void refreshModelCatalogs(this.session.modelRuntime, controller.signal)
                 .then(() => this.updateAvailableProviderCount())
-                .catch(() => { });
+                .catch(() => { })
+                .finally(() => clearTimeout(timeout));
         }
         // Start version check asynchronously
         checkForNewPiVersion(this.version, PACKAGE_NAME).then((newRelease) => {
@@ -1484,7 +1515,7 @@ export class InteractiveMode {
         const message = error instanceof Error ? error.message : String(error);
         this.showError(`${prefix}: ${message}`);
         stopThemeWatcher();
-        this.stop();
+        this.stop("transcript");
         process.exit(1);
     }
     renderCurrentSessionState() {
@@ -2307,6 +2338,10 @@ export class InteractiveMode {
         }
         await this.session.prompt(prompt, { images });
     }
+    handleStartupSubmit(text) {
+        this.editor.setText(text);
+        this.showStatus("Startup is still in progress");
+    }
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
             text = text.trim();
@@ -2794,6 +2829,19 @@ export class InteractiveMode {
             : message.content.filter((c) => c.type === "text");
         return textBlocks.map((c) => c.text).join("");
     }
+    /** Show a managed-tool status update in the chat. */
+    showManagedToolStatus(status) {
+        if (!this.managedToolStatusStarted) {
+            this.chatContainer.addChild(new Spacer(1));
+            this.managedToolStatusStarted = true;
+        }
+        const message = status.type === "warning" ? `Warning: ${status.message}` : status.message;
+        const color = status.type === "warning" ? "warning" : "dim";
+        this.chatContainer.addChild(new Text(theme.fg(color, message), 1, 0));
+        this.lastStatusSpacer = undefined;
+        this.lastStatusText = undefined;
+        this.ui.requestRender();
+    }
     /**
      * Show a status message in the chat.
      *
@@ -3165,7 +3213,7 @@ export class InteractiveMode {
             this.ui.stop();
         }
         catch { }
-        console.error("pi exiting due to uncaughtException:");
+        console.error(`${APP_NAME} exiting due to uncaughtException:`);
         console.error(error);
         process.exit(1);
     }
@@ -3626,7 +3674,7 @@ export class InteractiveMode {
                 httpIdleTimeoutMs: this.settingsManager.getHttpIdleTimeoutMs(),
                 thinkingLevel: this.session.thinkingLevel,
                 availableThinkingLevels: this.session.getAvailableThinkingLevels(),
-                currentTheme: this.settingsManager.getThemeSetting() || "dark",
+                currentTheme: this.themeController.getThemeSelection() || "dark",
                 terminalTheme: this.themeController.getTerminalTheme(),
                 availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
@@ -3644,6 +3692,7 @@ export class InteractiveMode {
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
                 tuiMode: this.settingsManager.getTuiMode(),
+                fullscreenExitOutput: this.settingsManager.getFullscreenExitOutput(),
                 fullscreenScrollbar: this.settingsManager.getFullscreenScrollbar(),
                 warnings: this.settingsManager.getWarnings(),
             }, {
@@ -3701,7 +3750,7 @@ export class InteractiveMode {
                 },
                 onThemeChange: (themeSetting) => {
                     this.settingsManager.setTheme(themeSetting);
-                    void this.themeController.applyFromSettings();
+                    void this.themeController.setThemeSetting(themeSetting);
                 },
                 onThemePreview: (themeName) => this.themeController.preview(themeName),
                 onHideThinkingBlockChange: (hidden) => {
@@ -3795,6 +3844,9 @@ export class InteractiveMode {
                         this.statusContainer.clear();
                     this.showStatus(`TUI mode: ${mode}`);
                 },
+                onFullscreenExitOutputChange: (output) => {
+                    this.settingsManager.setFullscreenExitOutput(output);
+                },
                 onFullscreenScrollbarChange: (mode) => {
                     this.settingsManager.setFullscreenScrollbar(mode);
                     this.transcriptScrollView?.setScrollbar(mode);
@@ -3842,7 +3894,8 @@ export class InteractiveMode {
             return this.session.scopedModels.map((scoped) => scoped.model);
         }
         try {
-            await this.session.modelRuntime.refresh();
+            const controller = new AbortController();
+            await refreshModelCatalogs(this.session.modelRuntime, controller.signal);
             return [...(await this.session.modelRuntime.getAvailable())];
         }
         catch {
@@ -3919,7 +3972,7 @@ export class InteractiveMode {
                 onSelect: (selection) => {
                     trustStore.setMany(selection.updates);
                     done();
-                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart pi for this to take effect.`);
+                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart ${APP_NAME} for this to take effect.`);
                 },
                 onCancel: () => {
                     done();
@@ -3954,7 +4007,8 @@ export class InteractiveMode {
     }
     async showModelsSelector() {
         // Get all available models
-        await this.session.modelRuntime.refresh();
+        const controller = new AbortController();
+        await refreshModelCatalogs(this.session.modelRuntime, controller.signal);
         const allModels = [...(await this.session.modelRuntime.getAvailable())];
         const allModelIds = new Set(allModels.map((model) => `${model.provider}/${model.id}`));
         const configuredPatterns = this.settingsManager.getEnabledModels();
@@ -4507,7 +4561,7 @@ export class InteractiveMode {
             this.ui.requestRender();
         };
         const dialog = new LoginDialogComponent(this.ui, providerOption.id, () => restoreEditor(), providerOption.name, `${providerOption.name} setup`);
-        dialog.showInfo(`${providerOption.method?.name ?? "Authentication"} is configured outside pi.`, [], true);
+        dialog.showInfo(`${providerOption.method?.name ?? "Authentication"} is configured outside ${APP_NAME}.`, [], true);
         this.editorContainer.clear();
         this.editorContainer.addChild(dialog);
         this.ui.setFocus(dialog);
@@ -4794,7 +4848,9 @@ export class InteractiveMode {
                 this.showStatus(`Session exported to: ${filePath}`);
             }
             else {
-                const filePath = await this.session.exportToHtml(outputPath);
+                const filePath = await this.session.exportToHtml(outputPath, {
+                    themeName: theme.name,
+                });
                 this.showStatus(`Session exported to: ${filePath}`);
             }
         }
@@ -4885,7 +4941,7 @@ export class InteractiveMode {
         // Export to a temp file
         const tmpFile = path.join(os.tmpdir(), "session.html");
         try {
-            await this.session.exportToHtml(tmpFile);
+            await this.session.exportToHtml(tmpFile, { themeName: theme.name });
         }
         catch (error) {
             this.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
@@ -5326,7 +5382,7 @@ export class InteractiveMode {
             // Ignore, will be emitted as an event
         }
     }
-    stop() {
+    stop(fullscreenExitOutput = this.settingsManager.getFullscreenExitOutput()) {
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }
@@ -5339,7 +5395,7 @@ export class InteractiveMode {
             this.unsubscribe();
         }
         if (this.isInitialized) {
-            this.stopInteractiveTui();
+            this.stopInteractiveTui(fullscreenExitOutput);
             this.isInitialized = false;
         }
         this.unregisterSignalHandlers();

package/dist/modes/interactive/model-catalog-refresh.d.ts

@@ -0,0 +1,6 @@
+import type { ModelsRefreshResult } from "@earendil-works/pi-ai";
+import type { ModelRuntime } from "../../core/model-runtime.ts";
+type ModelCatalogRuntime = Pick<ModelRuntime, "refresh">;
+/** Share concurrent interactive all-catalog refreshes while keeping each caller's cancellation independent. */
+export declare function refreshModelCatalogs(modelRuntime: ModelCatalogRuntime, signal: AbortSignal): Promise<ModelsRefreshResult>;
+export {};

package/dist/modes/interactive/model-catalog-refresh.js

@@ -0,0 +1,33 @@
+import { raceWithAbortSignal } from "../../utils/abort.js";
+class ModelCatalogRefreshCoordinator {
+    activeByRuntime = new WeakMap();
+    refresh(modelRuntime, signal) {
+        signal.throwIfAborted();
+        let active = this.activeByRuntime.get(modelRuntime);
+        if (!active) {
+            const controller = new AbortController();
+            let created;
+            const operation = modelRuntime.refresh({ signal: controller.signal });
+            const promise = raceWithAbortSignal(operation, controller.signal).finally(() => {
+                if (this.activeByRuntime.get(modelRuntime) === created) {
+                    this.activeByRuntime.delete(modelRuntime);
+                }
+            });
+            created = { controller, promise, waiters: 0 };
+            active = created;
+            this.activeByRuntime.set(modelRuntime, active);
+        }
+        active.waiters++;
+        return raceWithAbortSignal(active.promise, signal).finally(() => {
+            active.waiters--;
+            if (active.waiters === 0 && this.activeByRuntime.get(modelRuntime) === active) {
+                active.controller.abort();
+            }
+        });
+    }
+}
+const modelCatalogRefreshCoordinator = new ModelCatalogRefreshCoordinator();
+/** Share concurrent interactive all-catalog refreshes while keeping each caller's cancellation independent. */
+export function refreshModelCatalogs(modelRuntime, signal) {
+    return modelCatalogRefreshCoordinator.refresh(modelRuntime, signal);
+}

package/dist/modes/interactive/theme/dark.json

@@ -34,6 +34,8 @@
 
 		"selectedBg": "selectedBg",
 		"scrollbarThumb": "selectedBg",
+		"searchMatchBg": "selectedBg",
+		"searchMatchText": "text",
 		"userMessageBg": "userMsgBg",
 		"userMessageText": "text",
 		"customMessageBg": "customMsgBg",

package/dist/modes/interactive/theme/light.json

@@ -33,6 +33,8 @@
 
 		"selectedBg": "selectedBg",
 		"scrollbarThumb": "selectedBg",
+		"searchMatchBg": "selectedBg",
+		"searchMatchText": "text",
 		"userMessageBg": "userMsgBg",
 		"userMessageText": "text",
 		"customMessageBg": "customMsgBg",

package/dist/modes/interactive/theme/theme-controller.d.ts

@@ -7,17 +7,25 @@ type ThemeResult = {
 };
 export declare class InteractiveThemeController {
     private readonly ui;
-    private readonly settingsManager;
+    private readonly getSettingsManager;
     private readonly showError;
     private readonly onChanged;
+    private currentThemeSetting;
     private terminalTheme;
     private activeThemeName;
     private autoSyncEnabled;
     private terminalColorSchemeUnsubscribe;
-    constructor(ui: TUI, settingsManager: SettingsManager, showError: (message: string) => void, onChanged: () => void);
+    constructor(ui: TUI, options: {
+        getSettingsManager: () => SettingsManager;
+        showError: (message: string) => void;
+        onChanged: () => void;
+        initialThemeSetting?: string;
+    });
     rebindTui(): void;
     applyFromSettings(): Promise<void>;
+    getThemeSelection(): string | undefined;
     setThemeName(themeName: string, showError?: boolean): ThemeResult;
+    setThemeSetting(themeSetting: string): Promise<void>;
     setThemeInstance(themeInstance: Theme): ThemeResult;
     preview(themeSettingOrName: string): void;
     disableAutoSync(): void;

package/dist/modes/interactive/theme/theme-controller.js

@@ -1,19 +1,21 @@
 import { detectTerminalBackgroundFromEnv, detectTerminalBackgroundTheme, detectTerminalThemeForAuto, initTheme, parseAutoThemeSetting, resolveThemeSetting, setTheme, setThemeInstance, } from "./theme.js";
 export class InteractiveThemeController {
     ui;
-    settingsManager;
+    getSettingsManager;
     showError;
     onChanged;
+    currentThemeSetting;
     terminalTheme = detectTerminalBackgroundFromEnv().theme;
     activeThemeName;
     autoSyncEnabled = false;
     terminalColorSchemeUnsubscribe;
-    constructor(ui, settingsManager, showError, onChanged) {
+    constructor(ui, options) {
         this.ui = ui;
-        this.settingsManager = settingsManager;
-        this.showError = showError;
-        this.onChanged = onChanged;
-        this.activeThemeName = resolveThemeSetting(this.settingsManager.getThemeSetting(), this.terminalTheme);
+        this.getSettingsManager = options.getSettingsManager;
+        this.showError = options.showError;
+        this.onChanged = options.onChanged;
+        this.currentThemeSetting = options.initialThemeSetting;
+        this.activeThemeName = resolveThemeSetting(this.currentThemeSetting ?? this.getSettingsManager().getThemeSetting(), this.terminalTheme);
         initTheme(this.activeThemeName, true);
         this.bindTerminalColorSchemeListener();
     }
@@ -23,7 +25,8 @@ export class InteractiveThemeController {
         this.ui.setTerminalColorSchemeNotifications(this.autoSyncEnabled);
     }
     async applyFromSettings() {
-        const themeSetting = this.settingsManager.getThemeSetting();
+        const settingsManager = this.getSettingsManager();
+        const themeSetting = this.currentThemeSetting ?? settingsManager.getThemeSetting();
         const autoTheme = parseAutoThemeSetting(themeSetting);
         if (autoTheme) {
             this.terminalTheme = await detectTerminalThemeForAuto({ ui: this.ui, timeoutMs: 100 });
@@ -41,13 +44,24 @@ export class InteractiveThemeController {
         if (!this.applyThemeName(detection.theme).success)
             return;
         if (detection.confidence === "high") {
-            this.settingsManager.setTheme(detection.theme);
-            await this.settingsManager.flush();
+            settingsManager.setTheme(detection.theme);
+            await settingsManager.flush();
         }
     }
+    getThemeSelection() {
+        return this.currentThemeSetting ?? this.getSettingsManager().getThemeSetting() ?? this.activeThemeName;
+    }
     setThemeName(themeName, showError = false) {
         this.setAutoSync(false);
-        return this.applyThemeName(themeName, showError);
+        const result = this.applyThemeName(themeName, showError);
+        if (result.success) {
+            this.currentThemeSetting = themeName;
+        }
+        return result;
+    }
+    async setThemeSetting(themeSetting) {
+        this.currentThemeSetting = themeSetting;
+        await this.applyFromSettings();
     }
     setThemeInstance(themeInstance) {
         this.setAutoSync(false);
@@ -97,7 +111,7 @@ export class InteractiveThemeController {
         if (!this.autoSyncEnabled)
             return;
         this.terminalTheme = terminalTheme;
-        const autoTheme = parseAutoThemeSetting(this.settingsManager.getThemeSetting());
+        const autoTheme = parseAutoThemeSetting(this.currentThemeSetting ?? this.getSettingsManager().getThemeSetting());
         if (!autoTheme) {
             this.setAutoSync(false);
             return;

package/dist/modes/interactive/theme/theme-schema.json

@@ -34,7 +34,7 @@
 		},
 		"colors": {
 			"type": "object",
-			"description": "Theme color definitions (thinkingMax is optional and falls back to thinkingXhigh)",
+			"description": "Theme color definitions (thinkingMax and scrollbarThumb are optional and use compatible fallbacks)",
 			"required": [
 				"accent",
 				"border",
@@ -137,6 +137,14 @@
 					"$ref": "#/$defs/colorValue",
 					"description": "Selected item background"
 				},
+				"searchMatchBg": {
+					"$ref": "#/$defs/colorValue",
+					"description": "Transcript search match background and current-match text (falls back to selectedBg when omitted)"
+				},
+				"searchMatchText": {
+					"$ref": "#/$defs/colorValue",
+					"description": "Transcript search match text and current-match background (falls back to text when omitted)"
+				},
 				"userMessageBg": {
 					"$ref": "#/$defs/colorValue",
 					"description": "User message background"