forgexa-cli 1.24.4__tar.gz → 1.24.6__tar.gz

{forgexa_cli-1.24.4 → forgexa_cli-1.24.6}/PKG-INFO

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

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

{forgexa_cli-1.24.4 → forgexa_cli-1.24.6}/forgexa_cli/daemon.py

@@ -870,7 +870,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.24.4"
+DAEMON_VERSION = "1.24.6"
 
 
 def _detect_client_type() -> str:
@@ -10850,7 +10850,10 @@ class RuntimeDaemon:
                 timeout=10,
             )
 
-            # Fetch latest refs.
+            # Fetch the configured integration branch explicitly. A daemon
+            # workspace is a shallow single-branch clone, so a plain fetch may
+            # leave origin/<integration_branch> at a stale commit after a user
+            # resolves and manually merges a conflict on that branch.
             await git(
                 "fetch",
                 "origin",
@@ -10858,6 +10861,16 @@ class RuntimeDaemon:
                 timeout=settings.GIT_FETCH_TIMEOUT,
                 project_key=_proj_key,
             )
+            if integration_branch:
+                integration_remote_ref = f"refs/remotes/origin/{integration_branch}"
+                await git(
+                    "fetch",
+                    "origin",
+                    f"+refs/heads/{integration_branch}:{integration_remote_ref}",
+                    cwd=workspace_path,
+                    timeout=settings.GIT_FETCH_TIMEOUT,
+                    project_key=_proj_key,
+                )
 
             # Determine base SHA: use recorded base, else the integration
             # branch's current HEAD (NOT the default branch — the first merge
@@ -11271,7 +11284,10 @@ class RuntimeDaemon:
         except Exception as exc:
             logger.error("deployment_merge: job %s exception: %s", job_id, exc)
             await _report(
-                {"merge_outcome": "conflict_needs_human"},
+                {
+                    "merge_outcome": "merge_execution_failed",
+                    "failure_code": "merge_execution_failed",
+                },
                 status="failed",
                 error=str(exc),
             )

{forgexa_cli-1.24.4 → forgexa_cli-1.24.6}/forgexa_cli.egg-info/PKG-INFO

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

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