forgexa-cli 1.14.4__tar.gz → 1.14.5__tar.gz

{forgexa_cli-1.14.4 → forgexa_cli-1.14.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.14.4
+Version: 1.14.5
 Summary: Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform
 Author-email: Jason Sun <dev.winds@gmail.com>
 License: MIT

{forgexa_cli-1.14.4 → forgexa_cli-1.14.5}/forgexa_cli/__init__.py

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

{forgexa_cli-1.14.4 → forgexa_cli-1.14.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.14.4"
+DAEMON_VERSION = "1.14.5"
 
 
 def _detect_client_type() -> str:
@@ -5106,28 +5106,47 @@ class ProcessManager:
 
         return info
 
-    async def _collect_git_info_vs_parent(self, cwd: Path) -> dict:
-        """Collect git diff stats comparing HEAD vs merge-base with default branch.
+    async def _collect_git_info_vs_parent(
+        self,
+        cwd: Path,
+        *,
+        default_branch: str = "",
+        before_sha: str = "",
+    ) -> dict:
+        """Collect git diff stats comparing HEAD vs merge-base with the base branch.
 
-        Uses merge-base to capture ALL changes on the feature branch, not just
+        Uses merge-base to capture ALL changes on the current branch, not just
         the last commit (agents like claude may create multiple commits).
-        Falls back to HEAD~1 if merge-base detection fails.
+        Prefers the project's configured default branch, then falls back to the
+        conventional `main` / `master` refs. Falls back to HEAD~1 if merge-base
+        detection fails.
         """
         info: dict[str, Any] = {}
         try:
-            # Try to find merge-base with origin's default branch
-            base_ref = "HEAD~1"
-            for candidate in ("origin/master", "origin/main"):
-                proc_mb = await asyncio.create_subprocess_exec(
-                    "git", "merge-base", candidate, "HEAD",
-                    stdout=asyncio.subprocess.PIPE,
-                    stderr=asyncio.subprocess.PIPE,
-                    cwd=str(cwd),
-                )
-                mb_stdout, _ = await asyncio.wait_for(proc_mb.communicate(), timeout=10)
-                if proc_mb.returncode == 0 and mb_stdout.strip():
-                    base_ref = mb_stdout.decode().strip()
-                    break
+            # Prefer the exact pre-node HEAD when available so the diff is
+            # scoped to this node's work, not the whole requirement branch.
+            base_ref = str(before_sha or "").strip() or "HEAD~1"
+            if not str(before_sha or "").strip():
+                candidate_refs: list[str] = []
+                for candidate in (default_branch, "main", "master"):
+                    candidate = str(candidate or "").strip()
+                    if not candidate:
+                        continue
+                    ref = candidate if candidate.startswith("origin/") else f"origin/{candidate}"
+                    if ref not in candidate_refs:
+                        candidate_refs.append(ref)
+
+                for candidate in candidate_refs:
+                    proc_mb = await asyncio.create_subprocess_exec(
+                        "git", "merge-base", candidate, "HEAD",
+                        stdout=asyncio.subprocess.PIPE,
+                        stderr=asyncio.subprocess.PIPE,
+                        cwd=str(cwd),
+                    )
+                    mb_stdout, _ = await asyncio.wait_for(proc_mb.communicate(), timeout=10)
+                    if proc_mb.returncode == 0 and mb_stdout.strip():
+                        base_ref = mb_stdout.decode().strip()
+                        break
 
             # Changed files since branch point
             proc = await asyncio.create_subprocess_exec(
@@ -5173,6 +5192,8 @@ class ProcessManager:
             )
             stdout4, _ = await asyncio.wait_for(proc4.communicate(), timeout=10)
             info["commit_sha"] = stdout4.decode().strip()
+            info["before_sha"] = base_ref
+            info["after_sha"] = info["commit_sha"]
 
         except Exception as e:
             logger.debug("Git info (vs parent) collection failed: %s", e)
@@ -6364,6 +6385,8 @@ class RuntimeDaemon:
     async def _execute_task(self, task: TaskInfo, conn: ServerConnection):
         """Execute a single task, reporting to the originating server connection."""
         reporter = conn.reporter
+        default_branch = str((task.project or {}).get("default_branch") or "").strip()
+        node_before_sha = ""
         # Use workspace-level granularity (requirement_workflow_id or graph_id) so that
         # tasks for DIFFERENT requirements can run in parallel on the same daemon, while
         # tasks for the SAME requirement (e.g. analysis + retry) are still serialized to
@@ -6543,6 +6566,19 @@ class RuntimeDaemon:
                                 output_dir_norm, task.task_id,
                             )
 
+            try:
+                node_before_sha = (
+                    await self.workspace_manager._git(
+                        "rev-parse", "HEAD", cwd=workspace_path, timeout=30,
+                    )
+                ).strip()
+            except Exception as _before_sha_err:
+                logger.debug(
+                    "Could not resolve pre-node HEAD for task %s: %s",
+                    task.task_id,
+                    _before_sha_err,
+                )
+
             # 3. Run agent with real-time output streaming + periodic progress heartbeat
             await reporter.report_progress(task.task_id, 10, "running_agent")
 
@@ -6615,7 +6651,11 @@ class RuntimeDaemon:
             _skip_fallback = False
             if self.process_manager.is_rate_limited(result):
                 _pre_fallback_git = await self.process_manager._collect_git_info(workspace_path)
-                _pre_fallback_committed = await self.process_manager._collect_git_info_vs_parent(workspace_path)
+                _pre_fallback_committed = await self.process_manager._collect_git_info_vs_parent(
+                    workspace_path,
+                    default_branch=default_branch,
+                    before_sha=node_before_sha,
+                )
                 has_workspace_changes = (
                     bool(_pre_fallback_git.get("files_changed"))
                     or bool(_pre_fallback_committed.get("files_changed"))
@@ -6726,7 +6766,11 @@ class RuntimeDaemon:
             # (e.g., after rate-limit fallback, or API errors not caught by output parsing).
             if result.status == "success" and task.node_type in ("coding", "fix", "testing"):
                 has_uncommitted = bool(pre_commit_git.get("files_changed"))
-                committed_git = await self.process_manager._collect_git_info_vs_parent(workspace_path)
+                committed_git = await self.process_manager._collect_git_info_vs_parent(
+                    workspace_path,
+                    default_branch=default_branch,
+                    before_sha=node_before_sha,
+                )
                 has_committed = bool(committed_git.get("files_changed"))
                 has_tokens = (
                     int(result.metrics.get("token_input", 0) or 0)
@@ -6764,7 +6808,11 @@ class RuntimeDaemon:
                 )
                 if can_attempt_recovery:
                     original_exit_code = result.exit_code
-                    committed_git = await self.process_manager._collect_git_info_vs_parent(workspace_path)
+                    committed_git = await self.process_manager._collect_git_info_vs_parent(
+                        workspace_path,
+                        default_branch=default_branch,
+                        before_sha=node_before_sha,
+                    )
                     has_committed_changes = bool(committed_git.get("files_changed"))
                     has_uncommitted_changes = bool(pre_commit_git.get("files_changed"))
                     has_no_uncommitted = not has_uncommitted_changes
@@ -6888,7 +6936,11 @@ class RuntimeDaemon:
             # 4.55 Analysis/design/fix nodes must update their deliverables in THIS run.
             # Existing files from a prior iteration are not sufficient evidence.
             if result.status == "success" and task.node_type in ("analysis", "design", "fix"):
-                committed_git = await self.process_manager._collect_git_info_vs_parent(workspace_path)
+                committed_git = await self.process_manager._collect_git_info_vs_parent(
+                    workspace_path,
+                    default_branch=default_branch,
+                    before_sha=node_before_sha,
+                )
                 git_check_passed = self.process_manager._has_required_deliverable_updates(
                     task,
                     pre_commit_git.get("files_changed"),
@@ -7002,7 +7054,11 @@ class RuntimeDaemon:
                             )
                             result.error = f"Git push failed: {push_err}"
                 # Re-collect git info after commit (compare with parent)
-                post_commit_git = await self.process_manager._collect_git_info_vs_parent(workspace_path)
+                post_commit_git = await self.process_manager._collect_git_info_vs_parent(
+                    workspace_path,
+                    default_branch=default_branch,
+                    before_sha=node_before_sha,
+                )
                 # Merge: use the pre-commit file list if post-commit is empty
                 result.git = post_commit_git
                 if not result.git.get("files_changed") and pre_commit_git.get("files_changed"):

{forgexa_cli-1.14.4 → forgexa_cli-1.14.5}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.14.4
+Version: 1.14.5
 Summary: Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform
 Author-email: Jason Sun <dev.winds@gmail.com>
 License: MIT

{forgexa_cli-1.14.4 → forgexa_cli-1.14.5}/pyproject.toml

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