forgexa-cli 1.24.0__tar.gz → 1.24.2__tar.gz

{forgexa_cli-1.24.0 → forgexa_cli-1.24.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.24.0
+Version: 1.24.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.24.0 → forgexa_cli-1.24.2}/forgexa_cli/__init__.py

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

{forgexa_cli-1.24.0 → forgexa_cli-1.24.2}/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.0"
+DAEMON_VERSION = "1.24.2"
 
 
 def _detect_client_type() -> str:
@@ -10735,6 +10735,38 @@ class RuntimeDaemon:
             logger.info("deployment_merge GC: removed %d worktree(s)", removed)
         return removed
 
+    @staticmethod
+    def _scan_conflicted_files_for_markers(
+        workspace_path: Path, conflicted_files: list[str],
+    ) -> list[str]:
+        """Return the subset of ``conflicted_files`` still containing conflict
+        markers.
+
+        Scoped to files actually in conflict — a previous whole-repo ``git grep``
+        matched legitimate content (Markdown Setext H1 underlines like
+        ``Title\\n=======``, CodeMirror mode fixtures, patch context, etc.) and
+        falsely reported ``precheck_failed`` on every merge for documentation-
+        heavy projects. AI can only leave stray markers in files it touched;
+        unrelated files are not its business.
+
+        Marker detection: a real git conflict block always has ``<<<<<<<`` at
+        the start (and ``>>>>>>>`` at the end). ``=======`` alone is NOT
+        matched — it is indistinguishable from a Markdown Setext heading
+        underline and would re-introduce the false positive. The start/end
+        markers are unique enough to be definitive.
+        """
+        marker_re = re.compile(r"^(?:<<<<<<<|>>>>>>>)", re.MULTILINE)
+        found: list[str] = []
+        for fpath in conflicted_files:
+            full_path = workspace_path / fpath
+            try:
+                content = full_path.read_text(errors="replace")
+            except (OSError, UnicodeDecodeError):
+                continue
+            if marker_re.search(content):
+                found.append(fpath)
+        return found
+
     async def _execute_deployment_merge_job(self, aj: dict, conn: "ServerConnection"):
         """Execute a deployment_merge AIJob: git merge + conflict resolution.
 
@@ -10827,9 +10859,22 @@ class RuntimeDaemon:
                 project_key=_proj_key,
             )
 
-            # Determine base SHA: use recorded base, else default branch HEAD.
+            # Determine base SHA: use recorded base, else the integration
+            # branch's current HEAD (NOT the default branch — the first merge
+            # onto a manually-created integration branch must build on that
+            # branch's content, not an unrelated default branch; otherwise the
+            # candidate's history diverges from the integration branch and the
+            # FF-only promote can never succeed).
             if base_integration_sha:
                 base_ref = base_integration_sha
+            elif integration_branch:
+                try:
+                    base_ref = (await git("rev-parse", f"origin/{integration_branch}", cwd=workspace_path)).strip()
+                except RuntimeError:
+                    try:
+                        base_ref = (await git("rev-parse", f"origin/{default_branch}", cwd=workspace_path)).strip()
+                    except RuntimeError:
+                        base_ref = "HEAD"
             else:
                 try:
                     base_ref = (await git("rev-parse", f"origin/{default_branch}", cwd=workspace_path)).strip()
@@ -11125,16 +11170,12 @@ class RuntimeDaemon:
                 # deterministic precheck + reporting block below.
 
             # Deterministic precheck: scan for residual conflict markers.
-            # Applies to both clean merges and AI-resolved merges.
+            # Applies to both clean merges and AI-resolved merges. Scoped to
+            # files actually in conflict — see _scan_conflicted_files_for_markers.
             candidate_sha = (await git("rev-parse", "HEAD", cwd=workspace_path)).strip()
-            marker_proc = await asyncio.create_subprocess_exec(
-                "git", "grep", "-l", "-E", r"^(<<<<<<<|=======|>>>>>>>)",
-                cwd=str(workspace_path),
-                stdout=asyncio.subprocess.PIPE,
-                stderr=asyncio.subprocess.DEVNULL,
+            marker_files = self._scan_conflicted_files_for_markers(
+                workspace_path, conflicted_files,
             )
-            marker_stdout, _ = await marker_proc.communicate()
-            marker_files = [f.strip() for f in marker_stdout.decode().strip().splitlines() if f.strip()]
 
             if marker_files:
                 logger.warning(
@@ -11175,9 +11216,16 @@ class RuntimeDaemon:
                 return
 
             # Push the candidate commit to origin so external CI can check it
-            # out and subsequent merges can fetch it as a base.
+            # out and subsequent merges can fetch it as a base. Force-push
+            # because the candidate ref is ephemeral — a re-merge (new train
+            # round, baseline resync) produces a different commit history that
+            # is NOT a fast-forward of the previous candidate.
             try:
-                await git("push", "origin", f"HEAD:{candidate_ref}", cwd=workspace_path)
+                await git(
+                    "push", "origin", f"+HEAD:{candidate_ref}",
+                    cwd=workspace_path,
+                    timeout=settings.GIT_PUSH_TIMEOUT,
+                )
             except RuntimeError as exc:
                 logger.warning(
                     "deployment_merge: job %s candidate push failed: %s", job_id, exc,

{forgexa_cli-1.24.0 → forgexa_cli-1.24.2}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.24.0
+Version: 1.24.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.24.0 → forgexa_cli-1.24.2}/pyproject.toml

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