forgexa-cli 1.13.3__tar.gz → 1.13.5__tar.gz

{forgexa_cli-1.13.3 → forgexa_cli-1.13.5}/PKG-INFO

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

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

{forgexa_cli-1.13.3 → forgexa_cli-1.13.5}/forgexa_cli/daemon.py

@@ -523,7 +523,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.13.3"
+DAEMON_VERSION = "1.13.5"
 
 
 def _detect_client_type() -> str:
@@ -794,28 +794,231 @@ def _prepare_ai_job_output(
     return output_content, scenario_items
 
 
+# ── Self-contained agent-output extraction ────────────────────────────────────
+# These functions are deliberately inlined here (duplicated from
+# app.services.ai_execution_strategy / qa_ai_assistant) so that the daemon
+# works correctly when running as the CLI or desktop standalone daemon where
+# the `app` package is NOT on sys.path.  Any time the originals change,
+# keep these in sync.
+
+def _daemon_extract_copilot_output(raw: str) -> str:
+    """Extract assistant text from Copilot CLI JSONL output."""
+    final_answer_ids: set[str] = set()
+    final_message_parts: list[str] = []
+    final_delta_parts: list[str] = []
+    fallback_message_parts: list[str] = []
+    fallback_delta_parts: list[str] = []
+
+    for line in raw.split("\n"):
+        line = line.strip()
+        if not line:
+            continue
+        try:
+            data = json.loads(line)
+        except json.JSONDecodeError:
+            continue
+        if not isinstance(data, dict):
+            continue
+
+        event_type = str(data.get("type", ""))
+        msg_data = data.get("data") or data
+
+        if event_type == "assistant.message_start":
+            if msg_data.get("phase") == "final_answer":
+                message_id = msg_data.get("messageId")
+                if isinstance(message_id, str) and message_id:
+                    final_answer_ids.add(message_id)
+            continue
+
+        if event_type == "assistant.message":
+            content = msg_data.get("content", "")
+            if not isinstance(content, str) or not content.strip():
+                continue
+            message_id = msg_data.get("messageId")
+            if message_id in final_answer_ids or msg_data.get("phase") == "final_answer":
+                final_message_parts.append(content.strip())
+            else:
+                fallback_message_parts.append(content.strip())
+            continue
+
+        if event_type == "assistant.message_delta":
+            delta = msg_data.get("deltaContent", "")
+            if not isinstance(delta, str) or not delta:
+                continue
+            message_id = msg_data.get("messageId")
+            if message_id in final_answer_ids:
+                final_delta_parts.append(delta)
+            else:
+                fallback_delta_parts.append(delta)
+
+    if final_delta_parts:
+        return "".join(final_delta_parts).strip()
+    if final_message_parts:
+        return "\n\n".join(final_message_parts).strip()
+    if fallback_message_parts:
+        return "\n\n".join(fallback_message_parts).strip()
+    if fallback_delta_parts:
+        return "".join(fallback_delta_parts).strip()
+    return raw
+
+
+def _daemon_extract_claude_output(raw: str) -> str:
+    """Extract result text from Claude CLI JSON/stream-json output."""
+    raw = raw.strip()
+    try:
+        data = json.loads(raw)
+        if isinstance(data, dict):
+            if "result" in data:
+                return data["result"]
+            if "content" in data:
+                blocks = data["content"]
+                if isinstance(blocks, list):
+                    texts = [b.get("text", "") for b in blocks if b.get("type") == "text"]
+                    return "\n".join(texts)
+        elif isinstance(data, list):
+            texts = [item.get("text", "") for item in data if isinstance(item, dict) and item.get("type") == "text"]
+            if texts:
+                return "\n".join(texts)
+    except (json.JSONDecodeError, KeyError, TypeError):
+        pass
+
+    lines = raw.split("\n")
+    for line in reversed(lines):
+        line = line.strip()
+        if not line.startswith("{"):
+            continue
+        try:
+            data = json.loads(line)
+            if isinstance(data, dict) and "result" in data:
+                result_val = data["result"]
+                if isinstance(result_val, str) and result_val.strip():
+                    return result_val
+        except (json.JSONDecodeError, KeyError, TypeError):
+            continue
+
+    parts: list[str] = []
+    for line in lines:
+        line = line.strip()
+        if not line.startswith("{"):
+            continue
+        try:
+            data = json.loads(line)
+            if not isinstance(data, dict):
+                continue
+            ev_type = data.get("type", "")
+            if ev_type == "assistant":
+                msg = data.get("message") or {}
+                for block in msg.get("content", []):
+                    if isinstance(block, dict) and block.get("type") == "text":
+                        text = block.get("text", "")
+                        if isinstance(text, str) and text.strip():
+                            parts.append(text)
+        except (json.JSONDecodeError, KeyError, TypeError):
+            continue
+    if parts:
+        return "\n\n".join(parts)
+
+    brace_start = raw.rfind('{"type":"result"')
+    if brace_start == -1:
+        brace_start = raw.rfind('{"type": "result"')
+    if brace_start >= 0:
+        depth = 0
+        for i in range(brace_start, len(raw)):
+            if raw[i] == "{":
+                depth += 1
+            elif raw[i] == "}":
+                depth -= 1
+                if depth == 0:
+                    try:
+                        data = json.loads(raw[brace_start : i + 1])
+                        if isinstance(data, dict) and "result" in data:
+                            return data["result"]
+                    except (json.JSONDecodeError, KeyError, TypeError):
+                        pass
+                    break
+    return raw
+
+
+def _daemon_extract_opencode_output(raw: str) -> str:
+    """Extract text content from OpenCode JSONL output."""
+    parts: list[str] = []
+    for line in raw.split("\n"):
+        line = line.strip()
+        if not line:
+            continue
+        try:
+            data = json.loads(line)
+        except json.JSONDecodeError:
+            if line:
+                parts.append(line)
+            continue
+        if not isinstance(data, dict):
+            continue
+        ev_type = str(data.get("type", ""))
+        part = data.get("part") or {}
+        if ev_type == "text" and isinstance(part, dict):
+            text = part.get("text", "")
+            if isinstance(text, str) and text.strip():
+                parts.append(text)
+    return "\n".join(parts) if parts else raw
+
+
+def _daemon_extract_agent_output(agent_id: str, raw: str) -> str:
+    """Dispatch to per-agent extraction; falls back to raw for unknown agents."""
+    if agent_id == "claude":
+        return _daemon_extract_claude_output(raw)
+    if agent_id == "copilot":
+        return _daemon_extract_copilot_output(raw)
+    if agent_id == "opencode":
+        return _daemon_extract_opencode_output(raw)
+    return raw
+
+
+def _daemon_extract_json(text: str):
+    """Extract a JSON array or object from text (no external imports)."""
+    text = text.strip()
+    if text.startswith("```"):
+        text = text.split("\n", 1)[-1].rsplit("```", 1)[0].strip()
+    try:
+        return json.loads(text)
+    except json.JSONDecodeError:
+        pass
+    for start_char, end_char in [("[", "]"), ("{", "}")]:
+        start = text.find(start_char)
+        end = text.rfind(end_char)
+        if start != -1 and end > start:
+            try:
+                return json.loads(text[start : end + 1])
+            except json.JSONDecodeError:
+                continue
+    return None
+
+# ─────────────────────────────────────────────────────────────────────────────
+
+
 def _normalize_ai_job_output(
     *,
     task_type: str,
     agent_id: str,
     raw_output: str,
 ) -> tuple[str, list[dict] | None]:
-    """Extract agent-specific final text before truncating for transport."""
+    """Extract agent-specific final text before truncating for transport.
+
+    Uses self-contained helpers (_daemon_extract_*) so this function works
+    both inside the backend server (where ``app.*`` is importable) and in the
+    standalone CLI / desktop daemon (where it is not).
+    """
     if not raw_output:
         return "", None
 
     if task_type not in {"qa_scenario_generate_prompt", "test_script_generate"}:
         return raw_output, None
 
-    from app.services.ai_execution_strategy import AIExecutionStrategy
-
-    extracted_output = AIExecutionStrategy._extract_agent_output(agent_id, raw_output)
+    extracted_output = _daemon_extract_agent_output(agent_id, raw_output)
     if task_type == "test_script_generate":
         return extracted_output or raw_output, None
 
-    from app.services.qa_ai_assistant import QAAIAssistant
-
-    parsed = QAAIAssistant._extract_json(extracted_output)
+    parsed = _daemon_extract_json(extracted_output)
     if isinstance(parsed, list):
         return json.dumps(parsed), parsed
     if isinstance(parsed, dict):
@@ -2934,6 +3137,31 @@ class ProcessManager:
             and not signals["error_messages"]
         )
 
+    @staticmethod
+    def _copilot_called_any_tools(stdout: str) -> bool:
+        """Return True if the Copilot output contains at least one tool call.
+
+        Used to distinguish an early API-rejection failure (exitCode=1 with
+        no work done) from a mid-run failure where the CLI did attempt tool
+        calls before encountering an error.
+        """
+        for raw in (stdout or "").split("\n"):
+            raw = raw.strip()
+            if not raw:
+                continue
+            try:
+                data = json.loads(raw)
+            except json.JSONDecodeError:
+                continue
+            if isinstance(data, dict):
+                ev = data.get("type", "")
+                # tool.execution_start / tool_use / assistant.tool_calls are
+                # all signals that at least one tool was invoked.
+                if ev in ("tool.execution_start", "tool_use", "tool_result",
+                          "tool.execution_complete", "assistant.tool_calls"):
+                    return True
+        return False
+
     @staticmethod
     def is_rate_limited(result: "TaskResult") -> bool:
         """Check if an agent failure warrants trying a different agent.
@@ -3894,6 +4122,8 @@ class ProcessManager:
     async def _run_copilot(
         self, agent: DiscoveredAgent, prompt: str, cwd: Path, timeout: int, task_id: str,
         on_chunk: Any = None,
+        *,
+        _retry_without_effort: bool = False,
     ) -> TaskResult:
         """Run GitHub Copilot CLI in non-interactive JSON-streaming mode.
 
@@ -3902,30 +4132,50 @@ class ProcessManager:
         ``gh auth login`` or GITHUB_TOKEN env var must be set.
 
         Flags:
-          -p / --prompt     Non-interactive prompt (exits after completion).
+          -p / --prompt          Non-interactive prompt (exits after completion).
           --output-format json   JSONL stream of session events.
-          --allow-all       Grant all tool + path + URL permissions required
-                            for autonomous file-editing tasks.
-          -C <dir>          Change working directory before execution.
+          --allow-all            Grant all tool + path + URL permissions required
+                                 for autonomous file-editing tasks.
+          -C <dir>               Change working directory before execution.
+
+        Compatibility note:
+          ``--effort`` is only included when ``FACTORY_COPILOT_REASONING`` is
+          explicitly set to a non-empty value.  Older Copilot CLI releases (and
+          some VS Code–bundled variants) don't accept ``--effort``; passing it
+          makes the CLI return exitCode=1 in the JSONL result event immediately
+          without calling any tools.  Making it opt-in avoids this incompatibility
+          while still allowing operators to tune effort on supported versions.
         """
         env = os.environ.copy()
         env["TERM"] = "dumb"  # suppress TTY-detection that suspends the process
         env["COPILOT_HOME"] = self._prepare_copilot_home()
 
         model_override = os.environ.get("FACTORY_COPILOT_MODEL")
-        reasoning = os.environ.get("FACTORY_COPILOT_REASONING", "medium")
+        # FACTORY_COPILOT_REASONING is opt-in: only pass --effort when the env
+        # var is explicitly set to a non-empty string.  The default (unset / "")
+        # intentionally omits --effort so that Copilot CLI versions that don't
+        # support the flag don't immediately fail with exitCode=1.
+        reasoning = os.environ.get("FACTORY_COPILOT_REASONING", "").strip()
 
         cmd = [
             agent.command,
             "--output-format", "json",
             "--allow-all",
-            "--effort", reasoning,
-            "-C", str(cwd),
-            "-p", prompt,
         ]
+        if reasoning and not _retry_without_effort:
+            cmd += ["--effort", reasoning]
+        cmd += ["-C", str(cwd), "-p", prompt]
         if model_override:
             cmd = [agent.command, "--model", model_override] + cmd[1:]
 
+        # Log the exact invocation (redact prompt body) so operators can
+        # reproduce failures manually and diagnose CLI version incompatibilities.
+        _cmd_display = " ".join(
+            f'"{a}"' if " " in a else a
+            for a in cmd[:-1]  # omit the -p value (potentially huge/sensitive)
+        ) + ' -p "<prompt>"'
+        logger.debug("Copilot invocation for task %s: %s", task_id, _cmd_display)
+
         try:
             proc = await asyncio.create_subprocess_exec(
                 *cmd,
@@ -3975,6 +4225,38 @@ class ProcessManager:
                     metrics=metrics,
                 )
             else:
+                # --- Immediate-failure retry ladder ---
+                # If Copilot exited with code 1 and no tools were called, the CLI
+                # rejected the initial API request before doing any work. This is a
+                # flag-incompatibility or auth/quota symptom; retry with progressively
+                # stripped flags to auto-heal across CLI versions.
+                #
+                # Retry 1: drop --effort (added in newer ghcs; unsupported in older
+                #          VS Code-bundled versions).
+                # Retry 2: if still failing AND we haven't already tried both drops,
+                #          the error is likely auth/quota — log actionable hint.
+                _no_tools = not self._copilot_called_any_tools(stdout)
+                if effective_rc == 1 and _no_tools and reasoning and not _retry_without_effort:
+                    logger.warning(
+                        "Copilot exitCode=1 with no tool calls for task %s — "
+                        "retrying without --effort (flag may be unsupported by this CLI version). "
+                        "Invocation was: %s",
+                        task_id, _cmd_display,
+                    )
+                    return await self._run_copilot(
+                        agent, prompt, cwd, timeout, task_id, on_chunk,
+                        _retry_without_effort=True,
+                    )
+                # Exhausted retries — emit an actionable diagnostic hint
+                if effective_rc == 1 and _no_tools:
+                    logger.error(
+                        "Copilot exitCode=1 with no tool calls for task %s after retries. "
+                        "Likely causes: (1) GitHub auth expired — run `gh auth status` and "
+                        "`gh auth login --scopes copilot`; (2) Copilot subscription inactive; "
+                        "(3) --allow-all flag not supported by this CLI version (%s). "
+                        "To reproduce manually: %s",
+                        task_id, agent.version, _cmd_display,
+                    )
                 return TaskResult(
                     status="failed",
                     exit_code=effective_rc,
@@ -6465,8 +6747,36 @@ class RuntimeDaemon:
                         if not intents:
                             issues.append("test-intent.json contains no test intents")
                         for ti in intents[:20]:
-                            if not ti.get("id") or not (ti.get("title") or ti.get("description")):
-                                issues.append(f"Test intent missing 'id' or 'title'/'description': {ti.get('id', '?')}")
+                            # Accept common alternative field names that agents generate:
+                            # id      → also accept "test_id", "intent_id"
+                            # title   → also accept "description", "summary", "name"
+                            _ti_id = (
+                                ti.get("id")
+                                or ti.get("test_id")
+                                or ti.get("intent_id")
+                            )
+                            _ti_label = (
+                                ti.get("title")
+                                or ti.get("description")
+                                or ti.get("summary")
+                                or ti.get("name")
+                            )
+                            if not _ti_id or not _ti_label:
+                                # Include actual keys present so the retry prompt gives
+                                # the agent precise feedback on what to fix.
+                                _present_keys = list(ti.keys())[:8]
+                                if not _ti_id:
+                                    issues.append(
+                                        f"Test intent missing required 'id' field "
+                                        f"(found keys: {_present_keys}). "
+                                        f"Each intent MUST have an 'id' field (e.g. \"id\": \"TI-001\")."
+                                    )
+                                else:
+                                    issues.append(
+                                        f"Test intent '{_ti_id}' missing required 'title' or 'description' field "
+                                        f"(found keys: {_present_keys}). "
+                                        f"Each intent MUST have a 'title' field (e.g. \"title\": \"...\")."
+                                    )
                                 break
                     except _json.JSONDecodeError as e:
                         issues.append(f"test-intent.json is not valid JSON: {e}")

{forgexa_cli-1.13.3 → forgexa_cli-1.13.5}/forgexa_cli/main.py

@@ -27,6 +27,16 @@ Usage:
     forgexa gates pending
     forgexa config show
     forgexa --help
+
+Daemon shortcut commands (aliases — no need to type `daemon`):
+    forgexa start -d
+    forgexa stop
+    forgexa restart
+    forgexa status
+    forgexa status --verbose
+    forgexa logs -f
+    forgexa logs -n 100 -f
+    forgexa agents
 """
 from __future__ import annotations
 
@@ -1387,6 +1397,59 @@ def main() -> None:
     )
     daemon_agents_p.add_argument("--all", action="store_true", help="Include all users' runtimes (admin only)")
 
+    # ── Daemon shortcut commands ───────────────────────────────────────────────
+    # Top-level aliases so users can type `forgexa start` instead of
+    # `forgexa daemon start`. Both forms are fully equivalent.
+    _start_sc = sub.add_parser(
+        "start",
+        help="Start local daemon  (alias: forgexa daemon start)",
+    )
+    _start_sc.add_argument(
+        "-d", "--detach",
+        action="store_true",
+        help="Run in background (recommended for production use)",
+    )
+    _start_sc.add_argument("--server-url", default=None, help="Server URL to connect to")
+
+    sub.add_parser(
+        "stop",
+        help="Stop local daemon  (alias: forgexa daemon stop)",
+    )
+
+    _restart_sc = sub.add_parser(
+        "restart",
+        help="Restart local daemon  (alias: forgexa daemon restart)",
+    )
+    _restart_sc.add_argument("--server-url", default=None, help="Server URL to connect to")
+
+    _status_sc = sub.add_parser(
+        "status",
+        help="Daemon status and agents  (alias: forgexa daemon status)",
+    )
+    _status_sc.add_argument("--all", action="store_true", help="List all runtimes (platform admin only)")
+    _status_sc.add_argument("-v", "--verbose", action="store_true", help="Expanded per-agent detail")
+
+    _logs_sc = sub.add_parser(
+        "logs",
+        help="Stream daemon logs  (alias: forgexa daemon logs)",
+    )
+    _logs_sc.add_argument(
+        "-n", "--lines",
+        type=int, default=50, metavar="N",
+        help="Show last N lines before following (default: 50)",
+    )
+    _logs_sc.add_argument(
+        "-f", "--follow",
+        action="store_true",
+        help="Stream new log lines as they arrive (like tail -f)",
+    )
+
+    _agents_sc = sub.add_parser(
+        "agents",
+        help="List AI agents  (alias: forgexa daemon agents)",
+    )
+    _agents_sc.add_argument("--all", action="store_true", help="Include all users' runtimes (admin only)")
+
     # runtimes
     rt_p = sub.add_parser("runtimes", help="Runtime management")
     rt_sub = rt_p.add_subparsers(dest="rt_cmd")
@@ -1489,6 +1552,13 @@ def main() -> None:
             "logs":    cmd_daemon_logs,
             "agents":  cmd_daemon_agents,
         }.get(a.daemon_cmd, lambda _: daemon_p.print_help())(a),
+        # Daemon shortcut aliases (identical handlers, no `daemon` prefix needed)
+        "start":   cmd_daemon_start,
+        "stop":    cmd_daemon_stop,
+        "restart": cmd_daemon_restart,
+        "status":  cmd_daemon_status,
+        "logs":    cmd_daemon_logs,
+        "agents":  cmd_daemon_agents,
         "runtimes": lambda a: {
             "list": cmd_runtimes_list,
         }.get(a.rt_cmd, lambda _: rt_p.print_help())(a),

{forgexa_cli-1.13.3 → forgexa_cli-1.13.5}/forgexa_cli.egg-info/PKG-INFO

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

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