@wrongstack/tools 0.320.1 → 1.0.1

package/dist/{chunk-OTPTQBYE.js → chunk-MGPR7VG3.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-BTSFTGIL.js";
 import {
   getPersistentProcessRegistry
-} from "./chunk-QGF2C7TF.js";
+} from "./chunk-PVCB7RUZ.js";
 import {
   createOutputSpool,
   spoolNote
@@ -11,7 +11,7 @@ import {
 import {
   getProcessRegistry,
   redactCommand
-} from "./chunk-ESLPBT5A.js";
+} from "./chunk-HDYUBRMF.js";
 import {
   buildWin32CmdShimInvocation,
   resolveWin32Command
@@ -47,6 +47,7 @@ var flagLetters = (args) => {
   }
   return seen;
 };
+var isPowerShellCmd = (cmd) => /^(?:powershell|pwsh)(?:\.exe)?$/i.test(cmd);
 var RULES = [
   // ----- rm / rmdir: recursive force delete (any path) -----
   // Note: BLOCKED_ARG_PATTERNS already hard-denies root/home/glob paths,
@@ -85,7 +86,12 @@ var RULES = [
     id: "powershell-remove-item-recursive-force",
     level: "destructive",
     test: (cmd, args) => {
-      if (cmd !== "powershell" && cmd !== "pwsh") return false;
+      const isPwsh = isPowerShellCmd(cmd);
+      const isRemoveItemCmd = /^(?:remove-item|ri)(?:\.exe)?$/i.test(cmd);
+      if (!isPwsh && !isRemoveItemCmd) return false;
+      if (isPwsh && !args.some((a) => /^(?:Remove-Item|ri|rm|del|erase|rd|rmdir)(?:\.exe)?$/i.test(a))) {
+        return false;
+      }
       const hasRecurse = argMatches(args, /^-(?:r|recurse)(?::\$true)?$/i);
       const hasForce = argMatches(args, /^-(?:f|force)(?::\$true)?$/i);
       if (argMatches(args, /^-whatif(?::\$true)?$/i)) return false;
@@ -98,7 +104,7 @@ var RULES = [
     id: "powershell-disk-volume-destroy",
     level: "destructive",
     test: (cmd, args) => {
-      if (cmd !== "powershell" && cmd !== "pwsh") return false;
+      if (!isPowerShellCmd(cmd)) return false;
       return args.some(
         (a) => /^(?:Format-Volume|Clear-Disk|Initialize-Disk|Remove-Partition|Clear-Volume)(?:\s|$)/i.test(
           a
@@ -112,7 +118,7 @@ var RULES = [
     id: "powershell-stop-restart-computer",
     level: "destructive",
     test: (cmd, args) => {
-      if (cmd !== "powershell" && cmd !== "pwsh") return false;
+      if (!isPowerShellCmd(cmd)) return false;
       return args.some((a) => /^(?:Stop-Computer|Restart-Computer)(?:\s|$)/i.test(a));
     },
     reason: "PowerShell system shutdown or restart"
@@ -122,7 +128,7 @@ var RULES = [
     id: "powershell-execution-policy-bypass",
     level: "caution",
     test: (cmd, args) => {
-      if (cmd !== "powershell" && cmd !== "pwsh") return false;
+      if (!isPowerShellCmd(cmd)) return false;
       return args.some(
         (a) => /Set-ExecutionPolicy\s+(?:Bypass|Unrestricted)|-(?:EncodedCommand|enc)\b/i.test(a)
       );
@@ -269,7 +275,12 @@ var RULES = [
     level: "destructive",
     test: (cmd, args) => {
       if (!["npm", "pnpm", "yarn", "bun", "cargo"].includes(cmd)) return false;
-      return args.includes("publish") || cmd === "cargo" && args.includes("yank");
+      const firstPositional = args.find((a) => !a.startsWith("-"));
+      if (!firstPositional) return false;
+      if (cmd === "cargo") {
+        return firstPositional === "publish" || firstPositional === "yank";
+      }
+      return firstPositional === "publish";
     },
     reason: "publishing to a public package registry (hard to reverse)"
   },
@@ -460,245 +471,6 @@ function levelRank(level) {
   }
 }
 
-// src/exec-kill-guard.ts
-import * as os from "node:os";
-import * as path from "node:path";
-var isWin = os.platform() === "win32";
-async function checkExecKillCommand(cmd, args) {
-  if (!cmd) return { blocked: false };
-  const cmdLower = cmd.toLowerCase().trim();
-  const fullCommand = [cmdLower, ...args].join(" ").replace(/\s+/g, " ").trim();
-  if (isWin) {
-    if (cmdLower === "taskkill" || cmdLower === "taskkill.exe") {
-      const hasForce = args.some((a) => a.toUpperCase() === "/F" || a.toUpperCase() === "-F");
-      const signal = hasForce ? "FORCE" : "TERM";
-      for (let i = 0; i < args.length; i++) {
-        const a = args[i];
-        if (a.toUpperCase() === "/IM" || a.toUpperCase() === "-IM") {
-          const nameArg = args[i + 1];
-          if (nameArg) {
-            const result = await checkKillTarget({ name: nameArg, signal, cmd: fullCommand });
-            if (result.blocked) return result;
-          }
-        }
-      }
-      for (let i = 0; i < args.length; i++) {
-        const a = args[i];
-        if (a.toUpperCase() === "/PID" || a.toUpperCase() === "-PID") {
-          const pidArg = args[i + 1];
-          if (pidArg && /^\d+$/.test(pidArg)) {
-            const result = await checkKillTarget({
-              pid: parseInt(pidArg, 10),
-              signal,
-              cmd: fullCommand
-            });
-            if (result.blocked) return result;
-          }
-        }
-      }
-      for (let i = 0; i < args.length; i++) {
-        const a = args[i];
-        if (a.toUpperCase() === "/FI" || a.toUpperCase() === "-FI") {
-          const filterArg = args[i + 1];
-          if (filterArg) {
-            const nameMatch = filterArg.match(/IMAGENAME\s+eq\s+"?([^"\s]+)/i);
-            if (nameMatch?.[1]) {
-              const result = await checkKillTarget({
-                name: nameMatch[1],
-                signal,
-                cmd: fullCommand
-              });
-              if (result.blocked) return result;
-            }
-          }
-        }
-      }
-      return { blocked: false };
-    }
-    if (cmdLower === "powershell" || cmdLower === "powershell.exe" || cmdLower === "pwsh" || cmdLower === "pwsh.exe" || cmdLower === "cmd" || cmdLower === "cmd.exe") {
-      const shellFlagIndex = args.findIndex((arg) => {
-        const lower = arg.toLowerCase();
-        return lower === "-c" || lower === "-command" || lower === "/c";
-      });
-      if (shellFlagIndex >= 0) {
-        const innerTokens = tokenizeShellCommand(args.slice(shellFlagIndex + 1).join(" "));
-        const innerCommand = innerTokens[0];
-        if (innerCommand) {
-          const result = await checkExecKillCommand(innerCommand, innerTokens.slice(1));
-          if (result.blocked) return result;
-        }
-      }
-    }
-    if (cmdLower === "stop-process" || cmdLower === "kill") {
-      for (let i = 0; i < args.length; i++) {
-        const a = args[i];
-        if (a === "-Name" || a === "-n") {
-          const nameArg = args[i + 1]?.replace(/^['"]|['"]$/g, "");
-          if (nameArg) {
-            const result = await checkKillTarget({
-              name: nameArg,
-              signal: "FORCE",
-              cmd: fullCommand
-            });
-            if (result.blocked) return result;
-          }
-        }
-        if (a === "-Id" || a === "-PID" || a === "-pid") {
-          const pidArg = args[i + 1];
-          if (pidArg && /^\d+$/.test(pidArg)) {
-            const result = await checkKillTarget({
-              pid: parseInt(pidArg, 10),
-              signal: "FORCE",
-              cmd: fullCommand
-            });
-            if (result.blocked) return result;
-          }
-        }
-      }
-      const firstNonFlag = args.find((a) => !a.startsWith("-"));
-      if (firstNonFlag) {
-        const name = firstNonFlag.replace(/^['"]|['"]$/g, "");
-        const result = await checkKillTarget({ name, signal: "TERM", cmd: fullCommand });
-        if (result.blocked) return result;
-      }
-    }
-    if (cmdLower === "wmic" || cmdLower === "wmic.exe") {
-      const joined = args.join(" ").toLowerCase();
-      if (/\bprocess\b/.test(joined) && /\bdelete\b/.test(joined)) {
-        const nameMatch = joined.match(/name\s*=\s*['"]?([^'"]+)/);
-        if (nameMatch?.[1]) {
-          const result = await checkKillTarget({
-            name: nameMatch[1].trim(),
-            signal: "FORCE",
-            cmd: fullCommand
-          });
-          if (result.blocked) return result;
-        }
-        return {
-          blocked: true,
-          reason: "Blocked: wmic process delete targets all matched processes \u2014 would include protected WrongStack processes."
-        };
-      }
-    }
-    if (cmdLower === "node" || cmdLower === "node.exe") {
-      if (args.includes("-e") || args.includes("--eval")) {
-        const evalIdx = args.indexOf("-e") !== -1 ? args.indexOf("-e") : args.indexOf("--eval");
-        const evalCode = args[evalIdx + 1] ?? "";
-        if (/\bprocess\.kill\s*\(/.test(evalCode)) {
-          const pidMatch = evalCode.match(/process\.kill\s*\(\s*(\d+)/);
-          if (pidMatch?.[1]) {
-            const pid = parseInt(pidMatch[1], 10);
-            const result = await checkKillTarget({ pid, signal: "SIGTERM", cmd: fullCommand });
-            if (result.blocked) return result;
-          }
-          return {
-            blocked: true,
-            reason: "Blocked: node -e with process.kill() \u2014 would target protected WrongStack process(es)."
-          };
-        }
-      }
-    }
-  } else {
-    if (cmdLower === "kill") {
-      for (const a of args) {
-        const num = a.replace(/^-/, "");
-        if (/^\d+$/.test(num)) {
-          const pid = parseInt(num, 10);
-          const result = await checkKillTarget({ pid, signal: "SIGTERM", cmd: fullCommand });
-          if (result.blocked) return result;
-        }
-      }
-    }
-    if (cmdLower === "pkill" || cmdLower === "killall") {
-      const firstNonFlag = args.find((a) => !a.startsWith("-"));
-      if (firstNonFlag) {
-        const result = await checkKillTarget({
-          name: firstNonFlag,
-          signal: "SIGTERM",
-          cmd: fullCommand
-        });
-        if (result.blocked) return result;
-      }
-    }
-  }
-  return { blocked: false };
-}
-function tokenizeShellCommand(command) {
-  const tokens = [];
-  let current = "";
-  let quote = null;
-  for (const char of command.trim()) {
-    if (quote) {
-      if (char === quote) quote = null;
-      else current += char;
-      continue;
-    }
-    if (char === '"' || char === "'") {
-      quote = char;
-    } else if (/\s/.test(char)) {
-      if (current) {
-        tokens.push(current);
-        current = "";
-      }
-    } else {
-      current += char;
-    }
-  }
-  if (current) tokens.push(current);
-  return tokens;
-}
-async function checkKillTarget(target) {
-  const registry = getPersistentProcessRegistry();
-  if (target.pid !== void 0) {
-    const blocked = await registry.shouldBlockKill(target.pid);
-    if (blocked) {
-      return {
-        blocked: true,
-        reason: `Blocked: kill ${target.signal} PID ${target.pid} targets a protected WrongStack process (${target.cmd.slice(0, 80)}).`
-      };
-    }
-    if (target.pid === process.pid) {
-      return {
-        blocked: true,
-        reason: "Blocked: cannot kill the current WrongStack process."
-      };
-    }
-    if (target.pid === process.ppid) {
-      return {
-        blocked: true,
-        reason: "Blocked: cannot kill the parent terminal hosting WrongStack."
-      };
-    }
-    return { blocked: false };
-  }
-  if (target.name) {
-    const nameLower = target.name.toLowerCase().replace(/\.exe$/, "");
-    if (nameLower.includes("wrongstack")) {
-      return {
-        blocked: true,
-        reason: `Blocked: kill ${target.signal} '${target.name}' targets a WrongStack process name.`
-      };
-    }
-    const currentImage = path.basename(process.execPath).toLowerCase().replace(/\.exe$/, "");
-    const targetsNodeRuntime = nameLower === "node" || nameLower.startsWith("node");
-    if (targetsNodeRuntime && currentImage === "node") {
-      return {
-        blocked: true,
-        reason: `Blocked: kill ${target.signal} '${target.name}' would kill the active WrongStack node.exe runtime.`
-      };
-    }
-    const protectedPids = await registry.getAllProtectedPids();
-    if (protectedPids.length > 0 && targetsNodeRuntime) {
-      return {
-        blocked: true,
-        reason: `Blocked: kill ${target.signal} '${target.name}' would kill all node.exe processes including active WrongStack instance(s).`
-      };
-    }
-    return { blocked: false };
-  }
-  return { blocked: false };
-}
-
 // src/exec-allowlist.ts
 var DEFAULT_ALLOWED_COMMANDS = /* @__PURE__ */ new Set([
   // JS / TS toolchain
@@ -1289,6 +1061,245 @@ var DEFAULT_ALLOWED_COMMANDS = /* @__PURE__ */ new Set([
   "chaos"
 ]);
 
+// src/exec-kill-guard.ts
+import * as os from "node:os";
+import * as path from "node:path";
+var isWin = os.platform() === "win32";
+async function checkExecKillCommand(cmd, args) {
+  if (!cmd) return { blocked: false };
+  const cmdLower = cmd.toLowerCase().trim();
+  const fullCommand = [cmdLower, ...args].join(" ").replace(/\s+/g, " ").trim();
+  if (isWin) {
+    if (cmdLower === "taskkill" || cmdLower === "taskkill.exe") {
+      const hasForce = args.some((a) => a.toUpperCase() === "/F" || a.toUpperCase() === "-F");
+      const signal = hasForce ? "FORCE" : "TERM";
+      for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a.toUpperCase() === "/IM" || a.toUpperCase() === "-IM") {
+          const nameArg = args[i + 1];
+          if (nameArg) {
+            const result = await checkKillTarget({ name: nameArg, signal, cmd: fullCommand });
+            if (result.blocked) return result;
+          }
+        }
+      }
+      for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a.toUpperCase() === "/PID" || a.toUpperCase() === "-PID") {
+          const pidArg = args[i + 1];
+          if (pidArg && /^\d+$/.test(pidArg)) {
+            const result = await checkKillTarget({
+              pid: parseInt(pidArg, 10),
+              signal,
+              cmd: fullCommand
+            });
+            if (result.blocked) return result;
+          }
+        }
+      }
+      for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a.toUpperCase() === "/FI" || a.toUpperCase() === "-FI") {
+          const filterArg = args[i + 1];
+          if (filterArg) {
+            const nameMatch = filterArg.match(/IMAGENAME\s+eq\s+"?([^"\s]+)/i);
+            if (nameMatch?.[1]) {
+              const result = await checkKillTarget({
+                name: nameMatch[1],
+                signal,
+                cmd: fullCommand
+              });
+              if (result.blocked) return result;
+            }
+          }
+        }
+      }
+      return { blocked: false };
+    }
+    if (cmdLower === "powershell" || cmdLower === "powershell.exe" || cmdLower === "pwsh" || cmdLower === "pwsh.exe" || cmdLower === "cmd" || cmdLower === "cmd.exe") {
+      const shellFlagIndex = args.findIndex((arg) => {
+        const lower = arg.toLowerCase();
+        return lower === "-c" || lower === "-command" || lower === "/c";
+      });
+      if (shellFlagIndex >= 0) {
+        const innerTokens = tokenizeShellCommand(args.slice(shellFlagIndex + 1).join(" "));
+        const innerCommand = innerTokens[0];
+        if (innerCommand) {
+          const result = await checkExecKillCommand(innerCommand, innerTokens.slice(1));
+          if (result.blocked) return result;
+        }
+      }
+    }
+    if (cmdLower === "stop-process" || cmdLower === "kill") {
+      for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a === "-Name" || a === "-n") {
+          const nameArg = args[i + 1]?.replace(/^['"]|['"]$/g, "");
+          if (nameArg) {
+            const result = await checkKillTarget({
+              name: nameArg,
+              signal: "FORCE",
+              cmd: fullCommand
+            });
+            if (result.blocked) return result;
+          }
+        }
+        if (a === "-Id" || a === "-PID" || a === "-pid") {
+          const pidArg = args[i + 1];
+          if (pidArg && /^\d+$/.test(pidArg)) {
+            const result = await checkKillTarget({
+              pid: parseInt(pidArg, 10),
+              signal: "FORCE",
+              cmd: fullCommand
+            });
+            if (result.blocked) return result;
+          }
+        }
+      }
+      const firstNonFlag = args.find((a) => !a.startsWith("-"));
+      if (firstNonFlag) {
+        const name = firstNonFlag.replace(/^['"]|['"]$/g, "");
+        const result = await checkKillTarget({ name, signal: "TERM", cmd: fullCommand });
+        if (result.blocked) return result;
+      }
+    }
+    if (cmdLower === "wmic" || cmdLower === "wmic.exe") {
+      const joined = args.join(" ").toLowerCase();
+      if (/\bprocess\b/.test(joined) && /\bdelete\b/.test(joined)) {
+        const nameMatch = joined.match(/name\s*=\s*['"]?([^'"]+)/);
+        if (nameMatch?.[1]) {
+          const result = await checkKillTarget({
+            name: nameMatch[1].trim(),
+            signal: "FORCE",
+            cmd: fullCommand
+          });
+          if (result.blocked) return result;
+        }
+        return {
+          blocked: true,
+          reason: "Blocked: wmic process delete targets all matched processes \u2014 would include protected WrongStack processes."
+        };
+      }
+    }
+    if (cmdLower === "node" || cmdLower === "node.exe") {
+      if (args.includes("-e") || args.includes("--eval")) {
+        const evalIdx = args.indexOf("-e") !== -1 ? args.indexOf("-e") : args.indexOf("--eval");
+        const evalCode = args[evalIdx + 1] ?? "";
+        if (/\bprocess\.kill\s*\(/.test(evalCode)) {
+          const pidMatch = evalCode.match(/process\.kill\s*\(\s*(\d+)/);
+          if (pidMatch?.[1]) {
+            const pid = parseInt(pidMatch[1], 10);
+            const result = await checkKillTarget({ pid, signal: "SIGTERM", cmd: fullCommand });
+            if (result.blocked) return result;
+          }
+          return {
+            blocked: true,
+            reason: "Blocked: node -e with process.kill() \u2014 would target protected WrongStack process(es)."
+          };
+        }
+      }
+    }
+  } else {
+    if (cmdLower === "kill") {
+      for (const a of args) {
+        const num = a.replace(/^-/, "");
+        if (/^\d+$/.test(num)) {
+          const pid = parseInt(num, 10);
+          const result = await checkKillTarget({ pid, signal: "SIGTERM", cmd: fullCommand });
+          if (result.blocked) return result;
+        }
+      }
+    }
+    if (cmdLower === "pkill" || cmdLower === "killall") {
+      const firstNonFlag = args.find((a) => !a.startsWith("-"));
+      if (firstNonFlag) {
+        const result = await checkKillTarget({
+          name: firstNonFlag,
+          signal: "SIGTERM",
+          cmd: fullCommand
+        });
+        if (result.blocked) return result;
+      }
+    }
+  }
+  return { blocked: false };
+}
+function tokenizeShellCommand(command) {
+  const tokens = [];
+  let current = "";
+  let quote = null;
+  for (const char of command.trim()) {
+    if (quote) {
+      if (char === quote) quote = null;
+      else current += char;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+    } else if (/\s/.test(char)) {
+      if (current) {
+        tokens.push(current);
+        current = "";
+      }
+    } else {
+      current += char;
+    }
+  }
+  if (current) tokens.push(current);
+  return tokens;
+}
+async function checkKillTarget(target) {
+  const registry = getPersistentProcessRegistry();
+  if (target.pid !== void 0) {
+    const blocked = await registry.shouldBlockKill(target.pid);
+    if (blocked) {
+      return {
+        blocked: true,
+        reason: `Blocked: kill ${target.signal} PID ${target.pid} targets a protected WrongStack process (${target.cmd.slice(0, 80)}).`
+      };
+    }
+    if (target.pid === process.pid) {
+      return {
+        blocked: true,
+        reason: "Blocked: cannot kill the current WrongStack process."
+      };
+    }
+    if (target.pid === process.ppid) {
+      return {
+        blocked: true,
+        reason: "Blocked: cannot kill the parent terminal hosting WrongStack."
+      };
+    }
+    return { blocked: false };
+  }
+  if (target.name) {
+    const nameLower = target.name.toLowerCase().replace(/\.exe$/, "");
+    if (nameLower.includes("wrongstack")) {
+      return {
+        blocked: true,
+        reason: `Blocked: kill ${target.signal} '${target.name}' targets a WrongStack process name.`
+      };
+    }
+    const currentImage = path.basename(process.execPath).toLowerCase().replace(/\.exe$/, "");
+    const targetsNodeRuntime = nameLower === "node" || nameLower.startsWith("node");
+    if (targetsNodeRuntime && currentImage === "node") {
+      return {
+        blocked: true,
+        reason: `Blocked: kill ${target.signal} '${target.name}' would kill the active WrongStack node.exe runtime.`
+      };
+    }
+    const protectedPids = await registry.getAllProtectedPids();
+    if (protectedPids.length > 0 && targetsNodeRuntime) {
+      return {
+        blocked: true,
+        reason: `Blocked: kill ${target.signal} '${target.name}' would kill all node.exe processes including active WrongStack instance(s).`
+      };
+    }
+    return { blocked: false };
+  }
+  return { blocked: false };
+}
+
 // src/exec.ts
 var isWin2 = process.platform === "win32";
 var allowedCommands = new Set(DEFAULT_ALLOWED_COMMANDS);
@@ -1340,10 +1351,9 @@ var BLOCKED_ARG_PATTERNS = {
     /^--exec=/,
     /^--upload-pack=/,
     /^--receive-pack=/,
-    /^-C$/,
-    /^-c$/,
+    /^-C/,
+    /^-c/,
     /^--config$/,
-    /^-c=/,
     /^--config=/,
     /^--config-env=/
   ],
@@ -1443,6 +1453,7 @@ function validateArgs(cmd, args) {
   const blocked = BLOCKED_ARG_PATTERNS[cmd];
   if (!blocked) return null;
   for (const arg of args) {
+    if (arg === "--") break;
     for (const pattern of blocked) {
       if (pattern.test(arg)) {
         return `Blocked argument "${arg}" for command "${cmd}" (matches security pattern ${pattern})`;
@@ -1646,11 +1657,6 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId, danger) {
       });
       return;
     }
-    const resolved = resolveWin32Command(cmd);
-    const needsShell = isWin2 && (resolved.endsWith(".cmd") || resolved.endsWith(".bat"));
-    const shim = needsShell ? buildWin32CmdShimInvocation(resolved, args) : null;
-    const spawnCmd = shim?.command ?? resolved;
-    const spawnArgs = shim?.args ?? args;
     const emitCompletedOnce = (exitCode, pid2, signal2) => {
       if (telemetryCompleted) return;
       telemetryCompleted = true;
@@ -1667,6 +1673,11 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId, danger) {
     };
     let child;
     try {
+      const resolved = resolveWin32Command(cmd);
+      const needsShell = isWin2 && (resolved.endsWith(".cmd") || resolved.endsWith(".bat"));
+      const shim = needsShell ? buildWin32CmdShimInvocation(resolved, args) : null;
+      const spawnCmd = shim?.command ?? resolved;
+      const spawnArgs = shim?.args ?? args;
       child = spawn(spawnCmd, spawnArgs, {
         cwd,
         env: buildChildEnv(sessionId),
@@ -1676,6 +1687,7 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId, danger) {
         ...shim ? { windowsVerbatimArguments: shim.windowsVerbatimArguments } : {}
       });
     } catch (err) {
+      getProcessRegistry().afterCall(Date.now() - startedAt, true);
       spool.finalize();
       emitProcessStarted({
         parentPid: process.pid,
@@ -1707,10 +1719,18 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId, danger) {
       background: false,
       startedAt: new Date(startedAt).toISOString()
     });
+    const registry = getProcessRegistry();
+    const pid = child.pid;
+    let timer;
+    const onAbort = () => {
+      killed = true;
+      if (typeof pid === "number") registry.kill(pid, { force: true });
+      else child.kill("SIGTERM");
+    };
     child.on("error", (err) => {
       const isAbort = err && err.code === "ABORT_ERR";
       const stderrText = isAbort ? `Aborted: ${err.message}` : err.message;
-      clearTimeout(timer);
+      if (timer !== void 0) clearTimeout(timer);
       if (isWin2) signal.removeEventListener("abort", onAbort);
       if (typeof pid === "number") registry.unregister(pid);
       registry.afterCall(Date.now() - startedAt, true);
@@ -1727,8 +1747,6 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId, danger) {
         danger
       });
     });
-    const registry = getProcessRegistry();
-    const pid = child.pid;
     if (typeof pid === "number") {
       const fullCommand = `${cmd} ${args.join(" ")}`;
       registry.register({
@@ -1740,17 +1758,12 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId, danger) {
         child
       });
     }
-    const timer = setTimeout(() => {
+    timer = setTimeout(() => {
       killed = true;
       timedOut = true;
       if (typeof pid === "number") registry.kill(pid);
       else child.kill("SIGTERM");
     }, timeout);
-    const onAbort = () => {
-      killed = true;
-      if (typeof pid === "number") registry.kill(pid, { force: true });
-      else child.kill("SIGTERM");
-    };
     if (isWin2) {
       if (signal.aborted) onAbort();
       else signal.addEventListener("abort", onAbort, { once: true });
@@ -1776,9 +1789,10 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId, danger) {
       }
     });
     child.on("close", (code) => {
-      clearTimeout(timer);
+      if (timer !== void 0) clearTimeout(timer);
       if (isWin2) signal.removeEventListener("abort", onAbort);
       if (typeof pid === "number") registry.unregister(pid);
+      if (resolvedOnce.value) return;
       const durationMs = Date.now() - startedAt;
       const exitCode = killed ? 124 : code ?? 1;
       emitCompletedOnce(exitCode, pid);
@@ -1821,4 +1835,4 @@ export {
   getExecAllowlist,
   execTool
 };
-//# sourceMappingURL=chunk-OTPTQBYE.js.map
+//# sourceMappingURL=chunk-MGPR7VG3.js.map

package/dist/{chunk-C2DQKVLO.js → chunk-MJSJWXBF.js}

@@ -269,4 +269,4 @@ function prettyJson(s) {
 export {
   fetchTool
 };
-//# sourceMappingURL=chunk-C2DQKVLO.js.map
+//# sourceMappingURL=chunk-MJSJWXBF.js.map