ref(test): Share result bundle argument parsing

Move result bundle path parsing into a shared helper so single-phase and
two-phase test execution paths use the same validation and precedence rules.

Refs #397
Co-Authored-By: Codex <noreply@openai.com>

Author: cameroncooke

src/utils/result-bundle-args.ts

@@ -0,0 +1,48 @@
+function isResultBundlePathValue(value: string | undefined): value is string {
+  return value !== undefined && value.length > 0 && !value.startsWith('-');
+}
+
+export function parseResultBundlePathArgs(extraArgs?: readonly string[]): {
+  remainingArgs: string[];
+  resultBundlePath?: string;
+} {
+  if (!extraArgs) {
+    return { remainingArgs: [] };
+  }
+
+  const remainingArgs: string[] = [];
+  let resultBundlePath: string | undefined;
+
+  for (let index = 0; index < extraArgs.length; index += 1) {
+    const argument = extraArgs[index];
+    if (argument === '-resultBundlePath') {
+      const value = extraArgs[index + 1];
+      if (isResultBundlePathValue(value)) {
+        resultBundlePath = value;
+        index += 1;
+      }
+      continue;
+    }
+
+    if (argument?.startsWith('-resultBundlePath=')) {
+      const value = argument.slice('-resultBundlePath='.length);
+      if (isResultBundlePathValue(value)) {
+        resultBundlePath = value;
+      }
+      continue;
+    }
+
+    if (argument !== undefined) {
+      remainingArgs.push(argument);
+    }
+  }
+
+  return {
+    remainingArgs,
+    ...(resultBundlePath ? { resultBundlePath } : {}),
+  };
+}
+
+export function findResultBundlePathArg(extraArgs?: readonly string[]): string | undefined {
+  return parseResultBundlePathArgs(extraArgs).resultBundlePath;
+}

src/utils/simulator-test-execution.ts

@@ -1,51 +1,37 @@
+import { parseResultBundlePathArgs } from './result-bundle-args.ts';
 import type { TestPreflightResult } from './test-preflight.ts';
 
-function isResultBundlePathValue(value: string | undefined): value is string {
-  return value !== undefined && value.length > 0 && !value.startsWith('-');
-}
-
 function parseTestSelectorArgs(extraArgs: string[] | undefined): {
   remainingArgs: string[];
   selectorArgs: string[];
   resultBundlePath?: string;
 } {
-  if (!extraArgs || extraArgs.length === 0) {
-    return { remainingArgs: [], selectorArgs: [] };
+  const parsedResultBundleArgs = parseResultBundlePathArgs(extraArgs);
+  if (parsedResultBundleArgs.remainingArgs.length === 0) {
+    return {
+      remainingArgs: [],
+      selectorArgs: [],
+      ...(parsedResultBundleArgs.resultBundlePath
+        ? { resultBundlePath: parsedResultBundleArgs.resultBundlePath }
+        : {}),
+    };
   }
 
   const remainingArgs: string[] = [];
   const selectorArgs: string[] = [];
-  let resultBundlePath: string | undefined;
 
-  for (let index = 0; index < extraArgs.length; index += 1) {
-    const argument = extraArgs[index]!;
+  for (let index = 0; index < parsedResultBundleArgs.remainingArgs.length; index += 1) {
+    const argument = parsedResultBundleArgs.remainingArgs[index]!;
 
     if (argument === '-only-testing' || argument === '-skip-testing') {
-      const value = extraArgs[index + 1];
+      const value = parsedResultBundleArgs.remainingArgs[index + 1];
       if (value) {
         selectorArgs.push(argument, value);
         index += 1;
       }
       continue;
     }
 
-    if (argument === '-resultBundlePath') {
-      const value = extraArgs[index + 1];
-      if (isResultBundlePathValue(value)) {
-        resultBundlePath = value;
-        index += 1;
-      }
-      continue;
-    }
-
-    if (argument.startsWith('-resultBundlePath=')) {
-      const value = argument.slice('-resultBundlePath='.length);
-      if (isResultBundlePathValue(value)) {
-        resultBundlePath = value;
-      }
-      continue;
-    }
-
     if (argument.startsWith('-only-testing:') || argument.startsWith('-skip-testing:')) {
       selectorArgs.push(argument);
       continue;
@@ -54,7 +40,13 @@ function parseTestSelectorArgs(extraArgs: string[] | undefined): {
     remainingArgs.push(argument);
   }
 
-  return { remainingArgs, selectorArgs, resultBundlePath };
+  return {
+    remainingArgs,
+    selectorArgs,
+    ...(parsedResultBundleArgs.resultBundlePath
+      ? { resultBundlePath: parsedResultBundleArgs.resultBundlePath }
+      : {}),
+  };
 }
 
 export function createSimulatorTwoPhaseExecutionPlan(params: {

src/utils/test-common.ts

@@ -16,6 +16,7 @@ import { getDefaultCommandExecutor } from './command.ts';
 import { type TestPreflightResult } from './test-preflight.ts';
 
 import { createSimulatorTwoPhaseExecutionPlan } from './simulator-test-execution.ts';
+import { findResultBundlePathArg } from './result-bundle-args.ts';
 
 import type {
   BuildTarget,
@@ -59,37 +60,6 @@ function getFallbackErrorMessages(
   return [...streamedLines, ...(responseContent ?? []).map((item) => item.text)];
 }
 
-function isResultBundlePathValue(value: string | undefined): value is string {
-  return value !== undefined && value.length > 0 && !value.startsWith('-');
-}
-
-function findResultBundlePathArg(extraArgs?: readonly string[]): string | undefined {
-  if (!extraArgs) {
-    return undefined;
-  }
-
-  let resultBundlePath: string | undefined;
-  for (let index = 0; index < extraArgs.length; index += 1) {
-    const argument = extraArgs[index];
-    if (argument === '-resultBundlePath') {
-      const value = extraArgs[index + 1];
-      if (isResultBundlePathValue(value)) {
-        resultBundlePath = value;
-        index += 1;
-      }
-      continue;
-    }
-    if (argument?.startsWith('-resultBundlePath=')) {
-      const value = argument.slice('-resultBundlePath='.length);
-      if (isResultBundlePathValue(value)) {
-        resultBundlePath = value;
-      }
-    }
-  }
-
-  return resultBundlePath;
-}
-
 function createXcodebuildTestArtifacts(
   params: Pick<SharedTestExecutorParams, 'deviceId'>,
   started: ReturnType<typeof createDomainStreamingPipeline>,