forgexa-cli 1.10.1__tar.gz → 1.10.3__tar.gz

{forgexa_cli-1.10.1 → forgexa_cli-1.10.3}/PKG-INFO

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

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

{forgexa_cli-1.10.1 → forgexa_cli-1.10.3}/forgexa_cli/daemon.py

@@ -396,7 +396,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.10.1"
+DAEMON_VERSION = "1.10.3"
 
 
 def _detect_client_type() -> str:
@@ -648,6 +648,31 @@ class TaskResult:
     git: dict = field(default_factory=dict)
 
 
+def _resolve_git_author(project: dict) -> tuple[str, str]:
+    """Resolve git commit author (name, email) using a fallback chain.
+
+    Priority:
+      1. Task triggering user  — populated by the API server from ``graph.triggered_by``
+         (the human who submitted/re-triggered the workflow).
+      2. Runtime owner user    — populated by the API server from ``runtime.owner``
+         (the user who registered this daemon).
+      3. Hardcoded fallback    — ``"Forgexa Agent" / "agent@forgexa.net"``
+         (backwards-compatible default when neither is available).
+
+    Using real user identities makes commits auditable: customers can trace
+    each automated commit back to the person who initiated the workflow.
+    """
+    name = (project.get("triggered_by_git_name") or "").strip()
+    email = (project.get("triggered_by_git_email") or "").strip()
+    if name and email:
+        return name, email
+    name = (project.get("runtime_owner_git_name") or "").strip()
+    email = (project.get("runtime_owner_git_email") or "").strip()
+    if name and email:
+        return name, email
+    return "Forgexa Agent", "agent@forgexa.net"
+
+
 # ── Type-aware analysis outputs (inline fallback for standalone daemons) ──
 # Mirrors type_workflow_profiles.py — used when import is unavailable (CLI/Desktop).
 _ANALYSIS_OUTPUTS_BY_TYPE: dict[str, list[str]] = {
@@ -1206,9 +1231,10 @@ class WorkspaceManager:
                 readme = ws_path / "README.md"
                 readme.write_text(f"# {project_key}\n\nInitialized by Forgexa.\n")
                 await self._git("add", ".", cwd=ws_path)
+                _git_name, _git_email = _resolve_git_author(project)
                 await self._git(
-                    "-c", "user.name=Forgexa Agent",
-                    "-c", "user.email=agent@forgexa.net",
+                    "-c", f"user.name={_git_name}",
+                    "-c", f"user.email={_git_email}",
                     "commit", "-m", "Initial commit",
                     cwd=ws_path,
                 )
@@ -4569,9 +4595,10 @@ class RuntimeDaemon:
                                 # Remove physical files
                                 shutil.rmtree(str(dir_to_wipe), ignore_errors=True)
                                 # Commit the wipe so the branch diff is clean
+                                _git_name, _git_email = _resolve_git_author(task.project)
                                 await self._git(
-                                    "-c", "user.name=Forgexa Agent",
-                                    "-c", "user.email=agent@forgexa.net",
+                                    "-c", f"user.name={_git_name}",
+                                    "-c", f"user.email={_git_email}",
                                     "commit", "-m",
                                     f"cleanup: wipe analysis docs in {output_dir_norm} before fresh re-analysis",
                                     cwd=workspace_path,
@@ -5106,13 +5133,23 @@ class RuntimeDaemon:
 
             # Analysis deliverables live in analysis_output_dir (docs/requirements/...)
             _input = task.input_data or {}
-            doc_dir = (
-                _input.get("analysis_output_dir")
-                or _input.get("context", {}).get("analysis_output_dir")
-                or _input.get("output_dir")
-                or _input.get("context", {}).get("output_dir")
-                or ""
-            )
+            _top_dir = (_input.get("analysis_output_dir") or "").replace("\\", "/").rstrip("/")
+            _ctx_dir = ((_input.get("context") or {}).get("analysis_output_dir") or "").replace("\\", "/").rstrip("/")
+            # Prefer the deeper (v2) path — context always has the authoritative
+            # req_analysis_dir() value while the top-level field may contain a
+            # stale v1 path (e.g. "docs/requirements/KEY") from nodes created
+            # before the Phase 2 doc-paths migration (2026-06-10).
+            if _ctx_dir and len(_ctx_dir.split("/")) > len(_top_dir.split("/")):
+                doc_dir = _ctx_dir
+            elif _top_dir:
+                doc_dir = _top_dir
+            else:
+                doc_dir = (
+                    _ctx_dir
+                    or _input.get("output_dir")
+                    or (_input.get("context") or {}).get("output_dir")
+                    or ""
+                )
             if doc_dir:
                 base = workspace_path / doc_dir
             else:
@@ -5561,11 +5598,22 @@ class RuntimeDaemon:
 
             # Build a targeted fix prompt: original task + validation issues.
             _input = task.input_data or {}
-            _fix_doc_dir = (
-                _input.get("output_dir")
-                or _input.get("context", {}).get("output_dir")
-                or ""
-            )
+            # For analysis nodes prefer analysis_output_dir (may be v2 while output_dir
+            # is still a stale v1 path in pre-migration nodes).
+            if task.node_type == "analysis":
+                _fix_doc_dir = (
+                    _input.get("analysis_output_dir")
+                    or (_input.get("context") or {}).get("analysis_output_dir")
+                    or _input.get("output_dir")
+                    or (_input.get("context") or {}).get("output_dir")
+                    or ""
+                )
+            else:
+                _fix_doc_dir = (
+                    _input.get("output_dir")
+                    or (_input.get("context") or {}).get("output_dir")
+                    or ""
+                )
             fix_prompt = (
                 f"{original_prompt}\n\n"
                 "---\n\n"
@@ -5787,13 +5835,15 @@ class RuntimeDaemon:
                 except Exception as msg_err:
                     logger.warning("Failed to build rich commit message: %s — using fallback", msg_err)
                     commit_msg = f"{task.node_type}({task.requirement_key or task.task_id}): {display_title}"
+                _git_name, _git_email = _resolve_git_author(task.project)
                 proc = await asyncio.create_subprocess_exec(
                     "git", "commit", "-m", commit_msg,
                     cwd=str(workspace_path),
                     stdout=asyncio.subprocess.PIPE,
                     stderr=asyncio.subprocess.PIPE,
-                    env={**os.environ, "GIT_AUTHOR_NAME": "Forgexa Agent", "GIT_AUTHOR_EMAIL": "agent@forgexa.net",
-                         "GIT_COMMITTER_NAME": "Forgexa Agent", "GIT_COMMITTER_EMAIL": "agent@forgexa.net"},
+                    env={**os.environ,
+                         "GIT_AUTHOR_NAME": _git_name, "GIT_AUTHOR_EMAIL": _git_email,
+                         "GIT_COMMITTER_NAME": _git_name, "GIT_COMMITTER_EMAIL": _git_email},
                 )
                 await proc.communicate()
                 has_new_commit = True
@@ -5833,7 +5883,7 @@ class RuntimeDaemon:
                 return {"push_error": f"Would push to default branch {current_branch}"}
 
             # ── Push ──
-            push_error = await self._push_branch(workspace_path, project_key)
+            push_error = await self._push_branch(workspace_path, project_key, task=task)
             if push_error:
                 return {"push_error": push_error}
             return {}
@@ -6127,6 +6177,7 @@ class RuntimeDaemon:
         """
         git = self.workspace_manager._git
         target = f"origin/{default_branch}"
+        _git_name, _git_email = _resolve_git_author(task.project)
 
         # Fetch latest remote state
         try:
@@ -6174,8 +6225,8 @@ class RuntimeDaemon:
             # ── Tier 1: rebase (safe — branch not yet on remote) ──
             try:
                 await git(
-                    "-c", "user.name=Forgexa Agent",
-                    "-c", "user.email=agent@forgexa.net",
+                    "-c", f"user.name={_git_name}",
+                    "-c", f"user.email={_git_email}",
                     "rebase", target,
                     cwd=workspace_path, timeout=120,
                 )
@@ -6197,8 +6248,8 @@ class RuntimeDaemon:
         # ── Tier 2: merge ──
         try:
             await git(
-                "-c", "user.name=Forgexa Agent",
-                "-c", "user.email=agent@forgexa.net",
+                "-c", f"user.name={_git_name}",
+                "-c", f"user.email={_git_email}",
                 "merge", target, "--no-edit",
                 cwd=workspace_path, timeout=120,
             )
@@ -6221,8 +6272,7 @@ class RuntimeDaemon:
         in a clean state and push whatever we had before.
         """
         git = self.workspace_manager._git
-
-        # 1. List conflicted files
+        _git_name, _git_email = _resolve_git_author(task.project)
         try:
             diff_out = await git(
                 "diff", "--name-only", "--diff-filter=U", cwd=workspace_path,
@@ -6235,8 +6285,8 @@ class RuntimeDaemon:
             # No actual conflicts (merge completed or something unusual)
             try:
                 await git(
-                    "-c", "user.name=Forgexa Agent",
-                    "-c", "user.email=agent@forgexa.net",
+                    "-c", f"user.name={_git_name}",
+                    "-c", f"user.email={_git_email}",
                     "merge", "--continue", cwd=workspace_path,
                 )
             except RuntimeError:
@@ -6361,8 +6411,8 @@ class RuntimeDaemon:
             await git("add", "-A", cwd=workspace_path)
             try:
                 await git(
-                    "-c", "user.name=Forgexa Agent",
-                    "-c", "user.email=agent@forgexa.net",
+                    "-c", f"user.name={_git_name}",
+                    "-c", f"user.email={_git_email}",
                     "commit", "--no-edit",
                     cwd=workspace_path,
                 )
@@ -6378,9 +6428,13 @@ class RuntimeDaemon:
             except RuntimeError:
                 await git("reset", "--hard", "HEAD", cwd=workspace_path)
 
-    async def _push_branch(self, workspace_path: Path, project_key: str = "default") -> str | None:
+    async def _push_branch(
+        self, workspace_path: Path, project_key: str = "default",
+        task: "TaskInfo | None" = None,
+    ) -> str | None:
         """Push the current branch to origin. Returns error message on failure, None on success."""
         git = self.workspace_manager._git
+        _git_name, _git_email = _resolve_git_author(task.project if task else {})
         try:
             # Get current branch name
             branch = (await git("rev-parse", "--abbrev-ref", "HEAD", cwd=workspace_path)).strip()
@@ -6517,8 +6571,8 @@ class RuntimeDaemon:
                                             cwd=workspace_path,
                                         )
                                         await git(
-                                            "-c", "user.name=Forgexa Agent",
-                                            "-c", "user.email=agent@forgexa.net",
+                                            "-c", f"user.name={_git_name}",
+                                            "-c", f"user.email={_git_email}",
                                             "cherry-pick", *new_shas,
                                             cwd=workspace_path,
                                         )
@@ -6566,8 +6620,8 @@ class RuntimeDaemon:
                                 #    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",
+                                    "-c", f"user.name={_git_name}",
+                                    "-c", f"user.email={_git_email}",
                                     "rebase", "-X", "theirs", f"origin/{branch}",
                                     cwd=workspace_path,
                                 )

{forgexa_cli-1.10.1 → forgexa_cli-1.10.3}/forgexa_cli.egg-info/PKG-INFO

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

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