addressing codex review

pgondhi987 · pgondhi987 · commit a9c289b60ec0 · 2026-05-12T06:27:48.000Z
diff --git a/src/infra/shell-inline-command.ts b/src/infra/shell-inline-command.ts
@@ -217,6 +217,10 @@ export function resolvePowerShellInlineCommandMatch(argv: string[]): {
   });
 }
 
+export function isPowerShellInlineRestCommandFlag(token: string): boolean {
+  return POWERSHELL_INLINE_REST_COMMAND_FLAGS.has(normalizeLowercaseStringOrEmpty(token));
+}
+
 export function hasPosixInteractiveStartupBeforeInlineCommand(
   argv: string[],
   flags: ReadonlySet<string>,
diff --git a/src/infra/system-run-command.test.ts b/src/infra/system-run-command.test.ts
@@ -187,6 +187,18 @@ describe("system run command helpers", () => {
     expect(res.previewText).toBe("echo hi");
   });
 
+  test("validateSystemRunCommandConsistency accepts PowerShell command-with-args payload text", () => {
+    const res = expectValidResult(
+      validateSystemRunCommandConsistency({
+        argv: ["pwsh", "-cwa", "Write-Output", "hi"],
+        rawCommand: "Write-Output hi",
+        allowLegacyShellText: true,
+      }),
+    );
+    expect(res.shellPayload).toBe("Write-Output hi");
+    expect(res.previewText).toBe("Write-Output hi");
+  });
+
   test("validateSystemRunCommandConsistency rejects shell-only rawCommand for env assignment prelude", () => {
     expectRawCommandMismatch({
       argv: ["/usr/bin/env", "BASH_ENV=/tmp/payload.sh", "bash", "-lc", "echo hi"],
diff --git a/src/infra/system-run-command.ts b/src/infra/system-run-command.ts
@@ -7,8 +7,9 @@ import {
 } from "./exec-wrapper-resolution.js";
 import {
   POSIX_INLINE_COMMAND_FLAGS,
-  POWERSHELL_INLINE_COMMAND_FLAGS,
+  isPowerShellInlineRestCommandFlag,
   resolveInlineCommandMatch,
+  resolvePowerShellInlineCommandMatch,
 } from "./shell-inline-command.js";
 
 type SystemRunCommandValidation =
@@ -95,13 +96,19 @@ function hasTrailingPositionalArgvAfterInlineCommand(argv: string[]): boolean {
 
   const inlineCommandIndex =
     wrapper === "powershell" || wrapper === "pwsh"
-      ? resolveInlineCommandMatch(wrapperArgv, POWERSHELL_INLINE_COMMAND_FLAGS).valueTokenIndex
+      ? resolvePowerShellInlineCommandMatch(wrapperArgv).valueTokenIndex
       : resolveInlineCommandMatch(wrapperArgv, POSIX_INLINE_COMMAND_FLAGS, {
           allowCombinedC: true,
         }).valueTokenIndex;
   if (inlineCommandIndex === null) {
     return false;
   }
+  if (
+    (wrapper === "powershell" || wrapper === "pwsh") &&
+    isPowerShellInlineRestCommandFlag(wrapperArgv[inlineCommandIndex - 1] ?? "")
+  ) {
+    return false;
+  }
   return wrapperArgv.slice(inlineCommandIndex + 1).some((entry) => entry.trim().length > 0);
 }
 
