@averyyy/pi-coding-agent 0.82.0-piclient.1 → 0.82.1-piclient.2

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

@@ -16,8 +16,7 @@ import { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, }
 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 { getPiClientUpdateMarkerPath, PI_CLIENT_RUNTIME_RELOAD_EXIT_CODE, readPiClientUpdateMarker, writePiClientRuntimeReloadState, } from "../../core/pi-client-runtime-update.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
@@ -1447,6 +1446,15 @@ export class InteractiveMode {
         }
         this.ui.requestRender();
     }
+    restoreWorkingIndicator() {
+        if (!this.session.isStreaming || !this.workingVisible) {
+            return;
+        }
+        if (this.settingsManager.getShowTerminalProgress()) {
+            this.ui.terminal.setProgress(true);
+        }
+        this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.workingIndicatorOptions));
+    }
     setHiddenThinkingLabel(label) {
         this.hiddenThinkingLabel = label ?? this.defaultHiddenThinkingLabel;
         for (const child of this.chatContainer.children) {
@@ -2452,10 +2460,6 @@ export class InteractiveMode {
                 break;
             }
             case "agent_end":
-                if (this.settingsManager.getShowTerminalProgress()) {
-                    this.ui.terminal.setProgress(false);
-                }
-                this.clearStatusIndicator("working");
                 if (this.streamingComponent) {
                     this.chatContainer.removeChild(this.streamingComponent);
                     this.streamingComponent = undefined;
@@ -2465,7 +2469,12 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "agent_settled":
+                if (this.settingsManager.getShowTerminalProgress()) {
+                    this.ui.terminal.setProgress(false);
+                }
+                this.clearStatusIndicator("working");
                 await this.checkShutdownRequested();
+                this.ui.requestRender();
                 break;
             case "compaction_start": {
                 if (this.settingsManager.getShowTerminalProgress()) {
@@ -2498,9 +2507,7 @@ export class InteractiveMode {
                     }
                 }
                 else if (event.result) {
-                    this.chatContainer.clear();
                     this.rebuildChatFromMessages();
-                    this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
                     this.footer.invalidate();
                 }
                 else if (event.errorMessage) {
@@ -2512,6 +2519,7 @@ export class InteractiveMode {
                         this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
                     }
                 }
+                this.restoreWorkingIndicator();
                 void this.flushCompactionQueue({ willRetry: event.willRetry });
                 this.ui.requestRender();
                 break;
@@ -2537,6 +2545,7 @@ export class InteractiveMode {
                 if (!event.success) {
                     this.showError(`Retry failed after ${event.attempt} attempts: ${event.finalError || "Unknown error"}`);
                 }
+                this.restoreWorkingIndicator();
                 this.ui.requestRender();
                 break;
             }
@@ -2629,7 +2638,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);
                 }
@@ -2766,8 +2775,8 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     /**
-     * Render session entries to chat. Used for initial load and rebuild after compaction.
-     * @param entries Compaction-aware session entries to render
+     * Render session entries to chat. Used for initial load and transcript rebuilds.
+     * @param entries Active-branch session entries to render
      * @param options.updateFooter Update footer state
      * @param options.populateHistory Add user messages to editor history
      */
@@ -2810,7 +2819,7 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(text, 1, 0));
     }
     renderInitialMessages() {
-        const entries = this.sessionManager.buildContextEntries();
+        const entries = this.sessionManager.getBranch();
         this.renderSessionEntries(entries, {
             updateFooter: true,
             populateHistory: true,
@@ -2847,7 +2856,7 @@ export class InteractiveMode {
     }
     rebuildChatFromMessages() {
         this.chatContainer.clear();
-        this.renderSessionEntries(this.sessionManager.buildContextEntries());
+        this.renderSessionEntries(this.sessionManager.getBranch());
     }
     // =========================================================================
     // Key handlers
@@ -3532,7 +3541,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);
                             }
                         }
@@ -3717,12 +3728,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;
@@ -3730,18 +3746,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,
@@ -3765,9 +3785,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");
                 },