@pushpalsdev/cli 1.1.40 → 1.1.42

package/package.json

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

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

@@ -119,6 +119,7 @@ _DEFAULT_NO_EDIT_RECHECK_S = 120
 _NO_EDIT_RECOVERY_RECHECK_S = 30
 _DEFAULT_NO_EDIT_COMMAND_GRACE_S = 240
 _DEFAULT_NO_EDIT_COMMAND_PROGRESS_CAP_S = 360
+_BACKGROUND_NO_EDIT_COMMAND_PROGRESS_CAP_S = 120
 _NO_EDIT_RECOVERY_COMMAND_PROGRESS_CAP_S = 120
 _DEFAULT_STARTUP_STALL_WATCHDOG_S = 210
 _RECOVERY_STARTUP_STALL_WATCHDOG_S = 150
@@ -817,6 +818,7 @@ def _resolve_no_edit_command_progress_cap_seconds(
     communicate_timeout_s: Optional[int],
     no_edit_command_grace_s: Optional[int],
     recovery_attempt: int = 0,
+    prompt: str = "",
 ) -> Optional[int]:
     if not communicate_timeout_s or no_edit_command_grace_s is None:
         return None
@@ -834,11 +836,12 @@ def _resolve_no_edit_command_progress_cap_seconds(
         else:
             return max(1, min(parsed, max(1, communicate_timeout_s - 1)))
 
-    default_s = (
-        _NO_EDIT_RECOVERY_COMMAND_PROGRESS_CAP_S
-        if recovery_attempt > 0
-        else _DEFAULT_NO_EDIT_COMMAND_PROGRESS_CAP_S
-    )
+    if recovery_attempt > 0:
+        default_s = _NO_EDIT_RECOVERY_COMMAND_PROGRESS_CAP_S
+    elif _looks_like_background_autonomy_prompt(prompt):
+        default_s = _BACKGROUND_NO_EDIT_COMMAND_PROGRESS_CAP_S
+    else:
+        default_s = _DEFAULT_NO_EDIT_COMMAND_PROGRESS_CAP_S
     upper = max(1, communicate_timeout_s - 1)
     return max(1, min(default_s, upper))
 
@@ -2713,10 +2716,11 @@ def _run_codex_task(
                 communicate_timeout_s,
                 no_edit_command_grace_s,
                 recovery_attempt=recovery_depth,
+                prompt=prompt,
             )
             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)
@@ -2849,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

@@ -45,6 +45,7 @@ from openai_codex_executor import (
     _has_credible_shell_wrapper_progress,
     _load_prompt_template,
     _mask_repo_local_codex_files,
+    _minimum_recovery_attempt_seconds,
     _repo_root_for_prompt_loading,
     _restore_repo_local_codex_files,
     _resolve_codex_command_prefix,
@@ -249,6 +250,41 @@ class OpenAICodexRuntimeConfigTests(unittest.TestCase):
         )
         self.assertEqual(_resolve_rollout_watchdog_seconds(prompt, 1200, no_edit), 90)
 
+    def test_background_autonomy_caps_patchless_command_progress_before_recovery_reserve(self) -> None:
+        prompt = (
+            "Task planning contract from PushPals:\n"
+            "- Planning summary: intent=code_change, risk=low, priority=background\n"
+            "- Origin=autonomy targetPaths=[app/__tests__/opportunity-graph.contract.test.ts]\n"
+            "Add focused contract coverage without broad discovery.\n"
+        )
+        child_budget_s = 570
+
+        with mock.patch.dict(
+            os.environ,
+            {
+                "WORKERPALS_OPENAI_CODEX_NO_EDIT_COMMAND_GRACE_S": "",
+                "WORKERPALS_OPENAI_CODEX_NO_EDIT_COMMAND_PROGRESS_CAP_S": "",
+                "WORKERPALS_OPENAI_CODEX_STARTUP_STALL_WATCHDOG_S": "",
+            },
+            clear=False,
+        ):
+            command_grace_s = _resolve_no_edit_command_grace_seconds(child_budget_s)
+            command_cap_s = _resolve_no_edit_command_progress_cap_seconds(
+                child_budget_s,
+                command_grace_s,
+                prompt=prompt,
+            )
+            startup_stall_s = _resolve_startup_stall_watchdog_seconds(child_budget_s)
+
+        self.assertEqual(command_grace_s, 240)
+        self.assertEqual(command_cap_s, 120)
+        self.assertEqual(startup_stall_s, 210)
+        first_attempt_patchless_ceiling_s = startup_stall_s + command_cap_s
+        self.assertGreaterEqual(
+            child_budget_s - first_attempt_patchless_ceiling_s,
+            2 * _minimum_recovery_attempt_seconds(child_budget_s),
+        )
+
     def test_runtime_config_prefers_explicit_config_dir_override(self) -> None:
         import executor_base
 
@@ -1758,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"