forgexa-cli 1.20.4__tar.gz → 1.20.5__tar.gz

{forgexa_cli-1.20.4 → forgexa_cli-1.20.5}/PKG-INFO

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

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

{forgexa_cli-1.20.4 → forgexa_cli-1.20.5}/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.20.4"
+DAEMON_VERSION = "1.20.5"
 
 
 def _detect_client_type() -> str:
@@ -773,6 +773,33 @@ class DiscoveredAgent:
     compatibility_level: str
 
 
+def _prepare_agent_command(command: list[str]) -> list[str]:
+    """Make Windows script launchers executable through their shell hosts."""
+    if sys.platform != "win32" or not command:
+        return command
+
+    suffix = Path(command[0]).suffix.lower()
+    if suffix in {".cmd", ".bat"}:
+        return [
+            os.environ.get("COMSPEC", "cmd.exe"),
+            "/d",
+            "/s",
+            "/c",
+            subprocess.list2cmdline(command),
+        ]
+    if suffix == ".ps1":
+        return [
+            "powershell.exe",
+            "-NoProfile",
+            "-NonInteractive",
+            "-ExecutionPolicy",
+            "Bypass",
+            "-File",
+            *command,
+        ]
+    return command
+
+
 @dataclass
 class TaskInfo:
     task_id: str
@@ -1593,21 +1620,10 @@ class AgentDiscovery:
         import re
         try:
             parts = detect_cmd.split()
-            # On Windows, agent CLIs installed via npm create .cmd wrapper scripts
-            # (e.g. %APPDATA%\npm\copilot.cmd). Python's asyncio.create_subprocess_exec
-            # calls CreateProcess which cannot execute .cmd/.bat files directly —
-            # they need cmd.exe as the interpreter. Detect and wrap automatically.
-            if sys.platform == "win32":
-                resolved = shutil.which(parts[0])
-                if resolved:
-                    ext = Path(resolved).suffix.lower()
-                    if ext in ('.cmd', '.bat'):
-                        parts = ['cmd', '/c', resolved] + parts[1:]
-                    elif ext == '.ps1':
-                        parts = [
-                            'powershell', '-NoProfile', '-NonInteractive',
-                            '-Command', resolved,
-                        ] + parts[1:]
+            resolved = shutil.which(parts[0])
+            if resolved:
+                parts[0] = resolved
+            parts = _prepare_agent_command(parts)
             proc = await asyncio.create_subprocess_exec(
                 *parts,
                 stdin=asyncio.subprocess.DEVNULL,
@@ -3920,6 +3936,22 @@ class ProcessManager:
             or any(p in error_text for p in ProcessManager.AGENT_UNAVAILABLE_PATTERNS)
         )
 
+    @staticmethod
+    def is_silent_idle_timeout(result: "TaskResult") -> bool:
+        """Return whether an agent was killed before producing any evidence.
+
+        A timeout after output or workspace changes can represent completed work
+        and must be handled by the normal recovery path. A completely silent
+        timeout instead means this specific CLI is stuck before it can begin,
+        so one alternate agent is safe to try.
+        """
+        return (
+            result.failure_code == "agent_idle_timeout"
+            and not result.stdout.strip()
+            and not result.stderr.strip()
+            and not result.files_changed
+        )
+
     @staticmethod
     def _detect_agent_output_failure(result: "TaskResult", agent_id: str) -> str | None:
         """Detect agent-level failures despite exit code 0.
@@ -4440,6 +4472,7 @@ class ProcessManager:
             "--no-session-persistence",
             "--dangerously-skip-permissions",
         ]
+        cmd = _prepare_agent_command(cmd)
 
         env = os.environ.copy()
         for key in (
@@ -4539,6 +4572,7 @@ class ProcessManager:
                 stdout=getattr(exc, "stdout", "")[-settings.AGENT_MAX_OUTPUT_SIZE:],
                 stderr=getattr(exc, "stderr", "")[-10000:],
                 error=_err,
+                failure_code="agent_idle_timeout" if isinstance(exc, _IdleTimeoutError) else "",
             )
         except Exception as exc:
             logger.exception("Claude stream error for task %s", task_id)
@@ -5160,6 +5194,7 @@ class ProcessManager:
                 _task_file = None
 
         cmd += ["-C", str(cwd), "-p", _effective_prompt]
+        cmd = _prepare_agent_command(cmd)
 
         # Log the exact invocation (redact prompt body) so operators can
         # reproduce failures manually and diagnose CLI version incompatibilities.
@@ -5345,6 +5380,7 @@ class ProcessManager:
                 stdout=getattr(exc, "stdout", "")[-settings.AGENT_MAX_OUTPUT_SIZE:],
                 stderr=getattr(exc, "stderr", "")[-10000:],
                 error=_err,
+                failure_code="agent_idle_timeout" if isinstance(exc, _IdleTimeoutError) else "",
             )
         except Exception as exc:
             logger.exception("Copilot stream error for task %s", task_id)
@@ -5383,6 +5419,7 @@ class ProcessManager:
         stream_stderr: bool = False,
     ) -> TaskResult:
         try:
+            cmd = _prepare_agent_command(cmd)
             proc = await asyncio.create_subprocess_exec(
                 *cmd,
                 stdout=asyncio.subprocess.PIPE,
@@ -5421,6 +5458,7 @@ class ProcessManager:
                 stdout=getattr(exc, "stdout", "")[-settings.AGENT_MAX_OUTPUT_SIZE:],
                 stderr=getattr(exc, "stderr", "")[-10000:],
                 error=_err,
+                failure_code="agent_idle_timeout" if isinstance(exc, _IdleTimeoutError) else "",
             )
         except Exception as exc:
             logger.exception("CLI stream error for task %s", task_id)
@@ -7786,12 +7824,21 @@ class RuntimeDaemon:
 
             tried_agents.add(agent.agent_id)
 
-            # ── Agent fallback: if agent hit rate limit or API is unavailable, try next agent ──
+            # ── Agent fallback: try another CLI after a backend failure or a fully silent hang ──
             # Guard: if the agent already produced file changes in the workspace, it DID
             # meaningful work — don't trigger fallback even if it crashed after completing.
             # Let the recovery logic (step 4.1) handle non-zero exit with committed work.
+            is_rate_limited = self.process_manager.is_rate_limited(result)
+            is_silent_idle_timeout = self.process_manager.is_silent_idle_timeout(result)
+            fallback_reason = (
+                "rate_limit"
+                if is_rate_limited
+                else "agent_idle_timeout"
+                if is_silent_idle_timeout
+                else ""
+            )
             _skip_fallback = False
-            if self.process_manager.is_rate_limited(result):
+            if fallback_reason:
                 _pre_fallback_git = await self.process_manager._collect_git_info(workspace_path)
                 _pre_fallback_committed = await self.process_manager._collect_git_info_vs_parent(
                     workspace_path,
@@ -7810,10 +7857,10 @@ class RuntimeDaemon:
                     )
                     _skip_fallback = True
 
-            if self.process_manager.is_rate_limited(result) and not _skip_fallback:
+            if fallback_reason and not _skip_fallback:
                 logger.warning(
-                    "Agent '%s' unavailable/rate-limited for task %s, attempting fallback",
-                    agent.agent_id, task.task_id,
+                    "Agent '%s' failed for task %s (%s), attempting fallback",
+                    agent.agent_id, task.task_id, fallback_reason,
                 )
                 fallback_agent = self._select_fallback_agent(
                     agent.agent_id, task.fallback_chain, tried_agents
@@ -7830,7 +7877,7 @@ class RuntimeDaemon:
                     await reporter.report_progress(
                         task.task_id, 10,
                         f"agent_fallback: retrying with {agent.agent_id}",
-                        output_lines=[f"[daemon] Agent unavailable/rate-limited, switching to {agent.agent_id}"],
+                        output_lines=[f"[daemon] Agent {fallback_reason}, switching to {agent.agent_id}"],
                     )
 
                     # Re-run with fallback agent
@@ -7877,6 +7924,9 @@ class RuntimeDaemon:
                             )
                             _line_buffer.clear()
 
+                    # A silent hang gets exactly one alternate-agent attempt.
+                    # Unlike quota failures, do not serially spend the full idle
+                    # timeout on every installed CLI when the host is offline.
                     if not self.process_manager.is_rate_limited(result):
                         break  # Success or non-retriable failure
 
@@ -8260,7 +8310,7 @@ class RuntimeDaemon:
             result.metrics["actual_agent"] = agent.agent_id
             if agent.agent_id != task.agent_type:
                 result.metrics["original_agent"] = task.agent_type
-                result.metrics["fallback_reason"] = "rate_limit"
+                result.metrics["fallback_reason"] = fallback_reason
             await reporter.report_progress(task.task_id, 100, "completed" if result.status == "success" else "failed")
             await reporter.report_complete(task.task_id, result)
 

{forgexa_cli-1.20.4 → forgexa_cli-1.20.5}/forgexa_cli.egg-info/PKG-INFO

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

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

{forgexa_cli-1.20.4 → forgexa_cli-1.20.5}/tests/test_auth_and_runtime_commands.py

@@ -59,6 +59,26 @@ def test_login_persists_refresh_token(tmp_path: Path, monkeypatch: pytest.Monkey
     assert (tmp_path / ".forgexa" / "token").read_text() == "access-1"
 
 
+@pytest.mark.parametrize("suffix", [".cmd", ".bat"])
+def test_windows_batch_agent_commands_use_cmd_exe(
+    suffix: str, monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    launcher = r"C:\Windows\System32\cmd.exe"
+    command = [rf"C:\Users\agent\AppData\Roaming\npm\copilot{suffix}", "--version"]
+    monkeypatch.setattr(daemon.sys, "platform", "win32")
+    monkeypatch.setenv("COMSPEC", launcher)
+
+    result = daemon._prepare_agent_command(command)
+
+    assert result == [
+        launcher,
+        "/d",
+        "/s",
+        "/c",
+        daemon.subprocess.list2cmdline(command),
+    ]
+
+
 def test_get_retries_once_after_refresh_on_401(
     tmp_path: Path,
     monkeypatch: pytest.MonkeyPatch,