fix: extend JSON repair to browser tool and CLI (#862)

- repair malformed browser command envelopes before treating stdout as non-JSON
- repair eval/image payloads in browser_tool.py
- repair CLI parsing for vision and /cron tool responses
- add focused regression tests for browser and CLI repair paths

agent/auxiliary_client.py

@@ -1,4 +1,4 @@
-"""Shared auxiliary client router for side tasks.
+from agent.telemetry_logger import log_token_usage\n"""Shared auxiliary client router for side tasks.
 
 Provides a single resolution chain so every consumer (context compression,
 session search, web extraction, vision analysis, browser vision) picks up
@@ -38,7 +38,6 @@ import json
 import logging
 import os
 import threading
-from agent.telemetry_logger import log_token_usage
 import time
 from pathlib import Path  # noqa: F401 — used by test mocks
 from types import SimpleNamespace
@@ -123,16 +122,6 @@ _OR_HEADERS = {
     "X-OpenRouter-Categories": "productivity,cli-agent",
 }
 
-# Vercel AI Gateway app attribution headers. HTTP-Referer maps to
-# referrerUrl and X-Title maps to appName in the gateway analytics.
-from hermes_cli import __version__ as _HERMES_VERSION
-
-_AI_GATEWAY_HEADERS = {
-    "HTTP-Referer": "https://hermes-agent.nousresearch.com",
-    "X-Title": "Hermes Agent",
-    "User-Agent": f"HermesAgent/{_HERMES_VERSION}",
-}
-
 # Nous Portal extra_body for product attribution.
 # Callers should pass this as extra_body in chat.completions.create()
 # when the auxiliary client is backed by Nous Portal.
@@ -407,8 +396,7 @@ class _CodexCompletionsAdapter:
                     prompt_tokens=getattr(resp_usage, "input_tokens", 0),
                     completion_tokens=getattr(resp_usage, "output_tokens", 0),
                     total_tokens=getattr(resp_usage, "total_tokens", 0),
-                )
-                log_token_usage(usage.prompt_tokens, usage.completion_tokens, model)
+                )\n        log_token_usage(usage.prompt_tokens, usage.completion_tokens, model)
         except Exception as exc:
             logger.debug("Codex auxiliary Responses API call failed: %s", exc)
             raise
@@ -541,8 +529,7 @@ class _AnthropicCompletionsAdapter:
                 prompt_tokens=prompt_tokens,
                 completion_tokens=completion_tokens,
                 total_tokens=total_tokens,
-            )
-            log_token_usage(usage.prompt_tokens, usage.completion_tokens, model)
+            )\n    log_token_usage(usage.prompt_tokens, usage.completion_tokens, model)
 
         choice = SimpleNamespace(
             index=0,

cli.py

@@ -589,6 +589,7 @@ from tools.terminal_tool import set_sudo_password_callback, set_approval_callbac
 from tools.skills_tool import set_secret_capture_callback
 from hermes_cli.callbacks import prompt_for_secret
 from tools.browser_tool import _emergency_cleanup_all_sessions as _cleanup_all_browsers
+from utils import repair_and_load_json
 
 # Guard to prevent cleanup from running multiple times on exit
 _cleanup_done = False
@@ -3569,7 +3570,11 @@ class HermesCLI:
                 result_json = _asyncio.run(
                     vision_analyze_tool(image_url=str(img_path), user_prompt=analysis_prompt)
                 )
-                result = _json.loads(result_json)
+                result = repair_and_load_json(
+                    result_json,
+                    default={},
+                    context="cli_image_analysis",
+                ) if isinstance(result_json, str) else {}
                 if result.get("success"):
                     description = result.get("analysis", "")
                     enriched_parts.append(
@@ -4960,7 +4965,14 @@ class HermesCLI:
         from tools.cronjob_tools import cronjob as cronjob_tool
 
         def _cron_api(**kwargs):
-            return json.loads(cronjob_tool(**kwargs))
+            result = repair_and_load_json(
+                cronjob_tool(**kwargs),
+                default=None,
+                context="cli_cron_command",
+            )
+            if isinstance(result, dict):
+                return result
+            return {"success": False, "error": "Invalid JSON from cronjob tool"}
 
         def _normalize_skills(values):
             normalized = []

hermes_cli/main.py

@@ -168,7 +168,7 @@ import time as _time
 from datetime import datetime
 
 from hermes_cli import __version__, __release_date__
-from hermes_constants import AI_GATEWAY_BASE_URL, OPENROUTER_BASE_URL
+from hermes_constants import OPENROUTER_BASE_URL
 
 logger = logging.getLogger(__name__)
 
@@ -1112,8 +1112,6 @@ def select_provider_and_model(args=None):
     # Step 2: Provider-specific setup + model selection
     if selected_provider == "openrouter":
         _model_flow_openrouter(config, current_model)
-    elif selected_provider == "ai-gateway":
-        _model_flow_ai_gateway(config, current_model)
     elif selected_provider == "nous":
         _model_flow_nous(config, current_model, args=args)
     elif selected_provider == "openai-codex":
@@ -1269,55 +1267,6 @@ def _model_flow_openrouter(config, current_model=""):
         print("No change.")
 
 
-def _model_flow_ai_gateway(config, current_model=""):
-    """Vercel AI Gateway provider: ensure API key, then pick model with pricing."""
-    from hermes_cli.auth import _prompt_model_selection, _save_model_choice, deactivate_provider
-    from hermes_cli.config import get_env_value, save_env_value
-    from hermes_cli.models import ai_gateway_model_ids, get_pricing_for_provider
-
-    api_key = get_env_value("AI_GATEWAY_API_KEY")
-    if not api_key:
-        print("No Vercel AI Gateway API key configured.")
-        print("Create API key here: https://vercel.com/d?to=%2F%5Bteam%5D%2F%7E%2Fai-gateway&title=AI+Gateway")
-        print("Add a payment method to get $5 in free credits.")
-        print()
-        try:
-            import getpass
-            key = getpass.getpass("AI Gateway API key (or Enter to cancel): ").strip()
-        except (KeyboardInterrupt, EOFError):
-            print()
-            return
-        if not key:
-            print("Cancelled.")
-            return
-        save_env_value("AI_GATEWAY_API_KEY", key)
-        print("API key saved.")
-        print()
-
-    models_list = ai_gateway_model_ids(force_refresh=True)
-    pricing = get_pricing_for_provider("ai-gateway", force_refresh=True)
-
-    selected = _prompt_model_selection(models_list, current_model=current_model, pricing=pricing)
-    if selected:
-        _save_model_choice(selected)
-
-        from hermes_cli.config import load_config, save_config
-
-        cfg = load_config()
-        model = cfg.get("model")
-        if not isinstance(model, dict):
-            model = {"default": model} if model else {}
-            cfg["model"] = model
-        model["provider"] = "ai-gateway"
-        model["base_url"] = AI_GATEWAY_BASE_URL
-        model["api_mode"] = "chat_completions"
-        save_config(cfg)
-        deactivate_provider()
-        print(f"Default model set to: {selected} (via Vercel AI Gateway)")
-    else:
-        print("No change.")
-
-
 def _model_flow_nous(config, current_model="", args=None):
     """Nous Portal provider: ensure logged in, then pick model."""
     from hermes_cli.auth import (

hermes_cli/models.py

@@ -58,28 +58,6 @@ OPENROUTER_MODELS: list[tuple[str, str]] = [
 
 _openrouter_catalog_cache: list[tuple[str, str]] | None = None
 
-# Fallback Vercel AI Gateway snapshot used when the live catalog is unavailable.
-# OSS / open-weight models prioritized first, then closed-source by family.
-VERCEL_AI_GATEWAY_MODELS: list[tuple[str, str]] = [
-    ("moonshotai/kimi-k2.6", "recommended"),
-    ("alibaba/qwen3.6-plus", ""),
-    ("zai/glm-5.1", ""),
-    ("minimax/minimax-m2.7", ""),
-    ("anthropic/claude-sonnet-4.6", ""),
-    ("anthropic/claude-opus-4.7", ""),
-    ("anthropic/claude-opus-4.6", ""),
-    ("anthropic/claude-haiku-4.5", ""),
-    ("openai/gpt-5.4", ""),
-    ("openai/gpt-5.4-mini", ""),
-    ("openai/gpt-5.3-codex", ""),
-    ("google/gemini-3.1-pro-preview", ""),
-    ("google/gemini-3-flash", ""),
-    ("google/gemini-3.1-flash-lite-preview", ""),
-    ("xai/grok-4.20-reasoning", ""),
-]
-
-_ai_gateway_catalog_cache: list[tuple[str, str]] | None = None
-
 
 def _codex_curated_models() -> list[str]:
     """Derive the openai-codex curated list from codex_models.py.
@@ -280,21 +258,18 @@ _PROVIDER_MODELS: dict[str, list[str]] = {
         "minimax-m2.5",
     ],
     "ai-gateway": [
-        "moonshotai/kimi-k2.6",
-        "alibaba/qwen3.6-plus",
-        "zai/glm-5.1",
-        "minimax/minimax-m2.7",
-        "anthropic/claude-sonnet-4.6",
-        "anthropic/claude-opus-4.7",
         "anthropic/claude-opus-4.6",
+        "anthropic/claude-sonnet-4.6",
+        "anthropic/claude-sonnet-4.5",
         "anthropic/claude-haiku-4.5",
-        "openai/gpt-5.4",
-        "openai/gpt-5.4-mini",
-        "openai/gpt-5.3-codex",
-        "google/gemini-3.1-pro-preview",
+        "openai/gpt-5",
+        "openai/gpt-4.1",
+        "openai/gpt-4.1-mini",
+        "google/gemini-3-pro-preview",
         "google/gemini-3-flash",
-        "google/gemini-3.1-flash-lite-preview",
-        "xai/grok-4.20-reasoning",
+        "google/gemini-2.5-pro",
+        "google/gemini-2.5-flash",
+        "deepseek/deepseek-v3.2",
     ],
     "kilocode": [
         "anthropic/claude-opus-4.6",
@@ -541,7 +516,6 @@ class ProviderEntry(NamedTuple):
 CANONICAL_PROVIDERS: list[ProviderEntry] = [
     ProviderEntry("nous",           "Nous Portal",              "Nous Portal (Nous Research subscription)"),
     ProviderEntry("openrouter",     "OpenRouter",               "OpenRouter (100+ models, pay-per-use)"),
-    ProviderEntry("ai-gateway",     "Vercel AI Gateway",        "Vercel AI Gateway (200+ models, $5 free credit, no markup)"),
     ProviderEntry("anthropic",      "Anthropic",                "Anthropic (Claude models — API key or Claude Code)"),
     ProviderEntry("openai-codex",   "OpenAI Codex",             "OpenAI Codex"),
     ProviderEntry("xiaomi",         "Xiaomi MiMo",              "Xiaomi MiMo (MiMo-V2 models — pro, omni, flash)"),
@@ -562,6 +536,7 @@ CANONICAL_PROVIDERS: list[ProviderEntry] = [
     ProviderEntry("kilocode",       "Kilo Code",                "Kilo Code (Kilo Gateway API)"),
     ProviderEntry("opencode-zen",   "OpenCode Zen",             "OpenCode Zen (35+ curated models, pay-as-you-go)"),
     ProviderEntry("opencode-go",    "OpenCode Go",              "OpenCode Go (open models, $10/month subscription)"),
+    ProviderEntry("ai-gateway",     "Vercel AI Gateway",        "Vercel AI Gateway (200+ models, pay-per-use)"),
 ]
 
 # Derived dicts — used throughout the codebase
@@ -704,90 +679,6 @@ def model_ids(*, force_refresh: bool = False) -> list[str]:
 
 
 
-def _ai_gateway_model_is_free(pricing: Any) -> bool:
-    """Return True if an AI Gateway model has $0 input AND output pricing."""
-    if not isinstance(pricing, dict):
-        return False
-    try:
-        return float(pricing.get("input", "0")) == 0 and float(pricing.get("output", "0")) == 0
-    except (TypeError, ValueError):
-        return False
-
-
-def fetch_ai_gateway_models(
-    timeout: float = 8.0,
-    *,
-    force_refresh: bool = False,
-) -> list[tuple[str, str]]:
-    """Return the curated AI Gateway picker list, refreshed from the live catalog when possible."""
-    global _ai_gateway_catalog_cache
-
-    if _ai_gateway_catalog_cache is not None and not force_refresh:
-        return list(_ai_gateway_catalog_cache)
-
-    from hermes_constants import AI_GATEWAY_BASE_URL
-
-    fallback = list(VERCEL_AI_GATEWAY_MODELS)
-    preferred_ids = [mid for mid, _ in fallback]
-
-    try:
-        req = urllib.request.Request(
-            f"{AI_GATEWAY_BASE_URL.rstrip('/')}/models",
-            headers={"Accept": "application/json"},
-        )
-        with urllib.request.urlopen(req, timeout=timeout) as resp:
-            payload = json.loads(resp.read().decode())
-    except Exception:
-        return list(_ai_gateway_catalog_cache or fallback)
-
-    live_items = payload.get("data", [])
-    if not isinstance(live_items, list):
-        return list(_ai_gateway_catalog_cache or fallback)
-
-    live_by_id: dict[str, dict[str, Any]] = {}
-    for item in live_items:
-        if not isinstance(item, dict):
-            continue
-        mid = str(item.get("id") or "").strip()
-        if not mid:
-            continue
-        live_by_id[mid] = item
-
-    curated: list[tuple[str, str]] = []
-    for preferred_id in preferred_ids:
-        live_item = live_by_id.get(preferred_id)
-        if live_item is None:
-            continue
-        desc = "free" if _ai_gateway_model_is_free(live_item.get("pricing")) else ""
-        curated.append((preferred_id, desc))
-
-    if not curated:
-        return list(_ai_gateway_catalog_cache or fallback)
-
-    free_moonshot = next(
-        (
-            mid
-            for mid, item in live_by_id.items()
-            if mid.startswith("moonshotai/") and _ai_gateway_model_is_free(item.get("pricing"))
-        ),
-        None,
-    )
-    if free_moonshot:
-        curated = [(mid, desc) for mid, desc in curated if mid != free_moonshot]
-        curated.insert(0, (free_moonshot, "recommended"))
-    else:
-        first_id, _ = curated[0]
-        curated[0] = (first_id, "recommended")
-
-    _ai_gateway_catalog_cache = curated
-    return list(curated)
-
-
-def ai_gateway_model_ids(*, force_refresh: bool = False) -> list[str]:
-    """Return just the AI Gateway model-id strings."""
-    return [mid for mid, _ in fetch_ai_gateway_models(force_refresh=force_refresh)]
-
-
 # ---------------------------------------------------------------------------
 # Pricing helpers — fetch live pricing from OpenRouter-compatible /v1/models
 # ---------------------------------------------------------------------------
@@ -930,51 +821,6 @@ def fetch_models_with_pricing(
     return result
 
 
-def fetch_ai_gateway_pricing(
-    timeout: float = 8.0,
-    *,
-    force_refresh: bool = False,
-) -> dict[str, dict[str, str]]:
-    """Fetch Vercel AI Gateway /v1/models and return Hermes-shaped pricing."""
-    from hermes_constants import AI_GATEWAY_BASE_URL
-
-    cache_key = AI_GATEWAY_BASE_URL.rstrip("/")
-    if not force_refresh and cache_key in _pricing_cache:
-        return _pricing_cache[cache_key]
-
-    try:
-        req = urllib.request.Request(
-            f"{cache_key}/models",
-            headers={"Accept": "application/json"},
-        )
-        with urllib.request.urlopen(req, timeout=timeout) as resp:
-            payload = json.loads(resp.read().decode())
-    except Exception:
-        _pricing_cache[cache_key] = {}
-        return {}
-
-    result: dict[str, dict[str, str]] = {}
-    for item in payload.get("data", []):
-        if not isinstance(item, dict):
-            continue
-        mid = item.get("id")
-        pricing = item.get("pricing")
-        if not (mid and isinstance(pricing, dict)):
-            continue
-        entry: dict[str, str] = {
-            "prompt": str(pricing.get("input", "")),
-            "completion": str(pricing.get("output", "")),
-        }
-        if pricing.get("input_cache_read"):
-            entry["input_cache_read"] = str(pricing["input_cache_read"])
-        if pricing.get("input_cache_write"):
-            entry["input_cache_write"] = str(pricing["input_cache_write"])
-        result[mid] = entry
-
-    _pricing_cache[cache_key] = result
-    return result
-
-
 def _resolve_openrouter_api_key() -> str:
     """Best-effort OpenRouter API key for pricing fetch."""
     return os.getenv("OPENROUTER_API_KEY", "").strip()
@@ -993,7 +839,7 @@ def _resolve_nous_pricing_credentials() -> tuple[str, str]:
 
 
 def get_pricing_for_provider(provider: str, *, force_refresh: bool = False) -> dict[str, dict[str, str]]:
-    """Return live pricing for providers that support it (openrouter, ai-gateway, nous)."""
+    """Return live pricing for providers that support it (openrouter, nous)."""
     normalized = normalize_provider(provider)
     if normalized == "openrouter":
         return fetch_models_with_pricing(
@@ -1001,11 +847,11 @@ def get_pricing_for_provider(provider: str, *, force_refresh: bool = False) -> d
             base_url="https://openrouter.ai/api",
             force_refresh=force_refresh,
         )
-    if normalized == "ai-gateway":
-        return fetch_ai_gateway_pricing(force_refresh=force_refresh)
     if normalized == "nous":
         api_key, base_url = _resolve_nous_pricing_credentials()
         if base_url:
+            # Nous base_url typically looks like https://inference-api.nousresearch.com/v1
+            # We need the part before /v1 for our fetch function
             stripped = base_url.rstrip("/")
             if stripped.endswith("/v1"):
                 stripped = stripped[:-3]
@@ -1407,7 +1253,9 @@ def provider_model_ids(provider: Optional[str], *, force_refresh: bool = False)
         if live:
             return live
     if normalized == "ai-gateway":
-        return ai_gateway_model_ids()
+        live = _fetch_ai_gateway_models()
+        if live:
+            return live
     if normalized == "custom":
         base_url = _get_custom_base_url()
         if base_url:

run_agent.py

@@ -908,10 +908,6 @@ class AIAgent:
                         "X-OpenRouter-Title": "Hermes Agent",
                         "X-OpenRouter-Categories": "productivity,cli-agent",
                     }
-                elif "ai-gateway.vercel.sh" in effective_base.lower():
-                    from agent.auxiliary_client import _AI_GATEWAY_HEADERS
-
-                    client_kwargs["default_headers"] = dict(_AI_GATEWAY_HEADERS)
                 elif "api.githubcopilot.com" in effective_base.lower():
                     from hermes_cli.models import copilot_default_headers
 
@@ -4671,13 +4667,11 @@ class AIAgent:
         return True
 
     def _apply_client_headers_for_base_url(self, base_url: str) -> None:
-        from agent.auxiliary_client import _AI_GATEWAY_HEADERS, _OR_HEADERS
+        from agent.auxiliary_client import _OR_HEADERS
 
         normalized = (base_url or "").lower()
         if "openrouter" in normalized:
             self._client_kwargs["default_headers"] = dict(_OR_HEADERS)
-        elif "ai-gateway.vercel.sh" in normalized:
-            self._client_kwargs["default_headers"] = dict(_AI_GATEWAY_HEADERS)
         elif "api.githubcopilot.com" in normalized:
             from hermes_cli.models import copilot_default_headers
 

tests/cli/test_cli_json_repair.py

@@ -0,0 +1,62 @@
+import sys
+import types
+from unittest.mock import patch
+
+
+def _stub_auxiliary_client():
+    stub = types.ModuleType("agent.auxiliary_client")
+    stub.call_llm = lambda *args, **kwargs: None
+    stub.resolve_provider_client = lambda *args, **kwargs: (None, None)
+    stub.get_text_auxiliary_client = lambda *args, **kwargs: (None, None)
+    stub.async_call_llm = lambda *args, **kwargs: None
+    stub.extract_content_or_reasoning = lambda *args, **kwargs: ""
+    stub._OR_HEADERS = {}
+    stub._get_task_timeout = lambda *args, **kwargs: 30
+    sys.modules["agent.auxiliary_client"] = stub
+
+
+def _stub_vision_tools(vision_analyze_tool):
+    stub = types.ModuleType("tools.vision_tools")
+    stub.vision_analyze_tool = vision_analyze_tool
+    sys.modules["tools.vision_tools"] = stub
+
+
+def test_preprocess_images_with_vision_repairs_malformed_json(tmp_path):
+    _stub_auxiliary_client()
+    from cli import HermesCLI
+
+    cli_obj = HermesCLI.__new__(HermesCLI)
+    image_path = tmp_path / "test.png"
+    image_path.write_bytes(b"fake-image-bytes")
+
+    async def fake_vision(**kwargs):
+        return "{'success': true, 'analysis': 'Recovered image description',}"
+
+    _stub_vision_tools(fake_vision)
+    result = HermesCLI._preprocess_images_with_vision(
+        cli_obj,
+        "Describe this",
+        [image_path],
+        announce=False,
+    )
+
+    assert "Recovered image description" in result
+    assert "Describe this" in result
+    assert str(image_path) in result
+
+
+def test_handle_cron_command_repairs_malformed_json(capsys):
+    _stub_auxiliary_client()
+    from cli import HermesCLI
+
+    cli_obj = HermesCLI.__new__(HermesCLI)
+    malformed_result = """{'success': true, 'jobs': [{'job_id': 'job-1234567890ab', 'name': 'Nightly Check', 'state': 'scheduled', 'schedule': 'every 1h', 'repeat': 'forever', 'prompt_preview': 'Check server status', 'skills': ['blogwatcher',], 'next_run_at': '2026-04-22T01:00:00Z',},],}"""
+
+    with patch("tools.cronjob_tools.cronjob", return_value=malformed_result):
+        HermesCLI._handle_cron_command(cli_obj, "/cron list")
+
+    out = capsys.readouterr().out
+    assert "Scheduled Jobs:" in out
+    assert "job-1234567890ab" in out
+    assert "Nightly Check" in out
+    assert "blogwatcher" in out

tests/hermes_cli/test_ai_gateway_models.py

@@ -1,222 +0,0 @@
-"""AI Gateway provider UX, live pricing, and model promotion tests."""
-
-from __future__ import annotations
-
-import json
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from hermes_cli import models as models_module
-from hermes_cli.models import (
-    CANONICAL_PROVIDERS,
-    VERCEL_AI_GATEWAY_MODELS,
-    _ai_gateway_model_is_free,
-    ai_gateway_model_ids,
-    fetch_ai_gateway_models,
-    fetch_ai_gateway_pricing,
-    get_pricing_for_provider,
-)
-
-
-def _mock_urlopen(payload):
-    resp = MagicMock()
-    resp.read.return_value = json.dumps(payload).encode()
-    ctx = MagicMock()
-    ctx.__enter__.return_value = resp
-    ctx.__exit__.return_value = False
-    return ctx
-
-
-def _reset_caches():
-    models_module._ai_gateway_catalog_cache = None
-    models_module._pricing_cache.clear()
-
-
-@pytest.fixture
-def config_home(tmp_path, monkeypatch):
-    home = tmp_path / "hermes"
-    home.mkdir()
-    (home / "config.yaml").write_text("model: some-old-model\n")
-    (home / ".env").write_text("")
-    monkeypatch.setenv("HERMES_HOME", str(home))
-    monkeypatch.delenv("AI_GATEWAY_API_KEY", raising=False)
-    monkeypatch.delenv("AI_GATEWAY_BASE_URL", raising=False)
-    return home
-
-
-def test_ai_gateway_provider_is_promoted_near_top_of_picker():
-    slugs = [entry.slug for entry in CANONICAL_PROVIDERS]
-    assert "ai-gateway" in slugs[:3]
-
-
-def test_ai_gateway_pricing_translates_input_output_to_prompt_completion():
-    _reset_caches()
-    payload = {
-        "data": [
-            {
-                "id": "moonshotai/kimi-k2.5",
-                "type": "language",
-                "pricing": {
-                    "input": "0.0000006",
-                    "output": "0.0000025",
-                    "input_cache_read": "0.00000015",
-                    "input_cache_write": "0.0000006",
-                },
-            }
-        ]
-    }
-    with patch("urllib.request.urlopen", return_value=_mock_urlopen(payload)):
-        result = fetch_ai_gateway_pricing(force_refresh=True)
-
-    entry = result["moonshotai/kimi-k2.5"]
-    assert entry["prompt"] == "0.0000006"
-    assert entry["completion"] == "0.0000025"
-    assert entry["input_cache_read"] == "0.00000015"
-    assert entry["input_cache_write"] == "0.0000006"
-
-
-def test_get_pricing_for_provider_supports_ai_gateway():
-    _reset_caches()
-    payload = {
-        "data": [
-            {
-                "id": "moonshotai/kimi-k2.5",
-                "type": "language",
-                "pricing": {"input": "0.0001", "output": "0.0002"},
-            }
-        ]
-    }
-    with patch("urllib.request.urlopen", return_value=_mock_urlopen(payload)):
-        result = get_pricing_for_provider("ai-gateway", force_refresh=True)
-    assert result["moonshotai/kimi-k2.5"] == {"prompt": "0.0001", "completion": "0.0002"}
-
-
-def test_ai_gateway_pricing_returns_empty_on_fetch_failure():
-    _reset_caches()
-    with patch("urllib.request.urlopen", side_effect=OSError("network down")):
-        result = fetch_ai_gateway_pricing(force_refresh=True)
-    assert result == {}
-
-
-def test_ai_gateway_pricing_skips_entries_without_pricing_dict():
-    _reset_caches()
-    payload = {
-        "data": [
-            {"id": "x/y", "pricing": None},
-            {"id": "a/b", "pricing": {"input": "0", "output": "0"}},
-        ]
-    }
-    with patch("urllib.request.urlopen", return_value=_mock_urlopen(payload)):
-        result = fetch_ai_gateway_pricing(force_refresh=True)
-    assert "x/y" not in result
-    assert result["a/b"] == {"prompt": "0", "completion": "0"}
-
-
-def test_ai_gateway_free_detector():
-    assert _ai_gateway_model_is_free({"input": "0", "output": "0"}) is True
-    assert _ai_gateway_model_is_free({"input": "0", "output": "0.01"}) is False
-    assert _ai_gateway_model_is_free({"input": "0.01", "output": "0"}) is False
-    assert _ai_gateway_model_is_free(None) is False
-    assert _ai_gateway_model_is_free({"input": "not a number"}) is False
-
-
-def test_fetch_ai_gateway_models_filters_against_live_catalog():
-    _reset_caches()
-    preferred = [mid for mid, _ in VERCEL_AI_GATEWAY_MODELS]
-    live_ids = preferred[:3]
-    payload = {
-        "data": [
-            {"id": mid, "pricing": {"input": "0.001", "output": "0.002"}}
-            for mid in live_ids
-        ]
-    }
-    with patch("urllib.request.urlopen", return_value=_mock_urlopen(payload)):
-        result = fetch_ai_gateway_models(force_refresh=True)
-
-    assert [mid for mid, _ in result] == live_ids
-    assert result[0][1] == "recommended"
-    assert ai_gateway_model_ids(force_refresh=False) == live_ids
-
-
-def test_fetch_ai_gateway_models_tags_free_models():
-    _reset_caches()
-    first_id = VERCEL_AI_GATEWAY_MODELS[0][0]
-    second_id = VERCEL_AI_GATEWAY_MODELS[1][0]
-    payload = {
-        "data": [
-            {"id": first_id, "pricing": {"input": "0.001", "output": "0.002"}},
-            {"id": second_id, "pricing": {"input": "0", "output": "0"}},
-        ]
-    }
-    with patch("urllib.request.urlopen", return_value=_mock_urlopen(payload)):
-        result = fetch_ai_gateway_models(force_refresh=True)
-
-    by_id = dict(result)
-    assert by_id[first_id] == "recommended"
-    assert by_id[second_id] == "free"
-
-
-def test_free_moonshot_model_auto_promoted_to_top_even_if_not_curated():
-    _reset_caches()
-    first_curated = VERCEL_AI_GATEWAY_MODELS[0][0]
-    unlisted_free_moonshot = "moonshotai/kimi-coder-free-preview"
-    payload = {
-        "data": [
-            {"id": first_curated, "pricing": {"input": "0.001", "output": "0.002"}},
-            {"id": unlisted_free_moonshot, "pricing": {"input": "0", "output": "0"}},
-        ]
-    }
-    with patch("urllib.request.urlopen", return_value=_mock_urlopen(payload)):
-        result = fetch_ai_gateway_models(force_refresh=True)
-
-    assert result[0] == (unlisted_free_moonshot, "recommended")
-    assert any(mid == first_curated for mid, _ in result)
-
-
-def test_paid_moonshot_does_not_get_auto_promoted():
-    _reset_caches()
-    first_curated = VERCEL_AI_GATEWAY_MODELS[0][0]
-    payload = {
-        "data": [
-            {"id": first_curated, "pricing": {"input": "0.001", "output": "0.002"}},
-            {"id": "moonshotai/some-paid-variant", "pricing": {"input": "0.001", "output": "0.002"}},
-        ]
-    }
-    with patch("urllib.request.urlopen", return_value=_mock_urlopen(payload)):
-        result = fetch_ai_gateway_models(force_refresh=True)
-
-    assert result[0][0] == first_curated
-
-
-def test_fetch_ai_gateway_models_falls_back_on_error():
-    _reset_caches()
-    with patch("urllib.request.urlopen", side_effect=OSError("network")):
-        result = fetch_ai_gateway_models(force_refresh=True)
-    assert result == list(VERCEL_AI_GATEWAY_MODELS)
-
-
-def test_ai_gateway_setup_flow_shows_deeplink_and_passes_pricing(config_home, monkeypatch, capsys):
-    from hermes_cli.main import _model_flow_ai_gateway
-    from hermes_cli.config import load_config
-
-    pricing = {"moonshotai/kimi-k2.6": {"prompt": "0", "completion": "0"}}
-    monkeypatch.setenv("HERMES_HOME", str(config_home))
-
-    with patch("getpass.getpass", return_value="vercel-key"), \
-         patch("hermes_cli.models.ai_gateway_model_ids", return_value=["moonshotai/kimi-k2.6"]), \
-         patch("hermes_cli.models.get_pricing_for_provider", return_value=pricing), \
-         patch("hermes_cli.auth._prompt_model_selection", return_value="moonshotai/kimi-k2.6") as prompt_selection, \
-         patch("hermes_cli.auth.deactivate_provider"):
-        _model_flow_ai_gateway(load_config(), "")
-
-    out = capsys.readouterr().out
-    assert "vercel.com/d?to=%2F%5Bteam%5D%2F%7E%2Fai-gateway&title=AI+Gateway" in out
-    assert "free credits" in out.lower()
-    assert prompt_selection.call_args.kwargs["pricing"] == pricing
-
-    import yaml
-    config = yaml.safe_load((config_home / "config.yaml").read_text()) or {}
-    model = config["model"]
-    assert model["provider"] == "ai-gateway"
-    assert model["api_mode"] == "chat_completions"

tests/run_agent/test_provider_attribution_headers.py

@@ -1,62 +0,0 @@
-"""Attribution default_headers applied per provider via base-URL detection."""
-
-from unittest.mock import MagicMock, patch
-
-from run_agent import AIAgent
-
-
-@patch("run_agent.OpenAI")
-def test_openrouter_base_url_applies_or_headers(mock_openai):
-    mock_openai.return_value = MagicMock()
-    agent = AIAgent(
-        api_key="test-key",
-        base_url="https://openrouter.ai/api/v1",
-        model="test/model",
-        quiet_mode=True,
-        skip_context_files=True,
-        skip_memory=True,
-    )
-
-    agent._apply_client_headers_for_base_url("https://openrouter.ai/api/v1")
-
-    headers = agent._client_kwargs["default_headers"]
-    assert headers["HTTP-Referer"] == "https://hermes-agent.nousresearch.com"
-    assert headers["X-OpenRouter-Title"] == "Hermes Agent"
-
-
-@patch("run_agent.OpenAI")
-def test_ai_gateway_base_url_applies_attribution_headers(mock_openai):
-    mock_openai.return_value = MagicMock()
-    agent = AIAgent(
-        api_key="test-key",
-        base_url="https://openrouter.ai/api/v1",
-        model="test/model",
-        quiet_mode=True,
-        skip_context_files=True,
-        skip_memory=True,
-    )
-
-    agent._apply_client_headers_for_base_url("https://ai-gateway.vercel.sh/v1")
-
-    headers = agent._client_kwargs["default_headers"]
-    assert headers["HTTP-Referer"] == "https://hermes-agent.nousresearch.com"
-    assert headers["X-Title"] == "Hermes Agent"
-    assert headers["User-Agent"].startswith("HermesAgent/")
-
-
-@patch("run_agent.OpenAI")
-def test_unknown_base_url_clears_default_headers(mock_openai):
-    mock_openai.return_value = MagicMock()
-    agent = AIAgent(
-        api_key="test-key",
-        base_url="https://openrouter.ai/api/v1",
-        model="test/model",
-        quiet_mode=True,
-        skip_context_files=True,
-        skip_memory=True,
-    )
-    agent._client_kwargs["default_headers"] = {"X-Stale": "yes"}
-
-    agent._apply_client_headers_for_base_url("https://api.example.com/v1")
-
-    assert "default_headers" not in agent._client_kwargs

tests/tools/test_browser_json_repair.py

@@ -0,0 +1,108 @@
+import io
+import json
+import sys
+import types
+from unittest.mock import MagicMock, patch
+
+
+def _stub_auxiliary_client():
+    stub = types.ModuleType("agent.auxiliary_client")
+    stub.call_llm = lambda *args, **kwargs: None
+    stub.resolve_provider_client = lambda *args, **kwargs: (None, None)
+    stub.get_text_auxiliary_client = lambda *args, **kwargs: (None, None)
+    stub.async_call_llm = lambda *args, **kwargs: None
+    stub.extract_content_or_reasoning = lambda *args, **kwargs: ""
+    stub._OR_HEADERS = {}
+    stub._get_task_timeout = lambda *args, **kwargs: 30
+    sys.modules["agent.auxiliary_client"] = stub
+
+
+def test_run_browser_command_repairs_malformed_stdout_envelope(tmp_path):
+    _stub_auxiliary_client()
+    from tools.browser_tool import _run_browser_command
+
+    mock_proc = MagicMock()
+    mock_proc.returncode = 0
+    mock_proc.wait.return_value = 0
+    fake_session = {
+        "session_name": "test-session",
+        "session_id": "test-id",
+        "cdp_url": None,
+    }
+    malformed_stdout = "{'success': true, 'data': {'url': 'https://example.com',},}"
+
+    def fake_open(path, mode="r", *args, **kwargs):
+        path = str(path)
+        if path.endswith("_stdout_navigate"):
+            return io.StringIO(malformed_stdout)
+        if path.endswith("_stderr_navigate"):
+            return io.StringIO("")
+        raise FileNotFoundError(path)
+
+    with (
+        patch("tools.browser_tool._find_agent_browser", return_value="/usr/bin/agent-browser"),
+        patch("tools.browser_tool._get_session_info", return_value=fake_session),
+        patch("tools.browser_tool._socket_safe_tmpdir", return_value=str(tmp_path)),
+        patch("tools.browser_tool._merge_browser_path", side_effect=lambda p: p),
+        patch("tools.interrupt.is_interrupted", return_value=False),
+        patch("subprocess.Popen", return_value=mock_proc),
+        patch("os.open", return_value=99),
+        patch("os.close"),
+        patch("os.unlink"),
+        patch("builtins.open", side_effect=fake_open),
+    ):
+        result = _run_browser_command("task-1", "navigate", ["https://example.com"])
+
+    assert result["success"] is True
+    assert result["data"]["url"] == "https://example.com"
+
+
+def test_agent_browser_eval_repairs_malformed_json_result():
+    _stub_auxiliary_client()
+    from tools.browser_tool import _browser_eval
+
+    with patch(
+        "tools.browser_tool._run_browser_command",
+        return_value={"success": True, "data": {"result": "{'items': ['a', 'b',],}"}},
+    ):
+        result = json.loads(_browser_eval("document.body.innerText", task_id="test"))
+
+    assert result["success"] is True
+    assert result["result"] == {"items": ["a", "b"]}
+    assert result["result_type"] == "dict"
+
+
+def test_camofox_eval_repairs_malformed_json_result():
+    _stub_auxiliary_client()
+    from tools.browser_tool import _camofox_eval
+
+    with (
+        patch("tools.browser_camofox._ensure_tab", return_value={"tab_id": "tab-1", "user_id": "user-1"}),
+        patch("tools.browser_camofox._post", return_value={"result": "{'count': 3,}"}),
+    ):
+        result = json.loads(_camofox_eval("2+1", task_id="test"))
+
+    assert result["success"] is True
+    assert result["result"] == {"count": 3}
+    assert result["result_type"] == "dict"
+
+
+def test_browser_get_images_repairs_malformed_json_result():
+    _stub_auxiliary_client()
+    from tools.browser_tool import browser_get_images
+
+    with patch(
+        "tools.browser_tool._run_browser_command",
+        return_value={
+            "success": True,
+            "data": {
+                "result": "[{\"src\": \"https://example.com/cat.png\", \"alt\": \"cat\",}]"
+            },
+        },
+    ):
+        result = json.loads(browser_get_images(task_id="test"))
+
+    assert result["success"] is True
+    assert result["count"] == 1
+    assert result["images"] == [{"src": "https://example.com/cat.png", "alt": "cat"}]
+    assert "warning" not in result

tools/browser_tool.py

@@ -67,6 +67,7 @@ from typing import Dict, Any, Optional, List
 from pathlib import Path
 from agent.auxiliary_client import call_llm
 from hermes_constants import get_hermes_home
+from utils import repair_and_load_json
 
 try:
     from tools.website_policy import check_website_access
@@ -1171,8 +1172,12 @@ def _run_browser_command(
             return {"success": False, "error": f"Browser command '{command}' returned no output"}
 
         if stdout_text:
-            try:
-                parsed = json.loads(stdout_text)
+            parsed = repair_and_load_json(
+                stdout_text,
+                default=None,
+                context=f"browser_{command}_stdout",
+            )
+            if isinstance(parsed, dict):
                 # Warn if snapshot came back empty (common sign of daemon/CDP issues)
                 if command == "snapshot" and parsed.get("success"):
                     snap_data = parsed.get("data", {})
@@ -1181,35 +1186,35 @@ def _run_browser_command(
                                        "Possible stale daemon or CDP connection issue. "
                                        "returncode=%s", returncode)
                 return parsed
-            except json.JSONDecodeError:
-                raw = stdout_text[:2000]
-                logger.warning("browser '%s' returned non-JSON output (rc=%s): %s",
-                               command, returncode, raw[:500])
 
-                if command == "screenshot":
-                    stderr_text = (stderr or "").strip()
-                    combined_text = "\n".join(
-                        part for part in [stdout_text, stderr_text] if part
+            raw = stdout_text[:2000]
+            logger.warning("browser '%s' returned non-JSON output (rc=%s): %s",
+                           command, returncode, raw[:500])
+
+            if command == "screenshot":
+                stderr_text = (stderr or "").strip()
+                combined_text = "\n".join(
+                    part for part in [stdout_text, stderr_text] if part
+                )
+                recovered_path = _extract_screenshot_path_from_text(combined_text)
+
+                if recovered_path and Path(recovered_path).exists():
+                    logger.info(
+                        "browser 'screenshot' recovered file from non-JSON output: %s",
+                        recovered_path,
                     )
-                    recovered_path = _extract_screenshot_path_from_text(combined_text)
+                    return {
+                        "success": True,
+                        "data": {
+                            "path": recovered_path,
+                            "raw": raw,
+                        },
+                    }
 
-                    if recovered_path and Path(recovered_path).exists():
-                        logger.info(
-                            "browser 'screenshot' recovered file from non-JSON output: %s",
-                            recovered_path,
-                        )
-                        return {
-                            "success": True,
-                            "data": {
-                                "path": recovered_path,
-                                "raw": raw,
-                            },
-                        }
-
-                return {
-                    "success": False,
-                    "error": f"Non-JSON output from agent-browser for '{command}': {raw}"
-                }
+            return {
+                "success": False,
+                "error": f"Non-JSON output from agent-browser for '{command}': {raw}"
+            }
         
         # Check for errors
         if returncode != 0:
@@ -1777,10 +1782,11 @@ def _browser_eval(expression: str, task_id: Optional[str] = None) -> str:
     # is valid JSON, parse it so the model gets structured data.
     parsed = raw_result
     if isinstance(raw_result, str):
-        try:
-            parsed = json.loads(raw_result)
-        except (json.JSONDecodeError, ValueError):
-            pass  # keep as string
+        parsed = repair_and_load_json(
+            raw_result,
+            default=raw_result,
+            context="browser_eval_result",
+        )
 
     return json.dumps({
         "success": True,
@@ -1801,10 +1807,11 @@ def _camofox_eval(expression: str, task_id: Optional[str] = None) -> str:
         raw_result = resp.get("result") if isinstance(resp, dict) else resp
         parsed = raw_result
         if isinstance(raw_result, str):
-            try:
-                parsed = json.loads(raw_result)
-            except (json.JSONDecodeError, ValueError):
-                pass
+            parsed = repair_and_load_json(
+                raw_result,
+                default=raw_result,
+                context="camofox_eval_result",
+            )
 
         return json.dumps({
             "success": True,
@@ -1904,26 +1911,29 @@ def browser_get_images(task_id: Optional[str] = None) -> str:
     if result.get("success"):
         data = result.get("data", {})
         raw_result = data.get("result", "[]")
-        
-        try:
-            # Parse the JSON string returned by JavaScript
-            if isinstance(raw_result, str):
-                images = json.loads(raw_result)
-            else:
-                images = raw_result
-            
-            return json.dumps({
-                "success": True,
-                "images": images,
-                "count": len(images)
-            }, ensure_ascii=False)
-        except json.JSONDecodeError:
-            return json.dumps({
-                "success": True,
-                "images": [],
-                "count": 0,
-                "warning": "Could not parse image data"
-            }, ensure_ascii=False)
+
+        warning = None
+        if isinstance(raw_result, str):
+            images = repair_and_load_json(
+                raw_result,
+                default=None,
+                context="browser_get_images_result",
+            )
+        else:
+            images = raw_result
+
+        if not isinstance(images, list):
+            images = []
+            warning = "Could not parse image data"
+
+        payload = {
+            "success": True,
+            "images": images,
+            "count": len(images),
+        }
+        if warning:
+            payload["warning"] = warning
+        return json.dumps(payload, ensure_ascii=False)
     else:
         return json.dumps({
             "success": False,