agent-sh 0.12.8 → 0.12.9

package/dist/agent/agent-loop.js

@@ -15,6 +15,7 @@ import { getSettings, updateSettings } from "../settings.js";
 import { createToolProtocol } from "./tool-protocol.js";
 // Core tool factories
 import { createBashTool } from "./tools/bash.js";
+import { createPwshTool } from "./tools/pwsh.js";
 import { createReadFileTool } from "./tools/read-file.js";
 import { createWriteFileTool } from "./tools/write-file.js";
 import { createEditFileTool } from "./tools/edit-file.js";
@@ -591,6 +592,9 @@ export class AgentLoop {
             return env;
         };
         this.toolRegistry.register(createBashTool({ getCwd, getEnv, bus: this.bus }));
+        if (process.platform === "win32") {
+            this.toolRegistry.register(createPwshTool({ getCwd, getEnv, bus: this.bus }));
+        }
         this.toolRegistry.register(createReadFileTool(getCwd, this.fileReadCache));
         this.toolRegistry.register(createWriteFileTool(getCwd));
         this.toolRegistry.register(createEditFileTool(getCwd));

package/dist/agent/tools/glob.js

@@ -50,7 +50,7 @@ export function createGlobTool(getCwd) {
                 timeout: 10_000,
             });
             await done;
-            if (session.exitCode === -1 && session.output.startsWith("Failed to spawn")) {
+            if (session.spawnFailed) {
                 return {
                     content: "ripgrep not available — the bundled binary failed to load and `rg` is not on PATH. Reinstall agent-sh, or install ripgrep manually (https://github.com/BurntSushi/ripgrep#installation).",
                     exitCode: 1,

package/dist/agent/tools/grep.js

@@ -127,7 +127,7 @@ export function createGrepTool(getCwd) {
                 maxOutputBytes: 64 * 1024,
             });
             await done;
-            if (session.exitCode === -1 && session.output.startsWith("Failed to spawn")) {
+            if (session.spawnFailed) {
                 return {
                     content: "ripgrep not available — the bundled binary failed to load and `rg` is not on PATH. Reinstall agent-sh, or install ripgrep manually (https://github.com/BurntSushi/ripgrep#installation).",
                     exitCode: 1,

package/dist/agent/tools/pwsh.d.ts

@@ -0,0 +1,7 @@
+import type { EventBus } from "../../event-bus.js";
+import type { ToolDefinition } from "../types.js";
+export declare function createPwshTool(opts: {
+    getCwd: () => string;
+    getEnv: () => Record<string, string>;
+    bus: EventBus;
+}): ToolDefinition;

package/dist/agent/tools/pwsh.js

@@ -0,0 +1,90 @@
+import { executeArgv, killSession } from "../../executor.js";
+// Targets PowerShell 7+ (`pwsh`). Legacy `powershell.exe` is intentionally
+// not auto-fallback — its tool surface diverges enough that compatibility
+// shims aren't worth the maintenance.
+export function createPwshTool(opts) {
+    return {
+        name: "pwsh",
+        description: "Execute a PowerShell command in an isolated subprocess. " +
+            "Use this on Windows when the `bash` tool fails (no /bin/bash available). " +
+            "Use PowerShell syntax — e.g. `Get-ChildItem`, `Select-String`, `$env:HOME`. " +
+            "Does not affect the user's shell state. " +
+            "cwd is set to the working directory from the shell context. " +
+            "Do NOT use pwsh for file searching — use grep/glob instead. " +
+            "Do NOT use pwsh for reading files — use read_file instead.",
+        input_schema: {
+            type: "object",
+            properties: {
+                command: {
+                    type: "string",
+                    description: "The PowerShell command to execute",
+                },
+                timeout: {
+                    type: "number",
+                    description: "Timeout in seconds (default: 60)",
+                },
+                description: {
+                    type: "string",
+                    description: "Short description of what this command does (e.g., 'Install dependencies', 'Run test suite')",
+                },
+            },
+            required: ["command"],
+        },
+        showOutput: true,
+        modifiesFiles: true,
+        requiresPermission: true,
+        getDisplayInfo: () => ({
+            kind: "execute",
+            icon: "▶",
+            locations: [],
+        }),
+        async execute(args, onChunk, ctx) {
+            const command = args.command;
+            const timeout = (args.timeout ?? 60) * 1000;
+            const intercepted = opts.bus.emitPipe("agent:terminal-intercept", {
+                command,
+                cwd: opts.getCwd(),
+                intercepted: false,
+                output: "",
+            });
+            if (intercepted.intercepted) {
+                return {
+                    content: intercepted.output,
+                    exitCode: 0,
+                    isError: false,
+                };
+            }
+            const { session, done } = executeArgv({
+                file: "pwsh",
+                args: ["-NoProfile", "-NonInteractive", "-Command", command],
+                cwd: opts.getCwd(),
+                env: opts.getEnv(),
+                timeout,
+                onOutput: onChunk,
+            });
+            const onAbort = () => killSession(session);
+            ctx?.signal?.addEventListener("abort", onAbort, { once: true });
+            try {
+                await done;
+            }
+            finally {
+                ctx?.signal?.removeEventListener("abort", onAbort);
+            }
+            if (session.spawnFailed) {
+                return {
+                    content: "PowerShell (pwsh) not found on PATH. Install PowerShell 7: winget install Microsoft.PowerShell.",
+                    exitCode: 1,
+                    isError: true,
+                };
+            }
+            const content = session.truncated
+                ? `[output truncated, showing last portion]\n${session.output}`
+                : session.output;
+            return {
+                content: content || "(no output)",
+                exitCode: session.exitCode,
+                isError: session.exitCode !== 0,
+            };
+        },
+    };
+}

package/dist/executor.d.ts

@@ -6,6 +6,9 @@ export interface ExecutorSession {
     exitCode: number | null;
     done: boolean;
     truncated: boolean;
+    /** True when the binary couldn't be launched (ENOENT, EACCES). Lets callers
+     *  distinguish "tool missing" from "tool ran and exited with -1". */
+    spawnFailed: boolean;
     process: ChildProcess | null;
     resolve?: () => void;
 }

package/dist/executor.js

@@ -16,6 +16,7 @@ export function executeCommand(opts) {
         exitCode: null,
         done: false,
         truncated: false,
+        spawnFailed: false,
         process: null,
     };
     const done = new Promise((resolve) => {
@@ -39,6 +40,7 @@ export function executeCommand(opts) {
     }
     catch (err) {
         session.exitCode = -1;
+        session.spawnFailed = true;
         session.output = `Failed to spawn: ${err instanceof Error ? err.message : String(err)}`;
         session.done = true;
         session.resolve?.();
@@ -79,6 +81,9 @@ export function executeCommand(opts) {
         cancelKill?.();
         if (!session.done) {
             session.exitCode = -1;
+            const code = err.code;
+            if (code === "ENOENT" || code === "EACCES")
+                session.spawnFailed = true;
             session.output += `\nProcess error: ${err.message}`;
             session.done = true;
             session.process = null;
@@ -102,6 +107,7 @@ export function executeArgv(opts) {
         exitCode: null,
         done: false,
         truncated: false,
+        spawnFailed: false,
         process: null,
     };
     const done = new Promise((resolve) => {
@@ -123,6 +129,7 @@ export function executeArgv(opts) {
     }
     catch (err) {
         session.exitCode = -1;
+        session.spawnFailed = true;
         session.output = `Failed to spawn ${opts.file}: ${err instanceof Error ? err.message : String(err)}`;
         session.done = true;
         session.resolve?.();
@@ -168,6 +175,9 @@ export function executeArgv(opts) {
         clearTimeout(timer);
         if (!session.done) {
             session.exitCode = -1;
+            const code = err.code;
+            if (code === "ENOENT" || code === "EACCES")
+                session.spawnFailed = true;
             session.output += `\nProcess error: ${err.message}`;
             session.done = true;
             session.process = null;
@@ -185,10 +195,17 @@ export function killSession(session) {
     const proc = session.process;
     if (!proc || !proc.pid)
         return () => { };
+    // Try process-group kill first (works for executeCommand's detached bash
+    // children); fall back to direct kill (executeArgv's non-detached spawn,
+    // and Windows where negative pids aren't supported).
     try {
         process.kill(-proc.pid, "SIGTERM");
     }
     catch { }
+    try {
+        proc.kill("SIGTERM");
+    }
+    catch { }
     let settled = false;
     const fallback = setTimeout(() => {
         if (!settled && !session.done && proc.pid) {
@@ -196,6 +213,10 @@ export function killSession(session) {
                 process.kill(-proc.pid, "SIGKILL");
             }
             catch { }
+            try {
+                proc.kill("SIGKILL");
+            }
+            catch { }
         }
     }, 5000);
     fallback.unref();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-sh",
-  "version": "0.12.8",
+  "version": "0.12.9",
   "description": "A shell-first terminal where AI is one keystroke away",
   "type": "module",
   "main": "dist/core.js",