forgexa-cli 1.18.9__tar.gz → 1.18.10__tar.gz

{forgexa_cli-1.18.9 → forgexa_cli-1.18.10}/PKG-INFO

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

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

{forgexa_cli-1.18.9 → forgexa_cli-1.18.10}/forgexa_cli/daemon.py

@@ -555,7 +555,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.18.9"
+DAEMON_VERSION = "1.18.10"
 
 
 def _detect_client_type() -> str:
@@ -1716,6 +1716,13 @@ class WorkspaceManager:
         """Register an SSH private key for a project."""
         self._ssh_keys[project_key] = ssh_private_key
 
+    @staticmethod
+    def _summarize_git_error(error: Exception) -> str:
+        """Return a compact Git error without exposing embedded HTTPS credentials."""
+        detail = " ".join(str(error).split())
+        detail = re.sub(r"(https?://)[^/@\s]+@", r"\1***@", detail)
+        return detail[:500]
+
     def _migrate_legacy_project_dirs(self) -> None:
         """Move project directories from root/ to root/projects/ (one-time migration).
 
@@ -3042,6 +3049,7 @@ class WorkspaceManager:
         # Retry up to 2 times with short delay for cross-runtime timing issues
         # (analysis daemon may have just pushed the branch).
         branch_exists_remote = False
+        last_branch_fetch_error: str | None = None
         for _check_attempt in range(3 if not fresh_start else 1):
             try:
                 check_proc = await asyncio.create_subprocess_exec(
@@ -3070,8 +3078,8 @@ class WorkspaceManager:
                         timeout=settings.GIT_FETCH_TIMEOUT,
                         project_key=project_key,
                     )
-                except RuntimeError:
-                    pass
+                except RuntimeError as exc:
+                    last_branch_fetch_error = self._summarize_git_error(exc)
 
         # Fresh analysis with an existing remote branch that has implementation commits:
         # delete the remote branch so the agent starts from a clean slate.
@@ -3138,10 +3146,16 @@ class WorkspaceManager:
 
         if expect_branch and not fresh_start and not branch_exists_remote:
             self._safe_rmtree(ws_path)
+            fetch_detail = (
+                f" Last branch fetch error: {last_branch_fetch_error}"
+                if last_branch_fetch_error
+                else ""
+            )
             raise RuntimeError(
                 f"Expected remote branch '{branch_name}' to exist, but it could not be "
                 "fetched or resolved. Refusing to create a continuation workspace from "
                 f"origin/{default_branch} because that risks overwriting requirement-scoped history."
+                f"{fetch_detail}"
             )
 
         if branch_exists_remote and not fresh_start:

{forgexa_cli-1.18.9 → forgexa_cli-1.18.10}/forgexa_cli.egg-info/PKG-INFO

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

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

{forgexa_cli-1.18.9 → forgexa_cli-1.18.10}/tests/test_auth_and_runtime_commands.py

@@ -5,7 +5,7 @@ import io
 import json
 from pathlib import Path
 from types import SimpleNamespace
-from unittest.mock import MagicMock
+from unittest.mock import AsyncMock, MagicMock
 
 import httpx
 import pytest
@@ -196,6 +196,49 @@ def test_httpx_recovery_hints_use_platform_specific_upgrade_commands() -> None:
     assert linux_hints[0] == "python3 -m pip install --upgrade forgexa-cli"
 
 
+@pytest.mark.asyncio
+async def test_workspace_reports_last_expected_branch_fetch_error(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    manager = daemon.WorkspaceManager(str(tmp_path / "daemon-root"))
+    project_dir = tmp_path / "project"
+    (project_dir / "_main").mkdir(parents=True)
+
+    class DummyProc:
+        returncode = 1
+
+        async def communicate(self):
+            return b"", b""
+
+    async def fake_git(*args, **kwargs):
+        if args[:2] == ("fetch", "origin") and args[2].startswith("feature/SI-647:"):
+            raise RuntimeError("Permission denied (publickey).")
+        return ""
+
+    manager._git = AsyncMock(side_effect=fake_git)
+    monkeypatch.setattr(
+        daemon.asyncio,
+        "create_subprocess_exec",
+        AsyncMock(return_value=DummyProc()),
+    )
+    monkeypatch.setattr(daemon.asyncio, "sleep", AsyncMock())
+
+    with pytest.raises(
+        RuntimeError,
+        match="Last branch fetch error: Permission denied \\(publickey\\)\\.",
+    ):
+        await manager._create_worktree_impl(
+            project_dir,
+            "ssh://git@example.com/repo.git",
+            "develop",
+            "workflow-keep-branch",
+            "feature/SI-647",
+            project_key="SI",
+            expect_branch=True,
+        )
+
+
 def test_normalize_target_version_accepts_plain_and_v_prefixed_tags() -> None:
     assert main._normalize_target_version("1.12.3") == "1.12.3"
     assert main._normalize_target_version("v1.12.3") == "1.12.3"