forgexa-cli 1.27.2__tar.gz → 1.27.4__tar.gz

{forgexa_cli-1.27.2 → forgexa_cli-1.27.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.27.2
+Version: 1.27.4
 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.2 → forgexa_cli-1.27.4}/forgexa_cli/__init__.py

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

{forgexa_cli-1.27.2 → forgexa_cli-1.27.4}/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.2 → forgexa_cli-1.27.4}/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.2"
+DAEMON_VERSION = "1.27.4"
 
 
 def _detect_client_type() -> str:
@@ -1925,13 +1925,14 @@ async def _validate_local_workspace_binding(binding: dict[str, Any], runtime_id:
     entry = _load_local_workspaces_mapping().get(binding_id)
     if not binding_id or not isinstance(entry, dict):
         return "mapping_missing"
-    if (
-        str(entry.get("project_id") or "") != str(binding.get("project_id") or "")
-        or str(entry.get("user_id") or "") != str(binding.get("user_id") or "")
-        or str(entry.get("runtime_id") or "") != str(runtime_id)
-        or str(entry.get("repo_identity") or "") != str(binding.get("repo_identity") or "")
-    ):
-        return "mapping_mismatch"
+    if str(entry.get("project_id") or "") != str(binding.get("project_id") or ""):
+        return "mapping_project_mismatch"
+    if str(entry.get("user_id") or "") != str(binding.get("user_id") or ""):
+        return "mapping_user_mismatch"
+    if str(entry.get("runtime_id") or "") != str(runtime_id):
+        return "mapping_runtime_mismatch"
+    if str(entry.get("repo_identity") or "") != str(binding.get("repo_identity") or ""):
+        return "mapping_repository_mismatch"
 
     local_path = Path(str(entry.get("local_path") or "")).expanduser()
     try:
@@ -2267,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.
@@ -3433,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
@@ -4211,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}'. "
@@ -5852,7 +5899,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,
@@ -5860,14 +5907,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,
@@ -5932,6 +5980,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.2 → forgexa_cli-1.27.4}/forgexa_cli/main.py

@@ -2857,6 +2857,19 @@ def cmd_project_bind_local(args: argparse.Namespace) -> None:
     if not binding_id:
         print("Error: failed to create local workspace binding", file=sys.stderr)
         sys.exit(1)
+    expected_identity = binding.get("repo_identity")
+    if isinstance(expected_identity, str) and expected_identity != identity:
+        try:
+            _delete(f"/projects/{args.project}/local-workspace-bindings/{binding_id}")
+        except Exception:
+            pass
+        print(
+            "Error: this folder's Git remote does not match the selected Forgexa project's repository "
+            f"(project: {expected_identity}, this folder: {identity}). "
+            "Open the matching folder or update the project's repository URL.",
+            file=sys.stderr,
+        )
+        sys.exit(1)
 
     mapping = load_local_workspaces_mapping()
     local_path_str = str(local_path)

{forgexa_cli-1.27.2 → forgexa_cli-1.27.4}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.27.2
+Version: 1.27.4
 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.2 → forgexa_cli-1.27.4}/pyproject.toml

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

{forgexa_cli-1.27.2 → forgexa_cli-1.27.4}/tests/test_local_bind_commands.py

@@ -152,6 +152,44 @@ def test_bind_local_rejects_unrecognized_remote_url(tmp_path: Path, monkeypatch:
         main.cmd_project_bind_local(args)
 
 
+def test_bind_local_rejects_project_repository_mismatch_before_writing_mapping(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("HOME", str(tmp_path))
+    repo = tmp_path / "other-project"
+    _init_git_repo_with_remote(repo, "https://github.com/acme/other.git")
+
+    monkeypatch.setattr(main, "_get_runtimes", lambda: [
+        {"id": "runtime-1", "pool_type": "personal", "daemon_id": "d1", "device_name": "laptop"},
+    ])
+    monkeypatch.setattr(main, "_get", lambda path: {"id": "user-1"} if path == "/auth/me" else None)
+
+    posts: list[tuple[str, dict]] = []
+    deletes: list[str] = []
+
+    def fake_post(path: str, data=None):
+        posts.append((path, data or {}))
+        assert path == "/projects/project-1/local-workspace-bindings"
+        return {
+            "id": "binding-1",
+            "status": "pending",
+            "repo_identity": "github.com/acme/widgets",
+        }
+
+    monkeypatch.setattr(main, "_post", fake_post)
+    monkeypatch.setattr(main, "_delete", lambda path: deletes.append(path))
+
+    args = SimpleNamespace(project="project-1", path=str(repo), runtime=None)
+    with pytest.raises(SystemExit):
+        main.cmd_project_bind_local(args)
+
+    assert posts == [
+        ("/projects/project-1/local-workspace-bindings", {"runtime_id": "runtime-1"}),
+    ]
+    assert deletes == ["/projects/project-1/local-workspace-bindings/binding-1"]
+    assert not (tmp_path / ".forgexa" / "local-workspaces.json").exists()
+
+
 def test_bind_local_requires_disambiguation_with_multiple_personal_runtimes(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch,
 ) -> None: