forgexa-cli 1.18.10__tar.gz → 1.18.12__tar.gz

{forgexa_cli-1.18.10 → forgexa_cli-1.18.12}/PKG-INFO

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

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

{forgexa_cli-1.18.10 → forgexa_cli-1.18.12}/forgexa_cli/daemon.py

@@ -555,7 +555,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.18.10"
+DAEMON_VERSION = "1.18.12"
 
 
 def _detect_client_type() -> str:
@@ -7306,6 +7306,43 @@ class RuntimeDaemon:
         result.metrics["recovered_from_timeout_uncommitted_changes"] = True
         return True
 
+    async def _discard_verification_scope_changes(
+        self,
+        workspace_path: Path,
+        task: TaskInfo,
+        result: TaskResult,
+        before_sha: str,
+    ) -> None:
+        """Discard protected analysis changes from a failed verification task."""
+        if not bool((task.input_data or {}).get("verification_work_item")):
+            return
+
+        forbidden_paths = sorted(
+            path
+            for path in ProcessManager._normalize_repo_paths(result.files_changed)
+            if _is_requirement_analysis_path(path)
+        )
+        if not forbidden_paths:
+            return
+
+        try:
+            await self.workspace_manager._git(
+                "reset", "--hard", before_sha or "HEAD", cwd=workspace_path,
+            )
+            await self.workspace_manager._git(
+                "clean", "-f", "--", *forbidden_paths, cwd=workspace_path,
+            )
+            logger.warning(
+                "Discarded verification scope-violation changes for task %s: %s",
+                task.task_id,
+                forbidden_paths,
+            )
+        except Exception:
+            logger.exception(
+                "Failed to discard verification scope-violation changes for task %s",
+                task.task_id,
+            )
+
     async def _execute_task(self, task: TaskInfo, conn: ServerConnection):
         """Execute a single task, reporting to the originating server connection."""
         reporter = conn.reporter
@@ -7783,6 +7820,7 @@ class RuntimeDaemon:
                     result = await self._validate_and_retry(
                         agent, task, workspace_path, result,
                         reporter, on_output_chunk, max_retries=2,
+                        default_branch=default_branch, before_sha=node_before_sha,
                     )
                     # Re-collect git info if validation triggered retries
                     if result.metrics.get("validation_issues") is not None or True:
@@ -7790,6 +7828,11 @@ class RuntimeDaemon:
                 except Exception:
                     logger.exception("Validation gate error for task %s (proceeding anyway)", task.task_id)
 
+            if result.failure_code == "verification_work_item_scope_violation":
+                await self._discard_verification_scope_changes(
+                    workspace_path, task, result, node_before_sha,
+                )
+
             # 4.6 Post-validation rate-limit fallback.
             # _validate_and_retry returns early (preserving the rate-limit error)
             # when the agent hits a quota wall mid-retry.  The initial-run fallback
@@ -7831,6 +7874,7 @@ class RuntimeDaemon:
                                 result = await self._validate_and_retry(
                                     agent, task, workspace_path, result,
                                     reporter, on_output_chunk, max_retries=2,
+                                    default_branch=default_branch, before_sha=node_before_sha,
                                 )
                                 pre_commit_git = await self.process_manager._collect_git_info(workspace_path)
                             except Exception:
@@ -8793,6 +8837,8 @@ class RuntimeDaemon:
         reporter: "ProgressReporter",
         on_chunk: Any,
         max_retries: int = 2,
+        default_branch: str = "",
+        before_sha: str = "",
     ) -> TaskResult:
         """Validate agent output and retry with fix prompt if issues found.
 
@@ -8804,6 +8850,16 @@ class RuntimeDaemon:
         Returns the (possibly updated) TaskResult.
         """
         for attempt in range(max_retries):
+            if before_sha and bool((task.input_data or {}).get("verification_work_item")):
+                committed_git = await self.process_manager._collect_git_info_vs_parent(
+                    workspace_path,
+                    default_branch=default_branch,
+                    before_sha=before_sha,
+                )
+                result.files_changed = sorted(
+                    set(result.files_changed)
+                    | set(committed_git.get("files_changed") or [])
+                )
             issues = self._validate_outputs(workspace_path, task, result)
             if not issues:
                 return result  # All validations passed
@@ -8892,27 +8948,46 @@ class RuntimeDaemon:
                 return result
 
         # Final check after all retries
+        if before_sha and bool((task.input_data or {}).get("verification_work_item")):
+            committed_git = await self.process_manager._collect_git_info_vs_parent(
+                workspace_path,
+                default_branch=default_branch,
+                before_sha=before_sha,
+            )
+            result.files_changed = sorted(
+                set(result.files_changed)
+                | set(committed_git.get("files_changed") or [])
+            )
         remaining = self._validate_outputs(workspace_path, task, result)
         if remaining:
             # Distinguish critical issues (no output produced) from minor ones (syntax)
+            scope_violations = [
+                issue
+                for issue in remaining
+                if issue.startswith("Verification work item modified requirement analysis assets:")
+            ]
             critical_patterns = ("missing", "not found", "is empty")
             critical_issues = [
                 iss for iss in remaining
                 if any(p in iss.lower() for p in critical_patterns)
             ]
-            if critical_issues:
+            if critical_issues or scope_violations:
                 # Agent didn't produce required output — mark as failed
                 logger.warning(
                     "Validation gate: %d critical issues remain after %d retries for task %s — "
                     "marking as failed:\n%s",
-                    len(critical_issues), max_retries, task.task_id,
-                    "\n".join(f"  - {iss}" for iss in critical_issues),
+                    len(critical_issues) + len(scope_violations), max_retries, task.task_id,
+                    "\n".join(f"  - {iss}" for iss in critical_issues + scope_violations),
                 )
                 result.status = "failed"
-                result.error = (
-                    f"Agent failed to produce required output after {max_retries} retries: "
-                    + "; ".join(critical_issues[:3])
-                )
+                if scope_violations:
+                    result.failure_code = "verification_work_item_scope_violation"
+                    result.error = "; ".join(scope_violations[:3])
+                else:
+                    result.error = (
+                        f"Agent failed to produce required output after {max_retries} retries: "
+                        + "; ".join(critical_issues[:3])
+                    )
             else:
                 # Non-critical issues (syntax warnings) — proceed with warning
                 logger.warning(

{forgexa_cli-1.18.10 → forgexa_cli-1.18.12}/forgexa_cli.egg-info/PKG-INFO

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

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