@mariozechner/pi-coding-agent 0.25.1 → 0.25.3

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

@@ -3,9 +3,10 @@
  * Handles TUI rendering and user interaction, delegating business logic to AgentSession.
  */
 import * as fs from "node:fs";
+import * as os from "node:os";
 import * as path from "node:path";
 import { CombinedAutocompleteProvider, Container, getCapabilities, Input, Loader, Markdown, ProcessTerminal, Spacer, Text, TruncatedText, TUI, visibleWidth, } from "@mariozechner/pi-tui";
-import { exec } from "child_process";
+import { exec, spawnSync } from "child_process";
 import { APP_NAME, getDebugLogPath, getOAuthPath } from "../../config.js";
 import { isBashExecutionMessage } from "../../core/messages.js";
 import { invalidateOAuthCache } from "../../core/model-config.js";
@@ -157,6 +158,9 @@ export class InteractiveMode {
             theme.fg("dim", "ctrl+d") +
             theme.fg("muted", " to exit (empty)") +
             "\n" +
+            theme.fg("dim", "ctrl+z") +
+            theme.fg("muted", " to suspend") +
+            "\n" +
             theme.fg("dim", "ctrl+k") +
             theme.fg("muted", " to delete line") +
             "\n" +
@@ -244,17 +248,22 @@ export class InteractiveMode {
             this.chatContainer.addChild(new Spacer(1));
         }
         // Show loaded skills
-        const { skills, warnings: skillWarnings } = loadSkills();
-        if (skills.length > 0) {
-            const skillList = skills.map((s) => theme.fg("dim", `  ${s.filePath}`)).join("\n");
-            this.chatContainer.addChild(new Text(theme.fg("muted", "Loaded skills:\n") + skillList, 0, 0));
-            this.chatContainer.addChild(new Spacer(1));
-        }
-        // Show skill warnings if any
-        if (skillWarnings.length > 0) {
-            const warningList = skillWarnings.map((w) => theme.fg("warning", `  ${w.skillPath}: ${w.message}`)).join("\n");
-            this.chatContainer.addChild(new Text(theme.fg("warning", "Skill warnings:\n") + warningList, 0, 0));
-            this.chatContainer.addChild(new Spacer(1));
+        const skillsSettings = this.session.skillsSettings;
+        if (skillsSettings?.enabled !== false) {
+            const { skills, warnings: skillWarnings } = loadSkills(skillsSettings ?? {});
+            if (skills.length > 0) {
+                const skillList = skills.map((s) => theme.fg("dim", `  ${s.filePath}`)).join("\n");
+                this.chatContainer.addChild(new Text(theme.fg("muted", "Loaded skills:\n") + skillList, 0, 0));
+                this.chatContainer.addChild(new Spacer(1));
+            }
+            // Show skill warnings if any
+            if (skillWarnings.length > 0) {
+                const warningList = skillWarnings
+                    .map((w) => theme.fg("warning", `  ${w.skillPath}: ${w.message}`))
+                    .join("\n");
+                this.chatContainer.addChild(new Text(theme.fg("warning", "Skill warnings:\n") + warningList, 0, 0));
+                this.chatContainer.addChild(new Spacer(1));
+            }
         }
         // Show loaded custom tools
         if (this.customTools.size > 0) {
@@ -480,10 +489,12 @@ export class InteractiveMode {
         };
         this.editor.onCtrlC = () => this.handleCtrlC();
         this.editor.onCtrlD = () => this.handleCtrlD();
+        this.editor.onCtrlZ = () => this.handleCtrlZ();
         this.editor.onShiftTab = () => this.cycleThinkingLevel();
         this.editor.onCtrlP = () => this.cycleModel();
         this.editor.onCtrlO = () => this.toggleToolOutputExpansion();
         this.editor.onCtrlT = () => this.toggleThinkingBlockVisibility();
+        this.editor.onCtrlG = () => this.openExternalEditor();
         this.editor.onChange = (text) => {
             const wasBashMode = this.isBashMode;
             this.isBashMode = text.trimStart().startsWith("!");
@@ -990,6 +1001,17 @@ export class InteractiveMode {
         this.stop();
         process.exit(0);
     }
+    handleCtrlZ() {
+        // Set up handler to restore TUI when resumed
+        process.once("SIGCONT", () => {
+            this.ui.start();
+            this.ui.requestRender(true);
+        });
+        // Stop the TUI (restore terminal to normal mode)
+        this.ui.stop();
+        // Send SIGTSTP to process group (pid=0 means all processes in group)
+        process.kill(0, "SIGTSTP");
+    }
     updateEditorBorderColor() {
         if (this.isBashMode) {
             this.editor.borderColor = theme.getBashModeBorderColor();
@@ -1056,6 +1078,46 @@ export class InteractiveMode {
         this.rebuildChatFromMessages();
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
+    openExternalEditor() {
+        // Determine editor (respect $VISUAL, then $EDITOR)
+        const editorCmd = process.env.VISUAL || process.env.EDITOR;
+        if (!editorCmd) {
+            this.showWarning("No editor configured. Set $VISUAL or $EDITOR environment variable.");
+            return;
+        }
+        const currentText = this.editor.getText();
+        const tmpFile = path.join(os.tmpdir(), `pi-editor-${Date.now()}.pi.md`);
+        try {
+            // Write current content to temp file
+            fs.writeFileSync(tmpFile, currentText, "utf-8");
+            // Stop TUI to release terminal
+            this.ui.stop();
+            // Split by space to support editor arguments (e.g., "code --wait")
+            const [editor, ...editorArgs] = editorCmd.split(" ");
+            // Spawn editor synchronously with inherited stdio for interactive editing
+            const result = spawnSync(editor, [...editorArgs, tmpFile], {
+                stdio: "inherit",
+            });
+            // On successful exit (status 0), replace editor content
+            if (result.status === 0) {
+                const newContent = fs.readFileSync(tmpFile, "utf-8").replace(/\n$/, "");
+                this.editor.setText(newContent);
+            }
+            // On non-zero exit, keep original text (no action needed)
+        }
+        finally {
+            // Clean up temp file
+            try {
+                fs.unlinkSync(tmpFile);
+            }
+            catch {
+                // Ignore cleanup errors
+            }
+            // Restart TUI
+            this.ui.start();
+            this.ui.requestRender();
+        }
+    }
     // =========================================================================
     // UI helpers
     // =========================================================================
@@ -1443,10 +1505,12 @@ export class InteractiveMode {
 | \`Escape\` | Cancel autocomplete / abort streaming |
 | \`Ctrl+C\` | Clear editor (first) / exit (second) |
 | \`Ctrl+D\` | Exit (when editor is empty) |
+| \`Ctrl+Z\` | Suspend to background |
 | \`Shift+Tab\` | Cycle thinking level |
 | \`Ctrl+P\` | Cycle models |
 | \`Ctrl+O\` | Toggle tool output expansion |
 | \`Ctrl+T\` | Toggle thinking block visibility |
+| \`Ctrl+G\` | Edit message in external editor |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 `;