forgexa-cli 1.22.3__tar.gz → 1.22.5__tar.gz

{forgexa_cli-1.22.3 → forgexa_cli-1.22.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.22.3
+Version: 1.22.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.22.3 → forgexa_cli-1.22.5}/forgexa_cli/__init__.py

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

{forgexa_cli-1.22.3 → forgexa_cli-1.22.5}/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.22.3"
+DAEMON_VERSION = "1.22.5"
 
 
 def _detect_client_type() -> str:
@@ -2617,8 +2617,18 @@ class WorkspaceManager:
 
     async def _remove_broken_worktree(self, main_repo: Path, ws_path: Path, workspace_key: str):
         """Remove a broken worktree directory and clean up stale worktree refs."""
-        # Try to prune from main repo first
+        # `git worktree prune` keeps an entry while its directory exists, even
+        # when that directory's .git pointer is corrupt.
+        self._safe_rmtree(ws_path)
+
         if main_repo.exists():
+            # Prune also preserves explicitly locked worktrees, even after
+            # their directories disappear. Unlock before pruning so a stale
+            # registration cannot keep its branch ref occupied forever.
+            try:
+                await self._git("worktree", "unlock", str(ws_path), cwd=main_repo)
+            except RuntimeError:
+                pass
             try:
                 await self._git("worktree", "prune", cwd=main_repo)
             except RuntimeError:
@@ -2627,9 +2637,6 @@ class WorkspaceManager:
             wt_ref = main_repo / ".git" / "worktrees" / workspace_key
             if wt_ref.exists():
                 self._safe_rmtree(wt_ref)
-        # Remove the broken worktree directory using _safe_rmtree so that
-        # read-only git objects on Windows are properly handled.
-        self._safe_rmtree(ws_path)
 
     async def _safe_rmtree_main(self, main_repo: Path) -> None:
         """Remove _main repo, first evicting all linked worktrees to prevent orphans.
@@ -2677,8 +2684,10 @@ class WorkspaceManager:
         self,
         main_repo: Path,
         branch_name: str,
+        *,
+        healthy_only: bool = True,
     ) -> Path | None:
-        """Return an existing healthy linked worktree already on branch_name."""
+        """Return a linked worktree already on branch_name."""
         try:
             raw = await self._git("worktree", "list", "--porcelain", cwd=main_repo)
         except RuntimeError:
@@ -2704,6 +2713,8 @@ class WorkspaceManager:
         for candidate_path, candidate_branch in entries:
             if candidate_path == main_repo or candidate_branch != target_ref:
                 continue
+            if not healthy_only:
+                return candidate_path
             if candidate_path.exists() and await self._is_healthy_worktree(candidate_path, main_repo=main_repo):
                 return candidate_path
 
@@ -3827,6 +3838,43 @@ class WorkspaceManager:
                     cwd=main_repo,
                 )
             except Exception as exc:
+                existing_branch_worktree = await self._find_existing_worktree_for_branch(
+                    main_repo, branch_name,
+                )
+                if existing_branch_worktree is not None:
+                    logger.info(
+                        "Fresh start reusing worktree %s after resetting %s to origin/%s",
+                        existing_branch_worktree, branch_name, default_branch,
+                    )
+                    await self._git(
+                        "checkout", "-B", branch_name, f"origin/{default_branch}",
+                        cwd=existing_branch_worktree,
+                    )
+                    return existing_branch_worktree
+
+                stale_branch_worktree = await self._find_existing_worktree_for_branch(
+                    main_repo, branch_name, healthy_only=False,
+                )
+                if stale_branch_worktree is not None:
+                    logger.warning(
+                        "Fresh start found broken worktree %s holding branch %s; removing it before retrying",
+                        stale_branch_worktree, branch_name,
+                    )
+                    try:
+                        await self._remove_broken_worktree(
+                            main_repo, stale_branch_worktree, stale_branch_worktree.name,
+                        )
+                        await self._git(
+                            "branch", "-f", branch_name, f"origin/{default_branch}",
+                            cwd=main_repo,
+                        )
+                        await self._git(
+                            "worktree", "add", str(ws_path), branch_name,
+                            cwd=main_repo,
+                        )
+                        return ws_path
+                    except Exception as recovery_exc:
+                        exc = recovery_exc
                 self._safe_rmtree(ws_path)
                 raise RuntimeError(
                     f"Failed to create clean fresh worktree for branch '{branch_name}'. "

{forgexa_cli-1.22.3 → forgexa_cli-1.22.5}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.22.3
+Version: 1.22.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.22.3 → forgexa_cli-1.22.5}/pyproject.toml

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