@mariozechner/pi-coding-agent 0.31.1 → 0.32.1

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

@@ -194,6 +194,9 @@ export class InteractiveMode {
             theme.fg("dim", "!") +
             theme.fg("muted", " to run bash") +
             "\n" +
+            theme.fg("dim", "alt+enter") +
+            theme.fg("muted", " to queue follow-up") +
+            "\n" +
             theme.fg("dim", "drop files") +
             theme.fg("muted", " to attach");
         const header = new Text(`${logo}\n${instructions}`, 1, 0);
@@ -230,6 +233,9 @@ export class InteractiveMode {
         // Start the UI
         this.ui.start();
         this.isInitialized = true;
+        // Set terminal title
+        const cwdBasename = path.basename(process.cwd());
+        this.ui.terminal.setTitle(`pi - ${cwdBasename}`);
         // Initialize hooks with TUI-based UI context
         await this.initHooksAndCustomTools();
         // Subscribe to agent events
@@ -312,10 +318,10 @@ export class InteractiveMode {
         }
         hookRunner.initialize({
             getModel: () => this.session.model,
-            sendMessageHandler: (message, triggerTurn) => {
+            sendMessageHandler: (message, options) => {
                 const wasStreaming = this.session.isStreaming;
                 this.session
-                    .sendHookMessage(message, triggerTurn)
+                    .sendHookMessage(message, options)
                     .then(() => {
                     // For non-streaming cases with display=true, update UI
                     // (streaming cases update via message_end event)
@@ -388,7 +394,7 @@ export class InteractiveMode {
             abort: () => {
                 this.session.abort();
             },
-            hasQueuedMessages: () => this.session.queuedMessageCount > 0,
+            hasPendingMessages: () => this.session.pendingMessageCount > 0,
             uiContext,
             hasUI: true,
         });
@@ -420,7 +426,7 @@ export class InteractiveMode {
                         modelRegistry: this.session.modelRegistry,
                         model: this.session.model,
                         isIdle: () => !this.session.isStreaming,
-                        hasQueuedMessages: () => this.session.queuedMessageCount > 0,
+                        hasPendingMessages: () => this.session.pendingMessageCount > 0,
                         abort: () => {
                             this.session.abort();
                         },
@@ -596,8 +602,9 @@ export class InteractiveMode {
         this.editor.onEscape = () => {
             if (this.loadingAnimation) {
                 // Abort and restore queued messages to editor
-                const queuedMessages = this.session.clearQueue();
-                const queuedText = queuedMessages.join("\n\n");
+                const { steering, followUp } = this.session.clearQueue();
+                const allQueued = [...steering, ...followUp];
+                const queuedText = allQueued.join("\n\n");
                 const currentText = this.editor.getText();
                 const combinedText = [queuedText, currentText].filter((t) => t.trim()).join("\n\n");
                 this.editor.setText(combinedText);
@@ -613,10 +620,15 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
             }
             else if (!this.editor.getText().trim()) {
-                // Double-escape with empty editor triggers /branch
+                // Double-escape with empty editor triggers /tree or /branch based on setting
                 const now = Date.now();
                 if (now - this.lastEscapeTime < 500) {
-                    this.showUserMessageSelector();
+                    if (this.settingsManager.getDoubleEscapeAction() === "tree") {
+                        this.showTreeSelector();
+                    }
+                    else {
+                        this.showUserMessageSelector();
+                    }
                     this.lastEscapeTime = 0;
                 }
                 else {
@@ -636,6 +648,7 @@ export class InteractiveMode {
         this.editor.onCtrlO = () => this.toggleToolOutputExpansion();
         this.editor.onCtrlT = () => this.toggleThinkingBlockVisibility();
         this.editor.onCtrlG = () => this.openExternalEditor();
+        this.editor.onAltEnter = () => this.handleAltEnter();
         this.editor.onChange = (text) => {
             const wasBashMode = this.isBashMode;
             this.isBashMode = text.trimStart().startsWith("!");
@@ -742,9 +755,10 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            // Handle bash command
+            // Handle bash command (! for normal, !! for excluded from context)
             if (text.startsWith("!")) {
-                const command = text.slice(1).trim();
+                const isExcluded = text.startsWith("!!");
+                const command = isExcluded ? text.slice(2).trim() : text.slice(1).trim();
                 if (command) {
                     if (this.session.isBashRunning) {
                         this.showWarning("A bash command is already running. Press Esc to cancel it first.");
@@ -752,7 +766,7 @@ export class InteractiveMode {
                         return;
                     }
                     this.editor.addToHistory(text);
-                    await this.handleBashCommand(command);
+                    await this.handleBashCommand(command, isExcluded);
                     this.isBashMode = false;
                     this.updateEditorBorderColor();
                     return;
@@ -775,9 +789,9 @@ export class InteractiveMode {
                     return;
                 }
             }
-            // Queue regular messages if agent is streaming
+            // Queue steering message if agent is streaming (interrupts current work)
             if (this.session.isStreaming) {
-                await this.session.queueMessage(text);
+                await this.session.steer(text);
                 this.updatePendingMessagesDisplay();
                 this.editor.addToHistory(text);
                 this.editor.setText("");
@@ -1051,7 +1065,7 @@ export class InteractiveMode {
     addMessageToChat(message, options) {
         switch (message.role) {
             case "bashExecution": {
-                const component = new BashExecutionComponent(message.command, this.ui);
+                const component = new BashExecutionComponent(message.command, this.ui, message.excludeFromContext);
                 if (message.output) {
                     component.appendOutput(message.output);
                 }
@@ -1226,6 +1240,23 @@ export class InteractiveMode {
         // Send SIGTSTP to process group (pid=0 means all processes in group)
         process.kill(0, "SIGTSTP");
     }
+    async handleAltEnter() {
+        const text = this.editor.getText().trim();
+        if (!text)
+            return;
+        // Alt+Enter queues a follow-up message (waits until agent finishes)
+        if (this.session.isStreaming) {
+            await this.session.followUp(text);
+            this.updatePendingMessagesDisplay();
+            this.editor.addToHistory(text);
+            this.editor.setText("");
+            this.ui.requestRender();
+        }
+        // If not streaming, Alt+Enter acts like regular Enter (trigger onSubmit)
+        else if (this.editor.onSubmit) {
+            this.editor.onSubmit(text);
+        }
+    }
     updateEditorBorderColor() {
         if (this.isBashMode) {
             this.editor.borderColor = theme.getBashModeBorderColor();
@@ -1357,12 +1388,17 @@ export class InteractiveMode {
     }
     updatePendingMessagesDisplay() {
         this.pendingMessagesContainer.clear();
-        const queuedMessages = this.session.getQueuedMessages();
-        if (queuedMessages.length > 0) {
+        const steeringMessages = this.session.getSteeringMessages();
+        const followUpMessages = this.session.getFollowUpMessages();
+        if (steeringMessages.length > 0 || followUpMessages.length > 0) {
             this.pendingMessagesContainer.addChild(new Spacer(1));
-            for (const message of queuedMessages) {
-                const queuedText = theme.fg("dim", `Queued: ${message}`);
-                this.pendingMessagesContainer.addChild(new TruncatedText(queuedText, 1, 0));
+            for (const message of steeringMessages) {
+                const text = theme.fg("dim", `Steering: ${message}`);
+                this.pendingMessagesContainer.addChild(new TruncatedText(text, 1, 0));
+            }
+            for (const message of followUpMessages) {
+                const text = theme.fg("dim", `Follow-up: ${message}`);
+                this.pendingMessagesContainer.addChild(new TruncatedText(text, 1, 0));
             }
         }
     }
@@ -1398,13 +1434,16 @@ export class InteractiveMode {
             const selector = new SettingsSelectorComponent({
                 autoCompact: this.session.autoCompactionEnabled,
                 showImages: this.settingsManager.getShowImages(),
-                queueMode: this.session.queueMode,
+                autoResizeImages: this.settingsManager.getImageAutoResize(),
+                steeringMode: this.session.steeringMode,
+                followUpMode: this.session.followUpMode,
                 thinkingLevel: this.session.thinkingLevel,
                 availableThinkingLevels: this.session.getAvailableThinkingLevels(),
                 currentTheme: this.settingsManager.getTheme() || "dark",
                 availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
+                doubleEscapeAction: this.settingsManager.getDoubleEscapeAction(),
             }, {
                 onAutoCompactChange: (enabled) => {
                     this.session.setAutoCompactionEnabled(enabled);
@@ -1418,8 +1457,14 @@ export class InteractiveMode {
                         }
                     }
                 },
-                onQueueModeChange: (mode) => {
-                    this.session.setQueueMode(mode);
+                onAutoResizeImagesChange: (enabled) => {
+                    this.settingsManager.setImageAutoResize(enabled);
+                },
+                onSteeringModeChange: (mode) => {
+                    this.session.setSteeringMode(mode);
+                },
+                onFollowUpModeChange: (mode) => {
+                    this.session.setFollowUpMode(mode);
                 },
                 onThinkingLevelChange: (level) => {
                     this.session.setThinkingLevel(level);
@@ -1455,6 +1500,9 @@ export class InteractiveMode {
                 onCollapseChangelogChange: (collapsed) => {
                     this.settingsManager.setCollapseChangelog(collapsed);
                 },
+                onDoubleEscapeActionChange: (action) => {
+                    this.settingsManager.setDoubleEscapeAction(action);
+                },
                 onCancel: () => {
                     done();
                     this.ui.requestRender();
@@ -1835,7 +1883,7 @@ export class InteractiveMode {
     handleSessionCommand() {
         const stats = this.session.getSessionStats();
         let info = `${theme.bold("Session Info")}\n\n`;
-        info += `${theme.fg("dim", "File:")} ${stats.sessionFile}\n`;
+        info += `${theme.fg("dim", "File:")} ${stats.sessionFile ?? "In-memory"}\n`;
         info += `${theme.fg("dim", "ID:")} ${stats.sessionId}\n\n`;
         info += `${theme.bold("Messages")}\n`;
         info += `${theme.fg("dim", "User:")} ${stats.userMessages}\n`;
@@ -1971,9 +2019,9 @@ export class InteractiveMode {
         this.chatContainer.addChild(new ArminComponent(this.ui));
         this.ui.requestRender();
     }
-    async handleBashCommand(command) {
+    async handleBashCommand(command, excludeFromContext = false) {
         const isDeferred = this.session.isStreaming;
-        this.bashComponent = new BashExecutionComponent(command, this.ui);
+        this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext);
         if (isDeferred) {
             // Show in pending area when agent is streaming
             this.pendingMessagesContainer.addChild(this.bashComponent);
@@ -1990,7 +2038,7 @@ export class InteractiveMode {
                     this.bashComponent.appendOutput(chunk);
                     this.ui.requestRender();
                 }
-            });
+            }, { excludeFromContext });
             if (this.bashComponent) {
                 this.bashComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath);
             }