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

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 = []

docs/issue-954-verification.md

@@ -1,100 +0,0 @@
-# Issue #954 Verification — maps skill guest_house / camp_site / bakery
-
-Status: PASS
-
-## Drift noted
-
-Issue #954 asked for validation on `upstream/main` (commit `c5a814b23`).
-Fresh `forge/main` did not contain `skills/productivity/maps/`, so the forge branch was behind upstream for this feature cluster.
-This branch ports the upstream maps skill files into the forge checkout and adds regression coverage.
-
-## Automated verification
-
-Command:
-
-```bash
-pytest -q tests/skills/test_maps_client.py
-```
-
-Result:
-
-- 5 passed
-
-Coverage added:
-
-- maps skill files exist in the repo
-- `guest_house` category maps to `tourism=guest_house`
-- `camp_site` category maps to `tourism=camp_site`
-- `bakery` expands to both `shop=bakery` and `amenity=bakery`
-- dual-key bakery results dedupe correctly
-- skill documentation lists the new categories and supersedes `find-nearby`
-
-## Manual evidence
-
-### 1) guest_house lookup
-
-Command:
-
-```bash
-python3 skills/productivity/maps/scripts/maps_client.py nearby --near "Bath, United Kingdom" --category guest_house --limit 3
-```
-
-Observed results:
-
-- Henrietta House — 390.3 m
-- The Windsor — 437.2 m
-- The Old Rectory Bed & Breakfast — 495.7 m
-
-All returned `tourism=guest_house` in the raw tags.
-
-### 2) camp_site lookup
-
-Command:
-
-```bash
-python3 skills/productivity/maps/scripts/maps_client.py nearby --near "Yosemite Valley, California" --category camp_site --limit 5
-```
-
-Observed result:
-
-- Yellow Pine Administrative Campground — 90.3 m
-
-Returned `tourism=camp_site` in the raw tags.
-
-### 3) bakery lookup via `shop=bakery`
-
-Command:
-
-```bash
-python3 skills/productivity/maps/scripts/maps_client.py nearby --near "Lawrenceville, New Jersey" --category bakery --radius 5000 --limit 10
-```
-
-Observed results:
-
-- The Gingered Peach — 713.8 m
-- WildFlour Bakery — 741.9 m
-
-Both returned `shop=bakery` in the raw tags.
-
-### 4) bakery lookup via `amenity=bakery`
-
-Command:
-
-```bash
-python3 skills/productivity/maps/scripts/maps_client.py nearby --near "20735 Stevens Creek Boulevard, Cupertino, CA" --category bakery --radius 600 --limit 5
-```
-
-Observed result:
-
-- Paris Baguette — 28.6 m
-
-Returned `amenity=bakery` in the raw tags (and also includes `shop=bakery`), proving the dual-key union query reaches amenity-tagged bakeries too.
-
-## Conclusion
-
-PASS.
-
-- `guest_house` resolves correctly
-- `camp_site` resolves correctly
-- `bakery` resolves through both supported keys
-- forge/main drift from upstream/main was real and is addressed on this branch

skills/productivity/maps/SKILL.md

@@ -1,199 +0,0 @@
----
-name: maps
-description: >
-  Location intelligence — geocode a place, reverse-geocode coordinates,
-  find nearby places (46 POI categories), driving/walking/cycling
-  distance + time, turn-by-turn directions, timezone lookup, bounding
-  box + area for a named place, and POI search within a rectangle.
-  Uses OpenStreetMap + Overpass + OSRM. Free, no API key.
-version: 1.2.0
-author: Mibayy
-license: MIT
-metadata:
-  hermes:
-    tags: [maps, geocoding, places, routing, distance, directions, nearby, location, openstreetmap, nominatim, overpass, osrm]
-    category: productivity
-    requires_toolsets: [terminal]
-    supersedes: [find-nearby]
----
-
-# Maps Skill
-
-Location intelligence using free, open data sources. 8 commands, 44 POI
-categories, zero dependencies (Python stdlib only), no API key required.
-
-Data sources: OpenStreetMap/Nominatim, Overpass API, OSRM, TimeAPI.io.
-
-This skill supersedes the old `find-nearby` skill — all of find-nearby's
-functionality is covered by the `nearby` command below, with the same
-`--near "<place>"` shortcut and multi-category support.
-
-## When to Use
-
-- User sends a Telegram location pin (latitude/longitude in the message) → `nearby`
-- User wants coordinates for a place name → `search`
-- User has coordinates and wants the address → `reverse`
-- User asks for nearby restaurants, hospitals, pharmacies, hotels, etc. → `nearby`
-- User wants driving/walking/cycling distance or travel time → `distance`
-- User wants turn-by-turn directions between two places → `directions`
-- User wants timezone information for a location → `timezone`
-- User wants to search for POIs within a geographic area → `area` + `bbox`
-
-## Prerequisites
-
-Python 3.8+ (stdlib only — no pip installs needed).
-
-Script path: `~/.hermes/skills/maps/scripts/maps_client.py`
-
-## Commands
-
-```bash
-MAPS=~/.hermes/skills/maps/scripts/maps_client.py
-```
-
-### search — Geocode a place name
-
-```bash
-python3 $MAPS search "Eiffel Tower"
-python3 $MAPS search "1600 Pennsylvania Ave, Washington DC"
-```
-
-Returns: lat, lon, display name, type, bounding box, importance score.
-
-### reverse — Coordinates to address
-
-```bash
-python3 $MAPS reverse 48.8584 2.2945
-```
-
-Returns: full address breakdown (street, city, state, country, postcode).
-
-### nearby — Find places by category
-
-```bash
-# By coordinates (from a Telegram location pin, for example)
-python3 $MAPS nearby 48.8584 2.2945 restaurant --limit 10
-python3 $MAPS nearby 40.7128 -74.0060 hospital --radius 2000
-
-# By address / city / zip / landmark — --near auto-geocodes
-python3 $MAPS nearby --near "Times Square, New York" --category cafe
-python3 $MAPS nearby --near "90210" --category pharmacy
-
-# Multiple categories merged into one query
-python3 $MAPS nearby --near "downtown austin" --category restaurant --category bar --limit 10
-```
-
-46 categories: restaurant, cafe, bar, hospital, pharmacy, hotel, guest_house,
-camp_site, supermarket, atm, gas_station, parking, museum, park, school,
-university, bank, police, fire_station, library, airport, train_station,
-bus_stop, church, mosque, synagogue, dentist, doctor, cinema, theatre, gym,
-swimming_pool, post_office, convenience_store, bakery, bookshop, laundry,
-car_wash, car_rental, bicycle_rental, taxi, veterinary, zoo, playground,
-stadium, nightclub.
-
-Each result includes: `name`, `address`, `lat`/`lon`, `distance_m`,
-`maps_url` (clickable Google Maps link), `directions_url` (Google Maps
-directions from the search point), and promoted tags when available —
-`cuisine`, `hours` (opening_hours), `phone`, `website`.
-
-### distance — Travel distance and time
-
-```bash
-python3 $MAPS distance "Paris" --to "Lyon"
-python3 $MAPS distance "New York" --to "Boston" --mode driving
-python3 $MAPS distance "Big Ben" --to "Tower Bridge" --mode walking
-```
-
-Modes: driving (default), walking, cycling. Returns road distance, duration,
-and straight-line distance for comparison.
-
-### directions — Turn-by-turn navigation
-
-```bash
-python3 $MAPS directions "Eiffel Tower" --to "Louvre Museum" --mode walking
-python3 $MAPS directions "JFK Airport" --to "Times Square" --mode driving
-```
-
-Returns numbered steps with instruction, distance, duration, road name, and
-maneuver type (turn, depart, arrive, etc.).
-
-### timezone — Timezone for coordinates
-
-```bash
-python3 $MAPS timezone 48.8584 2.2945
-python3 $MAPS timezone 35.6762 139.6503
-```
-
-Returns timezone name, UTC offset, and current local time.
-
-### area — Bounding box and area for a place
-
-```bash
-python3 $MAPS area "Manhattan, New York"
-python3 $MAPS area "London"
-```
-
-Returns bounding box coordinates, width/height in km, and approximate area.
-Useful as input for the bbox command.
-
-### bbox — Search within a bounding box
-
-```bash
-python3 $MAPS bbox 40.75 -74.00 40.77 -73.98 restaurant --limit 20
-```
-
-Finds POIs within a geographic rectangle. Use `area` first to get the
-bounding box coordinates for a named place.
-
-## Working With Telegram Location Pins
-
-When a user sends a location pin, the message contains `latitude:` and
-`longitude:` fields. Extract those and pass them straight to `nearby`:
-
-```bash
-# User sent a pin at 36.17, -115.14 and asked "find cafes nearby"
-python3 $MAPS nearby 36.17 -115.14 cafe --radius 1500
-```
-
-Present results as a numbered list with names, distances, and the
-`maps_url` field so the user gets a tap-to-open link in chat. For "open
-now?" questions, check the `hours` field; if missing or unclear, verify
-with `web_search` since OSM hours are community-maintained and not always
-current.
-
-## Workflow Examples
-
-**"Find Italian restaurants near the Colosseum":**
-1. `nearby --near "Colosseum Rome" --category restaurant --radius 500`
-   — one command, auto-geocoded
-
-**"What's near this location pin they sent?":**
-1. Extract lat/lon from the Telegram message
-2. `nearby LAT LON cafe --radius 1500`
-
-**"How do I walk from hotel to conference center?":**
-1. `directions "Hotel Name" --to "Conference Center" --mode walking`
-
-**"What restaurants are in downtown Seattle?":**
-1. `area "Downtown Seattle"` → get bounding box
-2. `bbox S W N E restaurant --limit 30`
-
-## Pitfalls
-
-- Nominatim ToS: max 1 req/s (handled automatically by the script)
-- `nearby` requires lat/lon OR `--near "<address>"` — one of the two is needed
-- OSRM routing coverage is best for Europe and North America
-- Overpass API can be slow during peak hours; the script automatically
-  falls back between mirrors (overpass-api.de → overpass.kumi.systems)
-- `distance` and `directions` use `--to` flag for the destination (not positional)
-- If a zip code alone gives ambiguous results globally, include country/state
-
-## Verification
-
-```bash
-python3 ~/.hermes/skills/maps/scripts/maps_client.py search "Statue of Liberty"
-# Should return lat ~40.689, lon ~-74.044
-
-python3 ~/.hermes/skills/maps/scripts/maps_client.py nearby --near "Times Square" --category restaurant --limit 3
-# Should return a list of restaurants within ~500m of Times Square
-```

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/skills/test_maps_client.py

@@ -1,135 +0,0 @@
-"""Regression tests for the bundled maps skill."""
-
-from __future__ import annotations
-
-import importlib.util
-from pathlib import Path
-from types import SimpleNamespace
-
-SCRIPT_PATH = (
-    Path(__file__).resolve().parents[2]
-    / "skills/productivity/maps/scripts/maps_client.py"
-)
-SKILL_PATH = (
-    Path(__file__).resolve().parents[2]
-    / "skills/productivity/maps/SKILL.md"
-)
-
-
-def load_module():
-    assert SCRIPT_PATH.exists(), f"missing maps client script: {SCRIPT_PATH}"
-    spec = importlib.util.spec_from_file_location("maps_client_test", SCRIPT_PATH)
-    module = importlib.util.module_from_spec(spec)
-    assert spec.loader is not None
-    spec.loader.exec_module(module)
-    return module
-
-
-def test_maps_skill_files_exist():
-    assert SCRIPT_PATH.exists()
-    assert SKILL_PATH.exists()
-
-
-def test_category_tags_cover_guest_house_camp_site_and_dual_key_bakery():
-    module = load_module()
-
-    assert module.CATEGORY_TAGS["guest_house"] == ("tourism", "guest_house")
-    assert module.CATEGORY_TAGS["camp_site"] == ("tourism", "camp_site")
-    assert module.CATEGORY_TAGS["bakery"] == [
-        ("shop", "bakery"),
-        ("amenity", "bakery"),
-    ]
-    assert module._tags_for("bakery") == [
-        ("shop", "bakery"),
-        ("amenity", "bakery"),
-    ]
-
-
-def test_build_overpass_queries_include_all_supported_tags():
-    module = load_module()
-
-    bakery_query = module.build_overpass_nearby(
-        None,
-        None,
-        40.0,
-        -74.0,
-        500,
-        10,
-        tag_pairs=module._tags_for("bakery"),
-    )
-    assert 'node["shop"="bakery"]' in bakery_query
-    assert 'way["shop"="bakery"]' in bakery_query
-    assert 'node["amenity"="bakery"]' in bakery_query
-    assert 'way["amenity"="bakery"]' in bakery_query
-
-    guest_house_query = module.build_overpass_nearby(
-        None,
-        None,
-        40.0,
-        -74.0,
-        500,
-        10,
-        tag_pairs=module._tags_for("guest_house"),
-    )
-    assert 'node["tourism"="guest_house"]' in guest_house_query
-    assert 'way["tourism"="guest_house"]' in guest_house_query
-
-    camp_site_bbox = module.build_overpass_bbox(
-        None,
-        None,
-        39.0,
-        -75.0,
-        41.0,
-        -73.0,
-        10,
-        tag_pairs=module._tags_for("camp_site"),
-    )
-    assert 'node["tourism"="camp_site"]' in camp_site_bbox
-    assert 'way["tourism"="camp_site"]' in camp_site_bbox
-
-
-def test_cmd_nearby_dedupes_dual_tag_bakery_results(monkeypatch, capsys):
-    module = load_module()
-
-    duplicate_bakery = {
-        "elements": [
-            {
-                "type": "node",
-                "id": 101,
-                "lat": 40.0,
-                "lon": -74.0,
-                "tags": {"name": "Wild Flour", "shop": "bakery"},
-            },
-            {
-                "type": "node",
-                "id": 101,
-                "lat": 40.0,
-                "lon": -74.0,
-                "tags": {"name": "Wild Flour", "amenity": "bakery"},
-            },
-        ]
-    }
-
-    monkeypatch.setattr(module, "overpass_query", lambda query: duplicate_bakery)
-    args = SimpleNamespace(
-        lat="40.0",
-        lon="-74.0",
-        near=None,
-        category="bakery",
-        category_list=[],
-        radius=500,
-        limit=10,
-    )
-
-    module.cmd_nearby(args)
-    out = capsys.readouterr().out
-    assert '"count": 1' in out
-    assert '"Wild Flour"' in out
-
-
-def test_skill_doc_lists_new_categories_and_supersession():
-    text = SKILL_PATH.read_text(encoding="utf-8")
-    assert "guest_house" in text
-    assert "camp_site" in text
-    assert "bakery" in text
-    assert "supersedes: [find-nearby]" in text

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,