@wrongstack/tools 1.0.9 → 1.0.10

package/dist/bash-kill-guard.d.ts

@@ -7,7 +7,9 @@
  * dangerous kill commands targeting protected PIDs.
  *
  * Handles:
- * - Direct kill commands: kill -9 12345
+ * - Direct kill commands: kill -9 12345, kill -- 12345, kill 111 12345 (every target)
+ * - Sequenced commands: `true; kill 12345`, `a && kill 12345`, `a || kill 12345`,
+ *   `a & kill 12345`, newline-separated — each segment is checked on its own
  * - Shell -c wrapped: bash -c "kill -9 12345" (any shell path — see P2 #10)
  * - Full path kills: /bin/kill -9 12345
  * - Name-based kills: pkill, killall, pgrep
@@ -41,7 +43,10 @@
  * fast path for the common non-obfuscated forms.
  */
 export interface KillCommand {
+    /** First PID target (kept for single-target callers). */
     pid?: number;
+    /** Every PID target when the command names more than one (`kill 1 2 3`). */
+    pids?: number[];
     name?: string;
     signal?: string;
     isGroupKill: boolean;
@@ -52,9 +57,6 @@ export interface KillCheckResult {
     blocked: boolean;
     reason?: string;
 }
-/**
- * Parse a kill command string to extract PID and signal.
- */
 export declare function parseKillCommand(command: string): KillCommand | null;
 /**
  * Main entry point: Check if a bash command contains a kill operation targeting protected PIDs.

package/dist/bash.js

@@ -1,6 +1,6 @@
 import {
   bashTool
-} from "./chunk-QA37PFYL.js";
+} from "./chunk-FCSUBTUJ.js";
 import "./chunk-BTSFTGIL.js";
 import "./chunk-PVCB7RUZ.js";
 import "./chunk-SCMRM6NL.js";

package/dist/builtin.js

@@ -6,7 +6,7 @@ import {
   TIER2_TOOLS,
   TIER3_TOOLS,
   builtinTools
-} from "./chunk-OXO773CW.js";
+} from "./chunk-6I6RXQFG.js";
 import "./chunk-BVHKBBGA.js";
 import "./chunk-ENE22I5W.js";
 import "./chunk-XRNN44QY.js";
@@ -36,7 +36,7 @@ import "./chunk-ON6ET5ER.js";
 import "./chunk-DLZCOEVG.js";
 import "./chunk-YJTXRH5Y.js";
 import "./chunk-ZBMANLYH.js";
-import "./chunk-QA37PFYL.js";
+import "./chunk-FCSUBTUJ.js";
 import "./chunk-QAWI3RSK.js";
 import "./chunk-BTSFTGIL.js";
 import "./chunk-PVCB7RUZ.js";

package/dist/{chunk-OXO773CW.js → chunk-6I6RXQFG.js}

@@ -89,7 +89,7 @@ import {
   checkAndBlockKillCommand,
   diagnoseBashism,
   shellArgs
-} from "./chunk-QA37PFYL.js";
+} from "./chunk-FCSUBTUJ.js";
 import {
   detectDanger,
   execTool
@@ -1623,4 +1623,4 @@ export {
   TIER3_TOOLS,
   builtinTools
 };
-//# sourceMappingURL=chunk-OXO773CW.js.map
+//# sourceMappingURL=chunk-6I6RXQFG.js.map

package/dist/{chunk-QA37PFYL.js → chunk-FCSUBTUJ.js}

@@ -185,6 +185,34 @@ function isKillRelatedCommand(cmd) {
   if (SCRIPT_KILL_RE_POSIX.test(normalized)) return true;
   return false;
 }
+function parsePosixKillTargets(normalized, command) {
+  const tokens = normalized.split(" ");
+  if (tokens[0]?.toLowerCase() !== "kill") return null;
+  let i = 1;
+  let signal = "TERM";
+  const first = tokens[i];
+  if (first !== void 0 && /^-[sn]$/i.test(first)) {
+    const value = tokens[i + 1];
+    if (!value || !/^[a-zA-Z0-9]+$/.test(value)) return null;
+    signal = value.toUpperCase();
+    i += 2;
+  } else if (first !== void 0 && first !== "--" && /^-[a-zA-Z0-9]+$/.test(first) && tokens.length - i >= 2) {
+    signal = first.slice(1).toUpperCase();
+    i += 1;
+  }
+  if (tokens[i] === "--") i += 1;
+  const targets = tokens.slice(i);
+  if (targets.length === 0 || !targets.every((t) => /^-?\d+$/.test(t))) return null;
+  const pids = targets.map((t) => Number.parseInt(t.replace(/^-/, ""), 10));
+  return {
+    pid: pids[0],
+    ...pids.length > 1 ? { pids } : {},
+    signal,
+    isGroupKill: targets.some((t) => t.startsWith("-")),
+    isAllKill: false,
+    originalCommand: command
+  };
+}
 function parseKillCommand(command) {
   const normalized = command.replace(/\s+/g, " ").trim();
   if (isWin) {
@@ -241,27 +269,8 @@ function parseKillCommand(command) {
         originalCommand: command
       };
     }
-    const killSignalOptionMatch = normalized.match(/^kill\s+-s\s+([a-zA-Z0-9]+)\s+(\d+)$/i);
-    if (killSignalOptionMatch?.[1] && killSignalOptionMatch[2]) {
-      return {
-        pid: parseInt(killSignalOptionMatch[2], 10),
-        signal: killSignalOptionMatch[1].toUpperCase(),
-        isGroupKill: false,
-        isAllKill: false,
-        originalCommand: command
-      };
-    }
-    const killPosixMatch = normalized.match(/^kill\s+(?:(-[a-zA-Z0-9]+)\s+)?(\d+)$/);
-    if (killPosixMatch?.[2]) {
-      const sig = killPosixMatch[1] ? killPosixMatch[1].slice(1).toUpperCase() : "TERM";
-      return {
-        pid: parseInt(killPosixMatch[2], 10),
-        signal: sig,
-        isGroupKill: false,
-        isAllKill: false,
-        originalCommand: command
-      };
-    }
+    const gitBashKill = parsePosixKillTargets(normalized, command);
+    if (gitBashKill) return gitBashKill;
     const stopProcNameMatch = normalized.match(
       /^(?:stop-process|kill)\s+-(?:name|n)\s+(?:['"]([a-zA-Z0-9_.-]+)['"]|([a-zA-Z0-9_.-]+))(?:\s|$)/i
     );
@@ -324,33 +333,8 @@ function parseKillCommand(command) {
     }
     return null;
   }
-  const signalOptionMatch = normalized.match(/^kill\s+-s\s+([a-zA-Z0-9]+)\s+(\d+|-?\d+)$/i);
-  if (signalOptionMatch?.[1] && signalOptionMatch[2]) {
-    const pidOrGroup = signalOptionMatch[2];
-    const isGroupKill = pidOrGroup.startsWith("-");
-    return {
-      pid: parseInt(isGroupKill ? pidOrGroup.slice(1) : pidOrGroup, 10),
-      signal: signalOptionMatch[1].toUpperCase(),
-      isGroupKill,
-      isAllKill: false,
-      originalCommand: command
-    };
-  }
-  const simpleMatch = normalized.match(/^kill\s+(?:(-[a-zA-Z0-9]+)\s+)?(\d+|-?\d+)$/);
-  if (simpleMatch) {
-    const signal = simpleMatch[1] ?? "-TERM";
-    const pidOrGroup = simpleMatch[2];
-    if (!pidOrGroup) return null;
-    const isGroupKill = pidOrGroup.startsWith("-");
-    const pid = isGroupKill ? parseInt(pidOrGroup.slice(1), 10) : parseInt(pidOrGroup, 10);
-    return {
-      pid,
-      signal: signal.slice(1),
-      isGroupKill,
-      isAllKill: false,
-      originalCommand: command
-    };
-  }
+  const posixKill = parsePosixKillTargets(normalized, command);
+  if (posixKill) return posixKill;
   const pkillMatch = normalized.match(/^pkill\s+(?:(-[a-zA-Z]+)\s+)?(.+)$/);
   if (pkillMatch?.[2]) {
     const name = pkillMatch[2];
@@ -429,14 +413,60 @@ async function isKillProtected(kill) {
     const protectedPids = await registry.getAllProtectedPids();
     return protectedPids.length > 0;
   }
-  if (kill.pid !== void 0) {
-    if (await registry.shouldBlockKill(kill.pid)) return true;
-    if (kill.pid === process.pid || kill.pid === process.ppid) return true;
-    return false;
+  const targets = kill.pids ?? (kill.pid !== void 0 ? [kill.pid] : []);
+  for (const pid of targets) {
+    if (await registry.shouldBlockKill(pid)) return true;
+    if (pid === process.pid || pid === process.ppid) return true;
   }
   return false;
 }
 async function checkAndBlockKillCommand(command) {
+  const whole = await checkSingleCommand(command);
+  if (whole.blocked) return whole;
+  const segments = splitShellSequence(command);
+  if (segments.length > 1) {
+    for (const segment of segments) {
+      const result = await checkSingleCommand(segment);
+      if (result.blocked) return result;
+    }
+  }
+  return { blocked: false };
+}
+function splitShellSequence(command) {
+  const segments = [];
+  let current = "";
+  let quote = null;
+  for (let i = 0; i < command.length; i++) {
+    const ch = command[i];
+    const next = command[i + 1];
+    if (quote) {
+      if (ch === quote) quote = null;
+      current += ch;
+      continue;
+    }
+    if (ch === "\\" && next !== void 0) {
+      current += ch + next;
+      i++;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      current += ch;
+      continue;
+    }
+    const isSeparator = ch === ";" || ch === "\n" || ch === "\r" || ch === "|" && next === "|" || ch === "&" && command[i - 1] !== ">" && next !== ">";
+    if (isSeparator) {
+      if ((ch === "|" || ch === "&") && next === ch) i++;
+      if (current.trim()) segments.push(current.trim());
+      current = "";
+      continue;
+    }
+    current += ch;
+  }
+  if (current.trim()) segments.push(current.trim());
+  return segments;
+}
+async function checkSingleCommand(command) {
   const normalized = command.replace(/\s+/g, " ").trim();
   const killCmd = extractKillCommand(normalized) || (isKillRelatedCommand(normalized) ? normalized : null);
   if (!killCmd) {
@@ -462,6 +492,8 @@ async function checkAndBlockKillCommand(command) {
     let target;
     if (parsed.name) {
       target = `process name "${parsed.name}"`;
+    } else if (parsed.pids && parsed.pids.length > 1) {
+      target = `PIDs ${parsed.pids.join(", ")}`;
     } else if (parsed.pid !== void 0) {
       target = `PID ${parsed.pid}`;
     } else {
@@ -1054,4 +1086,4 @@ export {
   checkAndBlockKillCommand,
   bashTool
 };
-//# sourceMappingURL=chunk-QA37PFYL.js.map
+//# sourceMappingURL=chunk-FCSUBTUJ.js.map

package/dist/{chunk-WEUEU53R.js → chunk-FVSMTEO3.js}

@@ -1,6 +1,6 @@
 import {
   builtinTools
-} from "./chunk-OXO773CW.js";
+} from "./chunk-6I6RXQFG.js";
 
 // src/pack.ts
 var builtinToolsPack = {
@@ -12,4 +12,4 @@ var builtinToolsPack = {
 export {
   builtinToolsPack
 };
-//# sourceMappingURL=chunk-WEUEU53R.js.map
+//# sourceMappingURL=chunk-FVSMTEO3.js.map

package/dist/{chunk-HV7RWDCL.js → chunk-V25Q6TQ7.js}

@@ -1,10 +1,10 @@
 import {
   builtinToolsPack
-} from "./chunk-WEUEU53R.js";
+} from "./chunk-FVSMTEO3.js";
 import {
   TIER1_TOOLS,
   TIER2_TOOLS
-} from "./chunk-OXO773CW.js";
+} from "./chunk-6I6RXQFG.js";
 
 // src/tool-tier.ts
 function toolNameSet(tools) {
@@ -54,4 +54,4 @@ export {
   selectBuiltinToolsForTier,
   registerBuiltinToolTier
 };
-//# sourceMappingURL=chunk-HV7RWDCL.js.map
+//# sourceMappingURL=chunk-V25Q6TQ7.js.map

package/dist/index.js

@@ -46,10 +46,10 @@ import "./chunk-Z6DAKQ3U.js";
 import {
   registerBuiltinToolTier,
   selectBuiltinToolsForTier
-} from "./chunk-HV7RWDCL.js";
+} from "./chunk-V25Q6TQ7.js";
 import {
   builtinToolsPack
-} from "./chunk-WEUEU53R.js";
+} from "./chunk-FVSMTEO3.js";
 import {
   OFF_ONLY_TOOLS,
   OPTIONAL_TOOLS,
@@ -64,7 +64,7 @@ import {
   pwshTool,
   readUrlContentTool,
   securityAstScanTool
-} from "./chunk-OXO773CW.js";
+} from "./chunk-6I6RXQFG.js";
 import {
   discoverE2EProjects,
   e2ePlanTool
@@ -192,7 +192,7 @@ import {
 import {
   bashTool,
   checkAndBlockKillCommand
-} from "./chunk-QA37PFYL.js";
+} from "./chunk-FCSUBTUJ.js";
 import {
   checkExecKillCommand,
   configureDangerBypass,

package/dist/pack.js

@@ -1,7 +1,7 @@
 import {
   builtinToolsPack
-} from "./chunk-WEUEU53R.js";
-import "./chunk-OXO773CW.js";
+} from "./chunk-FVSMTEO3.js";
+import "./chunk-6I6RXQFG.js";
 import "./chunk-BVHKBBGA.js";
 import "./chunk-ENE22I5W.js";
 import "./chunk-XRNN44QY.js";
@@ -31,7 +31,7 @@ import "./chunk-ON6ET5ER.js";
 import "./chunk-DLZCOEVG.js";
 import "./chunk-YJTXRH5Y.js";
 import "./chunk-ZBMANLYH.js";
-import "./chunk-QA37PFYL.js";
+import "./chunk-FCSUBTUJ.js";
 import "./chunk-QAWI3RSK.js";
 import "./chunk-BTSFTGIL.js";
 import "./chunk-PVCB7RUZ.js";

package/dist/tool-tier.js

@@ -2,9 +2,9 @@ import {
   BUILTIN_TIER_COUNTS,
   registerBuiltinToolTier,
   selectBuiltinToolsForTier
-} from "./chunk-HV7RWDCL.js";
-import "./chunk-WEUEU53R.js";
-import "./chunk-OXO773CW.js";
+} from "./chunk-V25Q6TQ7.js";
+import "./chunk-FVSMTEO3.js";
+import "./chunk-6I6RXQFG.js";
 import "./chunk-BVHKBBGA.js";
 import "./chunk-ENE22I5W.js";
 import "./chunk-XRNN44QY.js";
@@ -34,7 +34,7 @@ import "./chunk-ON6ET5ER.js";
 import "./chunk-DLZCOEVG.js";
 import "./chunk-YJTXRH5Y.js";
 import "./chunk-ZBMANLYH.js";
-import "./chunk-QA37PFYL.js";
+import "./chunk-FCSUBTUJ.js";
 import "./chunk-QAWI3RSK.js";
 import "./chunk-BTSFTGIL.js";
 import "./chunk-PVCB7RUZ.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/tools",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "license": "MIT",
   "description": "WrongStack built-in tools: read/write/edit, bash/exec, grep/glob, git, fetch, test, lint, and more.",
   "repository": {
@@ -237,10 +237,10 @@
     "@msgpack/msgpack": "^3.1.3",
     "@playwright/test": "^1.63.0",
     "@typescript/typescript6": "^6.0.2",
-    "@wrongstack/core": "1.0.9",
-    "@wrongstack/kanban": "1.0.9",
-    "@wrongstack/persistence": "1.0.9",
-    "@wrongstack/primitives": "1.0.9",
+    "@wrongstack/core": "1.0.10",
+    "@wrongstack/kanban": "1.0.10",
+    "@wrongstack/persistence": "1.0.10",
+    "@wrongstack/primitives": "1.0.10",
     "tree-sitter-wasm": "1.1.8",
     "turndown": "^7.2.4",
     "undici": "^8.10.2",