forgexa-cli 1.25.2__tar.gz → 1.25.3__tar.gz

{forgexa_cli-1.25.2 → forgexa_cli-1.25.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.25.2
+Version: 1.25.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.25.2 → forgexa_cli-1.25.3}/forgexa_cli/__init__.py

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

{forgexa_cli-1.25.2 → forgexa_cli-1.25.3}/forgexa_cli/daemon.py

@@ -909,7 +909,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.25.2"
+DAEMON_VERSION = "1.25.3"
 
 
 def _detect_client_type() -> str:
@@ -10118,8 +10118,10 @@ class RuntimeDaemon:
             await git("checkout", "--detach", base_ref, cwd=workspace_path)
 
             # 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:
+            # refspec. Always fetch the source branch explicitly: a frozen SHA
+            # may already be known by the server but still be absent from this
+            # worktree's object database.
+            if source_branch:
                 try:
                     source_remote_ref = f"refs/remotes/origin/{source_branch}"
                     await git(
@@ -10130,9 +10132,10 @@ class RuntimeDaemon:
                         timeout=settings.GIT_FETCH_TIMEOUT,
                         project_key=_proj_key,
                     )
-                    source_commit_sha = (
-                        await git("rev-parse", source_remote_ref, cwd=workspace_path)
-                    ).strip()
+                    if not source_commit_sha:
+                        source_commit_sha = (
+                            await git("rev-parse", source_remote_ref, cwd=workspace_path)
+                        ).strip()
                 except RuntimeError:
                     pass
             if not source_commit_sha:
@@ -10150,6 +10153,27 @@ class RuntimeDaemon:
                 )
                 return
 
+            try:
+                await git(
+                    "cat-file", "-e", f"{source_commit_sha}^{{commit}}",
+                    cwd=workspace_path,
+                )
+            except RuntimeError:
+                await _report(
+                    {
+                        "merge_outcome": "precheck_failed",
+                        "failure_code": "source_commit_unavailable",
+                        "ai_resolution_notes": (
+                            "Cannot fetch frozen source commit SHA "
+                            f"{source_commit_sha} for "
+                            f"{source_branch or 'the configured source branch'}"
+                        ),
+                    },
+                    status="failed",
+                    error="Cannot resolve source commit SHA",
+                )
+                return
+
             # Attempt the merge.
             try:
                 await git(

{forgexa_cli-1.25.2 → forgexa_cli-1.25.3}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.25.2
+Version: 1.25.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.25.2 → forgexa_cli-1.25.3}/pyproject.toml

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