lsd-pi 1.1.4 → 1.1.6

package/packages/pi-coding-agent/dist/modes/interactive/interactive-mode.js

@@ -18,12 +18,14 @@ import { resolveModelScope } from "../../core/model-resolver.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { getPermissionMode, setPermissionMode, setFileChangeApprovalHandler, setClassifierHandler, setNetworkApprovalHandler, } from "../../core/tool-approval.js";
+import { isPtyAvailable } from "../../core/pty-executor.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { resetStdinForTui } from "../../utils/reset-stdin.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
+import { EmbeddedTerminalComponent } from "./components/embedded-terminal.js";
 import { BorderedLoader } from "./components/bordered-loader.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
 import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
@@ -79,7 +81,24 @@ export class InteractiveMode {
         this.isInitialized = false;
         this.loadingAnimation = undefined;
         this.pendingWorkingMessage = undefined;
-        this.defaultWorkingMessage = "Working...";
+        this.defaultWorkingMessage = "Cooking…";
+        this.workingMessages = [
+            "Cooking…",
+            "Vibing…",
+            "Brainworming…",
+            "Scheming…",
+            "Spelunking…",
+            "Manifesting…",
+            "Yak shaving…",
+            "Grokking…",
+            "Pondering…",
+            "Going deep…",
+            "Caffeinating…",
+            "On a mission…",
+            "Consulting the void…",
+            "Doing the thing…",
+            "Almost maybe…",
+        ];
         this.lastSigintTime = 0;
         this.lastEscapeTime = 0;
         this.changelogMarkdown = undefined;
@@ -91,10 +110,14 @@ export class InteractiveMode {
         this.streamingMessage = undefined;
         // Tool execution tracking: toolCallId -> component
         this.pendingTools = new Map();
+        this.agentPtyComponents = new Map();
         // Tool output expansion state
         this.toolOutputExpanded = false;
         // Thinking block visibility state
         this.hideThinkingBlock = false;
+        // Pin last prompt feature
+        this.pinLastPromptEnabled = false;
+        this.lastSentPromptText = undefined;
         // Skill commands: command name -> skill file path
         this.skillCommands = new Map();
         // Track if editor is in bash mode (text starts with !)
@@ -157,6 +180,8 @@ export class InteractiveMode {
         this.footerDataProvider.setSandboxStatus("disabled");
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+        // Load pin last prompt setting
+        this.pinLastPromptEnabled = this.settingsManager.getPinLastPrompt();
         // Register themes from resource loader and initialize
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
         initTheme(this.settingsManager.getTheme(), true, this.settingsManager.getThemeAccent());
@@ -419,6 +444,7 @@ export class InteractiveMode {
         // Main interactive loop
         while (true) {
             const userInput = await this.getUserInput();
+            this.recordLastSentPrompt(userInput);
             try {
                 await this.session.prompt(userInput);
             }
@@ -1085,7 +1111,7 @@ export class InteractiveMode {
         this.defaultEditor.onExtensionShortcut = undefined;
         this.updateTerminalTitle();
         if (this.loadingAnimation) {
-            this.loadingAnimation.setMessage(`${this.defaultWorkingMessage} (${appKey(this.keybindings, "interrupt")} to interrupt)`);
+            this.loadingAnimation.setCycleMessages(this.workingMessages);
         }
     }
     // Maximum total widget lines to prevent viewport overflow
@@ -1093,6 +1119,41 @@ export class InteractiveMode {
     /**
      * Render all extension widgets to the widget container.
      */
+    /**
+     * Record the last user-sent prompt text and refresh the widget.
+     * Called from the main loop and input-controller paths.
+     */
+    recordLastSentPrompt(text) {
+        // Ignore slash commands and bash commands — they're not "topic" prompts
+        const trimmed = text.trim();
+        if (trimmed.startsWith("/") || trimmed.startsWith("!"))
+            return;
+        this.lastSentPromptText = trimmed;
+        this.updatePinLastPromptWidget();
+    }
+    /**
+     * Update (or remove) the "pin last prompt" widget above the editor.
+     * Uses the built-in extension widget slot with key "__pin-last-prompt__".
+     */
+    updatePinLastPromptWidget() {
+        const key = "__pin-last-prompt__";
+        if (!this.pinLastPromptEnabled || !this.lastSentPromptText) {
+            // Remove widget
+            const existing = this.extensionWidgetsAbove.get(key);
+            if (existing?.dispose)
+                existing.dispose();
+            this.extensionWidgetsAbove.delete(key);
+        }
+        else {
+            // Truncate to one line (max 200 chars) to keep it compact
+            const raw = this.lastSentPromptText.replace(/[\r\n]+/g, " ").trim();
+            const label = raw.length > 200 ? raw.slice(0, 197) + "…" : raw;
+            const container = new Container();
+            container.addChild(new Text(theme.fg("dim", `  last prompt: ${label}`), 0, 0));
+            this.extensionWidgetsAbove.set(key, container);
+        }
+        this.renderWidgets();
+    }
     renderWidgets() {
         if (!this.widgetContainerAbove || !this.widgetContainerBelow)
             return;
@@ -1253,6 +1314,12 @@ export class InteractiveMode {
         const result = await this.showExtensionSelector(`${title}\n${message}`, ["Yes", "No"], opts);
         return result === "Yes";
     }
+    /** Reset the loading animation back to cycling working messages. */
+    resetLoadingMessage() {
+        if (this.loadingAnimation) {
+            this.loadingAnimation.setCycleMessages(this.workingMessages);
+        }
+    }
     _registerApprovalHandlers() {
         const classifierService = new ClassifierService(this.session.modelRegistry.authStorage);
         setFileChangeApprovalHandler(async (request) => {
@@ -1260,9 +1327,7 @@ export class InteractiveMode {
             const actionLabel = request.action.toUpperCase();
             const title = `Allow ${actionLabel}: ${request.path}\n${request.message}`;
             const approved = await this._showApprovalConfirm(title);
-            if (this.loadingAnimation) {
-                this.loadingAnimation.setMessage(this.defaultWorkingMessage);
-            }
+            this.resetLoadingMessage();
             return approved;
         });
         setClassifierHandler(async (request) => {
@@ -1299,25 +1364,19 @@ export class InteractiveMode {
                 sessionId: this.session.sessionId,
             });
             if (decision.approved) {
-                if (this.loadingAnimation) {
-                    this.loadingAnimation.setMessage(this.defaultWorkingMessage);
-                }
+                this.resetLoadingMessage();
                 return true;
             }
             this.loadingAnimation?.setMessage("Waiting for approval…");
             const title = `Classifier ${decision.source === "rule" ? "blocked" : "did not approve"} ${request.toolName}\n${decision.reason}\n${argsPreview}`;
             const approved = await this._showApprovalConfirm(title);
-            if (this.loadingAnimation) {
-                this.loadingAnimation.setMessage(this.defaultWorkingMessage);
-            }
+            this.resetLoadingMessage();
             return approved;
         });
         setNetworkApprovalHandler(async (request) => {
             this.loadingAnimation?.setMessage("Waiting for network approval…");
             const result = await this.showExtensionSelector(`${request.message}\n${request.command}`, ["Allow once", "Allow for session", "Deny"]);
-            if (this.loadingAnimation) {
-                this.loadingAnimation.setMessage(this.defaultWorkingMessage);
-            }
+            this.resetLoadingMessage();
             if (result === "Allow once")
                 return "allow-once";
             if (result === "Allow for session")
@@ -1606,6 +1665,7 @@ export class InteractiveMode {
         this.defaultEditor.onAction("cycleModelBackward", () => this.cycleModel("backward"));
         this.defaultEditor.onAction("cyclePermissionMode", () => this.cyclePermissionMode());
         this.defaultEditor.onAction("showHotkeys", () => showHotkeys(this.getSlashCommandContext()));
+        this.defaultEditor.onAction("terminalFocus", () => this.toggleEmbeddedTerminalFocus());
         // Global debug handler on TUI (works regardless of focus)
         this.ui.onDebug = () => this.handleDebugCommand();
         this.defaultEditor.onAction("selectModel", () => this.showModelSelector());
@@ -1921,7 +1981,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.settingsManager.getTimestampFormat());
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.settingsManager.getTimestampFormat(), this.session.thinkingLevel || "off");
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -2225,8 +2285,37 @@ export class InteractiveMode {
         for (const component of this.pendingBashComponents) {
             component.setExpanded(expanded);
         }
+        this.updateEditorExpandHint();
         this.ui.requestRender();
     }
+    /** Append/remove the "ctrl+o to expand" hint in the editor bottom border. */
+    updateEditorExpandHint() {
+        const expandKey = appKey(this.keybindings, "expandTools");
+        const collapseHint = `${theme.fg("dim", expandKey)}${theme.fg("muted", " collapse")}`;
+        const expandHint = `${theme.fg("dim", expandKey)}${theme.fg("muted", " : verbose")}`;
+        // The base hint set during agent_start
+        const enterKey = theme.fg("dim", "↵");
+        const followUpKey = theme.fg("dim", appKey(this.keybindings, "followUp"));
+        const steerLabel = theme.fg("muted", " steer");
+        const queueLabel = theme.fg("muted", " queue");
+        const baseHint = `${enterKey}${steerLabel}  ${followUpKey}${queueLabel}`;
+        // Check if there are any expandable tool outputs in the chat
+        const hasToolOutputs = this.chatContainer.children.some(isExpandable) ||
+            !!this.bashComponent ||
+            this.pendingBashComponents.length > 0;
+        const activeHint = this.toolOutputExpanded ? collapseHint : expandHint;
+        if (this.loadingAnimation) {
+            // Agent is running — always show expand/collapse hint when there are tool outputs
+            this.defaultEditor.bottomHint = hasToolOutputs
+                ? `${baseHint}  ${activeHint}`
+                : baseHint;
+        }
+        else if (hasToolOutputs) {
+            // Idle — show expand/collapse hint so user knows ctrl+o works
+            this.defaultEditor.bottomHint = activeHint;
+        }
+        // If no tool outputs and idle, leave bottomHint as-is (cleared by agent_end)
+    }
     toggleThinkingBlockVisibility() {
         this.hideThinkingBlock = !this.hideThinkingBlock;
         this.settingsManager.setHideThinkingBlock(this.hideThinkingBlock);
@@ -2517,6 +2606,7 @@ export class InteractiveMode {
                 enableSkillCommands: this.settingsManager.getEnableSkillCommands(),
                 codexRotate: this.settingsManager.getCodexRotate(),
                 cacheTimer: this.settingsManager.getCacheTimer(),
+                pinLastPrompt: this.settingsManager.getPinLastPrompt(),
                 steeringMode: this.session.steeringMode,
                 followUpMode: this.session.followUpMode,
                 transport: this.settingsManager.getTransport(),
@@ -2540,6 +2630,8 @@ export class InteractiveMode {
                 toolOutputMode: this.settingsManager.getToolOutputMode(),
                 rtk: this.settingsManager.getRtk(),
                 editorScheme: this.settingsManager.getEditorScheme(),
+                autoDream: this.settingsManager.getAutoDream(),
+                autoMemory: this.settingsManager.getAutoMemory(),
                 sandboxEnabled: this.settingsManager.getSandboxSettings().enabled ?? true,
                 sandboxNetworkMode: this.settingsManager.getSandboxSettings().networkMode
                     ?? (this.settingsManager.getSandboxSettings().networkEnabled === true ? "allow" : this.settingsManager.getSandboxSettings().networkEnabled === false ? "deny" : "ask"),
@@ -2593,10 +2685,24 @@ export class InteractiveMode {
                     this.settingsManager.setCacheTimer(enabled);
                     this.showStatus(`Cache timer: ${enabled ? "enabled" : "disabled"}`);
                 },
+                onPinLastPromptChange: (enabled) => {
+                    this.settingsManager.setPinLastPrompt(enabled);
+                    this.pinLastPromptEnabled = enabled;
+                    this.updatePinLastPromptWidget();
+                    this.showStatus(`Pin last prompt: ${enabled ? "enabled" : "disabled"}`);
+                },
                 onRtkChange: (enabled) => {
                     this.settingsManager.setRtk(enabled);
                     this.showStatus(`RTK: ${enabled ? "enabled" : "disabled"} (restart required)`);
                 },
+                onAutoDreamChange: (enabled) => {
+                    this.settingsManager.setAutoDream(enabled);
+                    this.showStatus(`Auto dream: ${enabled ? "enabled" : "disabled"}`);
+                },
+                onAutoMemoryChange: (enabled) => {
+                    this.settingsManager.setAutoMemory(enabled);
+                    this.showStatus(`Auto memory: ${enabled ? "enabled" : "disabled"}`);
+                },
                 onSteeringModeChange: (mode) => {
                     this.session.setSteeringMode(mode);
                 },
@@ -2949,7 +3055,7 @@ export class InteractiveMode {
                         this.session.abortBranchSummary();
                     };
                     this.chatContainer.addChild(new Spacer(1));
-                    summaryLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), `Summarizing branch... (${appKey(this.keybindings, "interrupt")} to cancel)`);
+                    summaryLoader = new Loader(this.ui, (spinner) => theme.fg("text", spinner), (text) => theme.fg("muted", text), `Summarizing branch... (${appKey(this.keybindings, "interrupt")} to cancel)`);
                     this.statusContainer.addChild(summaryLoader);
                     this.ui.requestRender();
                 }
@@ -3344,6 +3450,63 @@ export class InteractiveMode {
             this.handleDaxnuts();
         }
     }
+    getAgentPtyComponent(sessionId) {
+        return this.agentPtyComponents.get(sessionId);
+    }
+    ensureAgentPtyComponent(sessionId, command) {
+        let component = this.agentPtyComponents.get(sessionId);
+        if (component)
+            return component;
+        component = new EmbeddedTerminalComponent(command || `PTY ${sessionId}`, this.ui, this.settingsManager.getToolOutputMode(), appKey(this.keybindings, "terminalFocus"), false);
+        component.setStatusOverride(theme.fg("muted", "Agent-controlled terminal session"));
+        component.setExpanded(true);
+        this.chatContainer.addChild(component);
+        this.agentPtyComponents.set(sessionId, component);
+        return component;
+    }
+    updateAgentPtyComponent(sessionId, options) {
+        const component = this.ensureAgentPtyComponent(sessionId, options?.command);
+        if (options?.screenText !== undefined) {
+            component.setScreenText(options.screenText);
+        }
+        if (options?.completed) {
+            component.setStatusOverride(undefined);
+            component.setComplete(options.exitCode, options.cancelled ?? false);
+        }
+        else {
+            component.setStatusOverride(theme.fg("muted", "Agent-controlled terminal session"));
+        }
+    }
+    clearAgentPtyComponents() {
+        for (const [, component] of this.agentPtyComponents) {
+            this.chatContainer.removeChild(component);
+        }
+        this.agentPtyComponents.clear();
+    }
+    focusEmbeddedTerminal(component) {
+        this.focusedEmbeddedTerminal = component;
+        this.lastEmbeddedTerminalSize = undefined;
+        this.ui.setFocus(component);
+        component.invalidate();
+        this.ui.requestRender();
+    }
+    releaseEmbeddedTerminalFocus() {
+        const focused = this.focusedEmbeddedTerminal;
+        this.focusedEmbeddedTerminal = undefined;
+        this.lastEmbeddedTerminalSize = undefined;
+        this.ui.setFocus(this.editor);
+        focused?.invalidate();
+        this.ui.requestRender();
+    }
+    toggleEmbeddedTerminalFocus() {
+        if (this.focusedEmbeddedTerminal) {
+            this.releaseEmbeddedTerminalFocus();
+            return;
+        }
+        if (this.bashComponent instanceof EmbeddedTerminalComponent) {
+            this.focusEmbeddedTerminal(this.bashComponent);
+        }
+    }
     async handleBashCommand(command, excludeFromContext = false, displayCommand, loginShell) {
         const extensionRunner = this.session.extensionRunner;
         const label = displayCommand || command;
@@ -3360,20 +3523,21 @@ export class InteractiveMode {
         if (eventResult?.result) {
             const result = eventResult.result;
             // Create UI component for display
-            this.bashComponent = new BashExecutionComponent(label, this.ui, excludeFromContext, this.settingsManager.getToolOutputMode(), isRtkEnabled(), result.sandboxed ?? false);
-            this.bashComponent.setExpanded(this.toolOutputExpanded);
+            const component = new BashExecutionComponent(label, this.ui, excludeFromContext, this.settingsManager.getToolOutputMode(), isRtkEnabled(), result.sandboxed ?? false);
+            this.bashComponent = component;
+            component.setExpanded(this.toolOutputExpanded);
             if (this.session.isStreaming) {
-                this.pendingMessagesContainer.addChild(this.bashComponent);
-                this.pendingBashComponents.push(this.bashComponent);
+                this.pendingMessagesContainer.addChild(component);
+                this.pendingBashComponents.push(component);
             }
             else {
-                this.chatContainer.addChild(this.bashComponent);
+                this.chatContainer.addChild(component);
             }
             // Show output and complete
             if (result.output) {
-                this.bashComponent.appendOutput(result.output);
+                component.appendOutput(result.output);
             }
-            this.bashComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath, result.sandboxed);
+            component.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath, result.sandboxed);
             // Record the result in session
             this.session.recordBashResult(command, result, { excludeFromContext });
             this.bashComponent = undefined;
@@ -3382,33 +3546,73 @@ export class InteractiveMode {
         }
         // Normal execution path (possibly with custom operations)
         const isDeferred = this.session.isStreaming;
-        this.bashComponent = new BashExecutionComponent(label, this.ui, excludeFromContext, this.settingsManager.getToolOutputMode(), isRtkEnabled(), false);
-        this.bashComponent.setExpanded(this.toolOutputExpanded);
+        const canUsePty = !eventResult?.operations && await isPtyAvailable();
+        if (canUsePty) {
+            const component = new EmbeddedTerminalComponent(label, this.ui, this.settingsManager.getToolOutputMode(), appKey(this.keybindings, "terminalFocus"), excludeFromContext);
+            this.bashComponent = component;
+            component.setExpanded(this.toolOutputExpanded);
+            if (isDeferred) {
+                this.pendingMessagesContainer.addChild(component);
+                this.pendingBashComponents.push(component);
+            }
+            else {
+                this.chatContainer.addChild(component);
+            }
+            this.ui.requestRender();
+            try {
+                const session = await this.session.executeBashInteractive(command, {
+                    onChunk: (chunk) => {
+                        component.appendOutput(chunk);
+                        this.ui.requestRender();
+                    },
+                    cols: Math.max(40, this.ui.terminal.columns - 2),
+                    rows: Math.max(10, this.ui.terminal.rows - 8),
+                    loginShell,
+                });
+                component.setHandle(session.handle, () => this.releaseEmbeddedTerminalFocus());
+                if (!isDeferred) {
+                    this.focusEmbeddedTerminal(component);
+                }
+                const result = await session.result;
+                component.setComplete(result.exitCode, result.cancelled);
+                this.session.recordBashResult(command, result, { excludeFromContext });
+            }
+            catch (error) {
+                component.setComplete(undefined, false);
+                this.showError(`Bash command failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+            finally {
+                if (this.focusedEmbeddedTerminal === component) {
+                    this.releaseEmbeddedTerminalFocus();
+                }
+                this.session.clearBashAbortController();
+                this.bashComponent = undefined;
+                this.ui.requestRender();
+            }
+            return;
+        }
+        const fallbackComponent = new BashExecutionComponent(label, this.ui, excludeFromContext, this.settingsManager.getToolOutputMode(), isRtkEnabled(), false);
+        this.bashComponent = fallbackComponent;
+        fallbackComponent.setExpanded(this.toolOutputExpanded);
         if (isDeferred) {
             // Show in pending area when agent is streaming
-            this.pendingMessagesContainer.addChild(this.bashComponent);
-            this.pendingBashComponents.push(this.bashComponent);
+            this.pendingMessagesContainer.addChild(fallbackComponent);
+            this.pendingBashComponents.push(fallbackComponent);
         }
         else {
             // Show in chat immediately when agent is idle
-            this.chatContainer.addChild(this.bashComponent);
+            this.chatContainer.addChild(fallbackComponent);
         }
         this.ui.requestRender();
         try {
             const result = await this.session.executeBash(command, (chunk) => {
-                if (this.bashComponent) {
-                    this.bashComponent.appendOutput(chunk);
-                    this.ui.requestRender();
-                }
+                fallbackComponent.appendOutput(chunk);
+                this.ui.requestRender();
             }, { excludeFromContext, operations: eventResult?.operations, loginShell });
-            if (this.bashComponent) {
-                this.bashComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath, result.sandboxed);
-            }
+            fallbackComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath, result.sandboxed);
         }
         catch (error) {
-            if (this.bashComponent) {
-                this.bashComponent.setComplete(undefined, false);
-            }
+            fallbackComponent.setComplete(undefined, false);
             this.showError(`Bash command failed: ${error instanceof Error ? error.message : "Unknown error"}`);
         }
         this.bashComponent = undefined;
@@ -3430,7 +3634,7 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Spacer(1));
         const cancelHint = `(${appKey(this.keybindings, "interrupt")} to cancel)`;
         const label = isAuto ? `Auto-compacting context... ${cancelHint}` : `Compacting context... ${cancelHint}`;
-        const compactingLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), label);
+        const compactingLoader = new Loader(this.ui, (spinner) => theme.fg("text", spinner), (text) => theme.fg("muted", text), label);
         this.statusContainer.addChild(compactingLoader);
         this.ui.requestRender();
         let result;
@@ -3463,6 +3667,14 @@ export class InteractiveMode {
     requestRender(force = false) {
         if (!this.isInitialized)
             return;
+        if (this.focusedEmbeddedTerminal) {
+            const cols = Math.max(40, this.ui.terminal.columns - 2);
+            const rows = Math.max(10, this.ui.terminal.rows - 8);
+            if (!this.lastEmbeddedTerminalSize || this.lastEmbeddedTerminalSize.cols !== cols || this.lastEmbeddedTerminalSize.rows !== rows) {
+                this.focusedEmbeddedTerminal.resize(cols, rows);
+                this.lastEmbeddedTerminalSize = { cols, rows };
+            }
+        }
         this.ui.requestRender(force);
     }
     stop() {