forgexa-cli 1.29.2__tar.gz → 1.29.4__tar.gz

{forgexa_cli-1.29.2 → forgexa_cli-1.29.4}/PKG-INFO

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

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

{forgexa_cli-1.29.2 → forgexa_cli-1.29.4}/forgexa_cli/daemon.py

@@ -910,7 +910,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.29.2"
+DAEMON_VERSION = "1.29.4"
 
 
 def _detect_client_type() -> str:
@@ -3467,11 +3467,13 @@ class WorkspaceManager:
 
         if ws_path.exists():
             # Validate that this worktree is healthy (its .git file points to a
-            # valid main repo).  Worktrees break when directories are moved.
+            # valid main repo and has no stale Git index lock. Worktrees break
+            # when directories are moved or an interrupted Git process leaves
+            # its index locked.
             if not await self._is_healthy_worktree(
                 ws_path,
                 main_repo=main_repo,
-                require_unlocked=fresh_start,
+                require_unlocked=True,
             ):
                 logger.warning("Broken worktree detected at %s — removing and recreating", ws_path)
                 await self._remove_broken_worktree(main_repo, ws_path, workspace_key)
@@ -10098,6 +10100,13 @@ class RuntimeDaemon:
         source_branch = input_ctx.get("source_branch", "")
         base_integration_sha = input_ctx.get("base_integration_sha")
         default_branch = input_ctx.get("default_branch", "main")
+        requirement_key = str(input_ctx.get("requirement_key") or "").strip()
+        if not re.fullmatch(r"[A-Za-z0-9][A-Za-z0-9._-]*", requirement_key):
+            requirement_key = ""
+        prior_requirement_source_shas = [
+            sha for sha in input_ctx.get("prior_requirement_source_shas", [])
+            if isinstance(sha, str) and re.fullmatch(r"[0-9a-fA-F]{40}", sha)
+        ]
         agent_type = input_ctx.get("agent_type", "claude")
         fallback_chain = input_ctx.get("fallback_chain", [])
         timeout_seconds = min(int(input_ctx.get("timeout_seconds", 300)), 300)
@@ -10281,6 +10290,53 @@ class RuntimeDaemon:
             except RuntimeError:
                 diff_u = ""
             conflicted_files = [f.strip() for f in diff_u.strip().splitlines() if f.strip()]
+            replayed_artifact_paths: list[str] = []
+
+            artifact_prefix = f"docs/requirements/{requirement_key}/"
+            if (
+                conflicted_files
+                and requirement_key
+                and prior_requirement_source_shas
+                and all(path.startswith(artifact_prefix) for path in conflicted_files)
+            ):
+                try:
+                    conflict_status = await git("status", "--porcelain", cwd=workspace_path)
+                except RuntimeError:
+                    conflict_status = ""
+                add_add_paths = {
+                    line[3:].strip()
+                    for line in conflict_status.splitlines()
+                    if line.startswith("AA ")
+                }
+                if all(path in add_add_paths for path in conflicted_files):
+                    for prior_source_sha in prior_requirement_source_shas:
+                        try:
+                            await git(
+                                "merge-base", "--is-ancestor", prior_source_sha, base_ref,
+                                cwd=workspace_path,
+                            )
+                        except RuntimeError:
+                            continue
+                        for conflict_path in conflicted_files:
+                            await git(
+                                "checkout", "--theirs", "--", conflict_path,
+                                cwd=workspace_path,
+                            )
+                            await git("add", "--", conflict_path, cwd=workspace_path)
+                        await git(
+                            "-c", f"user.name={_git_name}",
+                            "-c", f"user.email={_git_email}",
+                            "commit", "--no-edit",
+                            cwd=workspace_path,
+                        )
+                        replayed_artifact_paths = list(conflicted_files)
+                        conflicted_files = []
+                        merge_conflicted = False
+                        logger.info(
+                            "deployment_merge: job %s replaced %d replayed requirement artifacts",
+                            job_id, len(replayed_artifact_paths),
+                        )
+                        break
 
             resolved_agent_id: str | None = None
             if merge_conflicted or conflicted_files:
@@ -10590,6 +10646,9 @@ class RuntimeDaemon:
             if resolved_agent_id:
                 outcome = "ai_resolved"
                 step_msg = f"AI resolved merge via {resolved_agent_id}"
+            elif replayed_artifact_paths:
+                outcome = "clean_merged"
+                step_msg = "Replaced replayed requirement artifacts"
             else:
                 outcome = "clean_merged"
                 step_msg = "Merge completed cleanly"
@@ -10611,6 +10670,11 @@ class RuntimeDaemon:
                 "merge_commit_sha": candidate_sha,
                 "base_integration_sha": base_ref,
                 "source_commit_sha": source_commit_sha,
+                "ai_resolution_notes": (
+                    f"Replaced {len(replayed_artifact_paths)} replayed requirement artifacts "
+                    f"under {artifact_prefix} from the new source commit."
+                    if replayed_artifact_paths else None
+                ),
             })
 
         except Exception as exc:

{forgexa_cli-1.29.2 → forgexa_cli-1.29.4}/forgexa_cli.egg-info/PKG-INFO

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

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