@wrongstack/tools 0.310.0 → 0.313.0

package/dist/tool-tier.js

@@ -9207,8 +9207,128 @@ import { buildChildEnv as buildChildEnv2 } from "@wrongstack/core/utils";
 
 // src/bash.ts
 init_output_spool();
+
+// src/_shell-pick.ts
+var POSIX_DEFAULT = "cmd";
+function pickShell(platform6, command, env) {
+  if (platform6 !== "win32") return POSIX_DEFAULT;
+  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)\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 bootstrap + "\n$ErrorActionPreference='Stop'\n" + command + "\nif ($LASTEXITCODE -is [int]) { 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", "-EncodedCommand"];
+  }
+  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.`;
+}
+
+// src/bash.ts
 init_util();
-init_process_registry();
+init_win32_resolve();
 
 // src/bash-kill-guard.ts
 import * as os3 from "node:os";
@@ -10049,126 +10169,8 @@ async function checkAndBlockKillCommand(command) {
   return { blocked: false };
 }
 
-// src/_shell-pick.ts
-var POSIX_DEFAULT = "cmd";
-function pickShell(platform6, command, env) {
-  if (platform6 !== "win32") return POSIX_DEFAULT;
-  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)\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 bootstrap + "\n$ErrorActionPreference='Stop'\n" + command + "\nif ($LASTEXITCODE -is [int]) { 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.`;
-}
-
 // src/bash.ts
-init_win32_resolve();
+init_process_registry();
 var MAX_OUTPUT = 32768;
 var DEFAULT_TIMEOUT_MS2 = 3e5;
 var STREAM_FLUSH_INTERVAL_MS = 200;
@@ -10276,8 +10278,7 @@ var bashTool = {
       plan = {
         bin,
         argv: shellArgs(shell2),
-        useStdin: shell2 === "powershell" || shell2 === "pwsh",
-        stdinBody: shell2 === "powershell" || shell2 === "pwsh" ? wrapPowerShellScript(input.command) : void 0
+        commandArg: shell2 === "powershell" || shell2 === "pwsh" ? Buffer.from(wrapPowerShellScript(input.command), "utf16le").toString("base64") : input.command
       };
     } else {
       const explicit = process.env["WRONGSTACK_SHELL"];
@@ -10291,10 +10292,10 @@ var bashTool = {
           else bin = "/bin/bash";
         } else bin = "/bin/bash";
       }
-      plan = { bin, argv: ["-c"], useStdin: false, stdinBody: void 0 };
+      plan = { bin, argv: ["-c"], commandArg: input.command };
     }
     const shell = plan.bin;
-    const args = plan.useStdin ? [...plan.argv] : [...plan.argv, input.command];
+    const args = [...plan.argv, plan.commandArg];
     const env = buildChildEnv2(ctx.session?.id);
     const spawnCwd = ctx.workingDir ?? ctx.projectRoot;
     const detached = !isWin5;
@@ -10303,26 +10304,10 @@ var bashTool = {
       const child2 = spawn3(shell, args, {
         cwd: spawnCwd,
         env,
-        // 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", "ignore", "ignore"],
-        // 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
-        // VISIBLE console window. detached: false lets CREATE_NO_WINDOW
-        // apply: the child gets a hidden console that grandchildren inherit.
-        // Windows children survive parent exit either way. POSIX keeps
-        // detached for the process-group kill semantics.
+        stdio: ["ignore", "ignore", "ignore"],
         detached: !isWin5,
         windowsHide: true
       });
-      if (plan.useStdin) {
-        try {
-          child2.stdin?.write(plan.stdinBody ?? input.command);
-          child2.stdin?.end();
-        } catch {
-        }
-      }
       const pid2 = child2.pid;
       const stdoutBytes2 = 0;
       const stderrBytes2 = 0;
@@ -10397,20 +10382,11 @@ var bashTool = {
     const child = spawn3(shell, args, {
       cwd: spawnCwd,
       env,
-      // 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"],
+      stdio: ["ignore", "pipe", "pipe"],
       detached,
       windowsHide: true,
       ...isWin5 ? {} : { signal: opts.signal }
     });
-    if (plan.useStdin) {
-      try {
-        child.stdin?.write(plan.stdinBody ?? input.command);
-        child.stdin?.end();
-      } catch {
-      }
-    }
     const pid = child.pid;
     let stdoutBytes = 0;
     let stderrBytes = 0;
@@ -30417,8 +30393,8 @@ import {
 } from "@wrongstack/core/observability";
 init_output_spool();
 init_util();
-init_process_registry();
 init_win32_resolve();
+init_process_registry();
 var MAX_OUTPUT4 = 32768;
 var DEFAULT_TIMEOUT_MS4 = 3e5;
 var STREAM_FLUSH_INTERVAL_MS2 = 200;
@@ -30528,15 +30504,14 @@ var pwshTool = {
     }
     const isWin5 = os11.platform() === "win32";
     const bin = isWin5 ? resolvePowerShell("pwsh.exe") : "pwsh";
-    const args = shellArgs("pwsh");
-    const stdinBody = wrapPwshCommand(input.command);
+    const encodedCommand = Buffer.from(wrapPwshCommand(input.command), "utf16le").toString(
+      "base64"
+    );
+    const args = [...shellArgs("pwsh"), encodedCommand];
     const env = buildChildEnv2(ctx.session?.id);
     let targetCwd;
     try {
-      targetCwd = await safeResolveReal(
-        input.workdir ?? ctx.workingDir ?? ctx.projectRoot,
-        ctx
-      );
+      targetCwd = await safeResolveReal(input.workdir ?? ctx.workingDir ?? ctx.projectRoot, ctx);
     } catch (err) {
       yield {
         type: "final",
@@ -30557,13 +30532,9 @@ var pwshTool = {
         cwd: targetCwd,
         env,
         detached,
-        stdio: ["pipe", "ignore", "ignore"],
+        stdio: ["ignore", "ignore", "ignore"],
         windowsHide: true
       });
-      if (child2.stdin) {
-        child2.stdin.write(stdinBody);
-        child2.stdin.end();
-      }
       const pid2 = child2.pid;
       if (typeof pid2 === "number") {
         registry.register({
@@ -30621,7 +30592,7 @@ Working directory: ${targetCwd}`,
       cwd: targetCwd,
       env,
       detached,
-      stdio: ["pipe", "pipe", "pipe"],
+      stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true
     });
     const pid = child.pid;
@@ -30662,14 +30633,7 @@ Working directory: ${targetCwd}`,
         processGroupLeader: detached && child.pid === pid
       });
     }
-    if (child.stdin) {
-      child.stdin.write(stdinBody);
-      child.stdin.end();
-    }
-    const timeoutMs = Math.min(
-      Math.max(1e3, input.timeout_ms ?? DEFAULT_TIMEOUT_MS4),
-      6e5
-    );
+    const timeoutMs = Math.min(Math.max(1e3, input.timeout_ms ?? DEFAULT_TIMEOUT_MS4), 6e5);
     let timedOut = false;
     const timers = [];
     const killWithTimeout = (timeout) => {
@@ -30679,7 +30643,17 @@ Working directory: ${targetCwd}`,
           if (!attempted) {
             try {
               child.kill();
-            } catch {
+            } catch (err) {
+              console.log(
+                JSON.stringify({
+                  level: "warn",
+                  event: "pwsh.kill_fallback_failed",
+                  pid: child.pid,
+                  platform: process.platform,
+                  error: err instanceof Error ? err.message : String(err),
+                  message: "pwsh child.kill() raised after the registry kill failed; process may be leaked"
+                })
+              );
             }
           }
         }
@@ -30690,7 +30664,16 @@ Working directory: ${targetCwd}`,
       } else {
         try {
           child.kill("SIGTERM");
-        } catch {
+        } catch (err) {
+          console.log(
+            JSON.stringify({
+              level: "warn",
+              event: "pwsh.sigterm_failed",
+              platform: process.platform,
+              error: err instanceof Error ? err.message : String(err),
+              message: 'pwsh child.kill("SIGTERM") raised on POSIX fallback; process may be leaked'
+            })
+          );
         }
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/tools",
-  "version": "0.310.0",
+  "version": "0.313.0",
   "license": "MIT",
   "description": "WrongStack built-in tools: read/write/edit, bash/exec, grep/glob, git, fetch, test, lint, and more.",
   "repository": {
@@ -253,10 +253,10 @@
     "turndown": "^7.2.4",
     "undici": "^8.10.0",
     "web-tree-sitter": "0.26.12",
-    "@wrongstack/core": "0.310.0",
-    "@wrongstack/kanban": "0.310.0",
-    "@wrongstack/primitives": "0.310.0",
-    "@wrongstack/persistence": "0.310.0"
+    "@wrongstack/kanban": "0.313.0",
+    "@wrongstack/core": "0.313.0",
+    "@wrongstack/primitives": "0.313.0",
+    "@wrongstack/persistence": "0.313.0"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",