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/morning-review-packet-2026-04-21-status.md

@@ -1,66 +0,0 @@
-# Morning Review Packet Status — #949
-
-Generated: 2026-04-22T14:57:44.332419+00:00
-Epic: [EPIC: Morning review packet — Hermes harness features landed 2026-04-21](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/949)
-
-## Summary
-
-- Child QA issues tracked: 13
-- Open child issues: 11
-- Closed child issues: 2
-- Open child issues already backed by PRs: 7
-- Open child issues still unowned on forge: 4
-
-## Child QA Matrix
-
-| Issue | State | Open PRs | Title |
-|------:|-------|----------|-------|
-| #950 | open | — | [QA] Verify AI Gateway provider UX + attribution headers |
-| #951 | open | — | [QA] Verify transport abstraction + AnthropicTransport wiring |
-| #952 | open | — | [QA] Verify CLI voice beep toggle |
-| #953 | open | [#1020](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1020) | [QA] Verify bundled skill scripts run out of the box |
-| #954 | open | [#1021](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1021) | [QA] Verify maps skill guest_house / camp_site / bakery expansion |
-| #955 | open | — | [QA] Verify KittenTTS local provider end-to-end |
-| #956 | open | [#1018](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1018) | [QA] Verify numbered keyboard shortcuts for approval + clarify prompts |
-| #957 | open | [#1015](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1015) | [QA] Verify optional adversarial-ux-test skill catalog flow |
-| #958 | open | [#1016](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1016) | [QA] Verify /usage account limits in CLI + gateway |
-| #959 | open | [#1014](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1014) | [QA] Verify OpenCode-Go curated catalog additions |
-| #960 | open | [#1017](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1017) | [QA] Verify patch 'did you mean?' suggestions |
-| #961 | closed | — | [QA] Verify web dashboard update/restart action buttons |
-| #962 | closed | — | [QA] Verify hardcoded-home path guard on burn/921 branch |
-
-## Drift Signals
-
-forge/main is still catching up to the upstream packet.
-
-Active PR-backed child lanes:
-- #953 -> #1020 ([QA] Verify bundled skill scripts run out of the box)
-- #954 -> #1021 ([QA] Verify maps skill guest_house / camp_site / bakery expansion)
-- #956 -> #1018 ([QA] Verify numbered keyboard shortcuts for approval + clarify prompts)
-- #957 -> #1015 ([QA] Verify optional adversarial-ux-test skill catalog flow)
-- #958 -> #1016 ([QA] Verify /usage account limits in CLI + gateway)
-- #959 -> #1014 ([QA] Verify OpenCode-Go curated catalog additions)
-- #960 -> #1017 ([QA] Verify patch 'did you mean?' suggestions)
-
-## Unowned Open QA Issues
-
-- #950 [QA] Verify AI Gateway provider UX + attribution headers
-- #951 [QA] Verify transport abstraction + AnthropicTransport wiring
-- #952 [QA] Verify CLI voice beep toggle
-- #955 [QA] Verify KittenTTS local provider end-to-end
-
-## Decomposition Follow-Ups
-
-- #965 [open] [EPIC: Morning review packet — Hermes harness features landed 2026-04-21] Phase 1: Landscape Analysis & Scaffolding
-- #966 [open] [EPIC: Morning review packet — Hermes harness features landed 2026-04-21] Phase 2: Core Logic Implementation
-- #967 [closed] [EPIC: Morning review packet — Hermes harness features landed 2026-04-21] Phase 3: Poka-yoke Integration & Fleet Verification
-
-## Conclusion
-
-Refs #949 only. This epic remains open until every child QA issue has a truthful PASS/FAIL outcome, attached evidence, and any upstream/main versus forge/main drift is resolved or explicitly documented.
-
-## Regeneration
-
-```bash
-python3 scripts/morning_review_packet_status.py --fetch-live --json-out docs/morning-review-packet-2026-04-21.snapshot.json --markdown-out docs/morning-review-packet-2026-04-21-status.md
-```

docs/morning-review-packet-2026-04-21.snapshot.json

@@ -1,172 +0,0 @@
-{
-  "generated_at": "2026-04-22T14:57:44.332419+00:00",
-  "repo": "Timmy_Foundation/hermes-agent",
-  "epic": {
-    "number": 949,
-    "title": "EPIC: Morning review packet \u2014 Hermes harness features landed 2026-04-21",
-    "state": "open",
-    "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/949"
-  },
-  "children": [
-    {
-      "number": 950,
-      "title": "[QA] Verify AI Gateway provider UX + attribution headers",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/950",
-      "open_prs": []
-    },
-    {
-      "number": 951,
-      "title": "[QA] Verify transport abstraction + AnthropicTransport wiring",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/951",
-      "open_prs": []
-    },
-    {
-      "number": 952,
-      "title": "[QA] Verify CLI voice beep toggle",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/952",
-      "open_prs": []
-    },
-    {
-      "number": 953,
-      "title": "[QA] Verify bundled skill scripts run out of the box",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/953",
-      "open_prs": [
-        {
-          "number": 1020,
-          "title": "fix: ship bundled skill scripts executable",
-          "head": "fix/953",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1020"
-        }
-      ]
-    },
-    {
-      "number": 954,
-      "title": "[QA] Verify maps skill guest_house / camp_site / bakery expansion",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/954",
-      "open_prs": [
-        {
-          "number": 1021,
-          "title": "feat: sync maps skill and verify guest_house/camp_site/bakery (#954)",
-          "head": "fix/954",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1021"
-        }
-      ]
-    },
-    {
-      "number": 955,
-      "title": "[QA] Verify KittenTTS local provider end-to-end",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/955",
-      "open_prs": []
-    },
-    {
-      "number": 956,
-      "title": "[QA] Verify numbered keyboard shortcuts for approval + clarify prompts",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/956",
-      "open_prs": [
-        {
-          "number": 1018,
-          "title": "fix: add numbered approval and clarify shortcuts (#956)",
-          "head": "fix/956",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1018"
-        }
-      ]
-    },
-    {
-      "number": 957,
-      "title": "[QA] Verify optional adversarial-ux-test skill catalog flow",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/957",
-      "open_prs": [
-        {
-          "number": 1015,
-          "title": "feat(skills): backport adversarial-ux-test optional skill",
-          "head": "fix/957",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1015"
-        }
-      ]
-    },
-    {
-      "number": 958,
-      "title": "[QA] Verify /usage account limits in CLI + gateway",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/958",
-      "open_prs": [
-        {
-          "number": 1016,
-          "title": "fix: restore /usage account limits in CLI + gateway (#958)",
-          "head": "fix/958",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1016"
-        }
-      ]
-    },
-    {
-      "number": 959,
-      "title": "[QA] Verify OpenCode-Go curated catalog additions",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/959",
-      "open_prs": [
-        {
-          "number": 1014,
-          "title": "fix(opencode-go): restore curated catalog additions",
-          "head": "fix/959",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1014"
-        }
-      ]
-    },
-    {
-      "number": 960,
-      "title": "[QA] Verify patch 'did you mean?' suggestions",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/960",
-      "open_prs": [
-        {
-          "number": 1017,
-          "title": "fix(patch): port and verify did-you-mean suggestions (#960)",
-          "head": "fix/960",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1017"
-        }
-      ]
-    },
-    {
-      "number": 961,
-      "title": "[QA] Verify web dashboard update/restart action buttons",
-      "state": "closed",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/961",
-      "open_prs": []
-    },
-    {
-      "number": 962,
-      "title": "[QA] Verify hardcoded-home path guard on burn/921 branch",
-      "state": "closed",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/962",
-      "open_prs": []
-    }
-  ],
-  "decomposition_issues": [
-    {
-      "number": 965,
-      "title": "[EPIC: Morning review packet \u2014 Hermes harness features landed 2026-04-21] Phase 1: Landscape Analysis & Scaffolding",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/965"
-    },
-    {
-      "number": 966,
-      "title": "[EPIC: Morning review packet \u2014 Hermes harness features landed 2026-04-21] Phase 2: Core Logic Implementation",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/966"
-    },
-    {
-      "number": 967,
-      "title": "[EPIC: Morning review packet \u2014 Hermes harness features landed 2026-04-21] Phase 3: Poka-yoke Integration & Fleet Verification",
-      "state": "closed",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/967"
-    }
-  ]
-}

scripts/morning_review_packet_status.py

@@ -1,288 +0,0 @@
-#!/usr/bin/env python3
-"""Generate a grounded status report for hermes-agent morning review packet epic #949."""
-
-from __future__ import annotations
-
-import argparse
-import base64
-import json
-import os
-import re
-import ssl
-import urllib.request
-from datetime import datetime, timezone
-from pathlib import Path
-from typing import Any
-
-BASE_API = "https://forge.alexanderwhitestone.com/api/v1"
-REPO = "Timmy_Foundation/hermes-agent"
-TOKEN_PATH = Path("~/.config/gitea/token").expanduser()
-DEFAULT_JSON_OUT = Path("docs/morning-review-packet-2026-04-21.snapshot.json")
-DEFAULT_MARKDOWN_OUT = Path("docs/morning-review-packet-2026-04-21-status.md")
-
-
-def extract_issue_numbers(text: str) -> list[int]:
-    seen: set[int] = set()
-    numbers: list[int] = []
-    for match in re.finditer(r"#(\d+)", text or ""):
-        num = int(match.group(1))
-        if num not in seen:
-            seen.add(num)
-            numbers.append(num)
-    return numbers
-
-
-def _auth_headers(token: str) -> list[dict[str, str]]:
-    basic = base64.b64encode(f"{token}:".encode()).decode()
-    return [
-        {"Authorization": f"token {token}", "Accept": "application/json"},
-        {"Authorization": f"Basic {basic}", "Accept": "application/json"},
-    ]
-
-
-def api_get(path: str, *, headers_options: list[dict[str, str]] | None = None) -> Any:
-    token = TOKEN_PATH.read_text(encoding="utf-8").strip()
-    headers_options = headers_options or _auth_headers(token)
-    ctx = ssl.create_default_context()
-    url = f"{BASE_API}{path}"
-    last_error: Exception | None = None
-    for headers in headers_options:
-        try:
-            req = urllib.request.Request(url, headers=headers)
-            with urllib.request.urlopen(req, context=ctx, timeout=30) as resp:
-                return json.loads(resp.read().decode())
-        except Exception as exc:  # pragma: no cover - exercised via live CLI use
-            last_error = exc
-    raise RuntimeError(f"GET {url} failed: {last_error}")
-
-
-def issue_pr_matches(pr: dict[str, Any], issue_num: int) -> bool:
-    title = pr.get("title") or ""
-    body = pr.get("body") or ""
-    head = (pr.get("head") or {}).get("ref") or ""
-    exact_ref = re.compile(rf"(?<!\d)#{issue_num}(?!\d)")
-    body_ref = re.compile(rf"(?i)(closes|close|fixes|fix|resolves|resolve|refs|ref)\s+#?{issue_num}(?!\d)")
-    branch_variants = {
-        f"fix/{issue_num}",
-        f"issue-{issue_num}",
-        f"burn/{issue_num}",
-        f"fix/issue-{issue_num}",
-    }
-    return bool(
-        exact_ref.search(title)
-        or exact_ref.search(body)
-        or body_ref.search(body)
-        or head in branch_variants
-    )
-
-
-def fetch_open_prs(*, headers_options: list[dict[str, str]]) -> list[dict[str, Any]]:
-    prs: list[dict[str, Any]] = []
-    page = 1
-    while True:
-        batch = api_get(
-            f"/repos/{REPO}/pulls?state=open&limit=100&page={page}",
-            headers_options=headers_options,
-        )
-        if not batch:
-            break
-        prs.extend(batch)
-        if len(batch) < 100:
-            break
-        page += 1
-    return prs
-
-
-def fetch_live_snapshot(epic_issue_num: int = 949) -> dict[str, Any]:
-    token = TOKEN_PATH.read_text(encoding="utf-8").strip()
-    headers_options = _auth_headers(token)
-
-    epic = api_get(f"/repos/{REPO}/issues/{epic_issue_num}", headers_options=headers_options)
-    comments = api_get(f"/repos/{REPO}/issues/{epic_issue_num}/comments", headers_options=headers_options)
-    child_numbers = [n for n in extract_issue_numbers(epic.get("body") or "") if n != epic_issue_num]
-    decomposition_numbers = [
-        n
-        for comment in comments
-        for n in extract_issue_numbers(comment.get("body") or "")
-        if n not in child_numbers and n != epic_issue_num
-    ]
-
-    open_prs = fetch_open_prs(headers_options=headers_options)
-
-    children = []
-    for number in child_numbers:
-        issue = api_get(f"/repos/{REPO}/issues/{number}", headers_options=headers_options)
-        matching_prs = [
-            {
-                "number": pr["number"],
-                "title": pr["title"],
-                "head": pr.get("head", {}).get("ref", ""),
-                "url": pr["html_url"],
-            }
-            for pr in open_prs
-            if issue_pr_matches(pr, number)
-        ]
-        children.append(
-            {
-                "number": issue["number"],
-                "title": issue["title"],
-                "state": issue["state"],
-                "html_url": issue["html_url"],
-                "open_prs": matching_prs,
-            }
-        )
-
-    decomposition_issues = []
-    for number in decomposition_numbers:
-        issue = api_get(f"/repos/{REPO}/issues/{number}", headers_options=headers_options)
-        decomposition_issues.append(
-            {
-                "number": issue["number"],
-                "title": issue["title"],
-                "state": issue["state"],
-                "html_url": issue["html_url"],
-            }
-        )
-
-    return {
-        "generated_at": datetime.now(timezone.utc).isoformat(),
-        "repo": REPO,
-        "epic": {
-            "number": epic["number"],
-            "title": epic["title"],
-            "state": epic["state"],
-            "html_url": epic["html_url"],
-        },
-        "children": children,
-        "decomposition_issues": decomposition_issues,
-    }
-
-
-def summarize_snapshot(snapshot: dict[str, Any]) -> dict[str, int]:
-    children = snapshot.get("children", [])
-    open_children = [issue for issue in children if issue.get("state") == "open"]
-    closed_children = [issue for issue in children if issue.get("state") == "closed"]
-    open_with_pr = [issue for issue in open_children if issue.get("open_prs")]
-    open_without_pr = [issue for issue in open_children if not issue.get("open_prs")]
-    return {
-        "total_children": len(children),
-        "open_children": len(open_children),
-        "closed_children": len(closed_children),
-        "open_with_pr": len(open_with_pr),
-        "open_without_pr": len(open_without_pr),
-    }
-
-
-def render_markdown(snapshot: dict[str, Any]) -> str:
-    epic = snapshot["epic"]
-    children = snapshot.get("children", [])
-    summary = summarize_snapshot(snapshot)
-    open_with_pr = [issue for issue in children if issue.get("state") == "open" and issue.get("open_prs")]
-    open_without_pr = [issue for issue in children if issue.get("state") == "open" and not issue.get("open_prs")]
-    decomposition = snapshot.get("decomposition_issues", [])
-
-    lines = [
-        f"# Morning Review Packet Status — #{epic['number']}",
-        "",
-        f"Generated: {snapshot.get('generated_at', '')}",
-        f"Epic: [{epic['title']}]({epic.get('html_url', '')})",
-        "",
-        "## Summary",
-        "",
-        f"- Child QA issues tracked: {summary['total_children']}",
-        f"- Open child issues: {summary['open_children']}",
-        f"- Closed child issues: {summary['closed_children']}",
-        f"- Open child issues already backed by PRs: {summary['open_with_pr']}",
-        f"- Open child issues still unowned on forge: {summary['open_without_pr']}",
-        "",
-        "## Child QA Matrix",
-        "",
-        "| Issue | State | Open PRs | Title |",
-        "|------:|-------|----------|-------|",
-    ]
-
-    for issue in children:
-        rendered_prs = []
-        for pr in issue.get("open_prs", []):
-            pr_num = pr.get("number", "?")
-            pr_url = pr.get("url") or pr.get("html_url") or ""
-            rendered_prs.append(f"[#{pr_num}]({pr_url})" if pr_url else f"#{pr_num}")
-        pr_text = ", ".join(rendered_prs) or "—"
-        lines.append(
-            f"| #{issue['number']} | {issue['state']} | {pr_text} | {issue['title']} |"
-        )
-
-    lines.extend([
-        "",
-        "## Drift Signals",
-        "",
-        "forge/main is still catching up to the upstream packet.",
-    ])
-
-    if open_with_pr:
-        lines.append("")
-        lines.append("Active PR-backed child lanes:")
-        for issue in open_with_pr:
-            pr_numbers = ", ".join(f"#{pr['number']}" for pr in issue.get("open_prs", []))
-            lines.append(f"- #{issue['number']} -> {pr_numbers} ({issue['title']})")
-
-    if open_without_pr:
-        lines.extend([
-            "",
-            "## Unowned Open QA Issues",
-            "",
-        ])
-        for issue in open_without_pr:
-            lines.append(f"- #{issue['number']} {issue['title']}")
-
-    if decomposition:
-        lines.extend([
-            "",
-            "## Decomposition Follow-Ups",
-            "",
-        ])
-        for issue in decomposition:
-            lines.append(f"- #{issue['number']} [{issue['state']}] {issue['title']}")
-
-    lines.extend([
-        "",
-        "## Conclusion",
-        "",
-        "Refs #949 only. This epic remains open until every child QA issue has a truthful PASS/FAIL outcome, attached evidence, and any upstream/main versus forge/main drift is resolved or explicitly documented.",
-        "",
-        "## Regeneration",
-        "",
-        "```bash",
-        "python3 scripts/morning_review_packet_status.py --fetch-live --json-out docs/morning-review-packet-2026-04-21.snapshot.json --markdown-out docs/morning-review-packet-2026-04-21-status.md",
-        "```",
-    ])
-
-    return "\n".join(lines) + "\n"
-
-
-def write_json(path: Path, data: dict[str, Any]) -> None:
-    path.parent.mkdir(parents=True, exist_ok=True)
-    path.write_text(json.dumps(data, indent=2) + "\n", encoding="utf-8")
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description="Generate grounded status docs for epic #949")
-    parser.add_argument("--fetch-live", action="store_true", help="Fetch the current packet state from Forge")
-    parser.add_argument("--snapshot", type=Path, help="Read a local JSON snapshot instead of hitting the API")
-    parser.add_argument("--json-out", type=Path, default=DEFAULT_JSON_OUT, help="Path to write JSON snapshot")
-    parser.add_argument("--markdown-out", type=Path, default=DEFAULT_MARKDOWN_OUT, help="Path to write markdown report")
-    args = parser.parse_args()
-
-    if args.fetch_live or not args.snapshot:
-        snapshot = fetch_live_snapshot()
-    else:
-        snapshot = json.loads(args.snapshot.read_text(encoding="utf-8"))
-
-    write_json(args.json_out, snapshot)
-    args.markdown_out.parent.mkdir(parents=True, exist_ok=True)
-    args.markdown_out.write_text(render_markdown(snapshot), encoding="utf-8")
-    print(args.markdown_out)
-
-
-if __name__ == "__main__":
-    main()

tests/test_morning_review_packet_status.py

@@ -1,94 +0,0 @@
-"""Tests for the morning review packet status report generator."""
-
-from __future__ import annotations
-
-import importlib.util
-from pathlib import Path
-
-SCRIPT_PATH = Path(__file__).resolve().parents[1] / "scripts" / "morning_review_packet_status.py"
-DOC_PATH = Path(__file__).resolve().parents[1] / "docs" / "morning-review-packet-2026-04-21-status.md"
-
-
-def load_module():
-    assert SCRIPT_PATH.exists(), f"missing status script: {SCRIPT_PATH}"
-    spec = importlib.util.spec_from_file_location("morning_review_packet_status_test", SCRIPT_PATH)
-    module = importlib.util.module_from_spec(spec)
-    assert spec.loader is not None
-    spec.loader.exec_module(module)
-    return module
-
-
-def sample_snapshot():
-    return {
-        "epic": {"number": 949, "title": "Morning review packet", "state": "open"},
-        "children": [
-            {
-                "number": 950,
-                "title": "Verify AI Gateway provider UX + attribution headers",
-                "state": "open",
-                "open_prs": [],
-            },
-            {
-                "number": 954,
-                "title": "Verify maps skill guest_house / camp_site / bakery expansion",
-                "state": "open",
-                "open_prs": [
-                    {"number": 1021, "head": "fix/954", "title": "feat: sync maps skill and verify guest_house/camp_site/bakery (#954)"}
-                ],
-            },
-            {
-                "number": 961,
-                "title": "Verify web dashboard update/restart action buttons",
-                "state": "closed",
-                "open_prs": [],
-            },
-        ],
-        "decomposition_issues": [
-            {"number": 965, "title": "Phase 1: Landscape Analysis & Scaffolding", "state": "open"},
-            {"number": 967, "title": "Phase 3: Poka-yoke Integration & Fleet Verification", "state": "closed"},
-        ],
-    }
-
-
-def test_extract_child_issue_numbers_from_epic_body():
-    module = load_module()
-    body = """
-- [ ] #950 one
-- [ ] #951 two
-- [ ] #962 three
-"""
-    assert module.extract_issue_numbers(body) == [950, 951, 962]
-
-
-def test_summarize_snapshot_counts_open_closed_and_pr_backing():
-    module = load_module()
-    summary = module.summarize_snapshot(sample_snapshot())
-
-    assert summary["total_children"] == 3
-    assert summary["open_children"] == 2
-    assert summary["closed_children"] == 1
-    assert summary["open_with_pr"] == 1
-    assert summary["open_without_pr"] == 1
-
-
-def test_render_markdown_includes_issue_matrix_and_drift_sections():
-    module = load_module()
-    md = module.render_markdown(sample_snapshot())
-
-    assert "# Morning Review Packet Status — #949" in md
-    assert "## Child QA Matrix" in md
-    assert "#950" in md
-    assert "#954" in md
-    assert "#1021" in md
-    assert "## Unowned Open QA Issues" in md
-    assert "## Drift Signals" in md
-    assert "forge/main is still catching up to the upstream packet" in md
-
-
-def test_committed_status_doc_exists_and_mentions_live_examples():
-    assert DOC_PATH.exists(), f"missing generated status doc: {DOC_PATH}"
-    text = DOC_PATH.read_text(encoding="utf-8")
-    assert "# Morning Review Packet Status — #949" in text
-    assert "#954" in text
-    assert "#1021" in text
-    assert "#950" in text

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