@pushpalsdev/cli 1.1.6 → 1.1.7

package/package.json

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

package/runtime/sandbox/apps/workerpals/src/backends/openai_codex_backend.ts

@@ -63,5 +63,6 @@ export const OPENAI_CODEX_BACKEND: DockerBackendSpec = {
     scriptPath: resolve(import.meta.dir, "openai_codex", "openai_codex_executor.py"),
     pythonConfigKey: "openaiCodexPython",
     timeoutConfigKey: "openaiCodexTimeoutMs",
+    capTimeoutToExecutionBudget: false,
   }),
 };

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

@@ -25,6 +25,7 @@ interface GenericPythonExecutorConfig {
   scriptPath: string;
   pythonConfigKey: string;
   timeoutConfigKey: string;
+  capTimeoutToExecutionBudget?: boolean;
 }
 
 function estimateTokensFromText(text: string): number {
@@ -119,6 +120,22 @@ function resolveRuntimeSettings(
   return { pythonBin, timeoutMs };
 }
 
+export function resolveGenericPythonExecutorTimeoutMs(params: {
+  configuredTimeoutMs: number;
+  executionBudgetMs?: number | null;
+  capTimeoutToExecutionBudget?: boolean;
+}): number {
+  const configuredTimeoutMs = Math.max(10_000, Math.floor(params.configuredTimeoutMs));
+  const executionBudgetMs =
+    typeof params.executionBudgetMs === "number" && Number.isFinite(params.executionBudgetMs)
+      ? Math.max(10_000, Math.floor(params.executionBudgetMs))
+      : null;
+  if (executionBudgetMs != null && params.capTimeoutToExecutionBudget !== false) {
+    return Math.min(configuredTimeoutMs, executionBudgetMs);
+  }
+  return configuredTimeoutMs;
+}
+
 export function createGenericPythonExecutor(
   config: GenericPythonExecutorConfig,
 ): BackendTaskExecutor {
@@ -150,10 +167,11 @@ export function createGenericPythonExecutor(
       typeof budgets?.executionBudgetMs === "number" && Number.isFinite(budgets.executionBudgetMs)
         ? Math.max(10_000, Math.floor(budgets.executionBudgetMs))
         : null;
-    const timeoutMs =
-      executionBudgetMs != null
-        ? Math.min(configuredTimeoutMs, executionBudgetMs)
-        : configuredTimeoutMs;
+    const timeoutMs = resolveGenericPythonExecutorTimeoutMs({
+      configuredTimeoutMs,
+      executionBudgetMs,
+      capTimeoutToExecutionBudget: config.capTimeoutToExecutionBudget,
+    });
     const payloadBase64 = Buffer.from(
       JSON.stringify({
         kind,

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

@@ -107,7 +107,12 @@ function dockerBuildFileArg(root: string, dockerfilePath: string): string {
 }
 
 function isMissingDockerImageDetail(detail: string): boolean {
-  return /\b(no such object|no such image|not found)\b/i.test(String(detail ?? ""));
+  const text = String(detail ?? "");
+  return (
+    /\b(no such object|no such image|not found)\b/i.test(text) ||
+    /\bunable to find image\b.*\blocally\b/i.test(text) ||
+    /\bpull access denied\b.*\brepository does not exist\b/i.test(text)
+  );
 }
 
 type ParsedWorktreeRecord = {
@@ -1600,12 +1605,28 @@ export class DockerExecutor {
     onLog?: (stream: "stdout" | "stderr", line: string) => void,
   ): Promise<void> {
     const backend = resolveExecutor(this.config);
-    for (let attempt = 1; attempt <= this.warmSetupMaxAttempts; attempt++) {
+    let attempt = 1;
+    let recoveredMissingImage = false;
+    while (attempt <= this.warmSetupMaxAttempts) {
       try {
         await this.ensureWarmContainer();
         await this.ensureBackendWarmup(backend);
         return;
       } catch (err) {
+        if (this.isMissingDockerImageError(err) && !recoveredMissingImage) {
+          recoveredMissingImage = true;
+          const rebuildNote = `[DockerExecutor] Warm runtime image ${this.options.imageName} is missing locally; rebuilding before retrying warm container startup.`;
+          console.warn(rebuildNote);
+          onLog?.("stderr", rebuildNote);
+          await this.stopWarmContainer("missing image recovery", true);
+          this.warmedBackends.clear();
+          if (await this.pullImage()) {
+            const retryNote = `[DockerExecutor] Warm runtime image ${this.options.imageName} is available again; retrying warm container startup.`;
+            console.log(retryNote);
+            onLog?.("stdout", retryNote);
+            continue;
+          }
+        }
         const retryable = this.isRetryableError(err);
         if (attempt >= this.warmSetupMaxAttempts || !retryable) {
           if (
@@ -1631,6 +1652,7 @@ export class DockerExecutor {
         onLog?.("stderr", note);
         await this.stopWarmContainer("warm setup retry", true);
         await this.sleep(retryInMs);
+        attempt += 1;
       }
     }
   }
@@ -1727,6 +1749,10 @@ export class DockerExecutor {
     return this.matchesRetryablePattern(text);
   }
 
+  private isMissingDockerImageError(err: unknown): boolean {
+    return isMissingDockerImageDetail(this.compactError(err));
+  }
+
   private isRetryableJobFailure(result: DockerJobResult): boolean {
     const text = `${result.summary ?? ""}\n${result.stderr ?? ""}`.toLowerCase();
     return this.matchesRetryablePattern(text);

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

@@ -635,6 +635,7 @@ export function tokenizeValidationCommandArgv(command: string): string[] | null
   const out: string[] = [];
   let current = "";
   let quote: "'" | '"' | null = null;
+  let escaped = false;
 
   const pushCurrent = () => {
     if (!current) return;
@@ -643,7 +644,16 @@ export function tokenizeValidationCommandArgv(command: string): string[] | null
   };
 
   for (const ch of trimmed) {
+    if (escaped) {
+      current += ch;
+      escaped = false;
+      continue;
+    }
     if (quote) {
+      if (quote === '"' && ch === "\\") {
+        escaped = true;
+        continue;
+      }
       if (ch === quote) {
         quote = null;
       } else {
@@ -662,6 +672,7 @@ export function tokenizeValidationCommandArgv(command: string): string[] | null
     }
     current += ch;
   }
+  if (escaped) current += "\\";
   if (quote) return null;
   pushCurrent();
   if (out.length === 0) return null;
@@ -2289,14 +2300,19 @@ export function inferFallbackValidationCommandsForTestTask(
     /\b(pytest|python)\b/.test(lowerInstruction) ||
     changedTestPaths.some((entry) => entry.toLowerCase().endsWith(".py"));
 
+  const bunTestPath = (path: string) => formatBunTestPathArg(path);
   const normalizedTarget = (targetPath ?? "").replace(/\\/g, "/").trim();
   if (normalizedTarget && isLikelyTestPath(normalizedTarget)) {
-    add(pythonSignal ? `pytest ${normalizedTarget}` : `bun test ${normalizedTarget}`);
+    add(pythonSignal ? `pytest ${normalizedTarget}` : `bun test ${bunTestPath(normalizedTarget)}`);
   }
 
   if (changedTestPaths.length > 0) {
-    const focused = changedTestPaths.slice(0, 4).join(" ");
-    add(pythonSignal ? `pytest ${focused}` : `bun test ${focused}`);
+    const focused = changedTestPaths.slice(0, 4);
+    add(
+      pythonSignal
+        ? `pytest ${focused.join(" ")}`
+        : `bun test ${focused.map((entry) => bunTestPath(entry)).join(" ")}`,
+    );
   }
 
   const scopeHints = [
@@ -2324,6 +2340,24 @@ export function inferFallbackValidationCommandsForTestTask(
   return candidates.slice(0, 4);
 }
 
+export function formatBunTestPathArg(path: string): string {
+  const normalized = String(path ?? "").replace(/\\/g, "/").trim();
+  if (!normalized) return normalized;
+  const pathArg =
+    normalized.startsWith("./") ||
+    normalized.startsWith("../") ||
+    normalized.startsWith("/") ||
+    /^[A-Za-z]:\//.test(normalized)
+      ? normalized
+      : `./${normalized}`;
+  return quoteValidationCommandArg(pathArg);
+}
+
+function quoteValidationCommandArg(arg: string): string {
+  if (!/[\s"\\]/.test(arg)) return arg;
+  return `"${arg.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+}
+
 export function isTestFocusedTask(
   instruction: string,
   planning: TaskExecutePlanning,

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

@@ -125,11 +125,31 @@ function isTestPath(path: string): boolean {
   return /(^tests\/|__tests__\/|\.test\.[cm]?[jt]sx?$|\.spec\.[cm]?[jt]sx?$)/i.test(path);
 }
 
+function formatBunTestPathArg(path: string): string {
+  const normalized = String(path ?? "").replace(/\\/g, "/").trim();
+  if (!normalized) return normalized;
+  const pathArg =
+    normalized.startsWith("./") ||
+    normalized.startsWith("../") ||
+    normalized.startsWith("/") ||
+    /^[A-Za-z]:\//.test(normalized)
+      ? normalized
+      : `./${normalized}`;
+  return quoteValidationCommandArg(pathArg);
+}
+
+function quoteValidationCommandArg(arg: string): string {
+  if (!/[\s"\\]/.test(arg)) return arg;
+  return `"${arg.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+}
+
 function deriveValidationSteps(existing: unknown, conflictPaths: string[]): string[] {
   const preserved = Array.isArray(existing)
     ? existing.map((entry) => String(entry ?? "").trim()).filter(Boolean)
     : [];
-  const targeted = conflictPaths.filter(isTestPath).map((entry) => `bun test ${entry}`);
+  const targeted = conflictPaths
+    .filter(isTestPath)
+    .map((entry) => `bun test ${formatBunTestPathArg(entry)}`);
   const merged = dedupeStrings([...targeted, ...preserved], 8);
   return merged.length > 0 ? merged : ["bun test"];
 }

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

@@ -987,7 +987,11 @@ function failNoChangeReviewFixJob(jobId: string, result: WorkerJobResult): Worke
     ok: false,
     summary:
       `Rejected review-fix job ${jobId} produced no code changes; refusing unchanged branch re-review.`,
-    stderr: [result.stderr, "Apply at least one concrete fix before requesting another review."]
+    stderr: [
+      result.stderr,
+      "Review-fix jobs must make at least one concrete code/test/docs change before requesting another review.",
+      "If the reviewer feedback is invalid, commit a narrow explanatory change that documents the decision; unchanged branch re-review is refused.",
+    ]
       .filter(Boolean)
       .join("\n"),
     exitCode: typeof result.exitCode === "number" ? result.exitCode : 4,