forgexa-cli 1.17.3__tar.gz → 1.17.5__tar.gz

{forgexa_cli-1.17.3 → forgexa_cli-1.17.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.17.3
+Version: 1.17.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.17.3 → forgexa_cli-1.17.5}/forgexa_cli/__init__.py

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

{forgexa_cli-1.17.3 → forgexa_cli-1.17.5}/forgexa_cli/daemon.py

@@ -523,7 +523,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.17.3"
+DAEMON_VERSION = "1.17.5"
 
 
 def _detect_client_type() -> str:
@@ -2017,31 +2017,36 @@ class WorkspaceManager:
             #      A final sync here keeps the workspace current so the agent works
             #      on the latest codebase and avoids non-fast-forward push failures.
             if not is_fresh_start:
+                sync_success = False
+                sync_error = ""
                 try:
                     await self._git(
                         "fetch", "origin",
                         f"{branch_name}:refs/remotes/origin/{branch_name}",
                         cwd=ws_path, project_key=project_key,
                     )
-                except RuntimeError:
-                    pass
-                try:
-                    # Ensure we're on the correct branch
-                    await self._git("checkout", branch_name, cwd=ws_path)
-                except RuntimeError:
-                    pass
-                # Use --ff-only to keep only fast-forward changes; if the branch has
-                # diverged (force-pushed by prior phase), reset --hard is used below.
-                pulled = False
-                try:
-                    await self._git(
-                        "pull", "--ff-only", "origin", branch_name,
-                        cwd=ws_path, project_key=project_key,
-                    )
-                    pulled = True
-                except RuntimeError:
-                    pass
-                if not pulled:
+                except RuntimeError as exc:
+                    sync_error = f"fetch branch ref failed: {exc}"
+                else:
+                    try:
+                        # Ensure we're on the correct branch
+                        await self._git("checkout", branch_name, cwd=ws_path)
+                    except RuntimeError as exc:
+                        sync_error = f"checkout branch failed: {exc}"
+                    else:
+                        # Use --ff-only to keep only fast-forward changes; if the
+                        # branch has diverged (force-pushed by prior phase),
+                        # reset --hard is used below.
+                        try:
+                            await self._git(
+                                "pull", "--ff-only", "origin", branch_name,
+                                cwd=ws_path, project_key=project_key,
+                            )
+                            sync_success = True
+                        except RuntimeError as exc:
+                            sync_error = f"pull --ff-only failed: {exc}"
+
+                if not sync_success:
                     # ff-only failed (diverged or remote not yet created) — try
                     # reset --hard to force-sync to whatever the remote has.
                     try:
@@ -2049,9 +2054,35 @@ class WorkspaceManager:
                             "reset", "--hard", f"origin/{branch_name}",
                             cwd=ws_path,
                         )
-                    except RuntimeError:
-                        # Remote branch may not exist yet (first analysis on fresh repo)
-                        pass
+                        sync_success = True
+                    except RuntimeError as exc:
+                        if sync_error:
+                            sync_error = f"{sync_error}; reset failed: {exc}"
+                        else:
+                            sync_error = f"reset --hard failed: {exc}"
+
+                if expect_branch and not sync_success:
+                    main_repo = project_dir / "_main"
+                    logger.warning(
+                        "Final branch sync failed for expected remote branch %s in %s: %s. "
+                        "Discarding worktree to avoid running on the wrong base.",
+                        branch_name,
+                        ws_path,
+                        sync_error or "unknown sync error",
+                    )
+                    try:
+                        await self._remove_broken_worktree(main_repo, ws_path, workspace_key)
+                    except Exception as cleanup_exc:
+                        logger.warning(
+                            "Failed to discard unsafe worktree %s after sync failure: %s",
+                            ws_path,
+                            cleanup_exc,
+                        )
+                    raise RuntimeError(
+                        f"Failed to sync expected remote branch '{branch_name}' before execution "
+                        f"({sync_error or 'unknown sync error'}). Refusing to continue on a "
+                        "workspace that may be based on the default branch."
+                    )
             return ws_path
         else:
             # No repo — create a directory with git init for change tracking
@@ -3060,6 +3091,14 @@ class WorkspaceManager:
                     # Treat as if branch doesn't exist to force fresh worktree
                     branch_exists_remote = False
 
+        if expect_branch and not fresh_start and not branch_exists_remote:
+            self._safe_rmtree(ws_path)
+            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."
+            )
+
         if branch_exists_remote and not fresh_start:
             # Branch exists on remote and we want to preserve it (refine mode)
             # First, update local branch ref to match remote (in case it's stale)
@@ -3106,6 +3145,13 @@ class WorkspaceManager:
                             ws_path,
                         )
                         return existing_branch_worktree
+                    if expect_branch:
+                        self._safe_rmtree(ws_path)
+                        raise RuntimeError(
+                            f"Failed to attach local worktree for existing remote branch '{branch_name}'. "
+                            "Refusing to fall back to the default branch because that would risk "
+                            "pushing unrelated commits into the requirement branch."
+                        )
                     # Fallback: create from default_branch
                     try:
                         await self._git(
@@ -8198,7 +8244,7 @@ class RuntimeDaemon:
         """Execute an AIJob in daemon workspace and report results back.
 
         Uses WorkspaceManager for branch-based isolation, runs the agent CLI
-        with the job's prompt, auto-commits results, and reports back.
+        with the job's prompt, snapshots git state, and reports back.
         """
         job_id = aj.get("job_id", "")
         task_type = aj.get("task_type", "unknown")
@@ -8373,12 +8419,15 @@ class RuntimeDaemon:
                 )
                 await _flush_output_to_server()
 
-            # 4. Auto-commit if successful (always call _auto_commit on success:
-            # _auto_commit handles both uncommitted changes AND internally-committed
-            # changes that just need to be pushed — same as _execute_task).
+            # 4. Capture branch/commit metadata without mutating the repository.
+            # Workspace-mode AIJobs are prompt-output tasks: scenario generation,
+            # test-script generation/repair, and deliverable generation all return
+            # their result via stdout / API payloads rather than repository commits.
+            # Pushing here is dangerous because it can propagate stale local branch
+            # state even when the AIJob produced no repo changes at all.
             git_info = {}
             if result.status == "success":
-                git_info = await self._auto_commit(workspace_path, fake_task)
+                git_info = await self._collect_workspace_git_info(workspace_path)
 
             # 5. Report completion
             # For deliverables: allow up to 200K chars (full document); others: last 20K
@@ -8444,6 +8493,29 @@ class RuntimeDaemon:
         finally:
             project_lock.release()
 
+    async def _collect_workspace_git_info(self, workspace_path: Path) -> dict:
+        """Return the current branch and commit SHA without mutating remote state."""
+        git = self.workspace_manager._git
+        info: dict[str, str] = {}
+
+        try:
+            branch = (await git(
+                "rev-parse", "--abbrev-ref", "HEAD", cwd=workspace_path,
+            )).strip()
+            if branch and branch != "HEAD":
+                info["branch"] = branch
+        except RuntimeError:
+            pass
+
+        try:
+            commit_sha = (await git("rev-parse", "HEAD", cwd=workspace_path)).strip()
+            if commit_sha:
+                info["commit_sha"] = commit_sha
+        except RuntimeError:
+            pass
+
+        return info
+
     async def _validate_and_retry(
         self,
         agent: "DiscoveredAgent",

{forgexa_cli-1.17.3 → forgexa_cli-1.17.5}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.17.3
+Version: 1.17.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.17.3 → forgexa_cli-1.17.5}/pyproject.toml

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