forgexa-cli 1.23.0__tar.gz → 1.23.2__tar.gz

{forgexa_cli-1.23.0 → forgexa_cli-1.23.2}/PKG-INFO

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

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

{forgexa_cli-1.23.0 → forgexa_cli-1.23.2}/forgexa_cli/daemon.py

@@ -557,7 +557,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.23.0"
+DAEMON_VERSION = "1.23.2"
 
 
 def _detect_client_type() -> str:
@@ -10178,10 +10178,15 @@ class RuntimeDaemon:
         self._record_merge_job(merge_job_id, str(input_ctx.get("project_id") or ""))
 
         async def _report(result: dict, status: str = "completed", error: str = ""):
+            result = dict(result)
+            if source_commit_sha and not result.get("source_commit_sha"):
+                result["source_commit_sha"] = source_commit_sha
             payload = {"status": status, "output_result": result}
             if error:
                 payload["error"] = error[:1000]
-                payload["failure_code"] = result.get("merge_outcome", "merge_failed")
+                payload["failure_code"] = result.get(
+                    "failure_code", result.get("merge_outcome", "merge_failed")
+                )
             try:
                 await conn.client.post(f"{reporter_url}/complete", json=payload, timeout=15)
             except Exception:
@@ -10224,7 +10229,13 @@ class RuntimeDaemon:
             )
 
             # Fetch latest refs.
-            await git("fetch", "origin", cwd=workspace_path)
+            await git(
+                "fetch",
+                "origin",
+                cwd=workspace_path,
+                timeout=settings.GIT_FETCH_TIMEOUT,
+                project_key=_proj_key,
+            )
 
             # Determine base SHA: use recorded base, else default branch HEAD.
             if base_integration_sha:
@@ -10238,14 +10249,37 @@ class RuntimeDaemon:
             # Detach HEAD to the base, creating a clean starting point for the candidate.
             await git("checkout", "--detach", base_ref, cwd=workspace_path)
 
-            # Resolve source SHA from branch name if not already a SHA.
+            # A shallow single-branch clone only tracks its configured baseline
+            # refspec. Fetch the source branch explicitly before resolving it.
             if not source_commit_sha and source_branch:
                 try:
-                    source_commit_sha = (await git("rev-parse", f"origin/{source_branch}", cwd=workspace_path)).strip()
+                    source_remote_ref = f"refs/remotes/origin/{source_branch}"
+                    await git(
+                        "fetch",
+                        "origin",
+                        f"+refs/heads/{source_branch}:{source_remote_ref}",
+                        cwd=workspace_path,
+                        timeout=settings.GIT_FETCH_TIMEOUT,
+                        project_key=_proj_key,
+                    )
+                    source_commit_sha = (
+                        await git("rev-parse", source_remote_ref, cwd=workspace_path)
+                    ).strip()
                 except RuntimeError:
                     pass
             if not source_commit_sha:
-                await _report({"merge_outcome": "conflict_needs_human"}, status="failed", error="Cannot resolve source commit SHA")
+                await _report(
+                    {
+                        "merge_outcome": "precheck_failed",
+                        "failure_code": "source_commit_unavailable",
+                        "ai_resolution_notes": (
+                            "Cannot resolve source commit SHA for "
+                            f"{source_branch or 'the configured source branch'}"
+                        ),
+                    },
+                    status="failed",
+                    error="Cannot resolve source commit SHA",
+                )
                 return
 
             # Attempt the merge.

{forgexa_cli-1.23.0 → forgexa_cli-1.23.2}/forgexa_cli.egg-info/PKG-INFO

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

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