@wrongstack/tools 0.272.2 → 0.273.1

package/dist/bash.js

@@ -2,6 +2,7 @@ import { spawn } from 'node:child_process';
 import * as os2 from 'node:os';
 import * as Core from '@wrongstack/core';
 import { buildChildEnv, expectDefined, wstackGlobalRoot } from '@wrongstack/core';
+import * as fs2 from 'node:fs';
 import { mkdirSync, createWriteStream } from 'node:fs';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
@@ -699,6 +700,21 @@ function getProcessRegistry() {
   return _registry;
 }
 var REGISTRY_FILE = ".wrongstack/process-registry.json";
+function toErrorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+function emitStructuredLog(level, event, message, error) {
+  const payload = {
+    level,
+    event,
+    message,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  if (error !== void 0) {
+    payload.error = toErrorMessage(error);
+  }
+  console.log(JSON.stringify(payload));
+}
 var HEARTBEAT_INTERVAL_MS = 5e3;
 var STALE_THRESHOLD_MS = 3e4;
 var LOCKFILE = ".wrongstack/.process-registry.lock";
@@ -708,6 +724,9 @@ function generateInstanceId() {
   const random = Math.random().toString(36).slice(2, 8);
   return `${hostname2}:${pid}:${random}`;
 }
+function isNodeError(err) {
+  return typeof err === "object" && err !== null && "code" in err;
+}
 async function acquireLock(lockfilePath, timeoutMs = 5e3) {
   const start = Date.now();
   const pidStr = String(process.pid);
@@ -722,7 +741,7 @@ async function acquireLock(lockfilePath, timeoutMs = 5e3) {
         }
       };
     } catch (err) {
-      if (err.code === "EEXIST") {
+      if (isNodeError(err) && err.code === "EEXIST") {
         try {
           const content = await fs.readFile(lockfilePath, "utf-8");
           const parts = content.split(":");
@@ -759,7 +778,7 @@ async function readRegistryFile(filePath) {
     }
     return parsed;
   } catch (err) {
-    if (err.code === "ENOENT") {
+    if (isNodeError(err) && err.code === "ENOENT") {
       return {
         version: 1,
         instances: /* @__PURE__ */ new Map(),
@@ -795,7 +814,7 @@ var PersistentProcessRegistry = class {
     this.lockPath = path.join(homeDir, LOCKFILE);
     this.baseRegistry = baseRegistry ?? getProcessRegistry();
     this.ensureDirectory().catch((err) => {
-      console.error("PersistentProcessRegistry: failed to create .wrongstack dir", err);
+      emitStructuredLog("warn", "process_registry.dir_create_failed", "PersistentProcessRegistry: failed to create .wrongstack directory", err);
     });
   }
   async ensureDirectory() {
@@ -803,7 +822,7 @@ var PersistentProcessRegistry = class {
     try {
       await fs.mkdir(dir, { recursive: true });
     } catch (err) {
-      if (err.code !== "EEXIST") throw err;
+      if (!isNodeError(err) || err.code !== "EEXIST") throw err;
     }
   }
   /**
@@ -883,6 +902,7 @@ var PersistentProcessRegistry = class {
     try {
       const data = await readRegistryFile(this.registryPath);
       data.instances.set(String(entry.pid), entry);
+      const child = null;
       this.baseRegistry.register({
         pid: entry.pid,
         name: entry.name,
@@ -890,8 +910,7 @@ var PersistentProcessRegistry = class {
         startedAt: entry.startedAt,
         sessionId: entry.sessionId,
         protected: entry.protected,
-        child: null
-        // Main process has no child handle
+        child
       });
       await writeRegistryFile(this.registryPath, data);
     } finally {
@@ -939,7 +958,7 @@ var PersistentProcessRegistry = class {
       data.lastCleanup = now;
       await writeRegistryFile(this.registryPath, data);
     } catch (err) {
-      console.error("PersistentProcessRegistry: sync failed", err);
+      emitStructuredLog("warn", "process_registry.sync_failed", "PersistentProcessRegistry: sync failed", err);
     } finally {
       await release();
     }
@@ -960,7 +979,11 @@ var PersistentProcessRegistry = class {
             if (process.platform !== "win32") {
               process.kill(entry.pid, 0);
             } else {
-              console.log(`PersistentProcessRegistry: checking stale pid ${entry.pid} (${age}ms old)`);
+              emitStructuredLog(
+                "debug",
+                "process_registry.stale_pid_check",
+                `PersistentProcessRegistry: checking stale pid ${entry.pid} (${age}ms old)`
+              );
             }
           } catch {
             stalePids.push(_pidStr);
@@ -974,7 +997,7 @@ var PersistentProcessRegistry = class {
         await writeRegistryFile(this.registryPath, data);
       }
     } catch (err) {
-      console.error("PersistentProcessRegistry: cleanup failed", err);
+      emitStructuredLog("warn", "process_registry.cleanup_failed", "PersistentProcessRegistry: cleanup failed", err);
     } finally {
       await release();
     }
@@ -1197,7 +1220,7 @@ async function isKillProtected(kill) {
     const entries = await getProtectedEntries();
     const killNameLower = kill.name.toLowerCase();
     for (const entry of entries) {
-      if (entry.name && entry.name.toLowerCase().includes(killNameLower)) {
+      if (entry.name?.toLowerCase().includes(killNameLower)) {
         return true;
       }
     }
@@ -1252,6 +1275,145 @@ async function checkAndBlockKillCommand(command) {
   }
   return { blocked: false };
 }
+function pickShell(platform3, command, env) {
+  const override = env.get("WRONGSTACK_SHELL")?.trim().toLowerCase();
+  if (override === "cmd" || override === "cmd.exe") return "cmd";
+  if (override === "powershell" || override === "powershell.exe") return "powershell";
+  if (override === "pwsh" || override === "pwsh.exe") return "pwsh";
+  if (looksLikePowerShell(command)) return "pwsh";
+  return "cmd";
+}
+function looksLikePowerShell(command) {
+  if (!command) return false;
+  const trimmed = command.trimStart();
+  if (/\.ps1\b/i.test(trimmed)) return true;
+  if (/^\s*#requires\s/i.test(trimmed)) return true;
+  if (/^\s*param\s*\(/i.test(trimmed)) return true;
+  if (/\$[\w:{]/i.test(trimmed)) return true;
+  if (/\$\(/.test(trimmed)) return true;
+  if (/@\s*['"]/.test(trimmed)) return true;
+  if (/&\s+\$/.test(trimmed)) return true;
+  if (/(^|\s)@\s*\(/.test(trimmed)) return true;
+  if (/(^|\s)@\{/.test(trimmed)) return true;
+  if (/(?:^|[\s\[\(\{,;])(?:-eq|-ne|-lt|-gt|-le|-ge|-like|-notlike|-match|-notmatch|-contains|-notcontains|-in|-notin|-and|-or|-not|-band|-bor|-bxor|-replace|-isplit|-csplit|-osplit|-join|-is|-as|-f)(?:$|[\s\]\)\},;])/i.test(trimmed)) {
+    return true;
+  }
+  if (PS_VERB_RE.test(trimmed)) return true;
+  if (/(?:^|[\s;&|])(gci|gi|gp|gcm|gps|sl|rm|cat|cp|mv)\b/i.test(trimmed)) {
+    return true;
+  }
+  if (looksLikePowerShellExtended(command)) return true;
+  return false;
+}
+function looksLikePowerShellExtended(command) {
+  if (!command) return false;
+  const trimmed = command.trimStart();
+  if (/(?:^|\s)[-/](?:WhatIf|Confirm|ErrorAction)(?::[^\s]+|\s|=|$)/i.test(trimmed)) {
+    return true;
+  }
+  if (/(?:^|[\s;&|])(Where-Object|ForEach-Object|Select-Object|Sort-Object|Group-Object|Measure-Object|Compare-Object|Tee-Object)(?:\s|$)/i.test(trimmed)) {
+    return true;
+  }
+  if (/\bWrite-(?:Host|Output|Error|Warning|Verbose|Debug|Information)(?:\s|$)/i.test(trimmed)) {
+    return true;
+  }
+  if (/HK(?:LM|CU|CR|U|CC|DD|PD):\\/i.test(trimmed)) return true;
+  if (/\[(?:string|int|bool|xml|double|float|decimal|char|byte|long|System\.)/i.test(trimmed)) {
+    return true;
+  }
+  if (/^\s*<#|#>\s*$/m.test(trimmed)) return true;
+  if (/(?:^|\s)[-/\/](?:AsPlainText|PipelineVariable|pv|FilterHashtable|OutVariable|ov)(?:\s|=|$)/i.test(trimmed)) {
+    return true;
+  }
+  return false;
+}
+function wrapPowerShellScript(command) {
+  const bootstrap = "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8;$ConfirmPreference='None';$WhatIfPreference=$false";
+  return "\uFEFF" + bootstrap + "\ntry {\n" + command + "\n} finally { exit $LASTEXITCODE }";
+}
+var PS_VERB_RE = new RegExp(
+  // Boundaries: start-of-string, whitespace, `;`, `&`, `|`, `(`, `{`, `,`.
+  "(?:^|[\\s;&|\\(\\{,])(?:Get|Set|New|Remove|Add|Clear|Copy|Move|Rename|Test|Update|Write|Read|Push|Pop|Invoke|Start|Stop|Wait|Out|Format|Group|Measure|Compare|Resolve|ConvertTo|ConvertFrom|Convert|Import|Export|Select|Where|ForEach|Sort|Tee|Split|Join|Limit|Skip|Step|Trace|Debug|Register|Unregister|Enable|Disable|Restart|Suspend|Resume|Save|Open|Close|Lock|Unlock|Mount|Dismount|Enter|Exit|Use|Show|Hide|Find|Search|Watch|Initialize|Optimize|Compress|Expand|Merge|Checkpoint|Undo|Redo|Approve|Deny|Block|Grant|Revoke|Assert|Confirm|Receive|Send|Connect|Disconnect|Reset|Backup|Restore|Publish|Unpublish|Install|Uninstall|Build|Rebuild|Deploy|Submit|Process|Complete|Approve|Revoke|Pay|Refund|Decline|Receive|Send)-[A-Za-z][A-Za-z0-9]+(?:[\\-\\+][A-Za-z][A-Za-z0-9]+)*(?:$|[\\s\\-\\;\\&\\|\\(\\)\\{\\},])",
+  "i"
+);
+function shellArgs(shell) {
+  if (shell === "powershell" || shell === "pwsh") {
+    return ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", "-"];
+  }
+  return ["/c"];
+}
+function diagnoseBashism(command, shell) {
+  if (!command) return void 0;
+  const isCmd = shell === "cmd";
+  const hints = [];
+  const add = (h) => {
+    if (!hints.includes(h)) hints.push(h);
+  };
+  if (/\/dev\/null/.test(command)) {
+    add(
+      isCmd ? "use `nul` instead of `/dev/null` (e.g. `2>nul`)" : "use `$null` instead of `/dev/null` (e.g. `2>$null`)"
+    );
+  }
+  if (/(^|[;&|]\s*)export\s+[A-Za-z_]\w*=/.test(command)) {
+    add(
+      isCmd ? "set env vars with `set NAME=value`, not `export`" : "set env vars with `$env:NAME = 'value'`, not `export`"
+    );
+  }
+  if (/<<-?\s*['"]?[A-Za-z_]\w*/.test(command)) {
+    add(
+      isCmd ? "cmd has no heredocs \u2014 write the content to a file or use multiple `echo` lines" : "PowerShell has no heredocs \u2014 use a single-quoted here-string `@'\u2026'@` (closing `'@` at column 0)"
+    );
+  }
+  if (shell === "powershell" && /(&&|\|\|)/.test(command)) {
+    add("Windows PowerShell 5.1 has no `&&`/`||` \u2014 separate commands with `;` (check `$LASTEXITCODE`)");
+  }
+  if (/\brm\s+-[A-Za-z]*[rf]/.test(command)) {
+    add(
+      isCmd ? "`rm` is not a cmd builtin \u2014 use `del` (files) or `rmdir /s /q` (dirs)" : "use `Remove-Item -Recurse -Force` \u2014 the `rm -rf` bash flags don't exist in PowerShell"
+    );
+  }
+  if (/\bwhich\s+\S/.test(command)) {
+    add(isCmd ? "use `where <cmd>` instead of `which`" : "use `Get-Command <cmd>` instead of `which`");
+  }
+  if (hints.length === 0) return void 0;
+  const label = isCmd ? "cmd.exe" : shell === "pwsh" ? "PowerShell 7" : "Windows PowerShell";
+  return `[wrongstack] This command failed and contains bash/POSIX syntax that ${label} does not accept \u2014 ${hints.join("; ")}. Rewrite it in ${isCmd ? "cmd" : "PowerShell"} syntax and retry.`;
+}
+function resolveWin32Command(cmd) {
+  if (process.platform !== "win32") return cmd;
+  if (cmd.includes("/") || cmd.includes("\\") || path.extname(cmd.replace(/\//g, "\\"))) {
+    return cmd;
+  }
+  const pathext = (process.env["PATHEXT"] ?? ".COM;.EXE;.BAT;.CMD;.VBS;.JS;.WS;.MSC").toLowerCase().split(";");
+  const pathDirs = (process.env["PATH"] ?? "").split(path.delimiter);
+  for (const dir of pathDirs) {
+    const base = path.join(dir, cmd);
+    for (const ext of pathext) {
+      const full = `${base}${ext}`;
+      try {
+        fs2.accessSync(full, fs2.constants.X_OK);
+        return full;
+      } catch {
+      }
+    }
+  }
+  return cmd;
+}
+function resolvePowerShell(cmd) {
+  if (process.platform !== "win32") return cmd;
+  const lower = cmd.toLowerCase();
+  if (lower !== "pwsh" && lower !== "powershell" && lower !== "pwsh.exe" && lower !== "powershell.exe") {
+    return resolveWin32Command(cmd);
+  }
+  const primary = lower.startsWith("pwsh") ? "pwsh.exe" : "powershell.exe";
+  const fallback = lower.startsWith("pwsh") ? "powershell.exe" : "pwsh.exe";
+  const resolved = resolveWin32Command(primary);
+  if (resolved !== primary) {
+    const fb = resolveWin32Command(fallback);
+    return fb === fallback ? cmd : fb;
+  }
+  return resolved;
+}
 
 // src/bash.ts
 var MAX_OUTPUT = 32768;
@@ -1348,18 +1510,36 @@ var bashTool = {
     }
     const timeoutMs = Math.max(1, Math.min(input.timeout_ms ?? DEFAULT_TIMEOUT_MS, 6e5));
     const isWin = os2.platform() === "win32";
-    const shell = (() => {
-      const explicit = process.env[isWin ? "WRONGSTACK_COMSPEC" : "WRONGSTACK_SHELL"];
-      if (explicit) return explicit;
-      if (isWin) return process.env["COMSPEC"] ?? "cmd.exe";
-      const fromEnv = process.env["SHELL"];
-      if (fromEnv) {
-        const name = fromEnv.split("/").pop() ?? "";
-        if (["bash", "zsh", "sh", "dash", "fish"].includes(name)) return fromEnv;
+    let plan;
+    let winShellKind;
+    if (isWin) {
+      const shell2 = pickShell("win32", input.command, {
+        get: (k) => process.env[k]
+      });
+      winShellKind = shell2;
+      const bin = shell2 === "powershell" ? resolvePowerShell("powershell.exe") : shell2 === "pwsh" ? resolvePowerShell("pwsh.exe") : process.env["COMSPEC"] ?? "cmd.exe";
+      plan = {
+        bin,
+        argv: shellArgs(shell2),
+        useStdin: shell2 === "powershell" || shell2 === "pwsh",
+        stdinBody: shell2 === "powershell" || shell2 === "pwsh" ? wrapPowerShellScript(input.command) : void 0
+      };
+    } else {
+      const explicit = process.env["WRONGSTACK_SHELL"];
+      let bin;
+      if (explicit) bin = explicit;
+      else {
+        const fromEnv = process.env["SHELL"];
+        if (fromEnv) {
+          const name = fromEnv.split("/").pop() ?? "";
+          if (["bash", "zsh", "sh", "dash", "fish"].includes(name)) bin = fromEnv;
+          else bin = "/bin/bash";
+        } else bin = "/bin/bash";
       }
-      return "/bin/bash";
-    })();
-    const args = isWin ? ["/c", input.command] : ["-c", input.command];
+      plan = { bin, argv: ["-c"], useStdin: false, stdinBody: void 0 };
+    }
+    const shell = plan.bin;
+    const args = plan.useStdin ? [...plan.argv] : [...plan.argv, input.command];
     const env = buildChildEnv(ctx.session?.id);
     const detached = !isWin;
     const startedAt = Date.now();
@@ -1369,7 +1549,9 @@ var bashTool = {
       const child2 = spawn(shell, args, {
         cwd: ctx.projectRoot,
         env,
-        stdio: ["ignore", "pipe", "pipe"],
+        // PowerShell takes the script on stdin (no argv quoting); cmd.exe
+        // and POSIX shells ignore stdin when given the command inline.
+        stdio: [plan.useStdin ? "pipe" : "ignore", "pipe", "pipe"],
         // win32: CreateProcess IGNORES CREATE_NO_WINDOW (windowsHide) when
         // DETACHED_PROCESS (detached: true) is set, so the console-less
         // cmd.exe's grandchildren (node, dev servers) each allocate a fresh
@@ -1380,6 +1562,13 @@ var bashTool = {
         detached: !isWin,
         windowsHide: true
       });
+      if (plan.useStdin) {
+        try {
+          child2.stdin?.write(plan.stdinBody ?? input.command);
+          child2.stdin?.end();
+        } catch {
+        }
+      }
       const pid2 = child2.pid;
       if (typeof pid2 === "number") {
         registry.register({
@@ -1434,11 +1623,20 @@ var bashTool = {
     const child = spawn(shell, args, {
       cwd: ctx.projectRoot,
       env,
-      stdio: ["ignore", "pipe", "pipe"],
+      // PowerShell takes the script on stdin (no argv quoting); cmd.exe
+      // and POSIX shells ignore stdin when given the command inline.
+      stdio: [plan.useStdin ? "pipe" : "ignore", "pipe", "pipe"],
       detached,
       windowsHide: true,
       ...isWin ? {} : { signal: opts.signal }
     });
+    if (plan.useStdin) {
+      try {
+        child.stdin?.write(plan.stdinBody ?? input.command);
+        child.stdin?.end();
+      } catch {
+      }
+    }
     const pid = child.pid;
     if (typeof pid === "number") {
       registry.register({
@@ -1589,10 +1787,13 @@ var bashTool = {
             yield { type: "partial_output", text: remainder };
           }
           const spooled = spool.finalize();
+          const hint = !timedOut && typeof c.code === "number" && c.code !== 0 && winShellKind ? diagnoseBashism(input.command, winShellKind) : void 0;
           yield {
             type: "final",
             output: {
-              output: normalizeCommandOutput(buf) + (spooled ? spoolNote(spooled) : ""),
+              output: normalizeCommandOutput(buf) + (spooled ? spoolNote(spooled) : "") + (hint ? `
+
+${hint}` : ""),
               exit_code: c.code,
               timed_out: timedOut
             }