@phi-code-admin/phi-code 0.74.3 → 0.75.1

package/dist/core/tools/bash.js

@@ -1,242 +1,335 @@
-import { randomBytes } from "node:crypto";
-import { createWriteStream, existsSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { Type } from "@sinclair/typebox";
+import { existsSync } from "node:fs";
 import { spawn } from "child_process";
-import { getShellConfig, getShellEnv, killProcessTree } from "../../utils/shell.js";
-import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize, truncateTail } from "./truncate.js";
-/**
- * Generate a unique temp file path for bash output
- */
-function getTempFilePath() {
-    const id = randomBytes(8).toString("hex");
-    return join(tmpdir(), `pi-bash-${id}.log`);
-}
+import { Container, Text, truncateToWidth } from "phi-code-tui";
+import { Type } from "typebox";
+import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";
+import { truncateToVisualLines } from "../../modes/interactive/components/visual-truncate.js";
+import { theme } from "../../modes/interactive/theme/theme.js";
+import { waitForChildProcess } from "../../utils/child-process.js";
+import { getShellConfig, getShellEnv, killProcessTree, trackDetachedChildPid, untrackDetachedChildPid, } from "../../utils/shell.js";
+import { OutputAccumulator } from "./output-accumulator.js";
+import { getTextOutput, invalidArgText, str } from "./render-utils.js";
+import { wrapToolDefinition } from "./tool-definition-wrapper.js";
+import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize } from "./truncate.js";
 const bashSchema = Type.Object({
     command: Type.String({ description: "Bash command to execute" }),
     timeout: Type.Optional(Type.Number({ description: "Timeout in seconds (optional, no default timeout)" })),
 });
 /**
- * Default bash operations using local shell
+ * Create bash operations using pi's built-in local shell execution backend.
+ *
+ * This is useful for extensions that intercept user_bash and still want pi's
+ * standard local shell behavior while wrapping or rewriting commands.
  */
-const defaultBashOperations = {
-    exec: (command, cwd, { onData, signal, timeout, env }) => {
-        return new Promise((resolve, reject) => {
-            const { shell, args } = getShellConfig();
-            if (!existsSync(cwd)) {
-                reject(new Error(`Working directory does not exist: ${cwd}\nCannot execute bash commands.`));
-                return;
-            }
-            const child = spawn(shell, [...args, command], {
-                cwd,
-                detached: true,
-                env: env ?? getShellEnv(),
-                stdio: ["ignore", "pipe", "pipe"],
-            });
-            let timedOut = false;
-            // Set timeout if provided
-            let timeoutHandle;
-            if (timeout !== undefined && timeout > 0) {
-                timeoutHandle = setTimeout(() => {
-                    timedOut = true;
-                    if (child.pid) {
-                        killProcessTree(child.pid);
-                    }
-                }, timeout * 1000);
-            }
-            // Stream stdout and stderr
-            if (child.stdout) {
-                child.stdout.on("data", onData);
-            }
-            if (child.stderr) {
-                child.stderr.on("data", onData);
-            }
-            // Handle shell spawn errors
-            child.on("error", (err) => {
-                if (timeoutHandle)
-                    clearTimeout(timeoutHandle);
-                if (signal)
-                    signal.removeEventListener("abort", onAbort);
-                reject(err);
-            });
-            // Handle abort signal - kill entire process tree
-            const onAbort = () => {
-                if (child.pid) {
-                    killProcessTree(child.pid);
-                }
-            };
-            if (signal) {
-                if (signal.aborted) {
-                    onAbort();
-                }
-                else {
-                    signal.addEventListener("abort", onAbort, { once: true });
-                }
-            }
-            // Handle process exit
-            child.on("close", (code) => {
-                if (timeoutHandle)
-                    clearTimeout(timeoutHandle);
-                if (signal)
-                    signal.removeEventListener("abort", onAbort);
-                if (signal?.aborted) {
-                    reject(new Error("aborted"));
+export function createLocalBashOperations(options) {
+    return {
+        exec: (command, cwd, { onData, signal, timeout, env }) => {
+            return new Promise((resolve, reject) => {
+                const { shell, args } = getShellConfig(options?.shellPath);
+                if (!existsSync(cwd)) {
+                    reject(new Error(`Working directory does not exist: ${cwd}\nCannot execute bash commands.`));
                     return;
                 }
-                if (timedOut) {
-                    reject(new Error(`timeout:${timeout}`));
-                    return;
+                const child = spawn(shell, [...args, command], {
+                    cwd,
+                    detached: process.platform !== "win32",
+                    env: env ?? getShellEnv(),
+                    stdio: ["ignore", "pipe", "pipe"],
+                });
+                if (child.pid)
+                    trackDetachedChildPid(child.pid);
+                let timedOut = false;
+                let timeoutHandle;
+                // Set timeout if provided.
+                if (timeout !== undefined && timeout > 0) {
+                    timeoutHandle = setTimeout(() => {
+                        timedOut = true;
+                        if (child.pid)
+                            killProcessTree(child.pid);
+                    }, timeout * 1000);
                 }
-                resolve({ exitCode: code });
+                // Stream stdout and stderr.
+                child.stdout?.on("data", onData);
+                child.stderr?.on("data", onData);
+                // Handle abort signal by killing the entire process tree.
+                const onAbort = () => {
+                    if (child.pid)
+                        killProcessTree(child.pid);
+                };
+                if (signal) {
+                    if (signal.aborted)
+                        onAbort();
+                    else
+                        signal.addEventListener("abort", onAbort, { once: true });
+                }
+                // Handle shell spawn errors and wait for the process to terminate without hanging
+                // on inherited stdio handles held by detached descendants.
+                waitForChildProcess(child)
+                    .then((code) => {
+                    if (child.pid)
+                        untrackDetachedChildPid(child.pid);
+                    if (timeoutHandle)
+                        clearTimeout(timeoutHandle);
+                    if (signal)
+                        signal.removeEventListener("abort", onAbort);
+                    if (signal?.aborted) {
+                        reject(new Error("aborted"));
+                        return;
+                    }
+                    if (timedOut) {
+                        reject(new Error(`timeout:${timeout}`));
+                        return;
+                    }
+                    resolve({ exitCode: code });
+                })
+                    .catch((err) => {
+                    if (child.pid)
+                        untrackDetachedChildPid(child.pid);
+                    if (timeoutHandle)
+                        clearTimeout(timeoutHandle);
+                    if (signal)
+                        signal.removeEventListener("abort", onAbort);
+                    reject(err);
+                });
             });
-        });
-    },
-};
-function resolveSpawnContext(command, cwd, spawnHook) {
-    const baseContext = {
-        command,
-        cwd,
-        env: { ...getShellEnv() },
+        },
     };
+}
+function resolveSpawnContext(command, cwd, spawnHook) {
+    const baseContext = { command, cwd, env: { ...getShellEnv() } };
     return spawnHook ? spawnHook(baseContext) : baseContext;
 }
-export function createBashTool(cwd, options) {
-    const ops = options?.operations ?? defaultBashOperations;
+const BASH_PREVIEW_LINES = 5;
+const BASH_UPDATE_THROTTLE_MS = 100;
+class BashResultRenderComponent extends Container {
+    state = {
+        cachedWidth: undefined,
+        cachedLines: undefined,
+        cachedSkipped: undefined,
+    };
+}
+function formatDuration(ms) {
+    return `${(ms / 1000).toFixed(1)}s`;
+}
+function formatBashCall(args) {
+    const command = str(args?.command);
+    const timeout = args?.timeout;
+    const timeoutSuffix = timeout ? theme.fg("muted", ` (timeout ${timeout}s)`) : "";
+    const commandDisplay = command === null ? invalidArgText(theme) : command ? command : theme.fg("toolOutput", "...");
+    return theme.fg("toolTitle", theme.bold(`$ ${commandDisplay}`)) + timeoutSuffix;
+}
+function rebuildBashResultRenderComponent(component, result, options, showImages, startedAt, endedAt) {
+    const state = component.state;
+    component.clear();
+    const output = getTextOutput(result, showImages).trim();
+    if (output) {
+        const styledOutput = output
+            .split("\n")
+            .map((line) => theme.fg("toolOutput", line))
+            .join("\n");
+        if (options.expanded) {
+            component.addChild(new Text(`\n${styledOutput}`, 0, 0));
+        }
+        else {
+            component.addChild({
+                render: (width) => {
+                    if (state.cachedLines === undefined || state.cachedWidth !== width) {
+                        const preview = truncateToVisualLines(styledOutput, BASH_PREVIEW_LINES, width);
+                        state.cachedLines = preview.visualLines;
+                        state.cachedSkipped = preview.skippedCount;
+                        state.cachedWidth = width;
+                    }
+                    if (state.cachedSkipped && state.cachedSkipped > 0) {
+                        const hint = theme.fg("muted", `... (${state.cachedSkipped} earlier lines,`) +
+                            ` ${keyHint("app.tools.expand", "to expand")})`;
+                        return ["", truncateToWidth(hint, width, "..."), ...(state.cachedLines ?? [])];
+                    }
+                    return ["", ...(state.cachedLines ?? [])];
+                },
+                invalidate: () => {
+                    state.cachedWidth = undefined;
+                    state.cachedLines = undefined;
+                    state.cachedSkipped = undefined;
+                },
+            });
+        }
+    }
+    const truncation = result.details?.truncation;
+    const fullOutputPath = result.details?.fullOutputPath;
+    if (truncation?.truncated || fullOutputPath) {
+        const warnings = [];
+        if (fullOutputPath) {
+            warnings.push(`Full output: ${fullOutputPath}`);
+        }
+        if (truncation?.truncated) {
+            if (truncation.truncatedBy === "lines") {
+                warnings.push(`Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines`);
+            }
+            else {
+                warnings.push(`Truncated: ${truncation.outputLines} lines shown (${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`);
+            }
+        }
+        component.addChild(new Text(`\n${theme.fg("warning", `[${warnings.join(". ")}]`)}`, 0, 0));
+    }
+    if (startedAt !== undefined) {
+        const label = options.isPartial ? "Elapsed" : "Took";
+        const endTime = endedAt ?? Date.now();
+        component.addChild(new Text(`\n${theme.fg("muted", `${label} ${formatDuration(endTime - startedAt)}`)}`, 0, 0));
+    }
+}
+export function createBashToolDefinition(cwd, options) {
+    const ops = options?.operations ?? createLocalBashOperations({ shellPath: options?.shellPath });
     const commandPrefix = options?.commandPrefix;
     const spawnHook = options?.spawnHook;
     return {
         name: "bash",
         label: "bash",
         description: `Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last ${DEFAULT_MAX_LINES} lines or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.`,
+        promptSnippet: "Execute bash commands (ls, grep, find, etc.)",
         parameters: bashSchema,
-        execute: async (_toolCallId, { command, timeout }, signal, onUpdate) => {
-            // Apply command prefix if configured (e.g., "shopt -s expand_aliases" for alias support)
+        async execute(_toolCallId, { command, timeout }, signal, onUpdate, _ctx) {
             const resolvedCommand = commandPrefix ? `${commandPrefix}\n${command}` : command;
             const spawnContext = resolveSpawnContext(resolvedCommand, cwd, spawnHook);
-            return new Promise((resolve, reject) => {
-                // We'll stream to a temp file if output gets large
-                let tempFilePath;
-                let tempFileStream;
-                let totalBytes = 0;
-                // Keep a rolling buffer of the last chunk for tail truncation
-                const chunks = [];
-                let chunksBytes = 0;
-                // Keep more than we need so we have enough for truncation
-                const maxChunksBytes = DEFAULT_MAX_BYTES * 2;
-                const handleData = (data) => {
-                    totalBytes += data.length;
-                    // Start writing to temp file once we exceed the threshold
-                    if (totalBytes > DEFAULT_MAX_BYTES && !tempFilePath) {
-                        tempFilePath = getTempFilePath();
-                        tempFileStream = createWriteStream(tempFilePath);
-                        // Write all buffered chunks to the file
-                        for (const chunk of chunks) {
-                            tempFileStream.write(chunk);
-                        }
-                    }
-                    // Write to temp file if we have one
-                    if (tempFileStream) {
-                        tempFileStream.write(data);
-                    }
-                    // Keep rolling buffer of recent data
-                    chunks.push(data);
-                    chunksBytes += data.length;
-                    // Trim old chunks if buffer is too large
-                    while (chunksBytes > maxChunksBytes && chunks.length > 1) {
-                        const removed = chunks.shift();
-                        chunksBytes -= removed.length;
-                    }
-                    // Stream partial output to callback (truncated rolling buffer)
-                    if (onUpdate) {
-                        const fullBuffer = Buffer.concat(chunks);
-                        const fullText = fullBuffer.toString("utf-8");
-                        const truncation = truncateTail(fullText);
-                        onUpdate({
-                            content: [{ type: "text", text: truncation.content || "" }],
-                            details: {
-                                truncation: truncation.truncated ? truncation : undefined,
-                                fullOutputPath: tempFilePath,
-                            },
-                        });
-                    }
-                };
-                ops.exec(spawnContext.command, spawnContext.cwd, {
-                    onData: handleData,
-                    signal,
-                    timeout,
-                    env: spawnContext.env,
-                })
-                    .then(({ exitCode }) => {
-                    // Close temp file stream
-                    if (tempFileStream) {
-                        tempFileStream.end();
-                    }
-                    // Combine all buffered chunks
-                    const fullBuffer = Buffer.concat(chunks);
-                    const fullOutput = fullBuffer.toString("utf-8");
-                    // Apply tail truncation
-                    const truncation = truncateTail(fullOutput);
-                    let outputText = truncation.content || "(no output)";
-                    // Build details with truncation info
-                    let details;
-                    if (truncation.truncated) {
-                        details = {
-                            truncation,
-                            fullOutputPath: tempFilePath,
-                        };
-                        // Build actionable notice
-                        const startLine = truncation.totalLines - truncation.outputLines + 1;
-                        const endLine = truncation.totalLines;
-                        if (truncation.lastLinePartial) {
-                            // Edge case: last line alone > 30KB
-                            const lastLineSize = formatSize(Buffer.byteLength(fullOutput.split("\n").pop() || "", "utf-8"));
-                            outputText += `\n\n[Showing last ${formatSize(truncation.outputBytes)} of line ${endLine} (line is ${lastLineSize}). Full output: ${tempFilePath}]`;
-                        }
-                        else if (truncation.truncatedBy === "lines") {
-                            outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines}. Full output: ${tempFilePath}]`;
-                        }
-                        else {
-                            outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines} (${formatSize(DEFAULT_MAX_BYTES)} limit). Full output: ${tempFilePath}]`;
-                        }
+            const output = new OutputAccumulator({ tempFilePrefix: "pi-bash" });
+            let updateTimer;
+            let updateDirty = false;
+            let lastUpdateAt = 0;
+            const emitOutputUpdate = () => {
+                if (!onUpdate || !updateDirty)
+                    return;
+                updateDirty = false;
+                lastUpdateAt = Date.now();
+                const snapshot = output.snapshot({ persistIfTruncated: true });
+                onUpdate({
+                    content: [{ type: "text", text: snapshot.content || "" }],
+                    details: {
+                        truncation: snapshot.truncation.truncated ? snapshot.truncation : undefined,
+                        fullOutputPath: snapshot.fullOutputPath,
+                    },
+                });
+            };
+            const clearUpdateTimer = () => {
+                if (updateTimer) {
+                    clearTimeout(updateTimer);
+                    updateTimer = undefined;
+                }
+            };
+            const scheduleOutputUpdate = () => {
+                if (!onUpdate)
+                    return;
+                updateDirty = true;
+                const delay = BASH_UPDATE_THROTTLE_MS - (Date.now() - lastUpdateAt);
+                if (delay <= 0) {
+                    clearUpdateTimer();
+                    emitOutputUpdate();
+                    return;
+                }
+                updateTimer ??= setTimeout(() => {
+                    updateTimer = undefined;
+                    emitOutputUpdate();
+                }, delay);
+            };
+            if (onUpdate) {
+                onUpdate({ content: [], details: undefined });
+            }
+            const handleData = (data) => {
+                output.append(data);
+                scheduleOutputUpdate();
+            };
+            const finishOutput = async () => {
+                output.finish();
+                clearUpdateTimer();
+                emitOutputUpdate();
+                const snapshot = output.snapshot({ persistIfTruncated: true });
+                await output.closeTempFile();
+                return snapshot;
+            };
+            const formatOutput = (snapshot, emptyText = "(no output)") => {
+                const truncation = snapshot.truncation;
+                let text = snapshot.content || emptyText;
+                let details;
+                if (truncation.truncated) {
+                    details = { truncation, fullOutputPath: snapshot.fullOutputPath };
+                    const startLine = truncation.totalLines - truncation.outputLines + 1;
+                    const endLine = truncation.totalLines;
+                    if (truncation.lastLinePartial) {
+                        const lastLineSize = formatSize(output.getLastLineBytes());
+                        text += `\n\n[Showing last ${formatSize(truncation.outputBytes)} of line ${endLine} (line is ${lastLineSize}). Full output: ${snapshot.fullOutputPath}]`;
                     }
-                    if (exitCode !== 0 && exitCode !== null) {
-                        outputText += `\n\nCommand exited with code ${exitCode}`;
-                        reject(new Error(outputText));
+                    else if (truncation.truncatedBy === "lines") {
+                        text += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines}. Full output: ${snapshot.fullOutputPath}]`;
                     }
                     else {
-                        resolve({ content: [{ type: "text", text: outputText }], details });
-                    }
-                })
-                    .catch((err) => {
-                    // Close temp file stream
-                    if (tempFileStream) {
-                        tempFileStream.end();
+                        text += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines} (${formatSize(DEFAULT_MAX_BYTES)} limit). Full output: ${snapshot.fullOutputPath}]`;
                     }
-                    // Combine all buffered chunks for error output
-                    const fullBuffer = Buffer.concat(chunks);
-                    let output = fullBuffer.toString("utf-8");
-                    if (err.message === "aborted") {
-                        if (output)
-                            output += "\n\n";
-                        output += "Command aborted";
-                        reject(new Error(output));
+                }
+                return { text, details };
+            };
+            const appendStatus = (text, status) => `${text ? `${text}\n\n` : ""}${status}`;
+            try {
+                let exitCode;
+                try {
+                    const result = await ops.exec(spawnContext.command, spawnContext.cwd, {
+                        onData: handleData,
+                        signal,
+                        timeout,
+                        env: spawnContext.env,
+                    });
+                    exitCode = result.exitCode;
+                }
+                catch (err) {
+                    const snapshot = await finishOutput();
+                    const { text } = formatOutput(snapshot, "");
+                    if (err instanceof Error && err.message === "aborted") {
+                        throw new Error(appendStatus(text, "Command aborted"));
                     }
-                    else if (err.message.startsWith("timeout:")) {
+                    if (err instanceof Error && err.message.startsWith("timeout:")) {
                         const timeoutSecs = err.message.split(":")[1];
-                        if (output)
-                            output += "\n\n";
-                        output += `Command timed out after ${timeoutSecs} seconds`;
-                        reject(new Error(output));
+                        throw new Error(appendStatus(text, `Command timed out after ${timeoutSecs} seconds`));
                     }
-                    else {
-                        reject(err);
-                    }
-                });
-            });
+                    throw err;
+                }
+                const snapshot = await finishOutput();
+                const { text: outputText, details } = formatOutput(snapshot);
+                if (exitCode !== 0 && exitCode !== null) {
+                    throw new Error(appendStatus(outputText, `Command exited with code ${exitCode}`));
+                }
+                return { content: [{ type: "text", text: outputText }], details };
+            }
+            finally {
+                clearUpdateTimer();
+            }
+        },
+        renderCall(args, _theme, context) {
+            const state = context.state;
+            if (context.executionStarted && state.startedAt === undefined) {
+                state.startedAt = Date.now();
+                state.endedAt = undefined;
+            }
+            const text = context.lastComponent ?? new Text("", 0, 0);
+            text.setText(formatBashCall(args));
+            return text;
+        },
+        renderResult(result, options, _theme, context) {
+            const state = context.state;
+            if (state.startedAt !== undefined && options.isPartial && !state.interval) {
+                state.interval = setInterval(() => context.invalidate(), 1000);
+            }
+            if (!options.isPartial || context.isError) {
+                state.endedAt ??= Date.now();
+                if (state.interval) {
+                    clearInterval(state.interval);
+                    state.interval = undefined;
+                }
+            }
+            const component = context.lastComponent ?? new BashResultRenderComponent();
+            rebuildBashResultRenderComponent(component, result, options, context.showImages, state.startedAt, state.endedAt);
+            component.invalidate();
+            return component;
         },
     };
 }
-/** Default bash tool using process.cwd() - for backwards compatibility */
-export const bashTool = createBashTool(process.cwd());
+export function createBashTool(cwd, options) {
+    return wrapToolDefinition(createBashToolDefinition(cwd, options));
+}
 //# sourceMappingURL=bash.js.map