forgex-cli 0.1.6__tar.gz → 0.1.8__tar.gz

{forgex_cli-0.1.6 → forgex_cli-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: forgex-cli
-Version: 0.1.6
+Version: 0.1.8
 Summary: FORGEX — multi-agent AI software engineering. Plan. Build. Refine. Verify.
 Project-URL: Homepage, https://github.com/B-max12/Forgex
 Project-URL: Repository, https://github.com/B-max12/Forgex

{forgex_cli-0.1.6 → forgex_cli-0.1.8}/src/forgex/__init__.py

@@ -1,3 +1,3 @@
 """FORGEX — Plan. Build. Refine. Verify."""
 
-__version__ = "0.1.6"
+__version__ = "0.1.8"

{forgex_cli-0.1.6 → forgex_cli-0.1.8}/src/forgex/agents/base.py

@@ -373,7 +373,13 @@ class BaseAgent(ABC):
 
                 action = str(normalized.get("action") or "").strip().lower()
                 if action == "tool":
-                    tool_name = normalized.get("tool") or normalized.get("name")
+                    raw_tool = normalized.get("tool") or normalized.get("name")
+                    if not raw_tool or not isinstance(raw_tool, str):
+                        protocol_errors += 1
+                        messages.append(Message(role="assistant", content=raw))
+                        messages.append(Message(role="user", content="Tool name missing or invalid. Use {\"action\": \"tool\", \"tool\": \"<name>\", \"arguments\": {...}}."))
+                        continue
+                    tool_name: str = raw_tool.strip()
                     args = normalized.get("arguments") or normalized.get("args") or {}
                     if not isinstance(args, dict):
                         args = {}

{forgex_cli-0.1.6 → forgex_cli-0.1.8}/src/forgex/cli/repl.py

@@ -9,7 +9,6 @@ import sys
 from pathlib import Path
 from typing import Any
 
-import typer
 from prompt_toolkit import PromptSession
 from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.formatted_text import HTML
@@ -168,12 +167,13 @@ class ForgexREPL:
 
     def _run_setup_wizard(self) -> None:
         """Run the setup wizard directly (not through CliRunner) so it can read real stdin."""
-        import click
+        import typer
+        import typer.core
         from forgex.cli.commands.config import setup_command
 
         try:
-            # Create a plain click Context — setup_command only needs ctx.obj for ui_from()
-            ctx = click.Context(click.Command("setup"))
+            # Create a typer Context — setup_command only needs ctx.obj for ui_from()
+            ctx = typer.Context(typer.core.TyperCommand("setup"))
             ctx.obj = {"verbose": False, "quiet": False, "json": False, "plain": False}
             setup_command(ctx)
             self.session.refresh()

{forgex_cli-0.1.6 → forgex_cli-0.1.8}/src/forgex/models/registry.py

@@ -53,10 +53,14 @@ _DEFAULT_CATALOG: dict[str, ModelCapabilities] = {
         known=True,
     ),
     # Meta Llama models (OpenRouter / Groq / Ollama)
+    # NOTE: Llama models via OpenRouter do not reliably produce native
+    # tool_calls in the API response — they often emit XML-style markup
+    # instead.  Disabling native tools forces the JSON-protocol fallback
+    # which works far more reliably with instruction-tuned Llama models.
     "meta-llama/llama-3.3-70b-instruct": ModelCapabilities(
         model="meta-llama/llama-3.3-70b-instruct",
         context_window=131072,
-        supports_tools=True,
+        supports_tools=False,
         supports_json=True,
         supports_streaming=True,
         known=True,
@@ -64,7 +68,7 @@ _DEFAULT_CATALOG: dict[str, ModelCapabilities] = {
     "meta-llama/llama-3.1-70b-instruct": ModelCapabilities(
         model="meta-llama/llama-3.1-70b-instruct",
         context_window=131072,
-        supports_tools=True,
+        supports_tools=False,
         supports_json=True,
         supports_streaming=True,
         known=True,
@@ -72,7 +76,7 @@ _DEFAULT_CATALOG: dict[str, ModelCapabilities] = {
     "meta-llama/llama-3.1-8b-instruct": ModelCapabilities(
         model="meta-llama/llama-3.1-8b-instruct",
         context_window=131072,
-        supports_tools=True,
+        supports_tools=False,
         supports_json=True,
         supports_streaming=True,
         known=True,

{forgex_cli-0.1.6 → forgex_cli-0.1.8}/tests/unit/test_builder_agent.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+from typing import Any, cast
 
 from forgex.agents.builder import BuilderAgent, execute_task
 from forgex.config import load_config
@@ -50,6 +51,7 @@ async def test_builder_executes_task_and_records_events(tmp_path):
     initialize_project(ws)
     with open_stores(ws) as stores:
         state = stores.state.load()
+        assert state is not None
         task = Task(id="TASK-001", description="create demo file", acceptance_criteria=["exists"])
         stores.save_tasks([task], project_id=state.project_id)
 
@@ -59,7 +61,7 @@ async def test_builder_executes_task_and_records_events(tmp_path):
         ])
         ctx = create_context(ws, load_config(ws), agent=AgentRole.BUILDER, events=stores.recorder)
         tools = ToolExecutor(build_tool_registry(), permission_set_for(AgentRole.BUILDER), ctx)
-        builder = BuilderAgent(router=router, tools=tools, events=stores.recorder)
+        builder = BuilderAgent(router=cast(Any, router), tools=tools, events=stores.recorder)
 
         res = await execute_task(stores=stores, task=task, config=load_config(ws), builder=builder)
         assert res.status == "completed"
@@ -72,6 +74,7 @@ async def test_builder_json_protocol_mode(tmp_path):
     initialize_project(ws)
     with open_stores(ws) as stores:
         state = stores.state.load()
+        assert state is not None
         task = Task(id="TASK-001", description="create demo file", acceptance_criteria=["exists"])
         stores.save_tasks([task], project_id=state.project_id)
 
@@ -88,7 +91,7 @@ async def test_builder_json_protocol_mode(tmp_path):
         ], supports_tools=False)
         ctx = create_context(ws, load_config(ws), agent=AgentRole.BUILDER, events=stores.recorder)
         tools = ToolExecutor(build_tool_registry(), permission_set_for(AgentRole.BUILDER), ctx)
-        builder = BuilderAgent(router=router, tools=tools, events=stores.recorder)
+        builder = BuilderAgent(router=cast(Any, router), tools=tools, events=stores.recorder)
 
         res = await execute_task(stores=stores, task=task, config=load_config(ws), builder=builder)
         assert res.status == "completed"