@pushpalsdev/cli 1.1.13 → 1.1.15

package/dist/pushpals-cli.js

@@ -1648,6 +1648,7 @@ var DEFAULT_EMBEDDED_SERVICE_LAUNCH_WARN_MS = 5000;
 var EMBEDDED_SERVICE_RESTART_MAX_ATTEMPTS = 4;
 var WORKERPAL_STARTUP_READINESS_PROBE_MAX_MS = 15000;
 var CLI_SESSION_JOB_LOG_MAX_CHARS = 700;
+var CLI_SESSION_SHOW_JOB_EVENTS_ENV = "PUSHPALS_CLI_SHOW_JOB_EVENTS";
 var EMBEDDED_RUNTIME_SAFETY_CAP_DISABLE_ENV = "PUSHPALS_DISABLE_EMBEDDED_SAFETY_CAPS";
 var EMBEDDED_RUNTIME_WINDOWS_SAFETY_CAPS = {
   REMOTEBUDDY_WORKERPAL_STARTUP_TIMEOUT_MS: "120000",
@@ -1674,6 +1675,12 @@ function formatTimestampedCliLine(line, at = new Date) {
   }
   return `[${at.toISOString()}]${text}`;
 }
+function isTruthyCliEnvValue(value) {
+  return /^(1|true|yes|on)$/i.test(String(value ?? "").trim());
+}
+function shouldShowCliSessionOperationalEvents(env = process.env) {
+  return isTruthyCliEnvValue(env[CLI_SESSION_SHOW_JOB_EVENTS_ENV]);
+}
 function formatRuntimeStartupTimingSummary(input) {
   const phaseSummary = input.phases.map((phase) => `${phase.name}=${Math.max(0, Math.floor(phase.durationMs))}ms(${phase.status.trim() || "unknown"})`).join(" ");
   const detail = typeof input.detail === "string" && input.detail.trim() ? ` detail=${input.detail.trim()}` : "";
@@ -5218,7 +5225,10 @@ function formatSessionEventLine(event) {
   const type = String(event.type ?? "").toLowerCase();
   const from = String(event.from ?? "");
   const payload = event.payload ?? {};
+  const showOperationalEvents = shouldShowCliSessionOperationalEvents();
   if (type === "job_enqueued") {
+    if (!showOperationalEvents)
+      return null;
     const jobId = String(payload.jobId ?? "").slice(0, 8);
     const kind = String(payload.kind ?? "").trim();
     const taskId = String(payload.taskId ?? "").slice(0, 8);
@@ -5226,11 +5236,15 @@ function formatSessionEventLine(event) {
     return `[job ${jobId}] queued: ${detail}`;
   }
   if (type === "job_claimed") {
+    if (!showOperationalEvents)
+      return null;
     const jobId = String(payload.jobId ?? "").slice(0, 8);
     const workerId = String(payload.workerId ?? "").trim();
     return `[job ${jobId}] claimed${workerId ? ` by ${workerId}` : ""}`;
   }
   if (type === "job_log") {
+    if (!showOperationalEvents)
+      return null;
     const jobId = String(payload.jobId ?? "").slice(0, 8);
     const stream = String(payload.stream ?? "").toLowerCase() === "stderr" ? " stderr" : "";
     const phase = compactCliSessionJobLogLine(String(payload.phase ?? "").trim());
@@ -5239,6 +5253,8 @@ function formatSessionEventLine(event) {
     return line ? `[job ${jobId}${stream}${phaseLabel}] ${line}` : null;
   }
   if (type === "job_failed") {
+    if (!showOperationalEvents)
+      return null;
     const jobId = String(payload.jobId ?? "").slice(0, 8);
     const message = String(payload.message ?? "").trim();
     return `[job ${jobId}] failed: ${message || "unknown"}`;
@@ -5251,24 +5267,34 @@ function formatSessionEventLine(event) {
     const text = String(payload.text ?? "").trim();
     if (!text)
       return null;
+    if (/^All systems online\b/i.test(text))
+      return null;
     return `assistant> ${text}`;
   }
   if (type === "task_progress") {
+    if (!showOperationalEvents)
+      return null;
     const taskId = String(payload.taskId ?? "").slice(0, 8);
     const message = String(payload.message ?? "").trim();
     return message ? `[task ${taskId}] ${message}` : null;
   }
   if (type === "task_failed") {
+    if (!showOperationalEvents)
+      return null;
     const taskId = String(payload.taskId ?? "").slice(0, 8);
     const message = String(payload.message ?? "").trim();
     return `[task ${taskId}] failed: ${message || "unknown"}`;
   }
   if (type === "task_completed") {
+    if (!showOperationalEvents)
+      return null;
     const taskId = String(payload.taskId ?? "").slice(0, 8);
     const summary = String(payload.summary ?? "").trim();
     return `[task ${taskId}] completed${summary ? `: ${summary}` : ""}`;
   }
   if (type === "job_completed") {
+    if (!showOperationalEvents)
+      return null;
     const jobId = String(payload.jobId ?? "").slice(0, 8);
     const summary = String(payload.summary ?? "").trim();
     return `[job ${jobId}] completed${summary ? `: ${summary}` : ""}`;
@@ -5277,6 +5303,8 @@ function formatSessionEventLine(event) {
     return null;
   }
   if (type === "status") {
+    if (!showOperationalEvents)
+      return null;
     const state = String(payload.state ?? "").trim();
     const detail = String(payload.detail ?? "").trim();
     const source = from || String(payload.agentId ?? "status");
@@ -5315,8 +5343,9 @@ function shouldSuppressCliSessionJobLogLine(line) {
     return true;
   if (/^\[QualityGate\]\s+(?:Policy:|Gates:)/i.test(text))
     return true;
-  if (/^\[Openai_codexExecutor\]\s+Spawning openai_codex executor/i.test(text))
+  if (/^\[(?:Openai_codex|OpenHands|Miniswe)Executor\]\s+(?:Spawning\b|Timeout reached\b|Still running\b|Process did not exit after graceful timeout termination\b)/i.test(text)) {
     return true;
+  }
   if (/^\[OpenAICodexExecutor\]\s+(?:Planner guidance|Codex auth mode|ChatGPT auth mode|Starting codex exec|codex exec finished|Codex JSON stream captured|Codex stdout captured|No reasoning-like|Reasoning-like event|Usage observed|Temporarily masked repo-local|Timeout reached after|Process did not exit after graceful timeout termination)/i.test(text)) {
     return true;
   }
@@ -6008,6 +6037,7 @@ export {
   startEmbeddedMonitoringHub,
   shutdownEmbeddedServiceManagerGracefully,
   shouldUseRemoteBuddySilentStartupFallback,
+  shouldShowCliSessionOperationalEvents,
   shouldRunEmbeddedRuntimeStartupPrechecks,
   shouldRestartEmbeddedService,
   runCommandWithEnv,

package/package.json

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

package/runtime/sandbox/apps/workerpals/src/backends/openai_codex/openai_codex_executor.py

@@ -1892,7 +1892,7 @@ def _run_codex_task(
             command_policy_rejection_loop = False
             no_edit_watchdog_s = (
                 _resolve_no_edit_watchdog_seconds(prompt, communicate_timeout_s)
-                if no_edit_recovery_attempt < _MAX_NO_EDIT_RECOVERY_ATTEMPTS
+                if no_edit_recovery_attempt <= _MAX_NO_EDIT_RECOVERY_ATTEMPTS
                 else None
             )
             no_edit_deadline = (

package/runtime/sandbox/apps/workerpals/src/backends/openai_codex/test_openai_codex_runtime_config.py

@@ -823,6 +823,69 @@ class OpenAICodexRuntimeConfigTests(unittest.TestCase):
         self.assertIn("Patched immediately after no-edit recovery", str(result.get("stdout") or ""))
         self.assertIn("src/", str(result.get("stdout") or ""))
 
+    def test_run_codex_task_recovery_attempt_is_still_guarded_by_no_edit_watchdog(self) -> None:
+        with tempfile.TemporaryDirectory(prefix="pushpals-codex-no-edit-watchdog-fail-") as temp_dir:
+            repo = Path(temp_dir) / "repo"
+            repo.mkdir(parents=True, exist_ok=True)
+            (repo / "README.md").write_text("# no edit watchdog failure repo\n", encoding="utf-8")
+            subprocess.run(["git", "init"], cwd=repo, check=True, capture_output=True, text=True)
+            subprocess.run(
+                ["git", "config", "user.name", "PushPals Test"],
+                cwd=repo,
+                check=True,
+                capture_output=True,
+                text=True,
+            )
+            subprocess.run(
+                ["git", "config", "user.email", "pushpals-tests@example.com"],
+                cwd=repo,
+                check=True,
+                capture_output=True,
+                text=True,
+            )
+            subprocess.run(["git", "add", "README.md"], cwd=repo, check=True, capture_output=True, text=True)
+            subprocess.run(
+                ["git", "commit", "-m", "chore: seed no-edit watchdog failure repo"],
+                cwd=repo,
+                check=True,
+                capture_output=True,
+                text=True,
+            )
+
+            stub_path = Path(temp_dir) / "fake_codex_no_edit_watchdog_fail.py"
+            stub_path.write_text(
+                "\n".join(
+                    [
+                        "import sys",
+                        "import time",
+                        "",
+                        "sys.stdin.read()",
+                        "print('item.completed | Still inspecting, no patch yet.', flush=True)",
+                        "time.sleep(10)",
+                    ]
+                ),
+                encoding="utf-8",
+            )
+
+            env_overrides = {
+                "PUSHPALS_OPENAI_CODEX_BIN_JSON": json.dumps([sys.executable, str(stub_path)]),
+                "PUSHPALS_OPENAI_CODEX_AUTH_MODE": "api_key",
+                "OPENAI_API_KEY": "pushpals-no-edit-watchdog-fail-test-key",
+                "WORKERPALS_OPENAI_CODEX_TIMEOUT_S": "20",
+                "WORKERPALS_OPENAI_CODEX_NO_EDIT_WATCHDOG_S": "1",
+                "WORKERPALS_OPENAI_CODEX_PROGRESS_LOG_INTERVAL_S": "1",
+            }
+            with mock.patch.dict(os.environ, env_overrides, clear=False):
+                result = _run_codex_task(
+                    str(repo),
+                    "Polish the first-entry home shell with a compact visual patch.",
+                    [],
+                )
+
+        self.assertFalse(result.get("ok"), result)
+        self.assertEqual(result.get("exitCode"), 124)
+        self.assertIn("no publishable changes", str(result.get("summary") or ""))
+
     def test_codex_changed_paths_filters_dependency_artifacts_from_publishable_delta(self) -> None:
         with tempfile.TemporaryDirectory(prefix="pushpals-codex-artifact-delta-") as temp_dir:
             repo = Path(temp_dir) / "repo"

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

@@ -28,6 +28,8 @@ interface GenericPythonExecutorConfig {
   capTimeoutToExecutionBudget?: boolean;
 }
 
+const BACKEND_TIMEOUT_RESULT_GRACE_MS = 30_000;
+
 function estimateTokensFromText(text: string): number {
   return Math.max(0, Math.ceil(String(text ?? "").length / 3));
 }
@@ -123,6 +125,7 @@ function resolveRuntimeSettings(
 export function resolveGenericPythonExecutorTimeoutMs(params: {
   configuredTimeoutMs: number;
   executionBudgetMs?: number | null;
+  finalizationBudgetMs?: number | null;
   capTimeoutToExecutionBudget?: boolean;
 }): number {
   const configuredTimeoutMs = Math.max(10_000, Math.floor(params.configuredTimeoutMs));
@@ -130,12 +133,49 @@ export function resolveGenericPythonExecutorTimeoutMs(params: {
     typeof params.executionBudgetMs === "number" && Number.isFinite(params.executionBudgetMs)
       ? Math.max(10_000, Math.floor(params.executionBudgetMs))
       : null;
+  const finalizationBudgetMs =
+    typeof params.finalizationBudgetMs === "number" && Number.isFinite(params.finalizationBudgetMs)
+      ? Math.max(0, Math.floor(params.finalizationBudgetMs))
+      : 0;
   if (executionBudgetMs != null && params.capTimeoutToExecutionBudget !== false) {
-    return Math.min(configuredTimeoutMs, executionBudgetMs);
+    return Math.min(configuredTimeoutMs, executionBudgetMs + finalizationBudgetMs);
   }
   return configuredTimeoutMs;
 }
 
+export function resolveGenericPythonExecutorChildTimeoutMs(params: {
+  backendName: string;
+  hostTimeoutMs: number;
+  executionBudgetMs?: number | null;
+}): number | null {
+  const hostTimeoutMs = Math.max(10_000, Math.floor(params.hostTimeoutMs));
+  if (params.backendName !== "openai_codex") return null;
+  const executionBudgetMs =
+    typeof params.executionBudgetMs === "number" && Number.isFinite(params.executionBudgetMs)
+      ? Math.max(10_000, Math.floor(params.executionBudgetMs))
+      : null;
+  const childBudgetMs =
+    executionBudgetMs == null ? hostTimeoutMs : Math.min(hostTimeoutMs, executionBudgetMs);
+  const graceMs = Math.min(
+    BACKEND_TIMEOUT_RESULT_GRACE_MS,
+    Math.max(2_000, Math.floor(childBudgetMs / 10)),
+  );
+  return Math.max(1_000, childBudgetMs - graceMs);
+}
+
+export function resolveGenericPythonExecutorChildTimeoutEnv(params: {
+  backendName: string;
+  hostTimeoutMs: number;
+  executionBudgetMs?: number | null;
+}): Record<string, string> {
+  const childTimeoutMs = resolveGenericPythonExecutorChildTimeoutMs(params);
+  if (childTimeoutMs == null) return {};
+  return {
+    WORKERPALS_OPENAI_CODEX_TIMEOUT_MS: String(childTimeoutMs),
+    WORKERPALS_OPENAI_CODEX_TIMEOUT_S: String(Math.max(1, Math.floor(childTimeoutMs / 1000))),
+  };
+}
+
 function toSnakeConfigKey(key: string): string {
   return key.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 }
@@ -144,6 +184,7 @@ function formatGenericPythonExecutorTimeoutDetail(
   config: GenericPythonExecutorConfig,
   configuredTimeoutMs: number,
   executionBudgetMs: number | null,
+  finalizationBudgetMs: number | null,
   timeoutMs: number,
 ): string {
   const configPath = `workerpals.${toSnakeConfigKey(config.timeoutConfigKey)}`;
@@ -154,11 +195,59 @@ function formatGenericPythonExecutorTimeoutDetail(
     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`;
+    const finalizationDetail =
+      finalizationBudgetMs && finalizationBudgetMs > 0
+        ? ` + finalizationBudgetMs=${finalizationBudgetMs}ms`
+        : "";
+    return `${configPath}=${configuredTimeoutMs}ms capped by planning executionBudgetMs=${executionBudgetMs}ms${finalizationDetail}`;
   }
   return `${configPath}=${configuredTimeoutMs}ms within planning executionBudgetMs=${executionBudgetMs}ms`;
 }
 
+export function normalizeGenericPythonExecutorParsedResultForTimeout(params: {
+  backendName: string;
+  kind: string;
+  timedOut: boolean;
+  timeoutMs: number;
+  timeoutDetail?: string;
+  summary: string;
+  stdout: string;
+  stderr: string;
+  exitCode: number;
+}): { summary: string; stdout: string; stderr: string; exitCode: number } {
+  const signalTerminatedCodex =
+    params.timedOut &&
+    params.backendName === "openai_codex" &&
+    /\bopenai_codex interrupted by signal 15\b/i.test(params.summary);
+  if (!signalTerminatedCodex) {
+    return {
+      summary: params.summary,
+      stdout: params.stdout,
+      stderr: params.stderr,
+      exitCode: params.exitCode,
+    };
+  }
+
+  const timeoutDetail = String(params.timeoutDetail ?? "").trim();
+  const cleanedStderr = String(params.stderr ?? "")
+    .replace(/\bopenai_codex interrupted by signal 15\b/gi, "OpenAI Codex exceeded the execution budget")
+    .trim();
+  const stderr = [
+    `OpenAI Codex exceeded the PushPals execution budget before returning a completed result.`,
+    timeoutDetail ? `Timeout detail: ${timeoutDetail}.` : "",
+    cleanedStderr ? `Last stderr:\n${cleanedStderr}` : "",
+  ]
+    .filter(Boolean)
+    .join("\n");
+
+  return {
+    summary: `${params.backendName} execution budget expired after ${params.timeoutMs}ms for ${params.kind}`,
+    stdout: params.stdout,
+    stderr,
+    exitCode: 124,
+  };
+}
+
 export function createGenericPythonExecutor(
   config: GenericPythonExecutorConfig,
 ): BackendTaskExecutor {
@@ -190,15 +279,21 @@ export function createGenericPythonExecutor(
       typeof budgets?.executionBudgetMs === "number" && Number.isFinite(budgets.executionBudgetMs)
         ? Math.max(10_000, Math.floor(budgets.executionBudgetMs))
         : null;
+    const finalizationBudgetMs =
+      typeof budgets?.finalizationBudgetMs === "number" && Number.isFinite(budgets.finalizationBudgetMs)
+        ? Math.max(0, Math.floor(budgets.finalizationBudgetMs))
+        : null;
     const timeoutMs = resolveGenericPythonExecutorTimeoutMs({
       configuredTimeoutMs,
       executionBudgetMs,
+      finalizationBudgetMs,
       capTimeoutToExecutionBudget: config.capTimeoutToExecutionBudget,
     });
     const timeoutDetail = formatGenericPythonExecutorTimeoutDetail(
       config,
       configuredTimeoutMs,
       executionBudgetMs,
+      finalizationBudgetMs,
       timeoutMs,
     );
     const payloadBase64 = Buffer.from(
@@ -210,6 +305,11 @@ export function createGenericPythonExecutor(
       "utf-8",
     ).toString("base64");
     const args = [pythonBin, scriptPath, payloadBase64];
+    const childTimeoutEnv = resolveGenericPythonExecutorChildTimeoutEnv({
+      backendName,
+      hostTimeoutMs: timeoutMs,
+      executionBudgetMs,
+    });
 
     onLog?.(
       "stdout",
@@ -229,6 +329,7 @@ export function createGenericPythonExecutor(
         stderr: "pipe",
         env: {
           ...buildWorkerSandboxWritableEnv(repo),
+          ...childTimeoutEnv,
           PUSHPALS_REPO_PATH: repo,
           PUSHPALS_ASSIGNED_REPO_ROOT: repo,
           PYTHONIOENCODING: "utf-8",
@@ -333,16 +434,27 @@ export function createGenericPythonExecutor(
         parsed.usage,
         estimateJobTokenUsage(backendName, modelId, params, summary, parsedStdout, parsedStderr),
       );
-
-      return {
-        ok: typeof parsed.ok === "boolean" ? parsed.ok : exitCode === 0,
+      const normalized = normalizeGenericPythonExecutorParsedResultForTimeout({
+        backendName,
+        kind,
+        timedOut,
+        timeoutMs,
+        timeoutDetail,
         summary,
-        stdout: truncate(parsedStdout, outputPolicy),
-        stderr: truncate(parsedStderr, outputPolicy),
+        stdout: parsedStdout,
+        stderr: parsedStderr,
         exitCode:
           typeof parsed.exitCode === "number" && Number.isFinite(parsed.exitCode)
             ? parsed.exitCode
             : exitCode,
+      });
+
+      return {
+        ok: typeof parsed.ok === "boolean" ? parsed.ok : exitCode === 0,
+        summary: normalized.summary,
+        stdout: truncate(normalized.stdout, outputPolicy),
+        stderr: truncate(normalized.stderr, outputPolicy),
+        exitCode: normalized.exitCode,
         usage,
       };
     } catch (err) {