@pushpalsdev/cli 1.1.41 → 1.1.43

package/package.json

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

package/runtime/sandbox/.pushpals-remotebuddy-fallback.js

@@ -7773,20 +7773,29 @@ ${JSON.stringify(input.messages ?? [])}`),
         return;
       }
       this.setPhase("scoring");
-      const scoringPhase = await this.llmPhase("scoring", runId, snapshot.snapshot_id, {
-        system: SCORING_SYSTEM_PROMPT,
-        json: true,
-        maxTokens: 1400,
-        temperature: 0.1,
-        messages: [
-          {
-            role: "user",
-            content: JSON.stringify({ candidates: normalizedCandidates, top_k: this.cfg.topK })
-          }
-        ]
-      });
-      llmCalls.push(scoringPhase.llmCall);
-      const scoringJson = scoringPhase.json;
+      let scoringJson = { scores: [] };
+      try {
+        const scoringPhase = await this.llmPhase("scoring", runId, snapshot.snapshot_id, {
+          system: SCORING_SYSTEM_PROMPT,
+          json: true,
+          maxTokens: 1400,
+          temperature: 0.1,
+          messages: [
+            {
+              role: "user",
+              content: JSON.stringify({ candidates: normalizedCandidates, top_k: this.cfg.topK })
+            }
+          ]
+        });
+        llmCalls.push(scoringPhase.llmCall);
+        scoringJson = scoringPhase.json;
+      } catch (error) {
+        if (error instanceof Error && error.message === "autonomy scoring phase timeout") {
+          console.warn(`[RemoteBuddyAutonomousEngine] tick ${runId}: scoring timed out; continuing with deterministic candidate scoring.`);
+        } else {
+          throw error;
+        }
+      }
       if (this.isSnapshotExpired(snapshot) || Date.now() > cycleDeadline) {
         this.setPhase("record_snapshot_expired");
         await this.recordSnapshotExpired(runId, snapshot.snapshot_id, llmCalls, candidatesPayload);

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

@@ -2720,7 +2720,7 @@ def _run_codex_task(
             )
             startup_stall_watchdog_s = _resolve_startup_stall_watchdog_seconds(
                 communicate_timeout_s,
-                recovery_attempt=startup_stall_recovery_attempt,
+                recovery_attempt=recovery_depth,
             )
             startup_stall_deadline = (
                 started_at + float(startup_stall_watchdog_s)
@@ -2853,6 +2853,11 @@ def _run_codex_task(
                                     first_no_edit_command_progress_at
                                     + float(no_edit_command_progress_cap_s),
                                 )
+                            if deadline is not None and command_grace_deadline > 0:
+                                command_grace_deadline = min(
+                                    command_grace_deadline,
+                                    max(now, deadline - 1.0),
+                                )
                             if command_progress_cap_reached:
                                 log.info(
                                     "No-edit watchdog observed Codex tool progress for "

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

@@ -1794,6 +1794,86 @@ class OpenAICodexRuntimeConfigTests(unittest.TestCase):
         self.assertIn("no publishable changes", str(result.get("summary") or ""))
         self.assertEqual(result.get("cooldownMs"), 600000)
 
+    def test_run_codex_task_recovery_command_grace_stops_before_child_timeout(self) -> None:
+        with tempfile.TemporaryDirectory(prefix="pushpals-codex-no-edit-before-timeout-") as temp_dir:
+            repo = Path(temp_dir) / "repo"
+            repo.mkdir(parents=True, exist_ok=True)
+            (repo / "README.md").write_text("# no edit before timeout 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 before timeout repo"],
+                cwd=repo,
+                check=True,
+                capture_output=True,
+                text=True,
+            )
+
+            stub_path = Path(temp_dir) / "fake_codex_no_edit_before_timeout.py"
+            stub_path.write_text(
+                "\n".join(
+                    [
+                        "import json",
+                        "import sys",
+                        "import time",
+                        "",
+                        "prompt = sys.stdin.read()",
+                        "print(json.dumps({'type': 'thread.started'}), flush=True)",
+                        "print(json.dumps({'type': 'turn.started'}), flush=True)",
+                        "if 'No-edit watchdog recovery' in prompt:",
+                        "    print(json.dumps({'type': 'item.started', 'item': {'id': 'cmd-read', 'type': 'command_execution', 'command': 'cat README.md', 'status': 'in_progress'}}), flush=True)",
+                        "    time.sleep(0.1)",
+                        "    print(json.dumps({'type': 'item.completed', 'item': {'id': 'cmd-read', 'type': 'command_execution', 'command': 'cat README.md', 'status': 'completed', 'exit_code': 0, 'aggregated_output': '# no edit before timeout repo'}}), flush=True)",
+                        "    time.sleep(6)",
+                        "    raise SystemExit(0)",
+                        "",
+                        "print(json.dumps({'type': 'item.completed', 'item': {'type': 'message', 'text': 'Still inspecting without a patch.'}}), flush=True)",
+                        "time.sleep(6)",
+                    ]
+                ),
+                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-before-timeout-test-key",
+                "WORKERPALS_OPENAI_CODEX_JSON": "true",
+                "WORKERPALS_OPENAI_CODEX_TIMEOUT_S": "6",
+                "WORKERPALS_OPENAI_CODEX_NO_EDIT_WATCHDOG_S": "1",
+                "WORKERPALS_OPENAI_CODEX_NO_EDIT_COMMAND_GRACE_S": "5",
+                "WORKERPALS_OPENAI_CODEX_PROGRESS_LOG_INTERVAL_S": "1",
+            }
+            with mock.patch.dict(os.environ, env_overrides, clear=False):
+                result = _run_codex_task(
+                    str(repo),
+                    "Make one focused test edit after the hinted file read.",
+                    [],
+                )
+
+        self.assertFalse(result.get("ok"), result)
+        self.assertEqual(result.get("exitCode"), 124)
+        self.assertEqual(
+            result.get("summary"),
+            "openai_codex made no publishable changes before the no-edit watchdog",
+        )
+        self.assertNotIn("execution timed out", str(result.get("summary") or ""))
+        self.assertEqual(result.get("cooldownMs"), 600000)
+
     def test_run_codex_task_no_edit_watchdog_rechecks_transient_publishable_progress(self) -> None:
         with tempfile.TemporaryDirectory(prefix="pushpals-codex-no-edit-recheck-") as temp_dir:
             repo = Path(temp_dir) / "repo"