@astralyn/pi 0.82.2 → 0.82.4

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

@@ -6,7 +6,7 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, Markdown, matchesKey, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
@@ -17,7 +17,7 @@ import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
-import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
+import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope, resolveModelScopeWithDiagnostics, } from "../../core/model-resolver.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
@@ -27,6 +27,7 @@ import { getUsageCostBreakdown } from "../../core/usage-totals.js";
 import { getChangelogPath, getNewEntries, normalizeChangelogLinks, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
+import { CoalescingTerminal } from "../../utils/coalescing-terminal.js";
 import { parseGitUrl } from "../../utils/git.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
@@ -272,7 +273,7 @@ export class InteractiveMode {
             await this.rebindCurrentSession({ renderBeforeBind: true });
         });
         this.version = VERSION;
-        this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor(), getAgentDir());
+        this.ui = new TUI(new CoalescingTerminal(), this.settingsManager.getShowHardwareCursor(), getAgentDir());
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         this.headerContainer = new Container();
         this.loadedResourcesContainer = new Container();
@@ -2636,7 +2637,7 @@ export class InteractiveMode {
             case "custom": {
                 if (message.display) {
                     const renderer = this.session.extensionRunner.getMessageRenderer(message.customType);
-                    const component = new CustomMessageComponent(message, renderer, this.getMarkdownThemeWithSettings());
+                    const component = new CustomMessageComponent(message, renderer, this.getMarkdownThemeWithSettings(), this.outputPad);
                     component.setExpanded(this.toolOutputExpanded);
                     this.chatContainer.addChild(component);
                 }
@@ -3531,7 +3532,9 @@ export class InteractiveMode {
                     this.outputPad = padding;
                     if (this.streamingComponent || this.session.isStreaming) {
                         for (const child of this.chatContainer.children) {
-                            if (child instanceof AssistantMessageComponent || child instanceof UserMessageComponent) {
+                            if (child instanceof AssistantMessageComponent ||
+                                child instanceof CustomMessageComponent ||
+                                child instanceof UserMessageComponent) {
                                 child.setOutputPad(padding);
                             }
                         }
@@ -3716,12 +3719,17 @@ export class InteractiveMode {
         // Get all available models
         await this.session.modelRuntime.refresh();
         const allModels = [...(await this.session.modelRuntime.getAvailable())];
-        if (allModels.length === 0) {
+        const allModelIds = new Set(allModels.map((model) => `${model.provider}/${model.id}`));
+        const configuredPatterns = this.settingsManager.getEnabledModels();
+        const sessionScopedModels = this.session.scopedModels;
+        if (allModels.length === 0 && !configuredPatterns?.length && sessionScopedModels.length === 0) {
             this.showStatus("No models available");
             return;
         }
+        const configuredScope = configuredPatterns?.length
+            ? await resolveModelScopeWithDiagnostics(configuredPatterns, this.session.modelRuntime)
+            : undefined;
         // Check if session has scoped models (from previous session-only changes or CLI --models)
-        const sessionScopedModels = this.session.scopedModels;
         const hasSessionScope = sessionScopedModels.length > 0;
         // Build enabled model IDs from session state or settings
         let currentEnabledIds = null;
@@ -3729,18 +3737,22 @@ export class InteractiveMode {
             // Use current session's scoped models
             currentEnabledIds = sessionScopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`);
         }
-        else {
-            // Fall back to settings
-            const patterns = this.settingsManager.getEnabledModels();
-            if (patterns !== undefined && patterns.length > 0) {
-                const scopedModels = await resolveModelScope(patterns, this.session.modelRuntime);
-                currentEnabledIds = scopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`);
-            }
+        else if (configuredScope) {
+            currentEnabledIds = configuredScope.scopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`);
+        }
+        for (const diagnostic of configuredScope?.diagnostics ?? []) {
+            if (diagnostic.code !== "no-match")
+                continue;
+            currentEnabledIds ??= [];
+            if (!currentEnabledIds.includes(diagnostic.pattern))
+                currentEnabledIds.push(diagnostic.pattern);
         }
         // Helper to update session's scoped models (session-only, no persist)
         const updateSessionModels = async (enabledIds) => {
             currentEnabledIds = enabledIds === null ? null : [...enabledIds];
-            if (enabledIds && enabledIds.length > 0 && enabledIds.length < allModels.length) {
+            const hasEnabledAvailableModel = enabledIds?.some((id) => allModelIds.has(id)) ?? false;
+            const allAvailableModelsEnabled = enabledIds !== null && [...allModelIds].every((id) => enabledIds.includes(id));
+            if (enabledIds && hasEnabledAvailableModel && !allAvailableModelsEnabled) {
                 const newScopedModels = await resolveModelScope(enabledIds, this.session.modelRuntime);
                 this.session.setScopedModels(newScopedModels.map((sm) => ({
                     model: sm.model,
@@ -3764,9 +3776,10 @@ export class InteractiveMode {
                 },
                 onPersist: (enabledIds) => {
                     // Persist to settings
-                    const newPatterns = enabledIds === null || enabledIds.length === allModels.length
-                        ? undefined // All enabled = clear filter
-                        : enabledIds;
+                    const allEnabled = enabledIds !== null &&
+                        enabledIds.length === allModels.length &&
+                        enabledIds.every((id) => allModelIds.has(id));
+                    const newPatterns = enabledIds === null || allEnabled ? undefined : enabledIds;
                     this.settingsManager.setEnabledModels(newPatterns ? [...newPatterns] : undefined);
                     this.showStatus("Model selection saved to settings");
                 },