agent-sh 0.12.14 → 0.12.15

package/dist/agent/tools/pwsh.js

@@ -1,7 +1,30 @@
+import { spawnSync } from "node:child_process";
 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.
+let cachedPwshPath;
+/** Resolve a usable PowerShell binary, or null if none is on PATH.
+ *  Prefers PowerShell 7+ (`pwsh`), falls back to Windows PowerShell (`powershell`). */
+function findPwsh() {
+    if (cachedPwshPath !== undefined)
+        return cachedPwshPath;
+    // Prefer PowerShell 7 (pwsh)
+    const pwsh = spawnSync("where", ["pwsh"], { encoding: "utf-8" });
+    if (pwsh.status === 0) {
+        cachedPwshPath = pwsh.stdout.split(/\r?\n/)[0].trim() || null;
+        if (cachedPwshPath)
+            return cachedPwshPath;
+    }
+    // Fallback to Windows PowerShell (powershell.exe)
+    const ps = spawnSync("where", ["powershell"], { encoding: "utf-8" });
+    cachedPwshPath = ps.status === 0 ? ps.stdout.split(/\r?\n/)[0].trim() || null : null;
+    return cachedPwshPath;
+}
+/** Return the PowerShell executable name for display purposes. */
+function getPwshDisplayName() {
+    const path = findPwsh();
+    if (!path)
+        return "PowerShell";
+    return path.toLowerCase().includes("pwsh") ? "pwsh" : "powershell";
+}
 export function createPwshTool(opts) {
     return {
         name: "pwsh",
@@ -54,8 +77,16 @@ export function createPwshTool(opts) {
                     isError: false,
                 };
             }
+            const pwshPath = findPwsh();
+            if (!pwshPath) {
+                return {
+                    content: "PowerShell not found on PATH. Neither pwsh (PowerShell 7+) nor powershell (Windows PowerShell) is available.",
+                    exitCode: 1,
+                    isError: true,
+                };
+            }
             const { session, done } = executeArgv({
-                file: "pwsh",
+                file: pwshPath,
                 args: ["-NoProfile", "-NonInteractive", "-Command", command],
                 cwd: opts.getCwd(),
                 env: opts.getEnv(),
@@ -72,7 +103,7 @@ export function createPwshTool(opts) {
             }
             if (session.spawnFailed) {
                 return {
-                    content: "PowerShell (pwsh) not found on PATH. Install PowerShell 7: winget install Microsoft.PowerShell.",
+                    content: `${getPwshDisplayName()} not found on PATH. Install PowerShell 7: winget install Microsoft.PowerShell.`,
                     exitCode: 1,
                     isError: true,
                 };

package/dist/executor.js

@@ -53,7 +53,8 @@ export function executeCommand(opts) {
             stdio: ["ignore", "pipe", "pipe"],
             cwd: opts.cwd,
             env,
-            detached: true,
+            detached: process.platform !== "win32",
+            windowsHide: true,
         });
     }
     catch (err) {
@@ -214,12 +215,14 @@ export function killSession(session) {
     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");
+    // children on Unix); fall back to direct kill (executeArgv's non-detached
+    // spawn, and Windows where negative pids aren't supported).
+    if (process.platform !== "win32") {
+        try {
+            process.kill(-proc.pid, "SIGTERM");
+        }
+        catch { }
     }
-    catch { }
     try {
         proc.kill("SIGTERM");
     }
@@ -227,10 +230,12 @@ export function killSession(session) {
     let settled = false;
     const fallback = setTimeout(() => {
         if (!settled && !session.done && proc.pid) {
-            try {
-                process.kill(-proc.pid, "SIGKILL");
+            if (process.platform !== "win32") {
+                try {
+                    process.kill(-proc.pid, "SIGKILL");
+                }
+                catch { }
             }
-            catch { }
             try {
                 proc.kill("SIGKILL");
             }

package/package.json

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