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

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

@@ -16,7 +16,6 @@ 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, 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";
@@ -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;
             }
@@ -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