forgexa-cli 1.8.5__tar.gz → 1.8.6__tar.gz

{forgexa_cli-1.8.5 → forgexa_cli-1.8.6}/PKG-INFO

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

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

{forgexa_cli-1.8.5 → forgexa_cli-1.8.6}/forgexa_cli/daemon.py

@@ -392,7 +392,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.8.5"
+DAEMON_VERSION = "1.8.6"
 
 
 def _detect_client_type() -> str:
@@ -5939,11 +5939,16 @@ class RuntimeDaemon:
                                     "fetch", "origin", branch,
                                     cwd=workspace_path,
                                 )
-                                # 2. Rebase local commits onto the updated remote HEAD
+                                # 2. Rebase local commits onto the updated remote HEAD.
+                                #    Use -X theirs so that when the same file was modified by
+                                #    a previous agent run AND the current run (e.g. analysis
+                                #    docs, PRD), git automatically accepts the current run's
+                                #    version.  This is correct: on an agent-managed feature
+                                #    branch the latest agent output is always authoritative.
                                 await git(
                                     "-c", "user.name=Forgexa Agent",
                                     "-c", "user.email=agent@forgexa.net",
-                                    "rebase", f"origin/{branch}",
+                                    "rebase", "-X", "theirs", f"origin/{branch}",
                                     cwd=workspace_path,
                                 )
                                 # 3. Push normally (no force needed — we're ahead of origin now)
@@ -5953,7 +5958,7 @@ class RuntimeDaemon:
                                 )
                                 logger.info(
                                     "Fetch+rebase recovery succeeded for branch %s "
-                                    "(%d remote commit(s) incorporated)",
+                                    "(%d remote commit(s) incorporated via rebase -X theirs)",
                                     branch, remote_count,
                                 )
                                 return None
@@ -5964,17 +5969,38 @@ class RuntimeDaemon:
                                     await git("rebase", "--abort", cwd=workspace_path)
                                 except RuntimeError:
                                     pass
-                                logger.error(
-                                    "Fetch+rebase recovery failed for branch %s: %s — "
-                                    "refusing push to protect remote work",
+                                logger.warning(
+                                    "Fetch+rebase (-X theirs) recovery failed for branch %s: %s — "
+                                    "falling back to --force-with-lease (we just fetched, safe)",
                                     branch, rebase_exc_str,
                                 )
-                                return (
-                                    f"Push refused: remote branch '{branch}' has {remote_count} "
-                                    f"commit(s) not in local history, and automatic rebase failed "
-                                    f"(likely a merge conflict). Manual resolution required. "
-                                    f"Details: {rebase_exc_str[:300]}"
-                                )
+                                # Fallback: --force-with-lease is safe here because we just ran
+                                # `git fetch origin {branch}`, so our lease ref is current.
+                                # Agent-managed feature branches have no concurrent human writers,
+                                # so the latest agent run always wins.
+                                try:
+                                    await git(
+                                        "push", "--force-with-lease", "-u", "origin", branch,
+                                        cwd=workspace_path, project_key=project_key,
+                                    )
+                                    logger.info(
+                                        "Force-with-lease fallback push succeeded for branch %s",
+                                        branch,
+                                    )
+                                    return None
+                                except RuntimeError as force_exc:
+                                    force_exc_str = str(force_exc)
+                                    logger.error(
+                                        "Force-with-lease fallback also failed for branch %s: %s",
+                                        branch, force_exc_str,
+                                    )
+                                    return (
+                                        f"Push refused: remote branch '{branch}' has {remote_count} "
+                                        f"commit(s) not in local history, rebase (-X theirs) failed, "
+                                        f"and force-with-lease fallback also failed. "
+                                        f"Rebase error: {rebase_exc_str[:200]} | "
+                                        f"Force error: {force_exc_str[:200]}"
+                                    )
 
                     logger.info("Found unpushed commits on %s, pushing...", branch)
                     last_push_exc: Exception | None = None

{forgexa_cli-1.8.5 → forgexa_cli-1.8.6}/forgexa_cli.egg-info/PKG-INFO

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

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