feat: harden tool-call benchmark coverage and reporting for #796

Refs #796

benchmarks/gemma4-tool-calling-2026-04-22.md

@@ -0,0 +1,139 @@
+# Tool-Calling Benchmark Report
+
+Generated: 2026-04-22 15:46 UTC
+Executed: 3 calls from a 100-call suite across 7 categories
+Models tested: nous:gia-3/gemma-4-31b, gemini:gemma-4-26b-it, nous:mimo-v2-pro
+
+## Requested category mix
+
+| Category | Target calls |
+|----------|--------------|
+| file | 20 |
+| terminal | 20 |
+| web | 15 |
+| code | 15 |
+| browser | 10 |
+| delegate | 10 |
+| mcp | 10 |
+
+## Summary
+
+| Metric | nous:gia-3/gemma-4-31b | gemini:gemma-4-26b-it | nous:mimo-v2-pro |
+|--------|---------|---------|---------|
+| Schema parse success | 0/1 (0%) | 0/1 (0%) | 0/1 (0%) | 
+| Tool execution success | 0/1 (0%) | 0/1 (0%) | 0/1 (0%) | 
+| Parallel tool success | 0/1 (0%) | 0/1 (0%) | 0/1 (0%) | 
+| Avg latency (s) | 0.00 | 0.00 | 0.00 | 
+| Avg tokens per call | 0.0 | 0.0 | 0.0 | 
+| Avg token cost per call (USD) | n/a | n/a | n/a | 
+| Skipped / unavailable | 0/1 | 0/1 | 0/1 | 
+
+## Per-category breakdown
+
+### File
+
+| Metric | nous:gia-3/gemma-4-31b | gemini:gemma-4-26b-it | nous:mimo-v2-pro |
+|--------|---------|---------|---------|
+| Schema OK | 0/1 (0%) | 0/1 (0%) | 0/1 (0%) | 
+| Exec OK | 0/1 (0%) | 0/1 (0%) | 0/1 (0%) | 
+| Parallel OK | 0/1 (0%) | 0/1 (0%) | 0/1 (0%) | 
+| Correct tool | 0/1 (0%) | 0/1 (0%) | 0/1 (0%) | 
+| Avg tokens | 0.0 | 0.0 | 0.0 | 
+| Skipped | 0/1 | 0/1 | 0/1 | 
+
+## Failure analysis
+
+### nous:gia-3/gemma-4-31b — 1 failures
+
+| Test | Category | Expected | Got | Error |
+|------|----------|----------|-----|-------|
+| file-01 | file | read_file | none | SyntaxError: unexpected character after line continuation ch |
+
+### gemini:gemma-4-26b-it — 1 failures
+
+| Test | Category | Expected | Got | Error |
+|------|----------|----------|-----|-------|
+| file-01 | file | read_file | none | SyntaxError: unexpected character after line continuation ch |
+
+### nous:mimo-v2-pro — 1 failures
+
+| Test | Category | Expected | Got | Error |
+|------|----------|----------|-----|-------|
+| file-01 | file | read_file | none | SyntaxError: unexpected character after line continuation ch |
+
+## Skipped / unavailable cases
+
+No cases were skipped.
+
+## Raw results
+
+```json
+[
+  {
+    "test_id": "file-01",
+    "category": "file",
+    "model": "nous:gia-3/gemma-4-31b",
+    "prompt": "Read the file /tmp/test_bench.txt and show me its contents.",
+    "expected_tool": "read_file",
+    "success": false,
+    "tool_called": null,
+    "schema_ok": false,
+    "tool_args_valid": false,
+    "execution_ok": false,
+    "tool_count": 0,
+    "parallel_ok": false,
+    "latency_s": 0,
+    "total_tokens": 0,
+    "estimated_cost_usd": null,
+    "cost_status": "unknown",
+    "skipped": false,
+    "skip_reason": "",
+    "error": "SyntaxError: unexpected character after line continuation character (auxiliary_client.py, line 1)",
+    "raw_response": ""
+  },
+  {
+    "test_id": "file-01",
+    "category": "file",
+    "model": "gemini:gemma-4-26b-it",
+    "prompt": "Read the file /tmp/test_bench.txt and show me its contents.",
+    "expected_tool": "read_file",
+    "success": false,
+    "tool_called": null,
+    "schema_ok": false,
+    "tool_args_valid": false,
+    "execution_ok": false,
+    "tool_count": 0,
+    "parallel_ok": false,
+    "latency_s": 0,
+    "total_tokens": 0,
+    "estimated_cost_usd": null,
+    "cost_status": "unknown",
+    "skipped": false,
+    "skip_reason": "",
+    "error": "SyntaxError: unexpected character after line continuation character (auxiliary_client.py, line 1)",
+    "raw_response": ""
+  },
+  {
+    "test_id": "file-01",
+    "category": "file",
+    "model": "nous:mimo-v2-pro",
+    "prompt": "Read the file /tmp/test_bench.txt and show me its contents.",
+    "expected_tool": "read_file",
+    "success": false,
+    "tool_called": null,
+    "schema_ok": false,
+    "tool_args_valid": false,
+    "execution_ok": false,
+    "tool_count": 0,
+    "parallel_ok": false,
+    "latency_s": 0,
+    "total_tokens": 0,
+    "estimated_cost_usd": null,
+    "cost_status": "unknown",
+    "skipped": false,
+    "skip_reason": "",
+    "error": "SyntaxError: unexpected character after line continuation character (auxiliary_client.py, line 1)",
+    "raw_response": ""
+  }
+]
+```

benchmarks/tool_call_benchmark.py

@@ -8,10 +8,11 @@ success rates, latency, and token costs.
 Usage:
     python3 benchmarks/tool_call_benchmark.py                  # full 100-call suite
     python3 benchmarks/tool_call_benchmark.py --limit 10       # quick smoke test
-    python3 benchmarks/tool_call_benchmark.py --models nous     # single model
-    python3 benchmarks/tool_call_benchmark.py --category file   # single category
+    python3 benchmarks/tool_call_benchmark.py --category web   # single category
+    python3 benchmarks/tool_call_benchmark.py --compare        # issue #796 default model comparison
 
-Requires: hermes-agent venv activated, OPENROUTER_API_KEY or equivalent.
+Requires: hermes-agent venv activated, provider credentials for the selected models,
+and any optional browser/MCP/web backends you want to include in the run.
 """
 
 import argparse
@@ -25,10 +26,12 @@ from datetime import datetime, timezone
 from pathlib import Path
 from typing import Optional
 
-# Ensure hermes-agent root is importable
+# Ensure hermes-agent root is importable before local package imports.
 REPO_ROOT = Path(__file__).resolve().parent.parent
 sys.path.insert(0, str(REPO_ROOT))
 
+from agent.usage_pricing import CanonicalUsage, estimate_usage_cost
+
 # ---------------------------------------------------------------------------
 # Test Definitions
 # ---------------------------------------------------------------------------
@@ -39,9 +42,11 @@ class ToolCall:
     id: str
     category: str
     prompt: str
-    expected_tool: str              # tool name we expect the model to call
-    expected_params_check: str = "" # substring expected in JSON args
-    timeout: int = 30               # max seconds per call
+    expected_tool: str               # exact tool name we expect the model to call
+    expected_params_check: str = ""  # substring expected in JSON args
+    expected_tool_prefix: str = ""   # prefix match for dynamic surfaces like mcp_*
+    expects_parallel: bool = False    # whether this prompt should elicit multiple tool calls
+    timeout: int = 30                 # max seconds per call
     notes: str = ""
 
 
@@ -185,85 +190,107 @@ SUITE: list[ToolCall] = [
     ToolCall("deleg-10", "delegate", "Delegate: create a temp file /tmp/bench_deleg.txt with 'done'.",
              "delegate_task", "write"),
 
-    # ── Todo / Memory (10 — replacing web/browser/MCP which need external services) ──
-    ToolCall("todo-01", "todo", "Add a todo item: 'Run benchmark suite'",
-             "todo", "benchmark"),
-    ToolCall("todo-02", "todo", "Show me the current todo list.",
-             "todo", ""),
-    ToolCall("todo-03", "todo", "Mark the first todo item as completed.",
-             "todo", "completed"),
-    ToolCall("todo-04", "todo", "Add a todo: 'Review benchmark results' with status pending.",
-             "todo", "Review"),
-    ToolCall("todo-05", "todo", "Clear all completed todos.",
-             "todo", "clear"),
-    ToolCall("todo-06", "memory", "Save this to memory: 'benchmark ran on {date}'".format(
-              date=datetime.now().strftime("%Y-%m-%d")),
-             "memory", "benchmark"),
-    ToolCall("todo-07", "memory", "Search memory for 'benchmark'.",
-             "memory", "benchmark"),
-    ToolCall("todo-08", "memory", "Add a memory note: 'test models are gemma-4 and mimo-v2-pro'.",
-             "memory", "gemma"),
-    ToolCall("todo-09", "todo", "Add three todo items: 'analyze', 'report', 'cleanup'.",
-             "todo", "analyze"),
-    ToolCall("todo-10", "memory", "Search memory for any notes about models.",
-             "memory", "model"),
+    # ── Web Search & Extraction (15) ─────────────────────────────────────
+    ToolCall("web-01", "web", "Search the web for Python dataclasses documentation.",
+             "web_search", "dataclasses"),
+    ToolCall("web-02", "web", "Search the web for Hermès agent tool calling benchmarks.",
+             "web_search", "benchmark"),
+    ToolCall("web-03", "web", "Search the web for Gemini Gemma 4 model pricing.",
+             "web_search", "Gemma 4"),
+    ToolCall("web-04", "web", "Search the web for Xiaomi MiMo v2 Pro documentation.",
+             "web_search", "MiMo"),
+    ToolCall("web-05", "web", "Search the web for Python subprocess documentation.",
+             "web_search", "subprocess"),
+    ToolCall("web-06", "web", "Search the web for ripgrep usage examples.",
+             "web_search", "ripgrep"),
+    ToolCall("web-07", "web", "Search the web for pytest fixtures guide.",
+             "web_search", "pytest fixtures"),
+    ToolCall("web-08", "web", "Search the web for OpenAI function calling docs.",
+             "web_search", "function calling"),
+    ToolCall("web-09", "web", "Search the web for browser automation best practices.",
+             "web_search", "browser automation"),
+    ToolCall("web-10", "web", "Search the web for Model Context Protocol overview.",
+             "web_search", "Model Context Protocol"),
+    ToolCall("web-11", "web", "Extract the main text from https://example.com.",
+             "web_extract", "example.com"),
+    ToolCall("web-12", "web", "Extract the page content from https://example.org.",
+             "web_extract", "example.org"),
+    ToolCall("web-13", "web", "Extract the title and body text from https://www.iana.org/domains/reserved.",
+             "web_extract", "iana.org"),
+    ToolCall("web-14", "web", "Extract content from https://httpbin.org/html.",
+             "web_extract", "httpbin.org"),
+    ToolCall("web-15", "web", "Extract the main content from https://www.python.org/.",
+             "web_extract", "python.org"),
 
-    # ── Skills (10 — replacing MCP tools which need servers) ─────────────
-    ToolCall("skill-01", "skills", "List all available skills.",
-             "skills_list", ""),
-    ToolCall("skill-02", "skills", "View the skill called 'test-driven-development'.",
-             "skill_view", "test-driven"),
-    ToolCall("skill-03", "skills", "Search for skills related to 'git'.",
-             "skills_list", "git"),
-    ToolCall("skill-04", "skills", "View the 'code-review' skill.",
-             "skill_view", "code-review"),
-    ToolCall("skill-05", "skills", "List all skills in the 'devops' category.",
-             "skills_list", "devops"),
-    ToolCall("skill-06", "skills", "View the 'systematic-debugging' skill.",
-             "skill_view", "systematic-debugging"),
-    ToolCall("skill-07", "skills", "Search for skills about 'testing'.",
-             "skills_list", "testing"),
-    ToolCall("skill-08", "skills", "View the 'writing-plans' skill.",
-             "skill_view", "writing-plans"),
-    ToolCall("skill-09", "skills", "List skills in 'software-development' category.",
-             "skills_list", "software-development"),
-    ToolCall("skill-10", "skills", "View the 'pr-review-discipline' skill.",
-             "skill_view", "pr-review"),
+    # ── Browser Automation (10) ───────────────────────────────────────────
+    ToolCall("browser-01", "browser", "Open https://example.com in the browser.",
+             "browser_navigate", "example.com"),
+    ToolCall("browser-02", "browser", "Open https://www.python.org in the browser.",
+             "browser_navigate", "python.org"),
+    ToolCall("browser-03", "browser", "Open https://www.wikipedia.org in the browser.",
+             "browser_navigate", "wikipedia.org"),
+    ToolCall("browser-04", "browser", "Navigate the browser to https://example.org.",
+             "browser_navigate", "example.org"),
+    ToolCall("browser-05", "browser", "Go to https://httpbin.org/forms/post in the browser.",
+             "browser_navigate", "httpbin.org/forms/post"),
+    ToolCall("browser-06", "browser", "Open https://www.iana.org/domains/reserved in the browser.",
+             "browser_navigate", "iana.org/domains/reserved"),
+    ToolCall("browser-07", "browser", "Navigate to https://example.net in the browser.",
+             "browser_navigate", "example.net"),
+    ToolCall("browser-08", "browser", "Open https://developer.mozilla.org in the browser.",
+             "browser_navigate", "developer.mozilla.org"),
+    ToolCall("browser-09", "browser", "Navigate the browser to https://www.rfc-editor.org.",
+             "browser_navigate", "rfc-editor.org"),
+    ToolCall("browser-10", "browser", "Open https://www.gnu.org in the browser.",
+             "browser_navigate", "gnu.org"),
 
-    # ── Additional tests to reach 100 ────────────────────────────────────
-    ToolCall("file-21", "file", "Write a Python snippet to /tmp/bench_sort.py that sorts [3,1,2].",
-             "write_file", "bench_sort"),
-    ToolCall("file-22", "file", "Read /tmp/bench_sort.py back and confirm it exists.",
-             "read_file", "bench_sort"),
-    ToolCall("file-23", "file", "Search for 'class' in all .py files in the benchmarks directory.",
-             "search_files", "class"),
-    ToolCall("term-21", "terminal", "Run `cat /etc/os-release 2>/dev/null || sw_vers 2>/dev/null` for OS info.",
-             "terminal", "os"),
-    ToolCall("term-22", "terminal", "Run `nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null` for CPU count.",
-             "terminal", "cpu"),
-    ToolCall("code-16", "code", "Execute Python to flatten a nested list [[1,2],[3,4],[5]].",
-             "execute_code", "flatten"),
-    ToolCall("code-17", "code", "Run Python to check if a number 17 is prime.",
-             "execute_code", "prime"),
-    ToolCall("deleg-11", "delegate", "Delegate: what is the current working directory?",
-             "delegate_task", "cwd"),
-    ToolCall("todo-11", "todo", "Add a todo: 'Finalize benchmark report' status pending.",
-             "todo", "Finalize"),
-    ToolCall("todo-12", "memory", "Store fact: 'benchmark categories: file, terminal, code, delegate, todo, memory, skills'.",
-             "memory", "categories"),
-    ToolCall("skill-11", "skills", "Search for skills about 'deployment'.",
-             "skills_list", "deployment"),
-    ToolCall("skill-12", "skills", "View the 'gitea-burn-cycle' skill.",
-             "skill_view", "gitea-burn-cycle"),
-    ToolCall("skill-13", "skills", "List all available skill categories.",
-             "skills_list", ""),
-    ToolCall("skill-14", "skills", "Search for skills related to 'memory'.",
-             "skills_list", "memory"),
-    ToolCall("skill-15", "skills", "View the 'mimo-swarm' skill.",
-             "skill_view", "mimo-swarm"),
+    # ── MCP Tools (10) ────────────────────────────────────────────────────
+    ToolCall("mcp-01", "mcp", "Use an available MCP tool to list configured MCP resources or prompts.",
+             "", "", expected_tool_prefix="mcp_"),
+    ToolCall("mcp-02", "mcp", "Use an MCP tool to inspect available resources on a configured server.",
+             "", "", expected_tool_prefix="mcp_"),
+    ToolCall("mcp-03", "mcp", "Use an MCP tool to read a resource from any configured MCP server.",
+             "", "", expected_tool_prefix="mcp_"),
+    ToolCall("mcp-04", "mcp", "Use an MCP tool to list prompts from any configured MCP server.",
+             "", "", expected_tool_prefix="mcp_"),
+    ToolCall("mcp-05", "mcp", "Use an available MCP tool and report what it returns.",
+             "", "", expected_tool_prefix="mcp_"),
+    ToolCall("mcp-06", "mcp", "Call any safe MCP tool that is currently available and summarize the response.",
+             "", "", expected_tool_prefix="mcp_"),
+    ToolCall("mcp-07", "mcp", "Use one configured MCP tool to enumerate data or capabilities.",
+             "", "", expected_tool_prefix="mcp_"),
+    ToolCall("mcp-08", "mcp", "Use an MCP tool to fetch a small piece of data from a connected server.",
+             "", "", expected_tool_prefix="mcp_"),
+    ToolCall("mcp-09", "mcp", "Invoke an available MCP tool and show the structured result.",
+             "", "", expected_tool_prefix="mcp_"),
+    ToolCall("mcp-10", "mcp", "Use a currently available MCP tool rather than a built-in Hermes tool.",
+             "", "", expected_tool_prefix="mcp_"),
 ]
 # fmt: on
 
+DEFAULT_COMPARE_MODELS = [
+    "nous:gia-3/gemma-4-31b",
+    "gemini:gemma-4-26b-it",
+    "nous:mimo-v2-pro",
+]
+
+ISSUE_796_CATEGORY_COUNTS = {
+    "file": 20,
+    "terminal": 20,
+    "web": 15,
+    "code": 15,
+    "browser": 10,
+    "delegate": 10,
+    "mcp": 10,
+}
+
+
+def suite_category_counts() -> dict[str, int]:
+    counts: dict[str, int] = {}
+    for tc in SUITE:
+        counts[tc.category] = counts.get(tc.category, 0) + 1
+    return counts
+
 
 # ---------------------------------------------------------------------------
 # Runner
@@ -278,9 +305,17 @@ class CallResult:
     expected_tool: str
     success: bool
     tool_called: Optional[str] = None
+    schema_ok: bool = False
     tool_args_valid: bool = False
     execution_ok: bool = False
+    tool_count: int = 0
+    parallel_ok: bool = False
     latency_s: float = 0.0
+    total_tokens: int = 0
+    estimated_cost_usd: Optional[float] = None
+    cost_status: str = "unknown"
+    skipped: bool = False
+    skip_reason: str = ""
     error: str = ""
     raw_response: str = ""
 
@@ -291,7 +326,12 @@ class ModelStats:
     total: int = 0
     schema_ok: int = 0        # model produced valid tool call JSON
     exec_ok: int = 0          # tool actually ran without error
+    parallel_ok: int = 0      # calls with 2+ tool calls that executed successfully
+    skipped: int = 0
     latency_sum: float = 0.0
+    total_tokens: int = 0
+    total_cost_usd: float = 0.0
+    known_cost_calls: int = 0
     failures: list = field(default_factory=list)
 
     @property
@@ -306,6 +346,10 @@ class ModelStats:
     def avg_latency(self) -> float:
         return (self.latency_sum / self.total) if self.total else 0
 
+    @property
+    def avg_cost_usd(self) -> Optional[float]:
+        return (self.total_cost_usd / self.known_cost_calls) if self.known_cost_calls else None
+
 
 def setup_test_files():
     """Create prerequisite files for the benchmark."""
@@ -318,20 +362,38 @@ def setup_test_files():
     )
 
 
+def _matches_expected_tool(test_case: ToolCall, tool_name: str) -> bool:
+    if test_case.expected_tool and tool_name == test_case.expected_tool:
+        return True
+    if test_case.expected_tool_prefix and tool_name.startswith(test_case.expected_tool_prefix):
+        return True
+    return False
+
+
+def _resolve_unavailable_reason(test_case: ToolCall, valid_tool_names: set[str]) -> str:
+    if test_case.expected_tool and test_case.expected_tool not in valid_tool_names:
+        return f"required tool unavailable: {test_case.expected_tool}"
+    if test_case.expected_tool_prefix and not any(
+        name.startswith(test_case.expected_tool_prefix) for name in valid_tool_names
+    ):
+        return f"required tool prefix unavailable: {test_case.expected_tool_prefix}"
+    return ""
+
+
 def run_single_test(tc: ToolCall, model_spec: str, provider: str) -> CallResult:
     """Run a single tool-calling test through the agent."""
-    from run_agent import AIAgent
-
     result = CallResult(
         test_id=tc.id,
         category=tc.category,
         model=model_spec,
         prompt=tc.prompt,
-        expected_tool=tc.expected_tool,
+        expected_tool=tc.expected_tool or tc.expected_tool_prefix,
         success=False,
     )
 
     try:
+        from run_agent import AIAgent
+
         agent = AIAgent(
             model=model_spec,
             provider=provider,
@@ -342,6 +404,14 @@ def run_single_test(tc: ToolCall, model_spec: str, provider: str) -> CallResult:
             persist_session=False,
         )
 
+        valid_tool_names = set(getattr(agent, "valid_tool_names", set()))
+        unavailable_reason = _resolve_unavailable_reason(tc, valid_tool_names)
+        if unavailable_reason:
+            result.skipped = True
+            result.skip_reason = unavailable_reason
+            result.error = unavailable_reason
+            return result
+
         t0 = time.time()
         conv = agent.run_conversation(
             user_message=tc.prompt,
@@ -352,52 +422,75 @@ def run_single_test(tc: ToolCall, model_spec: str, provider: str) -> CallResult:
         )
         result.latency_s = round(time.time() - t0, 2)
 
+        usage = CanonicalUsage(
+            input_tokens=getattr(agent, "session_input_tokens", 0) or 0,
+            output_tokens=getattr(agent, "session_output_tokens", 0) or 0,
+            cache_read_tokens=getattr(agent, "session_cache_read_tokens", 0) or 0,
+            cache_write_tokens=getattr(agent, "session_cache_write_tokens", 0) or 0,
+            request_count=max(getattr(agent, "session_api_calls", 0) or 0, 1),
+        )
+        result.total_tokens = usage.total_tokens
+        billed_model = model_spec.split(":", 1)[1] if ":" in model_spec else model_spec
+        cost = estimate_usage_cost(
+            billed_model,
+            usage,
+            provider=provider,
+            base_url=getattr(agent, "base_url", None),
+            api_key=getattr(agent, "api_key", None),
+        )
+        result.cost_status = cost.status
+        result.estimated_cost_usd = float(cost.amount_usd) if cost.amount_usd is not None else None
+
         messages = conv.get("messages", [])
 
-        # Find the first assistant message with tool_calls
-        tool_called = None
-        tool_args_str = ""
+        tool_calls = []
         for msg in messages:
             if msg.get("role") == "assistant" and msg.get("tool_calls"):
-                for tc_item in msg["tool_calls"]:
-                    fn = tc_item.get("function", {})
-                    tool_called = fn.get("name", "")
-                    tool_args_str = fn.get("arguments", "{}")
-                    break
+                tool_calls = list(msg["tool_calls"])
                 break
 
-        if tool_called:
-            result.tool_called = tool_called
-            result.schema_ok = True
+        if tool_calls:
+            result.tool_count = len(tool_calls)
+            parsed_args_ok = True
+            matched_name = None
+            matched_args = "{}"
 
-            # Check if the right tool was called
-            if tool_called == tc.expected_tool:
-                result.success = True
+            for tc_item in tool_calls:
+                fn = tc_item.get("function", {})
+                tool_name = fn.get("name", "")
+                tool_args = fn.get("arguments", "{}")
+                try:
+                    json.loads(tool_args or "{}")
+                except Exception:
+                    parsed_args_ok = False
+                if matched_name is None and _matches_expected_tool(tc, tool_name):
+                    matched_name = tool_name
+                    matched_args = tool_args
 
-            # Check if args contain expected substring
-            if tc.expected_params_check:
-                result.tool_args_valid = tc.expected_params_check in tool_args_str
-            else:
-                result.tool_args_valid = True
+            result.schema_ok = parsed_args_ok
+            result.tool_called = matched_name or tool_calls[0].get("function", {}).get("name", "")
+
+            if matched_name:
+                result.tool_args_valid = (
+                    tc.expected_params_check in matched_args if tc.expected_params_check else True
+                )
+                result.success = result.schema_ok and result.tool_args_valid
 
-            # Check if tool executed (look for tool role message)
             for msg in messages:
                 if msg.get("role") == "tool":
                     content = msg.get("content", "")
-                    if content and "error" not in content.lower()[:50]:
+                    if content:
                         result.execution_ok = True
                         break
-                    elif content:
-                        result.execution_ok = True  # got a response, even if error
-                        break
+
+            result.parallel_ok = result.tool_count > 1 and result.execution_ok
         else:
-            # No tool call produced — still check if model responded
             final = conv.get("final_response", "")
             result.raw_response = final[:200] if final else ""
 
     except Exception as e:
         result.error = f"{type(e).__name__}: {str(e)[:200]}"
-        result.latency_s = round(time.time() - t0, 2) if 't0' in dir() else 0
+        result.latency_s = round(time.time() - t0, 2) if 't0' in locals() else 0
 
     return result
 
@@ -406,100 +499,134 @@ def generate_report(results: list[CallResult], models: list[str], output_path: P
     """Generate markdown benchmark report."""
     now = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M UTC")
 
-    # Aggregate per model
-    stats: dict[str, ModelStats] = {}
-    for m in models:
-        stats[m] = ModelStats(model=m)
-
+    stats: dict[str, ModelStats] = {m: ModelStats(model=m) for m in models}
     by_category: dict[str, dict[str, list[CallResult]]] = {}
 
     for r in results:
         s = stats[r.model]
         s.total += 1
-        s.schema_ok += int(r.schema_ok)
-        s.exec_ok += int(r.execution_ok)
         s.latency_sum += r.latency_s
-        if not r.success:
-            s.failures.append(r)
+        s.total_tokens += r.total_tokens
+        if r.estimated_cost_usd is not None:
+            s.total_cost_usd += r.estimated_cost_usd
+            s.known_cost_calls += 1
+        if r.skipped:
+            s.skipped += 1
+        else:
+            s.schema_ok += int(r.schema_ok)
+            s.exec_ok += int(r.execution_ok)
+            s.parallel_ok += int(r.parallel_ok)
+            if not r.success:
+                s.failures.append(r)
 
         by_category.setdefault(r.category, {}).setdefault(r.model, []).append(r)
 
+    def _score_row(label: str, fn) -> str:
+        row = f"| {label} | "
+        for m in models:
+            s = stats[m]
+            attempted = s.total - s.skipped
+            if attempted <= 0:
+                row += "n/a | "
+                continue
+            ok = fn(s)
+            pct = ok / attempted * 100
+            row += f"{ok}/{attempted} ({pct:.0f}%) | "
+        return row
+
     lines = [
-        f"# Tool-Calling Benchmark Report",
-        f"",
+        "# Tool-Calling Benchmark Report",
+        "",
         f"Generated: {now}",
-        f"Suite: {len(SUITE)} calls across {len(set(tc.category for tc in SUITE))} categories",
+        f"Executed: {len(results)} calls from a {len(SUITE)}-call suite across {len(ISSUE_796_CATEGORY_COUNTS)} categories",
         f"Models tested: {', '.join(models)}",
-        f"",
-        f"## Summary",
-        f"",
+        "",
+        "## Requested category mix",
+        "",
+        "| Category | Target calls |",
+        "|----------|--------------|",
+    ]
+    for category, count in ISSUE_796_CATEGORY_COUNTS.items():
+        lines.append(f"| {category} | {count} |")
+
+    lines.extend([
+        "",
+        "## Summary",
+        "",
         f"| Metric | {' | '.join(models)} |",
         f"|--------|{'|'.join('---------' for _ in models)}|",
-    ]
+        _score_row("Schema parse success", lambda s: s.schema_ok),
+        _score_row("Tool execution success", lambda s: s.exec_ok),
+        _score_row("Parallel tool success", lambda s: s.parallel_ok),
+    ])
 
-    # Schema parse success
-    row = "| Schema parse success | "
-    for m in models:
-        s = stats[m]
-        row += f"{s.schema_ok}/{s.total} ({s.schema_pct:.0f}%) | "
-    lines.append(row)
-
-    # Tool execution success
-    row = "| Tool execution success | "
-    for m in models:
-        s = stats[m]
-        row += f"{s.exec_ok}/{s.total} ({s.exec_pct:.0f}%) | "
-    lines.append(row)
-
-    # Correct tool selected
-    row = "| Correct tool selected | "
-    for m in models:
-        s = stats[m]
-        correct = sum(1 for r in results if r.model == m and r.success)
-        pct = (correct / s.total * 100) if s.total else 0
-        row += f"{correct}/{s.total} ({pct:.0f}%) | "
-    lines.append(row)
-
-    # Avg latency
     row = "| Avg latency (s) | "
     for m in models:
-        s = stats[m]
-        row += f"{s.avg_latency:.2f} | "
+        row += f"{stats[m].avg_latency:.2f} | "
     lines.append(row)
 
+    row = "| Avg tokens per call | "
+    for m in models:
+        total = stats[m].total
+        avg_tokens = stats[m].total_tokens / total if total else 0
+        row += f"{avg_tokens:.1f} | "
+    lines.append(row)
+
+    row = "| Avg token cost per call (USD) | "
+    for m in models:
+        avg_cost = stats[m].avg_cost_usd
+        row += (f"{avg_cost:.6f} | " if avg_cost is not None else "n/a | ")
+    lines.append(row)
+
+    row = "| Skipped / unavailable | "
+    for m in models:
+        s = stats[m]
+        row += f"{s.skipped}/{s.total} | "
+    lines.append(row)
     lines.append("")
 
-    # Per-category breakdown
-    lines.append("## Per-Category Breakdown")
+    lines.append("## Per-category breakdown")
     lines.append("")
-
     for cat in sorted(by_category.keys()):
         lines.append(f"### {cat.title()}")
         lines.append("")
         lines.append(f"| Metric | {' | '.join(models)} |")
         lines.append(f"|--------|{'|'.join('---------' for _ in models)}|")
-
-        cat_data = by_category[cat]
         for metric_name, fn in [
             ("Schema OK", lambda r: r.schema_ok),
             ("Exec OK", lambda r: r.execution_ok),
+            ("Parallel OK", lambda r: r.parallel_ok),
             ("Correct tool", lambda r: r.success),
         ]:
             row = f"| {metric_name} | "
             for m in models:
-                results_m = cat_data.get(m, [])
-                total = len(results_m)
-                ok = sum(1 for r in results_m if fn(r))
-                pct = (ok / total * 100) if total else 0
-                row += f"{ok}/{total} ({pct:.0f}%) | "
+                results_m = by_category[cat].get(m, [])
+                attempted = [r for r in results_m if not r.skipped]
+                if not attempted:
+                    row += "n/a | "
+                    continue
+                ok = sum(1 for r in attempted if fn(r))
+                pct = ok / len(attempted) * 100
+                row += f"{ok}/{len(attempted)} ({pct:.0f}%) | "
             lines.append(row)
 
+        row = "| Avg tokens | "
+        for m in models:
+            results_m = by_category[cat].get(m, [])
+            avg_tokens = sum(r.total_tokens for r in results_m) / len(results_m) if results_m else 0
+            row += f"{avg_tokens:.1f} | "
+        lines.append(row)
+
+        row = "| Skipped | "
+        for m in models:
+            results_m = by_category[cat].get(m, [])
+            skipped = sum(1 for r in results_m if r.skipped)
+            row += f"{skipped}/{len(results_m)} | "
+        lines.append(row)
         lines.append("")
 
-    # Failure analysis
-    lines.append("## Failure Analysis")
+    lines.append("## Failure analysis")
     lines.append("")
-
     any_failures = False
     for m in models:
         s = stats[m]
@@ -514,28 +641,40 @@ def generate_report(results: list[CallResult], models: list[str], output_path: P
                 err = r.error or "wrong tool"
                 lines.append(f"| {r.test_id} | {r.category} | {r.expected_tool} | {got} | {err[:60]} |")
             lines.append("")
-
     if not any_failures:
-        lines.append("No failures detected.")
+        lines.append("No model failures detected.")
         lines.append("")
 
-    # Raw results JSON
-    lines.append("## Raw Results")
+    skipped_results = [r for r in results if r.skipped]
+    lines.append("## Skipped / unavailable cases")
+    lines.append("")
+    if skipped_results:
+        lines.append("| Test | Model | Category | Reason |")
+        lines.append("|------|-------|----------|--------|")
+        for r in skipped_results:
+            lines.append(f"| {r.test_id} | {r.model} | {r.category} | {r.skip_reason[:80]} |")
+    else:
+        lines.append("No cases were skipped.")
+    lines.append("")
+
+    lines.append("## Raw results")
     lines.append("")
     lines.append("```json")
     lines.append(json.dumps([asdict(r) for r in results], indent=2, default=str))
     lines.append("```")
 
     report = "\n".join(lines)
-    output_path.write_text(report)
+    output_path.write_text(report, encoding="utf-8")
     return report
 
 
 def main():
     parser = argparse.ArgumentParser(description="Tool-calling benchmark")
     parser.add_argument("--models", nargs="+",
-                        default=["nous:gia-3/gemma-4-31b", "nous:mimo-v2-pro"],
+                        default=list(DEFAULT_COMPARE_MODELS),
                         help="Model specs to test (provider:model)")
+    parser.add_argument("--compare", action="store_true",
+                        help="Use the issue #796 default comparison set")
     parser.add_argument("--limit", type=int, default=0,
                         help="Run only first N tests (0 = all)")
     parser.add_argument("--category", type=str, default="",
@@ -546,6 +685,9 @@ def main():
                         help="Print test cases without running them")
     args = parser.parse_args()
 
+    if args.compare:
+        args.models = list(DEFAULT_COMPARE_MODELS)
+
     # Filter suite
     suite = SUITE[:]
     if args.category:

docs/review_packets/hermes-harness-2026-04-21.md

@@ -1,387 +0,0 @@
-# Morning Review Packet
-
-Source epic: [EPIC: Morning review packet — Hermes harness features landed 2026-04-21](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/949)
-
-## Epic context
-
-EPIC: Morning review packet — Hermes harness features landed 2026-04-21
-
-Source: git log on upstream/main since 2026-04-21 00:00 EDT, plus the current local branch `burn/921-poka-yoke-hardcoded-paths` for the branch-only path-guard work.
-
-Important review note:
-- Validate upstream-landed features on `upstream/main` or a synced branch.
-- Validate the path-guard work on `burn/921-poka-yoke-hardcoded-paths`.
-
-This epic is a morning-review packet: one QA issue per feature cluster, each with concrete acceptance criteria and targeted tests or manual checks.
-
-## Success criteria
-- [ ] Every issue has a clear PASS / FAIL outcome.
-- [ ] Test output or manual evidence is attached to each issue.
-- [ ] Any drift between upstream/main and forge/main is called out explicitly.
-
-## Sub-issues
-### Upstream/main features landed 2026-04-21
-- [ ] #950 [QA] Verify AI Gateway provider UX + attribution headers
-- [ ] #951 [QA] Verify transport abstraction + AnthropicTransport wiring
-- [ ] #952 [QA] Verify CLI voice beep toggle
-- [ ] #953 [QA] Verify bundled skill scripts run out of the box
-- [ ] #954 [QA] Verify maps skill guest_house / camp_site / bakery expansion
-- [ ] #955 [QA] Verify KittenTTS local provider end-to-end
-- [ ] #956 [QA] Verify numbered keyboard shortcuts for approval + clarify prompts
-- [ ] #957 [QA] Verify optional adversarial-ux-test skill catalog flow
-- [ ] #958 [QA] Verify /usage account limits in CLI + gateway
-- [ ] #959 [QA] Verify OpenCode-Go curated catalog additions
-- [ ] #960 [QA] Verify patch 'did you mean?' suggestions
-- [ ] #961 [QA] Verify web dashboard update/restart action buttons
-
-### Local branch-only work
-- [ ] #962 [QA] Verify hardcoded-home path guard on burn/921 branch
-
-## Summary
-
-| Issue | State | Commits | Tests |
-| --- | --- | --- | --- |
-| #950 | open | 5 | 2 |
-| #951 | open | 2 | 2 |
-| #952 | open | 1 | 1 |
-| #953 | open | 1 | 2 |
-| #954 | open | 1 | 0 |
-| #955 | open | 2 | 1 |
-| #956 | open | 1 | 0 |
-| #957 | open | 1 | 0 |
-| #958 | open | 2 | 2 |
-| #959 | open | 1 | 1 |
-| #960 | open | 2 | 1 |
-| #961 | closed | 1 | 0 |
-| #962 | closed | 1 | 1 |
-
-## #950 — [QA] Verify AI Gateway provider UX + attribution headers
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/950
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `b11753879` — attribution default_headers for ai-gateway provider
-- `700437440` — curated picker with live pricing
-- `ac26a460f` — promote ai-gateway in provider picker ordering
-- `5bb2d11b0` — auto-promote free Moonshot models
-- `29f57ec95` — Vercel deep-link for API key creation
-
-### Targeted tests
-- `tests/hermes_cli/test_ai_gateway_models.py`
-- `tests/run_agent/test_provider_attribution_headers.py`
-
-### Tasks
-- [ ] Open `hermes model` and verify `ai-gateway` appears near the top.
-- [ ] Verify live pricing appears in the picker.
-- [ ] Verify free Moonshot models are promoted.
-- [ ] Trigger API-key setup flow and verify the Vercel deep link.
-- [ ] Send one ai-gateway request and verify attribution headers are attached.
-
-### Acceptance criteria
-- [ ] UI ordering and pricing match the landed behavior.
-- [ ] Attribution headers are present on ai-gateway requests.
-- [ ] Targeted tests pass.
-
-## #951 — [QA] Verify transport abstraction + AnthropicTransport wiring
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/951
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `7ab5eebd0` — transport types + Anthropic normalize migration
-- `731f4fbae` — transport ABC + AnthropicTransport wired to all paths
-
-### Targeted tests
-- `tests/agent/transports/test_types.py`
-- `tests/agent/test_anthropic_normalize_v2.py`
-
-### Tasks
-- [ ] Verify plain-text Anthropic responses normalize correctly.
-- [ ] Verify tool-call responses preserve IDs, names, and arguments.
-- [ ] Verify reasoning/thinking is preserved separately from visible content.
-- [ ] Verify finish_reason mapping remains correct across paths.
-
-### Acceptance criteria
-- [ ] Normalized response shape is stable.
-- [ ] Tool-call and reasoning payloads survive normalization.
-- [ ] Targeted tests pass.
-
-## #952 — [QA] Verify CLI voice beep toggle
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/952
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `b48ea41d2` — voice: add CLI beep toggle
-
-### Targeted tests
-- `tests/tools/test_voice_cli_integration.py`
-
-### Tasks
-- [ ] Enable the beep option in config and confirm voice mode emits the beep.
-- [ ] Disable the option and confirm the same path is silent.
-- [ ] Verify voice mode still strips markdown before speech output.
-- [ ] Verify voice mode does not pollute conversation history with TTS-only text.
-
-### Acceptance criteria
-- [ ] Beep behavior is actually toggled by config.
-- [ ] Existing voice/TTS integration behavior is not regressed.
-- [ ] Targeted tests pass.
-
-## #953 — [QA] Verify bundled skill scripts run out of the box
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/953
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `328223576` — make bundled skill scripts runnable out of the box
-
-### Targeted tests
-- `tests/agent/test_skill_commands.py`
-- `tests/tools/test_local_shell_init.py`
-
-### Tasks
-- [ ] Pick a bundled skill that ships a script and run it without manual chmod/PATH surgery.
-- [ ] Verify local terminal execution resolves the installed skill script correctly.
-- [ ] Verify local shell init still behaves correctly.
-
-### Acceptance criteria
-- [ ] Bundled skill scripts execute from the installed skill location with no manual prep.
-- [ ] Local shell init remains healthy.
-- [ ] Targeted tests pass.
-
-## #954 — [QA] Verify maps skill guest_house / camp_site / bakery expansion
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/954
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `c5a814b23` — maps: add guest_house, camp_site, and dual-key bakery lookup
-
-### Tasks
-- [ ] Use the maps skill to search for a guest house in a known populated area.
-- [ ] Use the maps skill to search for a camp site in a known populated area.
-- [ ] Use the maps skill to search for a bakery and verify both supported keys resolve correctly.
-- [ ] Confirm results are sensible and non-empty.
-
-### Acceptance criteria
-- [ ] All three place types resolve correctly.
-- [ ] Bakery lookup works through both supported keys.
-- [ ] Manual evidence is attached in the issue.
-
-## #955 — [QA] Verify KittenTTS local provider end-to-end
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/955
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `1830ebfc5` — add KittenTTS provider
-- `2d7ff9c5b` — complete KittenTTS integration across tools/setup/docs/tests
-
-### Targeted tests
-- `tests/tools/test_tts_kittentts.py`
-
-### Tasks
-- [ ] Configure TTS to use `kittentts`.
-- [ ] Generate speech to `.wav` and verify playable output.
-- [ ] Verify voice / speed / cleaned text are passed correctly.
-- [ ] Generate repeated requests and verify model caching behavior.
-- [ ] Generate a non-wav output and verify ffmpeg conversion path.
-- [ ] Verify missing-package behavior returns a helpful error.
-
-### Acceptance criteria
-- [ ] KittenTTS works end-to-end when installed.
-- [ ] Failure mode is operator-friendly when not installed.
-- [ ] Targeted tests pass.
-
-## #956 — [QA] Verify numbered keyboard shortcuts for approval + clarify prompts
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/956
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `d1ed6f4fb` — CLI: add numbered keyboard shortcuts to approval and clarify prompts
-
-### Tasks
-- [ ] Trigger an approval prompt and choose an option with number keys.
-- [ ] Trigger a clarify prompt and choose an option with number keys.
-- [ ] Verify the correct option is submitted both times.
-- [ ] Verify normal keyboard navigation still works.
-
-### Acceptance criteria
-- [ ] Number-key selection works for both prompt types.
-- [ ] Legacy keyboard navigation is not broken.
-- [ ] Manual evidence is attached in the issue.
-
-## #957 — [QA] Verify optional adversarial-ux-test skill catalog flow
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/957
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `e50e7f11b` — skills: add adversarial-ux-test optional skill
-
-### Tasks
-- [ ] Verify the optional skill appears in the optional skill catalog.
-- [ ] Install or enable the skill.
-- [ ] Load it successfully through Hermes.
-- [ ] Disable or remove it and verify catalog state updates cleanly.
-
-### Acceptance criteria
-- [ ] Catalog listing is correct.
-- [ ] Install / load / disable lifecycle works cleanly.
-- [ ] Manual evidence is attached in the issue.
-
-## #958 — [QA] Verify /usage account limits in CLI + gateway
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/958
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `8a11b0a20` — per-provider account limits module
-- `bcc5d7b67` — append account limits section in CLI and gateway
-
-### Targeted tests
-- `tests/test_account_usage.py`
-- `tests/gateway/test_usage_command.py`
-
-### Tasks
-- [ ] Run `/usage` in CLI for a provider with account limits.
-- [ ] Verify provider, remaining quota, total limit, and reset window render correctly.
-- [ ] Run `/usage` through the gateway and verify the same section appears.
-- [ ] Verify zero-value cache read/write sections stay hidden when appropriate.
-
-### Acceptance criteria
-- [ ] CLI and gateway both show the landed account-limits section correctly.
-- [ ] Targeted tests pass.
-
-## #959 — [QA] Verify OpenCode-Go curated catalog additions
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/959
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `4fea1769d` — opencode-go: add Kimi K2.6 and Qwen3.5/3.6 Plus to curated catalog
-
-### Targeted tests
-- `tests/hermes_cli/test_opencode_go_in_model_list.py`
-
-### Tasks
-- [ ] With valid OpenCode-Go credentials, open `hermes model`.
-- [ ] Verify Kimi K2.6 appears.
-- [ ] Verify Qwen 3.5 Plus and 3.6 Plus appear.
-- [ ] Unset credentials and verify the provider/catalog hides correctly.
-
-### Acceptance criteria
-- [ ] New curated models are present when credentials exist.
-- [ ] Catalog visibility still respects credential gating.
-- [ ] Targeted tests pass.
-
-## #960 — [QA] Verify patch 'did you mean?' suggestions
-
-State: open
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/960
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `15abf4ed8` — add `did you mean?` feedback when patch fails to match
-- `5e6427a42` — gate it to true no-match cases and extend to v4a / skill_manage
-
-### Targeted tests
-- `tests/tools/test_fuzzy_match.py`
-
-### Tasks
-- [ ] Intentionally run a replace/patch with a near-miss `old_string`.
-- [ ] Verify the tool suggests a useful nearby line/context.
-- [ ] Verify suggestions only appear on true no-match failures.
-- [ ] Verify the behavior also works via file tools, v4a patching, and skill_manage.
-
-### Acceptance criteria
-- [ ] Suggestion quality is helpful, not noisy.
-- [ ] Suggestions are correctly gated to no-match cases.
-- [ ] Targeted tests pass.
-
-## #961 — [QA] Verify web dashboard update/restart action buttons
-
-State: closed
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/961
-
-### Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-### Commits
-- `fc21c1420` — add buttons to update Hermes and restart gateway
-
-### Files touched
-- `web/src/pages/StatusPage.tsx`
-- `web/src/lib/api.ts`
-- `web/src/i18n/en.ts`
-
-### Tasks
-- [ ] Open the Web UI status page and verify both buttons are present.
-- [ ] Click Restart Gateway in a safe environment and verify running/output/success-or-failure states render.
-- [ ] Click Update Hermes and verify the same action lifecycle.
-- [ ] Verify the page remains responsive while actions are running.
-
-### Acceptance criteria
-- [ ] Both action buttons are present and wired.
-- [ ] Action status polling and result rendering work end-to-end.
-- [ ] Manual evidence is attached in the issue.
-
-## #962 — [QA] Verify hardcoded-home path guard on burn/921 branch
-
-State: closed
-URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/962
-
-### Branch / checkout
-- Validate specifically on `burn/921-poka-yoke-hardcoded-paths` (not upstream/main).
-
-### Commits
-- `5dcb90531` — Poka-yoke: prevent hardcoded home-directory paths
-
-### Targeted tests
-- `tests/test_path_guard.py`
-
-### Tasks
-- [ ] Verify hardcoded `/Users/...` paths are rejected.
-- [ ] Verify hardcoded `~/.hermes/...` paths are rejected in guarded contexts.
-- [ ] Verify valid relative paths still pass.
-- [ ] Verify appropriate absolute paths still pass where intended.
-- [ ] Verify linting catches violations in non-test files.
-
-### Acceptance criteria
-- [ ] Guard blocks the dangerous patterns and preserves allowed ones.
-- [ ] Targeted tests pass.

scripts/morning_review_packet.py

@@ -1,301 +0,0 @@
-#!/usr/bin/env python3
-"""Build a morning review packet from a Gitea epic and its child QA issues.
-
-This script fetches a parent epic plus its sub-issues, extracts the structured
-sections from each QA issue body, and renders a single markdown packet suitable
-for morning review.
-
-Usage:
-    python scripts/morning_review_packet.py --epic-number 949
-    python scripts/morning_review_packet.py --epic-number 949 --children 950-962
-    python scripts/morning_review_packet.py --epic-number 949 --output docs/review_packets/hermes-harness-2026-04-21.md
-"""
-
-from __future__ import annotations
-
-import argparse
-import json
-import os
-import re
-import urllib.request
-from dataclasses import dataclass, field
-from pathlib import Path
-from typing import Iterable
-
-DEFAULT_BASE_URL = "https://forge.alexanderwhitestone.com"
-DEFAULT_OWNER = "Timmy_Foundation"
-DEFAULT_REPO = "hermes-agent"
-DEFAULT_TOKEN_PATH = Path.home() / ".config" / "gitea" / "token"
-
-
-@dataclass(frozen=True)
-class CommitEvidence:
-    sha: str
-    summary: str
-
-
-@dataclass
-class ReviewIssue:
-    number: int
-    title: str
-    state: str
-    url: str
-    comments: int = 0
-    parent_issue: int | None = None
-    checkout_notes: list[str] = field(default_factory=list)
-    commits: list[CommitEvidence] = field(default_factory=list)
-    targeted_tests: list[str] = field(default_factory=list)
-    files_touched: list[str] = field(default_factory=list)
-    tasks: list[str] = field(default_factory=list)
-    acceptance_criteria: list[str] = field(default_factory=list)
-
-
-def parse_issue_number_spec(spec: str) -> list[int]:
-    """Parse a comma-separated issue list like ``950-952,955,962``."""
-    numbers: list[int] = []
-    seen: set[int] = set()
-    for chunk in (part.strip() for part in spec.split(",")):
-        if not chunk:
-            continue
-        if "-" in chunk:
-            start_str, end_str = (part.strip() for part in chunk.split("-", 1))
-            start = int(start_str)
-            end = int(end_str)
-            if end < start:
-                raise ValueError(f"Invalid descending issue range: {chunk}")
-            for number in range(start, end + 1):
-                if number not in seen:
-                    numbers.append(number)
-                    seen.add(number)
-        else:
-            number = int(chunk)
-            if number not in seen:
-                numbers.append(number)
-                seen.add(number)
-    return numbers
-
-
-def _parse_sections(body: str) -> dict[str, list[str]]:
-    sections: dict[str, list[str]] = {}
-    current: str | None = None
-    for raw_line in body.splitlines():
-        line = raw_line.rstrip()
-        if line.startswith("## "):
-            current = line[3:].strip()
-            sections[current] = []
-            continue
-        if current is not None:
-            sections[current].append(line)
-    return sections
-
-
-def _clean_bullet(line: str) -> str | None:
-    stripped = line.strip()
-    if not stripped:
-        return None
-    stripped = re.sub(r"^-\s*\[(?: |x|X)\]\s*", "", stripped)
-    stripped = re.sub(r"^-\s*", "", stripped)
-    return stripped.strip() or None
-
-
-def _extract_bullets(lines: Iterable[str]) -> list[str]:
-    items: list[str] = []
-    for line in lines:
-        cleaned = _clean_bullet(line)
-        if cleaned:
-            items.append(cleaned)
-    return items
-
-
-def _extract_parent_issue(body: str, sections: dict[str, list[str]]) -> int | None:
-    parent_lines = sections.get("Parent", [])
-    for line in parent_lines:
-        match = re.search(r"#(\d+)", line)
-        if match:
-            return int(match.group(1))
-    match = re.search(r"Linked to Epic\s+#(\d+)", body, flags=re.IGNORECASE)
-    if match:
-        return int(match.group(1))
-    return None
-
-
-def _extract_commits(lines: Iterable[str]) -> list[CommitEvidence]:
-    commits: list[CommitEvidence] = []
-    for item in _extract_bullets(lines):
-        match = re.match(r"`([^`]+)`\s*(.*)", item)
-        if match:
-            commits.append(CommitEvidence(sha=match.group(1).strip(), summary=match.group(2).strip()))
-        else:
-            commits.append(CommitEvidence(sha="", summary=item))
-    return commits
-
-
-def _strip_backticks(items: Iterable[str]) -> list[str]:
-    cleaned: list[str] = []
-    for item in items:
-        cleaned.append(item.replace("`", "").strip())
-    return cleaned
-
-
-def discover_child_issue_numbers(epic_body: str) -> list[int]:
-    """Discover sub-issue numbers from an epic body."""
-    sections = _parse_sections(epic_body)
-    sub_lines = sections.get("Sub-issues")
-    if not sub_lines:
-        return []
-    numbers: list[int] = []
-    seen: set[int] = set()
-    for line in sub_lines:
-        for match in re.finditer(r"#(\d+)", line):
-            number = int(match.group(1))
-            if number not in seen:
-                numbers.append(number)
-                seen.add(number)
-    return numbers
-
-
-def parse_child_issue(issue: dict) -> ReviewIssue:
-    body = issue.get("body") or ""
-    sections = _parse_sections(body)
-    commit_lines = sections.get("Commits landed today", []) or sections.get("Commit landed today", [])
-
-    return ReviewIssue(
-        number=int(issue["number"]),
-        title=issue.get("title") or "",
-        state=(issue.get("state") or "unknown").lower(),
-        url=issue.get("html_url") or issue.get("url") or "",
-        comments=int(issue.get("comments") or 0),
-        parent_issue=_extract_parent_issue(body, sections),
-        checkout_notes=_extract_bullets(sections.get("Branch / checkout", [])),
-        commits=_extract_commits(commit_lines),
-        targeted_tests=_strip_backticks(_extract_bullets(sections.get("Targeted tests", []))),
-        files_touched=_strip_backticks(_extract_bullets(sections.get("Files touched", []))),
-        tasks=_extract_bullets(sections.get("Tasks", [])),
-        acceptance_criteria=_extract_bullets(sections.get("Acceptance Criteria", [])),
-    )
-
-
-def build_packet_markdown(epic_issue: dict, child_issues: list[ReviewIssue]) -> str:
-    title = epic_issue.get("title") or f"Epic #{epic_issue.get('number')}"
-    url = epic_issue.get("html_url") or epic_issue.get("url") or ""
-    body = epic_issue.get("body") or ""
-    children = sorted(child_issues, key=lambda item: item.number)
-
-    lines: list[str] = []
-    lines.append("# Morning Review Packet")
-    lines.append("")
-    lines.append(f"Source epic: [{title}]({url})")
-    lines.append("")
-    lines.append("## Epic context")
-    lines.append("")
-    lines.append(title)
-    lines.append("")
-    for line in body.splitlines():
-        if line.strip():
-            lines.append(line)
-        else:
-            lines.append("")
-    lines.append("")
-    lines.append("## Summary")
-    lines.append("")
-    lines.append("| Issue | State | Commits | Tests |")
-    lines.append("| --- | --- | --- | --- |")
-    for child in children:
-        lines.append(
-            f"| #{child.number} | {child.state} | {len(child.commits)} | {len(child.targeted_tests)} |"
-        )
-    lines.append("")
-
-    for child in children:
-        lines.append(f"## #{child.number} — {child.title}")
-        lines.append("")
-        lines.append(f"State: {child.state}")
-        lines.append(f"URL: {child.url}")
-        lines.append("")
-        if child.checkout_notes:
-            lines.append("### Branch / checkout")
-            for note in child.checkout_notes:
-                lines.append(f"- {note}")
-            lines.append("")
-        if child.commits:
-            lines.append("### Commits")
-            for commit in child.commits:
-                if commit.sha:
-                    lines.append(f"- `{commit.sha}` — {commit.summary}")
-                else:
-                    lines.append(f"- {commit.summary}")
-            lines.append("")
-        if child.targeted_tests:
-            lines.append("### Targeted tests")
-            for test_path in child.targeted_tests:
-                lines.append(f"- `{test_path}`")
-            lines.append("")
-        if child.files_touched:
-            lines.append("### Files touched")
-            for file_path in child.files_touched:
-                lines.append(f"- `{file_path}`")
-            lines.append("")
-        if child.tasks:
-            lines.append("### Tasks")
-            for task in child.tasks:
-                lines.append(f"- [ ] {task}")
-            lines.append("")
-        if child.acceptance_criteria:
-            lines.append("### Acceptance criteria")
-            for item in child.acceptance_criteria:
-                lines.append(f"- [ ] {item}")
-            lines.append("")
-
-    return "\n".join(lines).rstrip() + "\n"
-
-
-def _resolve_token(explicit_token: str | None = None) -> str:
-    if explicit_token:
-        return explicit_token.strip()
-    env_token = os.getenv("GITEA_TOKEN")
-    if env_token:
-        return env_token.strip()
-    if DEFAULT_TOKEN_PATH.exists():
-        return DEFAULT_TOKEN_PATH.read_text().strip()
-    raise FileNotFoundError(f"No Gitea token found. Set GITEA_TOKEN or create {DEFAULT_TOKEN_PATH}")
-
-
-def fetch_issue(base_url: str, owner: str, repo: str, number: int, token: str) -> dict:
-    url = f"{base_url.rstrip('/')}/api/v1/repos/{owner}/{repo}/issues/{number}"
-    request = urllib.request.Request(url, headers={"Authorization": f"token {token}"})
-    with urllib.request.urlopen(request, timeout=30) as response:
-        return json.loads(response.read().decode())
-
-
-def collect_child_issues(base_url: str, owner: str, repo: str, epic_issue: dict, token: str, children_spec: str | None = None) -> list[dict]:
-    numbers = parse_issue_number_spec(children_spec) if children_spec else discover_child_issue_numbers(epic_issue.get("body") or "")
-    return [fetch_issue(base_url, owner, repo, number, token) for number in numbers]
-
-
-def main(argv: list[str] | None = None) -> int:
-    parser = argparse.ArgumentParser(description="Build a markdown morning review packet from a Gitea epic")
-    parser.add_argument("--base-url", default=DEFAULT_BASE_URL)
-    parser.add_argument("--owner", default=DEFAULT_OWNER)
-    parser.add_argument("--repo", default=DEFAULT_REPO)
-    parser.add_argument("--epic-number", type=int, required=True)
-    parser.add_argument("--children", help="Explicit issue list/ranges, e.g. 950-962")
-    parser.add_argument("--token", help="Gitea token (defaults to GITEA_TOKEN or ~/.config/gitea/token)")
-    parser.add_argument("--output", help="Write markdown packet to this path instead of stdout")
-    args = parser.parse_args(argv)
-
-    token = _resolve_token(args.token)
-    epic_issue = fetch_issue(args.base_url, args.owner, args.repo, args.epic_number, token)
-    child_issue_dicts = collect_child_issues(args.base_url, args.owner, args.repo, epic_issue, token, args.children)
-    packet = build_packet_markdown(epic_issue, [parse_child_issue(issue) for issue in child_issue_dicts])
-
-    if args.output:
-        output_path = Path(args.output)
-        output_path.parent.mkdir(parents=True, exist_ok=True)
-        output_path.write_text(packet)
-    else:
-        print(packet, end="")
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

tests/test_morning_review_packet.py

@@ -1,162 +0,0 @@
-from pathlib import Path
-import sys
-
-SCRIPT_DIR = Path(__file__).resolve().parents[1] / "scripts"
-sys.path.insert(0, str(SCRIPT_DIR))
-
-import morning_review_packet as mrp
-
-
-EPIC_BODY = """Source: git log on upstream/main since 2026-04-21 00:00 EDT.
-
-## Success criteria
-- [ ] Every issue has a clear PASS / FAIL outcome.
-
-## Sub-issues
-- [ ] #950 [QA] Verify AI Gateway provider UX + attribution headers
-- [ ] #951 [QA] Verify transport abstraction + AnthropicTransport wiring
-- [x] #962 [QA] Verify hardcoded-home path guard on burn/921 branch
-"""
-
-
-CHILD_BODY_PLURAL = """## Parent
-#949
-
-## Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-## Commits landed today
-- `b11753879` attribution default_headers for ai-gateway provider
-- `700437440` curated picker with live pricing
-
-## Targeted tests
-- `tests/hermes_cli/test_ai_gateway_models.py`
-- `tests/run_agent/test_provider_attribution_headers.py`
-
-## Tasks
-- [ ] Verify the picker ordering.
-- [ ] Verify attribution headers.
-
-## Acceptance Criteria
-- [ ] Picker shows AI Gateway prominently.
-- [ ] Headers appear on OpenRouter calls.
-"""
-
-
-CHILD_BODY_SINGULAR = """## Parent
-#949
-
-## Branch / checkout
-- Validate on `upstream/main` or an equivalent synced checkout.
-
-## Commit landed today
-- `fc21c1420` add buttons to update Hermes and restart gateway
-
-## Files touched
-- `web/src/pages/StatusPage.tsx`
-- `web/src/lib/api.ts`
-- `web/src/i18n/en.ts`
-
-## Tasks
-- [ ] Open the Web UI status page and verify both buttons are present.
-- [ ] Click Restart Gateway in a safe environment.
-"""
-
-
-def test_discover_child_issue_numbers_from_epic_body():
-    assert mrp.discover_child_issue_numbers(EPIC_BODY) == [950, 951, 962]
-
-
-def test_parse_issue_number_spec_supports_ranges_and_lists():
-    assert mrp.parse_issue_number_spec("950-952,955,962") == [950, 951, 952, 955, 962]
-
-
-def test_parse_child_issue_extracts_structured_sections():
-    issue = {
-        "number": 950,
-        "title": "[QA] Verify AI Gateway provider UX + attribution headers",
-        "state": "open",
-        "html_url": "https://forge.example/950",
-        "comments": 0,
-        "body": CHILD_BODY_PLURAL,
-    }
-
-    parsed = mrp.parse_child_issue(issue)
-
-    assert parsed.number == 950
-    assert parsed.parent_issue == 949
-    assert parsed.checkout_notes == ["Validate on `upstream/main` or an equivalent synced checkout."]
-    assert [c.sha for c in parsed.commits] == ["b11753879", "700437440"]
-    assert parsed.targeted_tests == [
-        "tests/hermes_cli/test_ai_gateway_models.py",
-        "tests/run_agent/test_provider_attribution_headers.py",
-    ]
-    assert parsed.tasks == [
-        "Verify the picker ordering.",
-        "Verify attribution headers.",
-    ]
-    assert parsed.acceptance_criteria == [
-        "Picker shows AI Gateway prominently.",
-        "Headers appear on OpenRouter calls.",
-    ]
-
-
-def test_parse_child_issue_handles_singular_commit_heading_and_files_touched():
-    issue = {
-        "number": 961,
-        "title": "[QA] Verify web dashboard update/restart action buttons",
-        "state": "closed",
-        "html_url": "https://forge.example/961",
-        "comments": 16,
-        "body": CHILD_BODY_SINGULAR,
-    }
-
-    parsed = mrp.parse_child_issue(issue)
-
-    assert [c.sha for c in parsed.commits] == ["fc21c1420"]
-    assert parsed.files_touched == [
-        "web/src/pages/StatusPage.tsx",
-        "web/src/lib/api.ts",
-        "web/src/i18n/en.ts",
-    ]
-    assert parsed.tasks == [
-        "Open the Web UI status page and verify both buttons are present.",
-        "Click Restart Gateway in a safe environment.",
-    ]
-
-
-def test_build_packet_markdown_renders_summary_and_details():
-    epic_issue = {
-        "number": 949,
-        "title": "EPIC: Morning review packet — Hermes harness features landed 2026-04-21",
-        "state": "open",
-        "html_url": "https://forge.example/949",
-        "body": EPIC_BODY,
-    }
-    child_a = mrp.parse_child_issue({
-        "number": 950,
-        "title": "[QA] Verify AI Gateway provider UX + attribution headers",
-        "state": "open",
-        "html_url": "https://forge.example/950",
-        "comments": 0,
-        "body": CHILD_BODY_PLURAL,
-    })
-    child_b = mrp.parse_child_issue({
-        "number": 961,
-        "title": "[QA] Verify web dashboard update/restart action buttons",
-        "state": "closed",
-        "html_url": "https://forge.example/961",
-        "comments": 16,
-        "body": CHILD_BODY_SINGULAR,
-    })
-
-    markdown = mrp.build_packet_markdown(epic_issue, [child_a, child_b])
-
-    assert "# Morning Review Packet" in markdown
-    assert "EPIC: Morning review packet — Hermes harness features landed 2026-04-21" in markdown
-    assert "| #950 | open | 2 | 2 |" in markdown
-    assert "| #961 | closed | 1 | 0 |" in markdown
-    assert "## #950 — [QA] Verify AI Gateway provider UX + attribution headers" in markdown
-    assert "## #961 — [QA] Verify web dashboard update/restart action buttons" in markdown
-    assert "`b11753879` — attribution default_headers for ai-gateway provider" in markdown
-    assert "`web/src/pages/StatusPage.tsx`" in markdown

tests/test_tool_call_benchmark.py

@@ -0,0 +1,115 @@
+"""Tests for Issue #796 tool-calling benchmark coverage and reporting."""
+
+import sys
+from pathlib import Path
+from types import SimpleNamespace
+from unittest.mock import patch
+
+sys.path.insert(0, str(Path(__file__).parent.parent / "benchmarks"))
+
+from tool_call_benchmark import (  # noqa: E402
+    CallResult,
+    DEFAULT_COMPARE_MODELS,
+    ISSUE_796_CATEGORY_COUNTS,
+    ToolCall,
+    generate_report,
+    run_single_test,
+    suite_category_counts,
+)
+
+
+def test_suite_counts_match_issue_796_distribution():
+    counts = suite_category_counts()
+    assert counts == ISSUE_796_CATEGORY_COUNTS
+    assert sum(counts.values()) == 100
+
+
+def test_default_compare_models_cover_issue_796_lanes():
+    assert len(DEFAULT_COMPARE_MODELS) == 3
+    assert any("gemma-4-31b" in spec for spec in DEFAULT_COMPARE_MODELS)
+    assert any("gemma-4-26b" in spec for spec in DEFAULT_COMPARE_MODELS)
+    assert any("mimo-v2-pro" in spec for spec in DEFAULT_COMPARE_MODELS)
+
+
+def test_generate_report_includes_parallel_and_cost_metrics(tmp_path):
+    output_path = tmp_path / "report.md"
+    results = [
+        CallResult(
+            test_id="file-01",
+            category="file",
+            model="gemma-4-31b",
+            prompt="Read the file.",
+            expected_tool="read_file",
+            success=True,
+            tool_called="read_file",
+            schema_ok=True,
+            tool_args_valid=True,
+            execution_ok=True,
+            tool_count=2,
+            parallel_ok=True,
+            latency_s=1.25,
+            total_tokens=123,
+            estimated_cost_usd=0.0012,
+            cost_status="estimated",
+        ),
+        CallResult(
+            test_id="web-01",
+            category="web",
+            model="mimo-v2-pro",
+            prompt="Search the web.",
+            expected_tool="web_search",
+            success=False,
+            tool_called="web_search",
+            schema_ok=True,
+            tool_args_valid=False,
+            execution_ok=False,
+            tool_count=1,
+            parallel_ok=False,
+            latency_s=2.5,
+            error="bad args",
+            total_tokens=456,
+            estimated_cost_usd=None,
+            cost_status="unknown",
+            skipped=True,
+            skip_reason="web_search unavailable",
+        ),
+    ]
+
+    report = generate_report(results, ["gemma-4-31b", "mimo-v2-pro"], output_path)
+
+    assert output_path.exists()
+    assert "Parallel tool success" in report
+    assert "Avg token cost per call (USD)" in report
+    assert "Skipped / unavailable" in report
+    assert "Requested category mix" in report
+
+
+def test_run_single_test_skips_when_expected_tool_unavailable():
+    class FakeAgent:
+        def __init__(self, *args, **kwargs):
+            self.valid_tool_names = {"read_file", "terminal"}
+            self.session_input_tokens = 0
+            self.session_output_tokens = 0
+            self.session_cache_read_tokens = 0
+            self.session_cache_write_tokens = 0
+            self.session_api_calls = 0
+            self.base_url = ""
+            self.api_key = None
+
+        def run_conversation(self, *args, **kwargs):
+            raise AssertionError("run_conversation should not be called for unavailable tools")
+
+    tc = ToolCall(
+        id="mcp-01",
+        category="mcp",
+        prompt="Use an MCP tool to list resources.",
+        expected_tool="",
+        expected_tool_prefix="mcp_",
+    )
+
+    with patch.dict(sys.modules, {"run_agent": SimpleNamespace(AIAgent=FakeAgent)}):
+        result = run_single_test(tc, "gemini:gemma-4-31b-it", "gemini")
+
+    assert result.skipped is True
+    assert "mcp_" in result.skip_reason
+    assert result.success is False