@code-yeongyu/senpi 2026.8.14 → 2026.8.17

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

@@ -42,6 +42,7 @@ import { openBrowser } from "../../utils/open-browser.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { getPiUserAgent } from "../../utils/pi-user-agent.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
+import { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewPiVersion, getReleaseChangelogUrl } from "../../utils/version-check.js";
 import { abortedErrorLabel } from "./aborted-error-label.js";
 import { transferCompactionQueue, waitForPromptDisposition, } from "./compaction-queue-transfer.js";
@@ -80,15 +81,15 @@ 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 { expandEditorSubmission, transferEditorContent } from "./editor-paste-transfer.js";
+import { expandEditorSubmission, expandSubmittedText, transferEditorContent } from "./editor-paste-transfer.js";
 import { formatExtensionErrorHeadline, sanitizeTuiErrorMessage } from "./extension-error-format.js";
 import { editFileInExternalEditor, editInExternalEditor } from "./external-editor.js";
 import { GrokChrome } from "./grok/chrome.js";
 import { restoreInteractiveStderr, takeOverInteractiveStderr } from "./interactive-stderr-guard.js";
 import { applyKeybindingsFileEdit, seedKeybindingsFile } from "./keybindings-command.js";
+import { refreshModelCatalogs } from "./model-catalog-refresh.js";
 import { getModelSearchText } from "./model-search.js";
 import { isRiskyMainModel, RISKY_MAIN_MODEL_WARNING } from "./risky-main-model-warning.js";
-import { resolveStartupToolPaths } from "./startup-tools.js";
 import { DEFAULT_SMOOTH_FPS, StreamingRevealController } from "./streaming-reveal.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, onThemeChange, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 import { InteractiveThemeController } from "./theme/theme-controller.js";
@@ -261,9 +262,21 @@ function formatLoginProviderCompletionDescription(provider) {
 export function createInteractiveTui(options) {
     const terminal = options.terminal ?? new ProcessTerminal({ onExternalStdoutWrite: appendHiddenTuiStdout });
     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);
@@ -359,6 +372,7 @@ export class InteractiveMode {
         // Status line tracking (for mutating immediately-sequential status updates)
         this.lastStatusSpacer = undefined;
         this.lastStatusText = undefined;
+        this.managedToolStatusStarted = false;
         // Streaming message tracking
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
@@ -427,6 +441,7 @@ export class InteractiveMode {
         });
         this.runtimeHost.setRebindSession(async () => {
             await this.rebindCurrentSession({ renderBeforeBind: true });
+            await this.themeController.applyFromSettings();
         });
         this.version = DISPLAY_VERSION;
         this.renderer = createInteractiveTui({
@@ -498,7 +513,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) {
@@ -661,14 +681,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;
@@ -725,9 +745,6 @@ export class InteractiveMode {
         this.registerSignalHandlers();
         // Load changelog (only show new entries, skip for resumed sessions)
         this.changelogMarkdown = this.getChangelogForDisplay();
-        // Startup should never wait for tool downloads. Missing tools are resolved
-        // lazily by the tools that need them.
-        this.fdPath = resolveStartupToolPaths().fdPath;
         if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
             const modelList = this.session.scopedModels
                 .map((sm) => {
@@ -780,9 +797,14 @@ export class InteractiveMode {
         else {
             this.mountInteractiveTui(this.renderer, rootComponents);
         }
+        // Accept text while startup completes, but only enable interrupt, exit, and submission feedback.
+        // Renderer-only lifecycle hosts may mount the chrome tree without constructing the base editor.
+        if (this.defaultEditor) {
+            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
         try {
             takeOverInteractiveStderr();
@@ -857,6 +879,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
@@ -903,8 +937,7 @@ export class InteractiveMode {
         if (!envValue("OFFLINE")) {
             const controller = new AbortController();
             const timeout = setTimeout(() => controller.abort(), 15_000);
-            void this.session.modelRuntime
-                .refresh({ signal: controller.signal })
+            void refreshModelCatalogs(this.session.modelRuntime, controller.signal)
                 .then(() => {
                 this.updateAvailableProviderCount();
                 this.ui.requestRender();
@@ -1733,7 +1766,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() {
@@ -2514,7 +2547,7 @@ export class InteractiveMode {
             const newEditor = factory(this.ui, this.chrome ? this.chrome.getEditorTheme() : getEditorTheme(), this.keybindings);
             // Wire up callbacks from the default editor
             newEditor.onSubmit = (text) => {
-                this.defaultEditor.onSubmit?.(expandEditorSubmission(newEditor, text));
+                this.defaultEditor.onSubmit?.(expandSubmittedText(newEditor, text));
             };
             newEditor.onChange = this.defaultEditor.onChange;
             // Copy text (and any collapsed paste markers) from previous editor
@@ -2805,6 +2838,10 @@ export class InteractiveMode {
         this.sessionLogger ??= createSessionLogger(this.runtimeHost.services.agentDir);
         return this.sessionLogger;
     }
+    handleStartupSubmit(text) {
+        this.editor.setText(text);
+        this.showStatus("Startup is still in progress");
+    }
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
             this.hideShortcutOverlay();
@@ -3080,6 +3117,9 @@ export class InteractiveMode {
             case "high_reasoning_warning":
                 this.showHighReasoningWarning(event);
                 break;
+            case "settings_source_selected":
+                this.showSettingsSourceSelected(event);
+                break;
             case "message_start":
                 if (event.message.role === "custom") {
                     this.addMessageToChat(event.message);
@@ -3515,6 +3555,19 @@ export class InteractiveMode {
             : message.content.filter((content) => content.type === "text");
         return textBlocks.map((content) => content.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.
      *
@@ -3910,7 +3963,7 @@ export class InteractiveMode {
         }
         catch { }
         restoreInteractiveStderr();
-        console.error("pi exiting due to uncaughtException:");
+        console.error(`${APP_NAME} exiting due to uncaughtException:`);
         console.error(error);
         process.exit(1);
     }
@@ -4210,6 +4263,9 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("error", text)));
         this.ui.requestRender();
     }
+    showSettingsSourceSelected(event) {
+        this.showStatus(`Settings: ${path.basename(event.path)} (${event.format.toUpperCase()})`);
+    }
     showHighReasoningWarning(event) {
         const { title, body } = buildHighReasoningWarning({ id: event.modelId, provider: event.provider }, event.thinkingLevel);
         this.chatContainer.addChild(new Spacer(1));
@@ -4498,7 +4554,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,
@@ -4519,6 +4575,7 @@ export class InteractiveMode {
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
                 tuiMode: this.ui.mode,
+                fullscreenExitOutput: this.settingsManager.getFullscreenExitOutput(),
                 fullscreenScrollbar: this.settingsManager.getFullscreenScrollbar(),
                 warnings: this.settingsManager.getWarnings(),
             }, {
@@ -4576,7 +4633,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) => {
@@ -4702,6 +4759,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.applyFullscreenScrollbarSetting();
@@ -4744,7 +4804,7 @@ export class InteractiveMode {
             controller.abort();
         }, 15_000);
         try {
-            const result = await this.session.modelRuntime.refresh({ signal: controller.signal });
+            const result = await refreshModelCatalogs(this.session.modelRuntime, controller.signal);
             if (result.aborted && timedOut) {
                 this.showWarning("Model refresh timed out; searching cached models.");
             }
@@ -4805,34 +4865,31 @@ export class InteractiveMode {
         const favoriteModels = await this.resolveFavoriteModelsForUi(patterns, candidateModels);
         return favoriteModels.map((favorite) => getModelFullId(favorite.model));
     }
-    async updateSessionFavoritesFromIds(favoriteIds, candidateModels) {
-        const nextIds = favoriteIds === null ? candidateModels.map(getModelFullId) : favoriteIds;
-        if (nextIds.length === 0) {
-            this.session.setFavoriteModels([]);
-            this.ui.requestRender();
-            return;
-        }
-        const newFavoriteModels = await this.resolveFavoriteModelsForUi(nextIds, candidateModels);
+    async captureFavoritePatternSnapshot() {
+        const storedPatterns = this.settingsManager.getFavoriteModels() ?? [];
+        const { patternResolutions } = await resolveModelScopeWithDiagnostics(storedPatterns, this.session.modelRuntime);
+        return { storedPatterns, patternResolutions };
+    }
+    async applyFavoriteSelection(favoriteIds, candidateModels, persist, patternSnapshot) {
+        const { storedPatterns, patternResolutions } = patternSnapshot;
+        const mergedPatterns = mergeFavoritePatternsForPersist({
+            storedPatterns,
+            patternResolutions,
+            selectedIds: favoriteIds,
+            candidateIds: candidateModels.map(getModelFullId),
+        });
+        const newFavoriteModels = mergedPatterns
+            ? await resolveModelScope(mergedPatterns, this.session.modelRuntime)
+            : [];
         this.session.setFavoriteModels(newFavoriteModels.map((favorite) => ({
             model: favorite.model,
             thinkingLevel: favorite.thinkingLevel,
             serviceTier: favorite.serviceTier,
         })));
+        if (persist)
+            this.settingsManager.setFavoriteModels(mergedPatterns);
         this.ui.requestRender();
     }
-    async persistFavoritePatterns(favoriteIds, candidateModels) {
-        const storedPatterns = this.settingsManager.getFavoriteModels() ?? [];
-        const { diagnostics } = await resolveModelScopeWithDiagnostics(storedPatterns, this.session.modelRuntime);
-        const unresolvedPatterns = diagnostics
-            .filter((diagnostic) => diagnostic.code === "no-match")
-            .map((diagnostic) => diagnostic.pattern);
-        this.settingsManager.setFavoriteModels(mergeFavoritePatternsForPersist({
-            storedPatterns,
-            unresolvedPatterns,
-            selectedIds: favoriteIds,
-            candidateIds: candidateModels.map(getModelFullId),
-        }));
-    }
     /** Update the footer's available provider count from the current snapshot without refreshing catalogs. */
     updateAvailableProviderCount() {
         const models = this.session.scopedModels.length > 0
@@ -4903,7 +4960,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();
@@ -4914,6 +4971,7 @@ export class InteractiveMode {
         });
     }
     showModelSelector(initialSearchInput) {
+        const favoritePatternSnapshot = this.captureFavoritePatternSnapshot();
         this.showSelector((done) => {
             const favoriteModelIds = this.session.favoriteModels.map((favorite) => getModelFullId(favorite.model));
             const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRuntime, this.session.scopedModels, (model) => {
@@ -4924,8 +4982,7 @@ export class InteractiveMode {
             }, initialSearchInput, {
                 favoriteModelIds,
                 onFavoriteChange: async (favoriteIds, allModels) => {
-                    await this.updateSessionFavoritesFromIds(favoriteIds, allModels);
-                    await this.persistFavoritePatterns(favoriteIds, allModels);
+                    await this.applyFavoriteSelection(favoriteIds, allModels, true, await favoritePatternSnapshot);
                 },
             });
             return { component: selector, focus: selector, dispose: () => selector.dispose() };
@@ -4938,6 +4995,7 @@ export class InteractiveMode {
             return;
         }
         const currentFavoriteIds = await this.getFavoriteModelIdsForUi(allModels);
+        const favoritePatternSnapshot = await this.captureFavoritePatternSnapshot();
         this.showSelector((done) => {
             const selector = new FavoriteModelsSelectorComponent({
                 allModels,
@@ -4945,10 +5003,10 @@ export class InteractiveMode {
                 currentModel: this.session.model,
             }, {
                 onChange: async (favoriteIds) => {
-                    await this.updateSessionFavoritesFromIds(favoriteIds, allModels);
+                    await this.applyFavoriteSelection(favoriteIds, allModels, false, favoritePatternSnapshot);
                 },
                 onPersist: (favoriteIds) => {
-                    void this.persistFavoritePatterns(favoriteIds, allModels).then(() => {
+                    void this.applyFavoriteSelection(favoriteIds, allModels, true, favoritePatternSnapshot).then(() => {
                         this.showStatus("Favorite models saved to settings");
                     });
                 },
@@ -5030,8 +5088,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 },
             });
-            void this.session.modelRuntime
-                .refresh({ signal: controller.signal })
+            void refreshModelCatalogs(this.session.modelRuntime, controller.signal)
                 .then((result) => {
                 if (disposed)
                     return;
@@ -5588,7 +5645,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);
@@ -5842,7 +5899,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}`);
             }
         }
@@ -5933,7 +5992,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"}`);
@@ -6385,7 +6444,7 @@ export class InteractiveMode {
             // Ignore, will be emitted as an event
         }
     }
-    stop() {
+    stop(fullscreenExitOutput) {
         InteractiveMode.restoreCompactionEscapeOverride(this);
         this.streamingReveal.stop();
         this.toolResultReveal.stop();
@@ -6407,7 +6466,7 @@ export class InteractiveMode {
         }
         if (this.isInitialized) {
             try {
-                this.stopInteractiveTui();
+                this.stopInteractiveTui(fullscreenExitOutput ?? this.settingsManager.getFullscreenExitOutput());
             }
             finally {
                 this.isInitialized = false;