forgexa-cli 1.57.7__tar.gz → 1.58.1__tar.gz

{forgexa_cli-1.57.7 → forgexa_cli-1.58.1}/PKG-INFO

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

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

{forgexa_cli-1.57.7 → forgexa_cli-1.58.1}/forgexa_cli/agent_core.py

@@ -816,6 +816,30 @@ class AgentDiscovery:
             os.environ["PATH"] = os.pathsep.join(additions) + os.pathsep + current
             logger.debug("Expanded PATH with: %s", ", ".join(additions))
 
+    @staticmethod
+    def _wsl_windows_executable(path: str) -> bool:
+        """Reject a Windows-side agent before its version probe can run via WSL interop."""
+        if sys.platform != "linux" or not os.environ.get("WSL_DISTRO_NAME"):
+            return False
+        resolved = Path(path).resolve()
+        if resolved.suffix.lower() in {".exe", ".cmd", ".bat"}:
+            return True
+        parts = resolved.parts
+        if len(parts) >= 3 and parts[1] == "mnt" and len(parts[2]) == 1 and parts[2].isalpha():
+            return True
+        # A custom DrvFs mount need not live under /mnt/<drive>.
+        try:
+            mounts = Path("/proc/mounts").read_text(encoding="utf-8")
+        except OSError:
+            return False
+        for line in mounts.splitlines():
+            fields = line.split()
+            if len(fields) >= 3 and fields[2] in {"9p", "drvfs"}:
+                mount = Path(fields[1].replace("\\040", " "))
+                if resolved == mount or mount in resolved.parents:
+                    return True
+        return False
+
     async def discover(self) -> list[DiscoveredAgent]:
         self._expand_path()
         # Probe bwrap support once at discovery time and log a clear warning
@@ -827,6 +851,9 @@ class AgentDiscovery:
             cmd = custom_path or spec["commands"][0]
             resolved = shutil.which(cmd)
             if resolved:
+                if self._wsl_windows_executable(resolved):
+                    logger.warning("Agent %s resolved only to a Windows executable inside WSL; skipping", agent_id)
+                    continue
                 version = await self._get_version(spec["detect"], resolved)
                 if version is None and "detect_alt" in spec:
                     # Primary detect command failed; try the alternative.
@@ -877,6 +904,8 @@ class AgentDiscovery:
         "binary found but not functional".
         """
         import re
+        probe_dir = None
+        proc = None
         try:
             parts = detect_cmd.split()
             if executable:
@@ -886,11 +915,17 @@ class AgentDiscovery:
                 if resolved:
                     parts[0] = resolved
             parts = _prepare_agent_command(parts, preserve_argv=False)
+            env = None
+            if detect_cmd in ("opencode --version", "mimo --version"):
+                probe_dir = tempfile.TemporaryDirectory(prefix=f"forgexa-{detect_cmd.split()[0]}-probe-")
+                env = os.environ.copy()
+                env.update(TMPDIR=probe_dir.name, BUN_TMPDIR=probe_dir.name)
             proc = await asyncio.create_subprocess_exec(
                 *parts,
                 stdin=asyncio.subprocess.DEVNULL,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
+                env=env,
                 **_agent_process_group_kwargs(),
             )
             stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=10)
@@ -918,11 +953,19 @@ class AgentDiscovery:
                 )
                 return None
             return output
+        except asyncio.CancelledError:
+            raise
         except Exception as exc:
             logger.warning(
                 "Version check for %r raised %s: %s", detect_cmd, type(exc).__name__, exc,
             )
             return None
+        finally:
+            if proc is not None and proc.returncode is None:
+                _kill_proc(proc)
+                await proc.wait()
+            if probe_dir is not None:
+                probe_dir.cleanup()
 
     @staticmethod
     async def _probe_bwrap_support() -> None:

{forgexa_cli-1.57.7 → forgexa_cli-1.58.1}/forgexa_cli/daemon.py

@@ -1150,7 +1150,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.57.7"
+DAEMON_VERSION = "1.58.1"
 
 
 def _detect_client_type() -> str:
@@ -2899,11 +2899,21 @@ class WorkspaceManager:
         self._ssh_keys[project_key] = ssh_private_key
 
     @staticmethod
-    def _summarize_git_error(error: Exception) -> str:
+    def _summarize_git_error(error: Exception, *, tail: bool = False) -> str:
         """Return a compact Git error without exposing embedded HTTPS credentials."""
         detail = " ".join(str(error).split())
         detail = re.sub(r"(https?://)[^/@\s]+@", r"\1***@", detail)
-        return detail[:500]
+        return detail[-500:] if tail else detail[:500]
+
+    @staticmethod
+    def _git_push_diagnostic(error: Exception) -> str:
+        detail = str(error).replace("\r\n", "\n").replace("\r", "\n")
+        detail = re.sub(r"(https?://)[^/@\s]+@", r"\1***@", detail)
+        if len(detail) <= 16_000:
+            return detail
+        beginning, ending = detail[:1000], detail[-14_800:]
+        omitted = len(detail) - len(beginning) - len(ending)
+        return f"{beginning}\n... [{omitted} earlier characters omitted] ...\n{ending}"
 
     def _migrate_legacy_project_dirs(self) -> None:
         """Move project directories from root/ to root/projects/ (one-time migration).
@@ -6699,6 +6709,7 @@ class ProcessManager:
                     data_home=tmp_data_root,
                     require_windows_shell=True,
                 )
+                env.update(TMPDIR=tmp_data_root, BUN_TMPDIR=tmp_data_root)
             except RuntimeError as exc:
                 return TaskResult(
                     status="failed",
@@ -6792,6 +6803,7 @@ class ProcessManager:
                 prompt_file=prompt_file,
             )
             env = agent_core.mimo_base_env(os.environ.copy())
+            env.update(TMPDIR=tmp_root, BUN_TMPDIR=tmp_root)
             result = await self._run_cli(
                 cmd, cwd, timeout, task_id, on_chunk=on_chunk, env=env,
             )
@@ -7900,6 +7912,7 @@ class ProcessManager:
         env: dict | None = None,
         stream_stderr: bool = False,
     ) -> TaskResult:
+        proc = None
         try:
             cmd = _prepare_agent_command(cmd)
             proc = await asyncio.create_subprocess_exec(
@@ -7938,7 +7951,8 @@ class ProcessManager:
                 failure_code="agent_launch_not_found",
             )
         except asyncio.TimeoutError as exc:
-            _kill_proc(self.active_processes.pop(task_id, None) or proc)
+            if proc is not None:
+                _kill_proc(proc)
             _err = (
                 f"Agent produced no stdout, stderr, or workspace changes for "
                 f"{exc.idle_seconds:.0f}s — process terminated. Inspect retained "
@@ -7954,16 +7968,14 @@ class ProcessManager:
             )
         except Exception as exc:
             logger.exception("CLI stream error for task %s", task_id)
-            if task_id in self.active_processes:
-                try:
-                    self.active_processes[task_id].kill()
-                except Exception:
-                    pass
             return TaskResult(
                 status="failed", exit_code=-1, stdout="", stderr="",
                 error=f"Stream processing error: {exc}",
             )
         finally:
+            if proc is not None and proc.returncode is None:
+                _kill_proc(proc)
+                await proc.wait()
             self.active_processes.pop(task_id, None)
 
     def _parse_claude_output(self, stdout: str) -> dict:
@@ -17715,6 +17727,41 @@ class RuntimeDaemon:
 
                     if remote_ahead:
                         remote_count = len(remote_ahead.splitlines())
+                        if (
+                            task is not None
+                            and task.workspace_resolution == "cloud_worktree"
+                            and task.node_type == "analysis"
+                            and task.input_data.get("analysis_mode") == "fresh"
+                            and task.requirement_key
+                            and branch == f"feature/{task.requirement_key}"
+                        ):
+                            default_branch = task.project.get("default_branch") or "main"
+                            try:
+                                await git(
+                                    "merge-base", "--is-ancestor", f"origin/{default_branch}",
+                                    "HEAD", cwd=workspace_path,
+                                )
+                                if await self.workspace_manager._branch_has_impl_commits(
+                                    workspace_path, branch, default_branch,
+                                ):
+                                    return (
+                                        f"Push blocked: remote branch '{branch}' contains "
+                                        "implementation commits; fresh analysis cannot replace it."
+                                    )
+                                remote_sha = (await git(
+                                    "rev-parse", "--verify", f"refs/remotes/origin/{branch}",
+                                    cwd=workspace_path,
+                                )).strip()
+                                await git(
+                                    "push", f"--force-with-lease=refs/heads/{branch}:{remote_sha}",
+                                    "-u", "origin", branch, cwd=workspace_path,
+                                    project_key=project_key, timeout=settings.GIT_PUSH_TIMEOUT,
+                                )
+                                logger.info("Pushed fresh analysis branch %s with exact lease", branch)
+                                return None
+                            except RuntimeError as exc:
+                                detail = self.workspace_manager._git_push_diagnostic(exc)
+                                return f"Fresh analysis push blocked for branch '{branch}': {detail}"
                         # Divergence detected — but this is expected after rebase.
                         # Check if the remote commits are already incorporated
                         # (i.e., their patches are empty against our branch, meaning
@@ -17922,8 +17969,8 @@ class RuntimeDaemon:
                                         f"Push refused: remote branch '{branch}' has {remote_count} "
                                         f"commit(s) not in local history, rebase (-X theirs) failed, "
                                         f"and force-with-lease fallback also failed. "
-                                        f"Rebase error: {rebase_exc_str[:200]} | "
-                                        f"Force error: {force_exc_str[:200]}"
+                                        f"Rebase error:\n{self.workspace_manager._git_push_diagnostic(rebase_exc)}\n"
+                                        f"Force error:\n{self.workspace_manager._git_push_diagnostic(force_exc)}"
                                     )
 
                     logger.info("Found unpushed commits on %s, pushing...", branch)

{forgexa_cli-1.57.7 → forgexa_cli-1.58.1}/forgexa_cli.egg-info/PKG-INFO

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

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