@pushpalsdev/cli 1.1.11 → 1.1.13

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

@@ -136,6 +136,29 @@ export function resolveGenericPythonExecutorTimeoutMs(params: {
   return configuredTimeoutMs;
 }
 
+function toSnakeConfigKey(key: string): string {
+  return key.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
+}
+
+function formatGenericPythonExecutorTimeoutDetail(
+  config: GenericPythonExecutorConfig,
+  configuredTimeoutMs: number,
+  executionBudgetMs: number | null,
+  timeoutMs: number,
+): string {
+  const configPath = `workerpals.${toSnakeConfigKey(config.timeoutConfigKey)}`;
+  if (executionBudgetMs == null) {
+    return `${configPath}=${configuredTimeoutMs}ms`;
+  }
+  if (config.capTimeoutToExecutionBudget === false) {
+    return `${configPath}=${configuredTimeoutMs}ms; planning executionBudgetMs=${executionBudgetMs}ms ignored by backend opt-out`;
+  }
+  if (timeoutMs < configuredTimeoutMs) {
+    return `${configPath}=${configuredTimeoutMs}ms capped by planning executionBudgetMs=${executionBudgetMs}ms`;
+  }
+  return `${configPath}=${configuredTimeoutMs}ms within planning executionBudgetMs=${executionBudgetMs}ms`;
+}
+
 export function createGenericPythonExecutor(
   config: GenericPythonExecutorConfig,
 ): BackendTaskExecutor {
@@ -172,6 +195,12 @@ export function createGenericPythonExecutor(
       executionBudgetMs,
       capTimeoutToExecutionBudget: config.capTimeoutToExecutionBudget,
     });
+    const timeoutDetail = formatGenericPythonExecutorTimeoutDetail(
+      config,
+      configuredTimeoutMs,
+      executionBudgetMs,
+      timeoutMs,
+    );
     const payloadBase64 = Buffer.from(
       JSON.stringify({
         kind,
@@ -184,7 +213,7 @@ export function createGenericPythonExecutor(
 
     onLog?.(
       "stdout",
-      `[${backendLabel}Executor] Spawning ${backendName} executor (timeout=${timeoutMs}ms)`,
+      `[${backendLabel}Executor] Spawning ${backendName} executor (timeout=${timeoutMs}ms; ${timeoutDetail})`,
     );
 
     try {
@@ -207,6 +236,7 @@ export function createGenericPythonExecutor(
       });
 
       let timedOut = false;
+      let hardKillTimer: ReturnType<typeof setTimeout> | null = null;
       const timeoutTimer = setTimeout(() => {
         timedOut = true;
         onLog?.(
@@ -214,6 +244,13 @@ export function createGenericPythonExecutor(
           `[${backendLabel}Executor] Timeout reached after ${timeoutMs}ms; terminating process.`,
         );
         proc.kill();
+        hardKillTimer = setTimeout(() => {
+          onLog?.(
+            "stdout",
+            `[${backendLabel}Executor] Process did not exit after graceful timeout termination; forcing kill.`,
+          );
+          proc.kill("SIGKILL");
+        }, 5_000);
       }, timeoutMs);
 
       const progressIntervalMs = 15_000;
@@ -246,6 +283,7 @@ export function createGenericPythonExecutor(
       ]);
 
       clearTimeout(timeoutTimer);
+      if (hardKillTimer) clearTimeout(hardKillTimer);
       clearInterval(progressTimer);
 
       const stdout = rawStdout ?? "";

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

@@ -303,7 +303,7 @@ export function resolveDockerJobTimeoutMs(
   if (!hasBrowserValidationCommand(job)) return baseTimeoutMs;
 
   const planning = maybeRecord(job.params.planning);
-  const executionBudgetMs = readPositiveNumber(planning?.executionBudgetMs) ?? 1_800_000;
+  const executionBudgetMs = readPositiveNumber(planning?.executionBudgetMs) ?? 1_200_000;
   const finalizationBudgetMs = readPositiveNumber(planning?.finalizationBudgetMs) ?? 120_000;
   const attempts = BROWSER_VALIDATION_JOB_REPAIR_ATTEMPTS + 1; // initial attempt plus repairs
   const estimatedTimeoutMs =

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

@@ -1145,6 +1145,21 @@ export function isLongRunningBrowserValidationCommand(command: string): boolean
   );
 }
 
+export function isParallelSafeFastValidationCommand(repo: string, command: string): boolean {
+  if (isLongRunningBrowserValidationCommand(command)) return false;
+  if (shouldEnsurePlaywrightBrowserRuntime(repo, command)) return false;
+  const tokens = tokenizeValidationCommandArgv(command);
+  if (!tokens || tokens.length === 0) return false;
+  const lower = tokens.map((token) => token.toLowerCase());
+  if (lower[0] !== "bun") return false;
+  if (lower[1] === "test") return true;
+  if (lower[1] === "x" && lower[2] === "tsc") return true;
+  if (lower[1] === "run" && ["lint", "typecheck", "test", "test:unit"].includes(lower[2] ?? "")) {
+    return true;
+  }
+  return false;
+}
+
 function readPackageJson(repo: string): {
   scripts?: Record<string, unknown>;
   dependencies?: Record<string, unknown>;
@@ -3116,7 +3131,71 @@ async function runDeterministicQualityGate(
       );
     }
     const playwrightBrowserRuntimeReadyTargets = new Set<string>();
-    for (const command of commandsToRun) {
+    for (let commandIndex = 0; commandIndex < commandsToRun.length; ) {
+      const parallelBatch: string[] = [];
+      while (
+        commandIndex + parallelBatch.length < commandsToRun.length &&
+        parallelBatch.length < 3
+      ) {
+        const candidate = commandsToRun[commandIndex + parallelBatch.length];
+        if (!isParallelSafeFastValidationCommand(repo, candidate)) break;
+        parallelBatch.push(candidate);
+      }
+      if (parallelBatch.length > 1) {
+        onLog?.(
+          "stdout",
+          `[ValidationGate] Running fast validation batch in parallel: ${parallelBatch.join(" | ")}`,
+        );
+        const batchRuns = await Promise.all(
+          parallelBatch.map(async (command) => {
+            const commandMissingTools = requirementsForValidationCommand(
+              toolchainPlan,
+              command,
+            ).filter((requirement) =>
+              missingToolRequirements.some((missing) => missing.tool === requirement.tool),
+            );
+            if (commandMissingTools.length > 0) {
+              const stderr = `Validation skipped before execution because required tool(s) are missing: ${formatMissingToolRequirements(
+                commandMissingTools,
+              )}.`;
+              return {
+                run: {
+                  step: command,
+                  command,
+                  ok: false,
+                  exitCode: 127,
+                  stdout: "",
+                  stderr,
+                  elapsedMs: 1,
+                } satisfies ValidationExecutionResult,
+                stream: "stderr" as const,
+                summary: `[ValidationGate] Validation skipped (missing toolchain): ${command}`,
+              };
+            }
+            const run = await runValidationCommand(
+              repo,
+              command,
+              resolveValidationCommandTimeoutMs(command, qualityValidationStepTimeoutMs),
+              outputPolicy,
+            );
+            const digest = run.ok ? "" : extractValidationFailureDigest(run);
+            return {
+              run,
+              stream: (run.ok ? "stdout" : "stderr") as "stdout" | "stderr",
+              summary: `[ValidationGate] ${run.ok ? "Passed" : "Failed"} (${run.elapsedMs}ms, exit ${run.exitCode}): ${command}${digest ? ` - ${digest}` : ""}`,
+            };
+          }),
+        );
+        for (const { run, stream, summary } of batchRuns) {
+          validationRuns.push(run);
+          onLog?.(stream, summary);
+        }
+        commandIndex += parallelBatch.length;
+        continue;
+      }
+
+      const command = commandsToRun[commandIndex];
+      commandIndex += 1;
       const commandMissingTools = requirementsForValidationCommand(toolchainPlan, command).filter(
         (requirement) =>
           missingToolRequirements.some((missing) => missing.tool === requirement.tool),
@@ -6665,6 +6744,7 @@ export async function executeJob(
   const previousValidationFailureDigests = new Map<string, string>();
   const failureJobFamily = buildTaskFailureJobFamily(normalizedParams);
   while (revisionAttempt <= qualityRevisionLoopMax) {
+    const attemptStartedAt = Date.now();
     const attemptParams: Record<string, unknown> = { ...normalizedParams };
     if (revisionHint) {
       attemptParams.qualityRevisionHint = revisionHint;
@@ -6683,6 +6763,7 @@ export async function executeJob(
     }
     let result: Awaited<ReturnType<typeof runExecutor>> | null = null;
     let mergeConflictPass = 0;
+    let executorElapsedMs = 0;
     while (true) {
       const currentResult = await runExecutor(
         kind,
@@ -6751,6 +6832,7 @@ export async function executeJob(
         exitCode: 4,
       };
     }
+    executorElapsedMs = Date.now() - attemptStartedAt;
 
     const preQualityStatus = await git(repo, ["status", "--porcelain"]);
     const preQualityChangedPaths = preQualityStatus.ok
@@ -6799,6 +6881,7 @@ export async function executeJob(
       };
     }
 
+    const qualityStartedAt = Date.now();
     const quality = await runDeterministicQualityGate(
       repo,
       attemptParams,
@@ -6810,6 +6893,15 @@ export async function executeJob(
         revisionAttempt,
       },
     );
+    const qualityElapsedMs = Date.now() - qualityStartedAt;
+    const validationCommandElapsedMs = quality.validationRuns.reduce(
+      (total, run) => total + Math.max(0, Number(run.elapsedMs) || 0),
+      0,
+    );
+    onLog?.(
+      "stdout",
+      `[JobRunner] Performance summary: attempt=${revisionAttempt}, executor=${executorElapsedMs}ms, quality=${qualityElapsedMs}ms, validation_commands=${quality.validationRuns.length}, validation_command_time=${validationCommandElapsedMs}ms, changed_files=${quality.changedPaths.length}`,
+    );
     let browserRepairPacket = buildBrowserValidationRepairPacket(
       quality.validationRuns,
       previousValidationFailureDigests,

package/runtime/sandbox/configs/default.toml

@@ -51,7 +51,7 @@ workerpal_heartbeat_ms = 0
 workerpal_labels = []
 execution_budget_interactive_ms = 600000
 execution_budget_normal_ms = 1500000
-execution_budget_background_ms = 1800000
+execution_budget_background_ms = 1200000
 finalization_budget_ms = 120000
 crash_restart_enabled = true
 crash_restart_max_restarts = 3

package/runtime/sandbox/packages/protocol/src/schemas/events.schema.json

@@ -515,7 +515,8 @@
             "stream": { "type": "string", "enum": ["stdout", "stderr"] },
             "seq": { "type": "integer", "minimum": 1 },
             "line": { "type": "string" },
-            "ts": { "type": "string" }
+            "ts": { "type": "string" },
+            "phase": { "type": ["string", "null"] }
           },
           "additionalProperties": false
         }

package/runtime/sandbox/packages/protocol/src/types.ts

@@ -125,6 +125,7 @@ export interface EventTypePayloadMap {
     seq: number;
     line: string;
     ts?: string;
+    phase?: string | null;
   };
 
   /** System heartbeat / status beacon */

package/runtime/sandbox/packages/shared/src/config.ts

@@ -1619,7 +1619,7 @@ export function loadPushPalsConfig(options: LoadOptions = {}): PushPalsConfig {
         asInt(
           parseIntEnv("REMOTEBUDDY_EXECUTION_BUDGET_BACKGROUND_MS") ??
             remoteNode.execution_budget_background_ms,
-          1_800_000,
+          1_200_000,
         ),
       ),
       finalizationBudgetMs: Math.max(

package/runtime/sandbox/protocol/schemas/events.schema.json

@@ -515,7 +515,8 @@
             "stream": { "type": "string", "enum": ["stdout", "stderr"] },
             "seq": { "type": "integer", "minimum": 1 },
             "line": { "type": "string" },
-            "ts": { "type": "string" }
+            "ts": { "type": "string" },
+            "phase": { "type": ["string", "null"] }
           },
           "additionalProperties": false
         }