@pushpalsdev/cli 1.0.97 → 1.0.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushpalsdev/cli",
-  "version": "1.0.97",
+  "version": "1.0.99",
   "description": "PushPals terminal CLI for LocalBuddy -> RemoteBuddy orchestration",
   "license": "MIT",
   "repository": {

package/runtime/sandbox/apps/workerpals/src/common/sandbox_env.ts

@@ -53,6 +53,12 @@ function ensureSandboxGitConfig(homeDir: string): void {
   }
 }
 
+function withNodeDnsIpv4First(value: string | undefined): string {
+  const existing = (value ?? "").trim();
+  if (/(^|\s)--dns-result-order=/.test(existing)) return existing;
+  return [existing, "--dns-result-order=ipv4first"].filter(Boolean).join(" ");
+}
+
 function resolveOriginalHome(env: Record<string, string>): string {
   return env.HOME || env.USERPROFILE || homedir();
 }
@@ -100,6 +106,8 @@ export function buildWorkerSandboxWritableEnv(
     EXPO_NO_INTERACTIVE: env.EXPO_NO_INTERACTIVE ?? "1",
     CI: env.CI ?? "1",
     BROWSER: env.BROWSER ?? "none",
+    NODE_OPTIONS: withNodeDnsIpv4First(env.NODE_OPTIONS),
+    REACT_NATIVE_PACKAGER_HOSTNAME: env.REACT_NATIVE_PACKAGER_HOSTNAME ?? "127.0.0.1",
     EXPO_DEV_SERVER_PORT: env.EXPO_DEV_SERVER_PORT ?? defaultExpoPort,
     RCT_METRO_PORT: env.RCT_METRO_PORT ?? defaultExpoPort,
     PUSHPALS_VALIDATION_REPO: repo,

package/runtime/sandbox/apps/workerpals/src/execute_job.ts

@@ -647,7 +647,49 @@ async function terminateValidationProcessTree(
   }
 }
 
-async function runValidationArgv(
+function captureValidationStream(stream: ReadableStream<Uint8Array> | null) {
+  let text = "";
+  let done = false;
+  const reader = stream?.getReader();
+  const promise = reader
+    ? (async () => {
+        try {
+          while (true) {
+            const result = await reader.read();
+            if (result.done) break;
+            text += Buffer.from(result.value).toString("utf8");
+          }
+        } catch {
+          // Stream cancellation after process exit is expected when descendants
+          // inherit pipes from failed browser/dev-server launchers.
+        } finally {
+          done = true;
+          try {
+            reader.releaseLock();
+          } catch {
+            // ignore
+          }
+        }
+      })()
+    : Promise.resolve().then(() => {
+        done = true;
+      });
+
+  return {
+    cancel: async () => {
+      try {
+        await reader?.cancel();
+      } catch {
+        // ignore
+      }
+    },
+    isDone: () => done,
+    promise,
+    text: () => text,
+  };
+}
+
+export async function runValidationArgv(
   repo: string,
   command: string,
   argv: string[],
@@ -665,31 +707,52 @@ async function runValidationArgv(
     stderr: "pipe",
     detached: process.platform !== "win32",
   });
+  const stdoutCapture = captureValidationStream(proc.stdout);
+  const stderrCapture = captureValidationStream(proc.stderr);
   let timedOut = false;
-  const timer = setTimeout(
-    () => {
+  const timeout = Math.max(1_000, timeoutMs);
+  let timeoutTimer: ReturnType<typeof setTimeout> | null = null;
+  const timeoutPromise = new Promise<"timeout">((resolveTimeout) => {
+    timeoutTimer = setTimeout(() => {
       timedOut = true;
       void terminateValidationProcessTree(proc);
-    },
-    Math.max(1_000, timeoutMs),
-  );
+      resolveTimeout("timeout");
+    }, timeout);
+  });
+  const exitOrTimeout = await Promise.race([
+    proc.exited.then((code) => ({ type: "exit" as const, code })),
+    timeoutPromise,
+  ]);
+  if (timeoutTimer) clearTimeout(timeoutTimer);
+  const exitCode = exitOrTimeout === "timeout" ? 124 : exitOrTimeout.code;
+
+  if (!timedOut) {
+    await Promise.race([
+      Promise.all([stdoutCapture.promise, stderrCapture.promise]),
+      Bun.sleep(1_000),
+    ]);
+    if (!stdoutCapture.isDone() || !stderrCapture.isDone()) {
+      await terminateValidationProcessTree(proc);
+      await Promise.all([stdoutCapture.cancel(), stderrCapture.cancel()]);
+    }
+  } else {
+    await Promise.all([stdoutCapture.cancel(), stderrCapture.cancel()]);
+  }
 
-  const [stdout, stderr, exitCode] = await Promise.all([
-    new Response(proc.stdout).text(),
-    new Response(proc.stderr).text(),
-    proc.exited,
+  await Promise.race([
+    Promise.all([stdoutCapture.promise, stderrCapture.promise]),
+    Bun.sleep(500),
   ]);
-  clearTimeout(timer);
 
   return {
     step: command,
     command,
     ok: !timedOut && exitCode === 0,
-    exitCode: timedOut ? 124 : exitCode,
-    stdout: compactJobOutput(stdout.trim(), outputPolicy),
+    exitCode,
+    stdout: compactJobOutput(stdoutCapture.text().trim(), outputPolicy),
     stderr: compactJobOutput(
       [
-        stderr.trim(),
+        stderrCapture.text().trim(),
         timedOut ? timeoutMessage : "",
       ]
         .filter(Boolean)
@@ -883,13 +946,69 @@ export function shouldEnsurePlaywrightBrowserRuntime(repo: string, command: stri
   );
 }
 
-export function playwrightBrowserInstallArgv(): string[] {
-  return ["bunx", "playwright", "install", "chromium"];
+const PLAYWRIGHT_BROWSER_INSTALL_TARGETS = new Set([
+  "chromium",
+  "chrome",
+  "chrome-beta",
+  "chrome-dev",
+  "chrome-canary",
+  "msedge",
+  "msedge-beta",
+  "msedge-dev",
+  "msedge-canary",
+  "firefox",
+  "webkit",
+]);
+
+function addPlaywrightInstallTarget(targets: Set<string>, rawValue: string): void {
+  const value = rawValue.trim().toLowerCase();
+  if (!value) return;
+  const normalized = value === "edge" ? "msedge" : value;
+  if (PLAYWRIGHT_BROWSER_INSTALL_TARGETS.has(normalized)) {
+    targets.add(normalized);
+  }
+}
+
+export function inferPlaywrightBrowserInstallTargets(repo: string, command: string): string[] {
+  const targets = new Set<string>(["chromium"]);
+  const script = resolvePackageScriptForValidationCommand(repo, command);
+  const scriptText = script
+    ? `${script.script}\n${readReferencedValidationScriptText(script.cwd, script.script)}`
+    : "";
+  const text = `${command}\n${scriptText}`;
+
+  for (const match of text.matchAll(/\bchannel\s*:\s*["'`]([^"'`]+)["'`]/gi)) {
+    addPlaywrightInstallTarget(targets, match[1] ?? "");
+  }
+  for (const match of text.matchAll(/\bbrowserName\s*:\s*["'`]([^"'`]+)["'`]/gi)) {
+    addPlaywrightInstallTarget(targets, match[1] ?? "");
+  }
+  for (const match of text.matchAll(/(?:^|\s)(?:--browser|--browser-name|--channel)[=\s]+["'`]?([A-Za-z0-9_-]+)/gi)) {
+    addPlaywrightInstallTarget(targets, match[1] ?? "");
+  }
+  for (const target of PLAYWRIGHT_BROWSER_INSTALL_TARGETS) {
+    const escaped = target.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    if (new RegExp(`\\b${escaped}\\s*\\.\\s*launch\\b`, "i").test(text)) {
+      addPlaywrightInstallTarget(targets, target);
+    }
+  }
+
+  return Array.from(targets).sort((a, b) => {
+    if (a === "chromium") return -1;
+    if (b === "chromium") return 1;
+    return a.localeCompare(b);
+  });
+}
+
+export function playwrightBrowserInstallArgv(targets: string[] = ["chromium"]): string[] {
+  const installTargets = Array.from(new Set(targets.map((target) => target.trim()).filter(Boolean)));
+  return ["bunx", "playwright", "install", ...(installTargets.length > 0 ? installTargets : ["chromium"])];
 }
 
 async function runPlaywrightBrowserRuntimePreflight(
   repo: string,
   command: string,
+  targets: string[],
   timeoutMs: number,
   outputPolicy: Partial<OutputCompactionPolicy>,
 ): Promise<ValidationExecutionResult> {
@@ -898,11 +1017,11 @@ async function runPlaywrightBrowserRuntimePreflight(
   return runValidationArgv(
     repo,
     command,
-    playwrightBrowserInstallArgv(),
+    playwrightBrowserInstallArgv(targets),
     env,
     timeout,
     outputPolicy,
-    `Browser runtime preflight timed out after ${timeout}ms while ensuring Playwright Chromium. Captured output is the process output emitted before PushPals terminated the installer process tree.`,
+    `Browser runtime preflight timed out after ${timeout}ms while ensuring Playwright browser target(s): ${targets.join(", ")}. Captured output is the process output emitted before PushPals terminated the installer process tree.`,
   );
 }
 
@@ -1186,6 +1305,10 @@ function detectValidationBlocker(runs: ValidationExecutionResult[]): ValidationB
     combined.includes("network access") ||
     combined.includes("connection refused") ||
     combined.includes("getaddrinfo") ||
+    combined.includes("err_socket_bad_port") ||
+    combined.includes("expo exited early") ||
+    combined.includes("eperm") ||
+    combined.includes("operation not permitted") ||
     combined.includes("eacces")
   ) {
     return {
@@ -1772,7 +1895,7 @@ async function runDeterministicQualityGate(
         )}`,
       );
     }
-    let playwrightBrowserRuntimeReady = false;
+    const playwrightBrowserRuntimeReadyTargets = new Set<string>();
     for (const command of commandsToRun) {
       const commandMissingTools = requirementsForValidationCommand(toolchainPlan, command).filter(
         (requirement) =>
@@ -1801,17 +1924,25 @@ async function runDeterministicQualityGate(
         repo,
         command,
       );
+      const playwrightBrowserTargets = commandNeedsPlaywrightBrowserRuntime
+        ? inferPlaywrightBrowserInstallTargets(repo, command)
+        : [];
+      const missingPlaywrightBrowserTargets = playwrightBrowserTargets.filter(
+        (target) => !playwrightBrowserRuntimeReadyTargets.has(target),
+      );
       let commandBrowserRuntimeEnsured =
-        playwrightBrowserRuntimeReady && commandNeedsPlaywrightBrowserRuntime;
-      if (!playwrightBrowserRuntimeReady && commandNeedsPlaywrightBrowserRuntime) {
+        commandNeedsPlaywrightBrowserRuntime &&
+        missingPlaywrightBrowserTargets.length === 0;
+      if (missingPlaywrightBrowserTargets.length > 0) {
         const browserEnv = buildWorkerSandboxWritableEnv(repo);
         onLog?.(
           "stdout",
-          `[ValidationGate] Browser runtime preflight: ensuring Playwright Chromium for "${command}" at ${browserEnv.PLAYWRIGHT_BROWSERS_PATH ?? "(default browser cache)"}`,
+          `[ValidationGate] Browser runtime preflight: ensuring Playwright browser target(s) ${missingPlaywrightBrowserTargets.join(", ")} for "${command}" at ${browserEnv.PLAYWRIGHT_BROWSERS_PATH ?? "(default browser cache)"}`,
         );
         const browserPreflight = await runPlaywrightBrowserRuntimePreflight(
           repo,
           command,
+          missingPlaywrightBrowserTargets,
           resolveValidationCommandTimeoutMs(command, qualityValidationStepTimeoutMs),
           outputPolicy,
         );
@@ -1820,7 +1951,7 @@ async function runDeterministicQualityGate(
           validationRuns.push({
             ...browserPreflight,
             stderr: [
-              `Browser runtime preflight failed before validation command "${command}". WorkerPals could not ensure Playwright Chromium in PLAYWRIGHT_BROWSERS_PATH=${browserEnv.PLAYWRIGHT_BROWSERS_PATH ?? "(default)"}.`,
+              `Browser runtime preflight failed before validation command "${command}". WorkerPals could not ensure Playwright browser target(s) ${missingPlaywrightBrowserTargets.join(", ")} in PLAYWRIGHT_BROWSERS_PATH=${browserEnv.PLAYWRIGHT_BROWSERS_PATH ?? "(default)"}.`,
               browserPreflight.stderr,
             ]
               .filter(Boolean)
@@ -1832,10 +1963,12 @@ async function runDeterministicQualityGate(
           );
           continue;
         }
-        playwrightBrowserRuntimeReady = true;
+        for (const target of missingPlaywrightBrowserTargets) {
+          playwrightBrowserRuntimeReadyTargets.add(target);
+        }
         onLog?.(
           "stdout",
-          `[ValidationGate] Browser runtime preflight passed for "${command}"`,
+          `[ValidationGate] Browser runtime preflight passed for "${command}" (${missingPlaywrightBrowserTargets.join(", ")})`,
         );
         commandBrowserRuntimeEnsured = true;
       }