forgexa-cli 1.58.2__tar.gz → 1.58.3__tar.gz

{forgexa_cli-1.58.2 → forgexa_cli-1.58.3}/PKG-INFO

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

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

{forgexa_cli-1.58.2 → forgexa_cli-1.58.3}/forgexa_cli/daemon.py

@@ -1058,6 +1058,32 @@ except (ImportError, ModuleNotFoundError):
         def GIT_CLONE_TIMEOUT(self) -> int:
             return int(os.environ.get("GIT_CLONE_TIMEOUT", "1800"))
 
+        @property
+        def GIT_WORKTREE_TIMEOUT(self) -> int:
+            """Timeout (seconds) for `git worktree add` operations.
+
+            `worktree add` materialises a full checkout of the target branch
+            into the new worktree.  On large repos (e.g. HP SI) or busy disks
+            this easily exceeds the 120 s default for ordinary git commands
+            (SI-1181: a fresh-start worktree add timed out after 120 s and
+            failed the node even though the checkout was still progressing).
+
+            Precedence:
+              1. GIT_WORKTREE_TIMEOUT env var (explicit override)
+              2. GIT_CLONE_TIMEOUT env var (backwards compat — an operator
+                 who raised the clone timeout for a huge repo wants local
+                 checkouts to get comparable headroom)
+              3. 600 s default (10 min — local disk I/O only, no network,
+                 so shorter than the clone/fetch/push ceiling)
+            """
+            env_worktree = os.environ.get("GIT_WORKTREE_TIMEOUT")
+            if env_worktree:
+                return int(env_worktree)
+            env_clone = os.environ.get("GIT_CLONE_TIMEOUT")
+            if env_clone:
+                return int(env_clone)
+            return 600
+
         @property
         def GIT_FETCH_TIMEOUT(self) -> int:
             """Timeout (seconds) for incremental git fetch operations.
@@ -1170,7 +1196,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.58.2"
+DAEMON_VERSION = "1.58.3"
 
 
 def _detect_client_type() -> str:
@@ -5436,7 +5462,8 @@ class WorkspaceManager:
                         ) from recovery_exc
                 self._safe_rmtree(ws_path)
                 raise RuntimeError(
-                    f"Failed to create clean fresh worktree for branch '{branch_name}'. "
+                    f"Failed to create clean fresh worktree for branch '{branch_name}': "
+                    f"{self._summarize_git_error(exc)}. "
                     "Refusing to reuse a stale local branch."
                 ) from exc
         else:
@@ -5472,13 +5499,18 @@ class WorkspaceManager:
         """Optional cleanup after task. For now, keep workspaces for debugging."""
         pass
 
-    async def _git(self, *args: str, cwd: Path | str | None = None, timeout: int = 120,
+    async def _git(self, *args: str, cwd: Path | str | None = None, timeout: int | None = None,
                    project_key: str | None = None) -> str:
         """Run a git command safely using exec (no shell injection).
 
         If a project SSH key is registered, remote-touching commands
         (clone, fetch, pull, push) will use GIT_SSH_COMMAND.
 
+        Timeout resolution (SI-1181): when ``timeout`` is None the default
+        is 120 s for ordinary git commands, but `worktree add` — which
+        materialises a full checkout of the branch — gets the dedicated
+        GIT_WORKTREE_TIMEOUT (default 600 s) instead.
+
         Process-group isolation: git is started in its own session so that
         SIGKILL on timeout propagates to all of git's children (especially
         the ssh subprocess that git forks for remote operations).  Without
@@ -5491,6 +5523,15 @@ class WorkspaceManager:
         accepts but never sends the git protocol banner) is detected within
         ~90 s rather than waiting forever.
         """
+        if timeout is None:
+            # `git worktree add` is a full checkout of the target branch;
+            # on large repos (e.g. HP SI) or busy disks it legitimately
+            # exceeds the 120 s default for ordinary git commands.
+            timeout = (
+                settings.GIT_WORKTREE_TIMEOUT
+                if args[:2] == ("worktree", "add")
+                else 120
+            )
         env = None
         git_prefix_args: list[str] = []
         # Inject SSH key for commands that touch the remote

{forgexa_cli-1.58.2 → forgexa_cli-1.58.3}/forgexa_cli.egg-info/PKG-INFO

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

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