forgexa-cli 1.68.1__tar.gz → 1.68.2__tar.gz

{forgexa_cli-1.68.1 → forgexa_cli-1.68.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.68.1
+Version: 1.68.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.68.1 → forgexa_cli-1.68.2}/forgexa_cli/__init__.py

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

{forgexa_cli-1.68.1 → forgexa_cli-1.68.2}/forgexa_cli/daemon.py

@@ -1234,7 +1234,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.68.1"
+DAEMON_VERSION = "1.68.2"
 
 
 def _detect_client_type() -> str:
@@ -3655,6 +3655,8 @@ class WorkspaceManager:
         Validates the daemon-private mapping entry (binding_id -> local_path),
         the directory's git remote identity, branch, and tracked changes.
         Pre-existing untracked and ignored files remain user-owned and local.
+        Uncommitted task-owned requirement artifacts are backed up locally
+        before restoring their committed baseline. User code is never reset.
         Ordinary local-bind tasks perform NO destructive git operation
         (no reset --hard, clean, branch deletion, or implicit branch switch)
         on the user's real directory. The only exception is an explicitly
@@ -3747,9 +3749,14 @@ class WorkspaceManager:
             "status", "--porcelain=v1", "--untracked-files=no", "-z", cwd=local_path,
         )
         dirty_paths = _git_status_paths(status_output)
-        if dirty_paths:
-            shown = ", ".join(dirty_paths[:20])
-            more = f" (+{len(dirty_paths) - 20} more)" if len(dirty_paths) > 20 else ""
+        recoverable_paths = self._local_requirement_artifact_paths(task, local_path)
+        user_dirty_paths = [
+            path for path in dirty_paths
+            if path not in recoverable_paths or not path.startswith("docs/requirements/")
+        ]
+        if user_dirty_paths:
+            shown = ", ".join(user_dirty_paths[:20])
+            more = f" (+{len(user_dirty_paths) - 20} more)" if len(user_dirty_paths) > 20 else ""
             raise RuntimeError(
                 "local_binding_unavailable: local directory has uncommitted tracked changes, "
                 f"refusing to overwrite user work: {shown}{more}. Commit or stash these "
@@ -3796,6 +3803,7 @@ class WorkspaceManager:
             remote_head = (
                 await self._git("rev-parse", f"origin/{target_branch}", cwd=local_path)
             ).strip()
+            await self._recover_local_requirement_artifacts(local_path, task, recoverable_paths)
             if local_head != remote_head:
                 await self._check_local_untracked_overwrites(local_path, remote_head)
                 try:
@@ -3841,6 +3849,7 @@ class WorkspaceManager:
                     f"local branch is not at origin/{default_branch}; refusing to bootstrap from "
                     "unpushed or stale history"
                 )
+            await self._recover_local_requirement_artifacts(local_path, task, recoverable_paths)
 
         if (
             task.node_type == "analysis"
@@ -3881,8 +3890,126 @@ class WorkspaceManager:
                     f"HEAD after fetch — cross-phase handoff incomplete: {', '.join(missing_shas)}"
                 )
 
+        task.local_untracked_paths = {
+            path for path in (await self._git(
+                "ls-files", "--others", "-z", cwd=local_path,
+            )).split("\0") if path
+        }
         return local_path
 
+    @staticmethod
+    def _local_requirement_artifact_paths(task: TaskInfo, local_path: Path | None = None) -> set[str]:
+        key = str(task.requirement_key or "")
+        if not re.fullmatch(r"[A-Za-z0-9][A-Za-z0-9._-]*", key):
+            return set()
+        prefix = f"docs/requirements/{key}/"
+        data = task.input_data or {}
+        context = data.get("context") or {}
+        names = {
+            name for outputs in _ANALYSIS_OUTPUTS_BY_TYPE.values() for name in outputs
+        } | {
+            "design.md", "test-cases.json", "coverage-matrix.json",
+            "test-evidence.json", "test-report.md", "release-note.md",
+        }
+        names.update(
+            _get_design_output_for_type(requirement_type)
+            for requirement_type in _ANALYSIS_OUTPUTS_BY_TYPE
+        )
+        paths: set[str] = set()
+        for values in (data, context):
+            for field_name in ("analysis_output_dir", "output_dir"):
+                directory = str(values.get(field_name) or "").replace("\\", "/").rstrip("/")
+                if (
+                    directory.startswith(prefix)
+                    and not any(part in ("", ".", "..") for part in directory.split("/"))
+                ):
+                    paths.update(f"{directory}/{name}" for name in names)
+        if local_path is not None:
+            for manifest_path in sorted(paths):
+                if not manifest_path.endswith("/test-cases.json"):
+                    continue
+                manifest_file = local_path / manifest_path
+                if not manifest_file.resolve().is_relative_to(local_path.resolve()):
+                    continue
+                try:
+                    manifest = json.loads(manifest_file.read_text(encoding="utf-8"))
+                except (OSError, ValueError, UnicodeError):
+                    continue
+                cases = manifest.get("test_cases") if isinstance(manifest, dict) else None
+                if not isinstance(cases, list):
+                    continue
+                for case in cases:
+                    if not isinstance(case, dict):
+                        continue
+                    case_id = str(case.get("id") or "")
+                    script_path = str(case.get("script_path") or "").replace("\\", "/")
+                    parts = script_path.split("/")
+                    if (
+                        re.fullmatch(r"TC-\d+", case_id)
+                        and len(parts) == 3
+                        and parts[0] == "tests"
+                        and parts[1] in ("e2e", "unit", "integration")
+                        and parts[2].startswith((case_id + "-", case_id + "."))
+                        and parts[2].endswith((".spec.ts", ".spec.js", ".test.ts", ".test.js", ".py"))
+                    ):
+                        paths.add(script_path)
+        return paths
+
+    async def _recover_local_requirement_artifacts(
+        self, local_path: Path, task: TaskInfo, recoverable_paths: set[str],
+    ) -> None:
+        if not recoverable_paths:
+            return
+        git = self._git
+        status_output = await git(
+            "status", "--porcelain=v1", "--untracked-files=all", "-z", cwd=local_path,
+        )
+        paths = sorted({
+            path for status, path in _git_status_entries(status_output)
+            if path in recoverable_paths
+            and (status == "??" or path.startswith("docs/requirements/"))
+        })
+        if not paths:
+            return
+        workspace_root = local_path.resolve()
+        if any(not (local_path / path).resolve().is_relative_to(workspace_root) for path in paths):
+            raise RuntimeError(
+                "local_binding_unavailable: requirement artifact resolves outside the local "
+                "workspace; refusing to recover files through an external symbolic link"
+            )
+        recovery_ref = f"refs/forgexa/local-artifact-recovery/{task.task_id}/{time.time_ns()}"
+        await git("check-ref-format", recovery_ref, cwd=local_path)
+        name, email = _resolve_git_author(task.project)
+        try:
+            await git(
+                "-c", f"user.name={name}", "-c", f"user.email={email}",
+                "stash", "push", "--include-untracked", "--message",
+                f"Forgexa requirement artifact recovery for {task.task_id}", "--",
+                *(f":(literal){path}" for path in paths), cwd=local_path,
+            )
+            recovery_sha = (await git("rev-parse", "refs/stash", cwd=local_path)).strip()
+            await git("update-ref", recovery_ref, recovery_sha, cwd=local_path)
+        except RuntimeError as exc:
+            raise RuntimeError(
+                "local_binding_unavailable: could not preserve uncommitted requirement "
+                "artifacts; any created backup remains in the local Git stash. "
+                "No user code was discarded."
+            ) from exc
+        _append_local_bind_output_log(task.task_id, [
+            f"[daemon] Preserved {len(paths)} unfinished requirement artifact(s) in "
+            f"{recovery_ref}; restored their committed baseline for this task. "
+            f"Recover with git stash apply --index {recovery_ref}.",
+        ])
+        logger.info("Preserved local requirement artifacts for task %s in %s", task.task_id, recovery_ref)
+        remaining_status = await git(
+            "status", "--porcelain=v1", "--untracked-files=no", "-z", cwd=local_path,
+        )
+        if _git_status_paths(remaining_status):
+            raise RuntimeError(
+                "local_binding_unavailable: tracked changes remain after requirement artifact "
+                f"recovery; no task was started. Preserved artifacts are in {recovery_ref}."
+            )
+
     async def _check_local_untracked_overwrites(self, local_path: Path, revision: str) -> None:
         untracked_paths = {
             path for path in (await self._git(

{forgexa_cli-1.68.1 → forgexa_cli-1.68.2}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.68.1
+Version: 1.68.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.68.1 → forgexa_cli-1.68.2}/pyproject.toml

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