@pushpalsdev/cli 1.1.43 → 1.1.44

package/package.json

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

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

@@ -107,6 +107,7 @@ _MAX_WRAPPER_BOOTSTRAP_TOTAL_CHARS = 5_000
 _MAX_CREDIBLE_WRAPPER_LOOP_CHANGED_PATHS = 8
 _MAX_CREDIBLE_WRAPPER_LOOP_TOP_LEVELS = 4
 _MAX_STARTUP_STALL_RECOVERY_ATTEMPTS = 1
+_MAX_STARTUP_STALL_DURING_NO_EDIT_RECOVERY_ATTEMPTS = 2
 _MAX_NO_EDIT_RECOVERY_ATTEMPTS = 1
 _MAX_ROLLOUT_RECOVERY_ATTEMPTS = 1
 _DEFAULT_NO_EDIT_WATCHDOG_S = 480
@@ -3137,21 +3138,36 @@ def _run_codex_task(
 
         if no_edit_watchdog_fired:
             startup_stall = _codex_trace_is_startup_stall(stdout_trace)
-            if startup_stall and startup_stall_recovery_attempt < _MAX_STARTUP_STALL_RECOVERY_ATTEMPTS:
+            startup_stall_recovery_limit = _MAX_STARTUP_STALL_RECOVERY_ATTEMPTS
+            if no_edit_recovery_attempt > 0:
+                startup_stall_recovery_limit = max(
+                    startup_stall_recovery_limit,
+                    _MAX_STARTUP_STALL_DURING_NO_EDIT_RECOVERY_ATTEMPTS,
+                )
+            if startup_stall and startup_stall_recovery_attempt < startup_stall_recovery_limit:
                 retry_guidance = [
                     *supplemental_guidance,
                     _build_startup_stall_recovery_guidance(trace_excerpt),
                 ]
-                recovery_model = _startup_stall_recovery_model(model)
+                prefer_same_model = (
+                    no_edit_recovery_attempt > 0
+                    and startup_stall_recovery_attempt < _MAX_STARTUP_STALL_RECOVERY_ATTEMPTS
+                )
+                recovery_model = model if prefer_same_model else _startup_stall_recovery_model(model)
                 recovery_detail = (
-                    f" using fallback model {recovery_model!r}"
-                    if recovery_model and recovery_model != model
-                    else ""
+                    f" using same model {recovery_model!r} because an earlier attempt made tool progress"
+                    if prefer_same_model
+                    else (
+                        f" using fallback model {recovery_model!r}"
+                        if recovery_model and recovery_model != model
+                        else ""
+                    )
                 )
                 log.warning(
                     "Codex emitted only startup events before the no-edit watchdog; "
-                    f"restarting Codex once{recovery_detail} before classifying the job terminally."
+                    f"restarting Codex{recovery_detail} before classifying the job terminally."
                 )
+                retry_model_override = model_override if prefer_same_model else recovery_model or model_override
                 retry_result = _run_codex_task(
                     repo,
                     instruction,
@@ -3161,7 +3177,7 @@ def _run_codex_task(
                     startup_stall_recovery_attempt=startup_stall_recovery_attempt + 1,
                     no_edit_recovery_attempt=no_edit_recovery_attempt,
                     rollout_recovery_attempt=rollout_recovery_attempt,
-                    model_override=recovery_model or model_override,
+                    model_override=retry_model_override,
                     baseline_changes=baseline_snapshot,
                     execution_deadline_monotonic=overall_deadline,
                 )

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

@@ -1307,6 +1307,101 @@ class OpenAICodexRuntimeConfigTests(unittest.TestCase):
         self.assertNotIn("no publishable", str(result.get("summary") or "").lower())
         self.assertEqual(result.get("cooldownMs"), 600000)
 
+    def test_run_codex_task_no_edit_recovery_retries_same_model_after_startup_stall(self) -> None:
+        with tempfile.TemporaryDirectory(prefix="pushpals-codex-no-edit-startup-stall-") as temp_dir:
+            repo = Path(temp_dir) / "repo"
+            repo.mkdir(parents=True, exist_ok=True)
+            (repo / "README.md").write_text("# no edit startup stall 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 startup stall repo"],
+                cwd=repo,
+                check=True,
+                capture_output=True,
+                text=True,
+            )
+
+            stub_path = Path(temp_dir) / "fake_codex_no_edit_startup_stall.py"
+            stub_path.write_text(
+                "\n".join(
+                    [
+                        "from pathlib import Path",
+                        "import json",
+                        "import sys",
+                        "import time",
+                        "",
+                        "argv = sys.argv[1:]",
+                        "last_message_path = None",
+                        "model = ''",
+                        "for index, arg in enumerate(argv):",
+                        "    if arg == '--output-last-message' and index + 1 < len(argv):",
+                        "        last_message_path = argv[index + 1]",
+                        "    if arg == '-m' and index + 1 < len(argv):",
+                        "        model = argv[index + 1]",
+                        "",
+                        "prompt = sys.stdin.read()",
+                        "has_no_edit_recovery = 'No-edit watchdog recovery' in prompt",
+                        "has_startup_recovery = 'Codex startup-stall recovery' in prompt",
+                        "if has_no_edit_recovery and has_startup_recovery and model != 'gpt-5.4':",
+                        "    Path('src').mkdir(exist_ok=True)",
+                        "    Path('src/no-edit-startup-stall-recovered.txt').write_text('patched after same-model restart\\n', encoding='utf-8')",
+                        "    if last_message_path:",
+                        "        Path(last_message_path).write_text('Patched after same-model startup-stall recovery.', encoding='utf-8')",
+                        "    print(json.dumps({'type': 'item.completed', 'item': {'type': 'message', 'text': 'Patched after same-model startup-stall recovery.'}}), flush=True)",
+                        "    raise SystemExit(0)",
+                        "",
+                        "print(json.dumps({'type': 'thread.started'}), flush=True)",
+                        "print(json.dumps({'type': 'turn.started'}), flush=True)",
+                        "if not has_no_edit_recovery:",
+                        "    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.2)",
+                        "    print(json.dumps({'type': 'item.completed', 'item': {'id': 'cmd-read', 'type': 'command_execution', 'command': 'cat README.md', 'status': 'completed', 'exit_code': 0}}), 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-startup-stall-test-key",
+                "WORKERPALS_OPENAI_CODEX_JSON": "true",
+                "WORKERPALS_OPENAI_CODEX_TIMEOUT_S": "30",
+                "WORKERPALS_OPENAI_CODEX_NO_EDIT_WATCHDOG_S": "1",
+                "WORKERPALS_OPENAI_CODEX_NO_EDIT_COMMAND_GRACE_S": "1",
+                "WORKERPALS_OPENAI_CODEX_NO_EDIT_COMMAND_PROGRESS_CAP_S": "1",
+                "WORKERPALS_OPENAI_CODEX_STARTUP_STALL_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),
+                    "Add one focused regression assertion after reading the hinted test.",
+                    [],
+                )
+
+        self.assertTrue(result.get("ok"), result)
+        self.assertEqual(result.get("exitCode"), 0)
+        stdout = str(result.get("stdout") or "")
+        self.assertIn("same-model startup-stall recovery", stdout)
+        self.assertIn("src/", stdout)
+
     def test_run_codex_task_retries_once_when_no_edit_watchdog_fires(self) -> None:
         with tempfile.TemporaryDirectory(prefix="pushpals-codex-no-edit-watchdog-") as temp_dir:
             repo = Path(temp_dir) / "repo"