forgexa-cli 1.27.3__tar.gz → 1.27.5__tar.gz

{forgexa_cli-1.27.3 → forgexa_cli-1.27.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.27.3
+Version: 1.27.5
 Summary: Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform
 Author-email: Jason Sun <dev.winds@gmail.com>
 License-Expression: MIT

{forgexa_cli-1.27.3 → forgexa_cli-1.27.5}/forgexa_cli/__init__.py

@@ -1,2 +1,2 @@
 """forgexa-cli — Forgexa command-line client."""
-__version__ = "1.27.3"
+__version__ = "1.27.5"

{forgexa_cli-1.27.3 → forgexa_cli-1.27.5}/forgexa_cli/agent_core.py

@@ -802,6 +802,12 @@ def _extract_output_signals(text: str) -> dict[str, Any]:
                 error_messages.append(err)
             elif isinstance(data.get("message"), str) and data.get("message", "").strip():
                 error_messages.append(data["message"])
+        elif ev_type == "session.mcp_server_status_changed":
+            status_data = data.get("data") or {}
+            if isinstance(status_data, dict) and status_data.get("status") == "failed":
+                message = status_data.get("error") or status_data.get("message") or ""
+                if message:
+                    error_messages.append(str(message))
         elif ev_type == "error":
             msg = data.get("message", "")
             if msg:

{forgexa_cli-1.27.3 → forgexa_cli-1.27.5}/forgexa_cli/daemon.py

@@ -909,7 +909,7 @@ except (ImportError, ModuleNotFoundError):
 # DAEMON_VERSION is the protocol/logic version of the daemon code.
 # Kept in sync with pyproject.toml version via bump-version.sh.
 # CLIENT_TYPE identifies which packaging/distribution this daemon runs in.
-DAEMON_VERSION = "1.27.3"
+DAEMON_VERSION = "1.27.5"
 
 
 def _detect_client_type() -> str:
@@ -2268,6 +2268,21 @@ class WorkspaceManager:
         )
         return any(marker in err for marker in retry_markers)
 
+    @staticmethod
+    def _is_unreadable_git_object_error(exc: Exception | str) -> bool:
+        detail = str(exc).lower()
+        return any(marker in detail for marker in (
+            "unable to read tree",
+            "could not read tree",
+            "cannot read tree",
+            "bad tree object",
+            "missing tree object",
+            "bad object",
+            "unknown object",
+            "not a valid object",
+            "无法读取树",
+        ))
+
     @staticmethod
     def _safe_rmtree(path: Path) -> None:
         """Remove a directory tree, handling two distinct Windows failure modes.
@@ -3434,6 +3449,7 @@ class WorkspaceManager:
         workspace_key: str, branch_name: str, *, fresh_start: bool = False,
         project_key: str = "default", expect_branch: bool = False,
         detach_head: bool = False,
+        _recovered_unreadable_object: bool = False,
     ) -> Path:
         main_repo = project_dir / "_main"
         ws_path = project_dir / workspace_key
@@ -4212,6 +4228,36 @@ class WorkspaceManager:
                         return ws_path
                     except Exception as recovery_exc:
                         exc = recovery_exc
+                if (
+                    not _recovered_unreadable_object
+                    and self._is_unreadable_git_object_error(exc)
+                ):
+                    logger.warning(
+                        "Fresh start could not read a Git object from %s; rebuilding _main cache",
+                        main_repo,
+                    )
+                    self._safe_rmtree(ws_path)
+                    await self._safe_rmtree_main(main_repo)
+                    if main_repo.exists():
+                        raise RuntimeError(
+                            f"Cannot rebuild local Git cache at {main_repo}; "
+                            "please stop the daemon and remove it manually."
+                        ) from exc
+                    try:
+                        return await self._create_worktree_impl(
+                            project_dir, repo_url, default_branch,
+                            workspace_key, branch_name,
+                            fresh_start=fresh_start,
+                            project_key=project_key,
+                            expect_branch=expect_branch,
+                            detach_head=detach_head,
+                            _recovered_unreadable_object=True,
+                        )
+                    except Exception as recovery_exc:
+                        raise RuntimeError(
+                            "Failed to create fresh worktree after rebuilding a local Git cache "
+                            "with unreadable objects."
+                        ) from recovery_exc
                 self._safe_rmtree(ws_path)
                 raise RuntimeError(
                     f"Failed to create clean fresh worktree for branch '{branch_name}'. "
@@ -4581,6 +4627,8 @@ class ProcessManager:
         "network is unreachable",
         "websockettransporterror",
         "websocket receive failed",
+        "421 misdirected request",
+        "failed to initialize mcp client",
         # "api error" removed: too broad — matches agent-generated code/output
         # discussing API errors. Real API transport errors are covered by the
         # connection patterns above (refused, reset, timed out, etc.).
@@ -5479,6 +5527,26 @@ class ProcessManager:
                 shutil.copy2(auth_src, isolated_data_dir / "auth.json")
             env = agent_core.opencode_base_env(os.environ.copy(), data_home=tmp_data_root)
             result = await self._run_cli(cmd, cwd, timeout, task_id, on_chunk=on_chunk, env=env)
+            output = "\n".join(
+                part for part in (result.stdout, result.stderr, result.error) if part
+            ).lower()
+            if model_override and "model not found" in output and model_override.lower() in output:
+                logger.warning(
+                    "OpenCode model override %r is unavailable for task %s; retrying without it",
+                    model_override,
+                    task_id,
+                )
+                retry_env = dict(env)
+                retry_env.pop("FACTORY_OPENCODE_MODEL", None)
+                cmd = agent_core.build_opencode_command(
+                    agent.command,
+                    cwd=cwd,
+                    prompt_file=prompt_file,
+                )
+                result = await self._run_cli(
+                    cmd, cwd, timeout, task_id, on_chunk=on_chunk, env=retry_env,
+                )
+                result.metrics["opencode_model_override_fallback"] = True
         finally:
             shutil.rmtree(tmp_data_root, ignore_errors=True)
 
@@ -5853,7 +5921,7 @@ class ProcessManager:
                     break
             effective_rc = copilot_exit if copilot_exit is not None else returncode
 
-            if effective_rc == 0 and returncode == 0:
+            if copilot_exit == 0 and returncode == 0:
                 return TaskResult(
                     status="success",
                     exit_code=0,
@@ -5861,14 +5929,15 @@ class ProcessManager:
                     stderr=stderr[-10000:],
                     metrics=metrics,
                 )
-            elif copilot_exit is None and returncode != 0 and completed_without_result:
-                logger.warning(
-                    "Copilot exited with return code %s for task %s despite a completed assistant turn and no result event; recovering to validation path",
-                    returncode,
-                    task_id,
-                )
-                metrics["recovered_missing_result_event"] = True
-                metrics["recovered_process_returncode"] = returncode
+            elif not copilot_specific_error and copilot_exit is None and completed_without_result:
+                if returncode != 0:
+                    logger.warning(
+                        "Copilot exited with return code %s for task %s despite a completed assistant turn and no result event; recovering to validation path",
+                        returncode,
+                        task_id,
+                    )
+                    metrics["recovered_missing_result_event"] = True
+                    metrics["recovered_process_returncode"] = returncode
                 return TaskResult(
                     status="success",
                     exit_code=0,
@@ -5933,6 +6002,11 @@ class ProcessManager:
                     )
                 if copilot_specific_error:
                     failure_error = copilot_specific_error[:1500]
+                elif copilot_exit is None and returncode == 0:
+                    stderr_detail = stderr[-500:].strip()
+                    failure_error = "Copilot exited without a successful result event"
+                    if stderr_detail:
+                        failure_error = f"{failure_error}: {stderr_detail}"
                 elif stderr.strip():
                     failure_error = f"Copilot exited with code {effective_rc}: {stderr[-500:].strip()}"
                 else:

{forgexa_cli-1.27.3 → forgexa_cli-1.27.5}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.27.3
+Version: 1.27.5
 Summary: Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform
 Author-email: Jason Sun <dev.winds@gmail.com>
 License-Expression: MIT

{forgexa_cli-1.27.3 → forgexa_cli-1.27.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "forgexa-cli"
-version = "1.27.3"
+version = "1.27.5"
 description = "Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform"
 requires-python = ">=3.9"
 license = "MIT"