refactor: unify exec wrapper resolution and parity fixtures

src/infra/system-run-command.ts

@@ -1,4 +1,4 @@
-import path from "node:path";
+import { extractShellWrapperCommand } from "./exec-wrapper-resolution.js";
 
 export type SystemRunCommandValidation =
   | {
@@ -26,163 +26,6 @@ export type ResolvedSystemRunCommand =
       details?: Record<string, unknown>;
     };
 
-function basenameLower(token: string): string {
-  const win = path.win32.basename(token);
-  const posix = path.posix.basename(token);
-  const base = win.length < posix.length ? win : posix;
-  return base.trim().toLowerCase();
-}
-
-const POSIX_SHELL_WRAPPERS = new Set(["ash", "bash", "dash", "fish", "ksh", "sh", "zsh"]);
-const WINDOWS_CMD_WRAPPERS = new Set(["cmd.exe", "cmd"]);
-const POWERSHELL_WRAPPERS = new Set(["powershell", "powershell.exe", "pwsh", "pwsh.exe"]);
-const ENV_OPTIONS_WITH_VALUE = new Set([
-  "-u",
-  "--unset",
-  "-c",
-  "--chdir",
-  "-s",
-  "--split-string",
-  "--default-signal",
-  "--ignore-signal",
-  "--block-signal",
-]);
-const ENV_FLAG_OPTIONS = new Set(["-i", "--ignore-environment", "-0", "--null"]);
-
-function isEnvAssignment(token: string): boolean {
-  return /^[A-Za-z_][A-Za-z0-9_]*=.*/.test(token);
-}
-
-function unwrapEnvInvocation(argv: string[]): string[] | null {
-  let idx = 1;
-  let expectsOptionValue = false;
-  while (idx < argv.length) {
-    const token = argv[idx]?.trim() ?? "";
-    if (!token) {
-      idx += 1;
-      continue;
-    }
-    if (expectsOptionValue) {
-      expectsOptionValue = false;
-      idx += 1;
-      continue;
-    }
-    if (token === "--" || token === "-") {
-      idx += 1;
-      break;
-    }
-    if (isEnvAssignment(token)) {
-      idx += 1;
-      continue;
-    }
-    if (token.startsWith("-") && token !== "-") {
-      const lower = token.toLowerCase();
-      const [flag] = lower.split("=", 2);
-      if (ENV_FLAG_OPTIONS.has(flag)) {
-        idx += 1;
-        continue;
-      }
-      if (ENV_OPTIONS_WITH_VALUE.has(flag)) {
-        if (!lower.includes("=")) {
-          expectsOptionValue = true;
-        }
-        idx += 1;
-        continue;
-      }
-      if (
-        lower.startsWith("-u") ||
-        lower.startsWith("-c") ||
-        lower.startsWith("-s") ||
-        lower.startsWith("--unset=") ||
-        lower.startsWith("--chdir=") ||
-        lower.startsWith("--split-string=") ||
-        lower.startsWith("--default-signal=") ||
-        lower.startsWith("--ignore-signal=") ||
-        lower.startsWith("--block-signal=")
-      ) {
-        idx += 1;
-        continue;
-      }
-      return null;
-    }
-    break;
-  }
-  return idx < argv.length ? argv.slice(idx) : null;
-}
-
-function extractPosixShellInlineCommand(argv: string[]): string | null {
-  const flag = argv[1]?.trim();
-  if (!flag) {
-    return null;
-  }
-  const lower = flag.toLowerCase();
-  if (lower !== "-lc" && lower !== "-c" && lower !== "--command") {
-    return null;
-  }
-  const cmd = argv[2]?.trim();
-  return cmd ? cmd : null;
-}
-
-function extractCmdInlineCommand(argv: string[]): string | null {
-  const idx = argv.findIndex((item) => String(item).trim().toLowerCase() === "/c");
-  if (idx === -1) {
-    return null;
-  }
-  const tail = argv.slice(idx + 1).map((item) => String(item));
-  if (tail.length === 0) {
-    return null;
-  }
-  const cmd = tail.join(" ").trim();
-  return cmd.length > 0 ? cmd : null;
-}
-
-function extractPowerShellInlineCommand(argv: string[]): string | null {
-  for (let i = 1; i < argv.length; i += 1) {
-    const token = argv[i]?.trim();
-    if (!token) {
-      continue;
-    }
-    const lower = token.toLowerCase();
-    if (lower === "--") {
-      break;
-    }
-    if (lower === "-c" || lower === "-command" || lower === "--command") {
-      const cmd = argv[i + 1]?.trim();
-      return cmd ? cmd : null;
-    }
-  }
-  return null;
-}
-
-function extractShellCommandFromArgvInternal(argv: string[], depth: number): string | null {
-  if (depth >= 4) {
-    return null;
-  }
-  const token0 = argv[0]?.trim();
-  if (!token0) {
-    return null;
-  }
-
-  const base0 = basenameLower(token0);
-  if (base0 === "env") {
-    const unwrapped = unwrapEnvInvocation(argv);
-    if (!unwrapped) {
-      return null;
-    }
-    return extractShellCommandFromArgvInternal(unwrapped, depth + 1);
-  }
-  if (POSIX_SHELL_WRAPPERS.has(base0)) {
-    return extractPosixShellInlineCommand(argv);
-  }
-  if (WINDOWS_CMD_WRAPPERS.has(base0)) {
-    return extractCmdInlineCommand(argv);
-  }
-  if (POWERSHELL_WRAPPERS.has(base0)) {
-    return extractPowerShellInlineCommand(argv);
-  }
-  return null;
-}
-
 export function formatExecCommand(argv: string[]): string {
   return argv
     .map((arg) => {
@@ -200,7 +43,7 @@ export function formatExecCommand(argv: string[]): string {
 }
 
 export function extractShellCommandFromArgv(argv: string[]): string | null {
-  return extractShellCommandFromArgvInternal(argv, 0);
+  return extractShellWrapperCommand(argv).command;
 }
 
 export function validateSystemRunCommandConsistency(params: {
@@ -211,7 +54,7 @@ export function validateSystemRunCommandConsistency(params: {
     typeof params.rawCommand === "string" && params.rawCommand.trim().length > 0
       ? params.rawCommand.trim()
       : null;
-  const shellCommand = extractShellCommandFromArgv(params.argv);
+  const shellCommand = extractShellWrapperCommand(params.argv).command;
   const inferred = shellCommand !== null ? shellCommand.trim() : formatExecCommand(params.argv);
 
   if (raw && raw !== inferred) {