@code-yeongyu/senpi 2026.8.22 → 2026.8.23

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

@@ -497,6 +497,7 @@ export class InteractiveMode {
         this.autocompleteProviderWrappers = [];
         this.isInitialized = false;
         this.pendingUserInputs = [];
+        this.agentIdle = false;
         /**
          * Clipboard images pasted into the composer, keyed by their visible
          * `[Image #N]` marker number. The editor stores marker ids only, so these
@@ -1192,14 +1193,11 @@ export class InteractiveMode {
         while (true) {
             const userInput = await this.getUserInput();
             try {
-                await this.session.prompt(userInput.text, {
-                    streamingBehavior: "steer",
-                    ...(userInput.images ? { images: userInput.images } : {}),
-                    ...this.optimisticUserEchoes.promptOptions(userInput.pendingEchoId),
-                });
+                await this.session.prompt(userInput.text, this.buildMainLoopPromptOptions(userInput));
             }
             catch (error) {
                 this.optimisticUserEchoes.reject(userInput.pendingEchoId);
+                this.clearStatusIndicator("working");
                 const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
                 this.showError(errorMessage);
             }
@@ -2299,13 +2297,17 @@ export class InteractiveMode {
         }
         const hadActiveStatusIndicator = this.activeStatusIndicator !== undefined;
         const isClearingWorking = this.activeStatusIndicator?.kind === "working";
+        const shouldReserveHeight = hadActiveStatusIndicator && this.options.tuiMode === "regular" && this.ui.getClearOnShrink();
+        const renderedHeight = shouldReserveHeight ? this.statusContainer.render(this.ui.terminal.columns).length : 0;
         this.activeStatusIndicator?.dispose();
         this.activeStatusIndicator = undefined;
         if (isClearingWorking) {
             this.workingStartedAt = undefined;
         }
         this.statusContainer.clear();
-        if (hadActiveStatusIndicator && this.options.tuiMode === "regular" && this.ui.getClearOnShrink()) {
+        if (shouldReserveHeight) {
+            const idleHeight = Math.min(this.ui.terminal.rows, Math.max(1, renderedHeight || 2));
+            this.idleStatus.setHeight(idleHeight);
             this.statusContainer.addChild(this.idleStatus);
         }
     }
@@ -3417,6 +3419,7 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
+                this.agentIdle = false;
                 this.clearPendingTools();
                 this.clearActiveToolExecutionStatus();
                 this.clearToolHookStatuses();
@@ -3627,7 +3630,6 @@ export class InteractiveMode {
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
-                this.clearStatusIndicator("working");
                 this.clearActiveToolExecutionStatus();
                 this.clearToolHookStatuses();
                 this.streamingReveal.stop();
@@ -3644,6 +3646,13 @@ export class InteractiveMode {
             case "agent_settled":
                 await this.checkShutdownRequested();
                 break;
+            case "agent_idle":
+                this.agentIdle = true;
+                if (this.pendingUserInputs.length === 0) {
+                    this.clearStatusIndicator("working");
+                }
+                this.ui.requestRender();
+                break;
             case "continuation_error":
                 this.showError(sanitizeTerminalLabel(event.errorMessage));
                 break;
@@ -4375,6 +4384,29 @@ export class InteractiveMode {
             };
         });
     }
+    // Build the session.prompt options for a main-loop submission. The optimistic echo
+    // keeps only a prompt that actually started; a buffered prompt consumed by an input
+    // extension with action "handled" clears the retained working dock, but only once
+    // agent_idle has fired (the agentIdle latch) so a settlement-deferred continuation
+    // still in admission keeps its dock.
+    buildMainLoopPromptOptions(userInput) {
+        const echoOptions = this.optimisticUserEchoes.promptOptions(userInput.pendingEchoId);
+        return {
+            streamingBehavior: "steer",
+            ...(userInput.images ? { images: userInput.images } : {}),
+            preflightResult: echoOptions.preflightResult,
+            promptDisposition: (disposition) => {
+                echoOptions.promptDisposition(disposition);
+                // Clear the retained dock on a handled prompt only when it was the last
+                // buffered input; a still-queued follow-up remounts it on agent_start, so
+                // clearing here would bounce the editor/footer.
+                if (disposition === "handled" && this.agentIdle && this.pendingUserInputs.length === 0) {
+                    this.clearStatusIndicator("working");
+                    this.ui.requestRender();
+                }
+            },
+        };
+    }
     rebuildChatFromMessages() {
         this.chatContainer.clear();
         this.renderSessionEntries(this.sessionManager.buildContextEntries());