lsd-pi 1.3.2 → 1.3.7

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

@@ -48,6 +48,7 @@ import { SessionSelectorComponent } from "./components/session-selector.js";
 import { SettingsSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
 import { ToolExecutionComponent } from "./components/tool-execution.js";
+import { ToolSummaryLine } from "./components/tool-summary-line.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
@@ -197,11 +198,16 @@ export class InteractiveMode {
         this.streamingMessage = undefined;
         // Tool execution tracking: toolCallId -> component
         this.pendingTools = new Map();
+        this.collapsedToolSummaryLine = undefined;
         this.agentPtyComponents = new Map();
         // Tool output expansion state
+        this.collapsedToolCallsExpanded = false;
         this.toolOutputExpanded = false;
         // Thinking block visibility state
         this.hideThinkingBlock = false;
+        // Notification sound (terminal bell on completed agent response)
+        this.notificationSoundEnabled = false;
+        this.playNotificationSoundOnAgentEnd = false;
         // Pin last prompt feature
         this.pinLastPromptEnabled = false;
         this.lastSentPromptText = undefined;
@@ -270,6 +276,10 @@ export class InteractiveMode {
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
         // Load pin last prompt setting
         this.pinLastPromptEnabled = this.settingsManager.getPinLastPrompt();
+        // Load notification sound setting
+        this.notificationSoundEnabled = this.settingsManager.getNotificationSound();
+        this.footer.setNotificationSoundEnabled(this.notificationSoundEnabled);
+        this.footer.setVerboseFooterEnabled(this.settingsManager.getVerboseFooter());
         // Register themes from resource loader and initialize
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
         initTheme(this.settingsManager.getTheme(), true, this.settingsManager.getThemeAccent());
@@ -1866,6 +1876,7 @@ export class InteractiveMode {
         this.defaultEditor.onAction("cyclePermissionMode", () => this.cyclePermissionMode());
         this.defaultEditor.onAction("showHotkeys", () => showHotkeys(this.getSlashCommandContext()));
         this.defaultEditor.onAction("terminalFocus", () => this.toggleEmbeddedTerminalFocus());
+        this.defaultEditor.onAction("toggleNotificationSound", () => this.toggleNotificationSound());
         // Global debug handler on TUI (works regardless of focus)
         this.ui.onDebug = () => this.handleDebugCommand();
         this.defaultEditor.onAction("selectModel", () => this.showModelSelector());
@@ -1884,6 +1895,7 @@ export class InteractiveMode {
             if (wasBashMode !== this.isBashMode) {
                 this.updateEditorBorderColor();
             }
+            this.updateEditorExpandHint();
         };
         // Handle clipboard image paste (triggered on Ctrl+V)
         this.defaultEditor.onPasteImage = () => {
@@ -2488,6 +2500,13 @@ export class InteractiveMode {
             this.showStatus(`Thinking level: ${newLevel}`);
         }
     }
+    toggleNotificationSound() {
+        this.notificationSoundEnabled = !this.notificationSoundEnabled;
+        this.settingsManager.setNotificationSound(this.notificationSoundEnabled);
+        this.footer.setNotificationSoundEnabled(this.notificationSoundEnabled);
+        this.ui.requestRender();
+        this.showStatus(`Notification sound: ${this.notificationSoundEnabled ? "enabled" : "disabled"}`);
+    }
     async cycleModel(direction) {
         try {
             const result = await this.session.cycleModel(direction);
@@ -2506,52 +2525,84 @@ export class InteractiveMode {
             this.showError(error instanceof Error ? error.message : String(error));
         }
     }
+    hasCollapsedToolCallSummaries() {
+        return this.chatContainer.children.some((child) => child instanceof ToolSummaryLine);
+    }
+    shouldUseCollapsedToolCallIntermediateState() {
+        return this.settingsManager.getCollapseToolCalls() && this.hasCollapsedToolCallSummaries();
+    }
     toggleToolOutputExpansion() {
-        this.setToolsExpanded(!this.toolOutputExpanded);
+        if (this.toolOutputExpanded) {
+            this.setToolOutputExpansionState(false, false);
+            return;
+        }
+        if (this.shouldUseCollapsedToolCallIntermediateState() && !this.collapsedToolCallsExpanded) {
+            this.setToolOutputExpansionState(true, false);
+            return;
+        }
+        this.setToolOutputExpansionState(true, true);
     }
     setToolsExpanded(expanded) {
-        this.toolOutputExpanded = expanded;
+        this.setToolOutputExpansionState(expanded, expanded);
+    }
+    setToolOutputExpansionState(collapsedToolCallsExpanded, toolOutputExpanded) {
+        this.collapsedToolCallsExpanded = collapsedToolCallsExpanded || toolOutputExpanded;
+        this.toolOutputExpanded = toolOutputExpanded;
+        const collapseToolCalls = this.settingsManager.getCollapseToolCalls();
+        const showCollapsedToolCalls = collapseToolCalls && this.collapsedToolCallsExpanded;
         for (const child of this.chatContainer.children) {
             if (isExpandable(child)) {
-                child.setExpanded(expanded);
+                child.setExpanded(toolOutputExpanded);
+            }
+            if (child instanceof ToolExecutionComponent) {
+                child.setHidden(!showCollapsedToolCalls && child.shouldHideWhenCollapsed(collapseToolCalls));
+            }
+            if (child instanceof ToolSummaryLine) {
+                child.setHidden(!collapseToolCalls || showCollapsedToolCalls);
             }
         }
         if (this.bashComponent) {
-            this.bashComponent.setExpanded(expanded);
+            this.bashComponent.setExpanded(toolOutputExpanded);
         }
         for (const component of this.pendingBashComponents) {
-            component.setExpanded(expanded);
+            component.setExpanded(toolOutputExpanded);
         }
         this.updateEditorExpandHint();
         this.ui.requestRender();
     }
-    /** Append/remove the "ctrl+o to expand" hint in the editor bottom border. */
+    /** Append/remove right-aligned expand and streaming hints in 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}`;
+        const expandToolCallsHint = `${theme.fg("dim", expandKey)}${theme.fg("muted", " : uncollapsed tools")}`;
+        const expandVerboseHint = `${theme.fg("dim", expandKey)}${theme.fg("muted", " : verbose")}`;
+        const editorHasText = this.defaultEditor.getText().trim().length > 0;
+        const streamingHints = editorHasText
+            ? `${theme.fg("dim", "↵")}${theme.fg("muted", " steer")}  ${theme.fg("dim", appKey(this.keybindings, "followUp"))}${theme.fg("muted", " queue")}`
+            : "";
         // 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;
+        const canExpandCollapsedToolCalls = this.shouldUseCollapsedToolCallIntermediateState();
+        let activeHint = expandVerboseHint;
+        if (this.toolOutputExpanded) {
+            activeHint = collapseHint;
+        }
+        else if (this.collapsedToolCallsExpanded && canExpandCollapsedToolCalls) {
+            activeHint = expandVerboseHint;
+        }
+        else if (canExpandCollapsedToolCalls) {
+            activeHint = expandToolCallsHint;
         }
-        else if (hasToolOutputs) {
-            // Idle - show expand/collapse hint so user knows ctrl+o works
-            this.defaultEditor.bottomHint = activeHint;
+        const rightHints = [];
+        if (this.loadingAnimation && streamingHints) {
+            rightHints.push(streamingHints);
         }
-        // If no tool outputs and idle, leave bottomHint as-is (cleared by agent_end)
+        if (hasToolOutputs) {
+            rightHints.push(activeHint);
+        }
+        this.defaultEditor.bottomHint = rightHints.join("  ");
     }
     toggleThinkingBlockVisibility() {
         this.hideThinkingBlock = !this.hideThinkingBlock;
@@ -2857,7 +2908,9 @@ export class InteractiveMode {
                 enableSkillCommands: this.settingsManager.getEnableSkillCommands(),
                 toolProfile: this.settingsManager.getToolProfile(),
                 codexRotate: this.settingsManager.getCodexRotate(),
+                fastMode: this.settingsManager.getFastMode(),
                 cacheTimer: this.settingsManager.getCacheTimer(),
+                verboseFooter: this.settingsManager.getVerboseFooter(),
                 pinLastPrompt: this.settingsManager.getPinLastPrompt(),
                 steeringMode: this.session.steeringMode,
                 followUpMode: this.session.followUpMode,
@@ -2882,10 +2935,12 @@ export class InteractiveMode {
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 timestampFormat: this.settingsManager.getTimestampFormat(),
                 toolOutputMode: this.settingsManager.getToolOutputMode(),
+                collapseToolCalls: this.settingsManager.getCollapseToolCalls(),
                 rtk: this.settingsManager.getRtk(),
                 editorScheme: this.settingsManager.getEditorScheme(),
                 autoDream: this.settingsManager.getAutoDream(),
                 autoMemory: this.settingsManager.getAutoMemory(),
+                notificationSound: this.notificationSoundEnabled,
                 telegramLiveRelayAutoConnect: this.settingsManager.getTelegramLiveRelayAutoConnect(),
                 sandboxEnabled: this.settingsManager.getSandboxSettings().enabled ?? true,
                 sandboxNetworkMode: this.settingsManager.getSandboxSettings().networkMode
@@ -2984,10 +3039,20 @@ export class InteractiveMode {
                     this.settingsManager.setCodexRotate(enabled);
                     this.showStatus(`Codex rotate: ${enabled ? "enabled" : "disabled"} (restart required)`);
                 },
+                onFastModeChange: (enabled) => {
+                    this.settingsManager.setFastMode(enabled);
+                    this.showStatus(`Fast mode: ${enabled ? "enabled" : "disabled"}`);
+                },
                 onCacheTimerChange: (enabled) => {
                     this.settingsManager.setCacheTimer(enabled);
                     this.showStatus(`Cache timer: ${enabled ? "enabled" : "disabled"}`);
                 },
+                onVerboseFooterChange: (enabled) => {
+                    this.settingsManager.setVerboseFooter(enabled);
+                    this.footer.setVerboseFooterEnabled(enabled);
+                    this.ui.requestRender();
+                    this.showStatus(`Verbose footer: ${enabled ? "enabled" : "disabled"}`);
+                },
                 onPinLastPromptChange: (enabled) => {
                     this.settingsManager.setPinLastPrompt(enabled);
                     this.pinLastPromptEnabled = enabled;
@@ -3006,6 +3071,13 @@ export class InteractiveMode {
                     this.settingsManager.setAutoMemory(enabled);
                     this.showStatus(`Auto memory: ${enabled ? "enabled" : "disabled"}`);
                 },
+                onNotificationSoundChange: (enabled) => {
+                    this.notificationSoundEnabled = enabled;
+                    this.settingsManager.setNotificationSound(enabled);
+                    this.footer.setNotificationSoundEnabled(enabled);
+                    this.ui.requestRender();
+                    this.showStatus(`Notification sound: ${enabled ? "enabled" : "disabled"}`);
+                },
                 onTelegramLiveRelayAutoConnectChange: (enabled) => {
                     this.settingsManager.setTelegramLiveRelayAutoConnect(enabled);
                     this.showStatus(`Telegram autoconnect: ${enabled ? "enabled" : "disabled"}`);
@@ -3116,6 +3188,14 @@ export class InteractiveMode {
                     this.settingsManager.setEditorScheme(scheme);
                     this.showStatus(`Editor link scheme: ${scheme}`);
                 },
+                onCollapseToolCallsChange: (enabled) => {
+                    this.settingsManager.setCollapseToolCalls(enabled);
+                    this.setToolOutputExpansionState(enabled && (this.collapsedToolCallsExpanded || this.toolOutputExpanded), this.toolOutputExpanded);
+                    if (!enabled) {
+                        this.collapsedToolSummaryLine = undefined;
+                    }
+                    this.showStatus(`Collapse tool calls: ${enabled ? "enabled" : "disabled"}`);
+                },
                 onToolOutputModeChange: (mode) => {
                     this.settingsManager.setToolOutputMode(mode);
                     for (const child of this.chatContainer.children) {