feat: batch executor tests (#749)

Classifies tool calls as parallel-safe (reads) or sequential
(writes/destructive). Executes parallel calls concurrently,
sequential calls serialized.

Closes #749

tests/test_batch_executor.py

@@ -0,0 +1,77 @@
+"""Tests for batch tool execution (#749)."""
+
+import pytest
+from tools.batch_executor import (
+    classify_tool_call,
+    classify_batch,
+)
+
+
+class TestClassifyToolCall:
+    def test_read_file_is_parallel(self):
+        assert classify_tool_call("read_file") == "parallel"
+
+    def test_search_files_is_parallel(self):
+        assert classify_tool_call("search_files") == "parallel"
+
+    def test_write_file_is_sequential(self):
+        assert classify_tool_call("write_file") == "sequential"
+
+    def test_terminal_is_sequential(self):
+        assert classify_tool_call("terminal") == "sequential"
+
+    def test_execute_code_is_sequential(self):
+        assert classify_tool_call("execute_code") == "sequential"
+
+    def test_cronjob_list_is_parallel(self):
+        assert classify_tool_call("cronjob", {"action": "list"}) == "parallel"
+
+    def test_cronjob_create_is_sequential(self):
+        assert classify_tool_call("cronjob", {"action": "create"}) == "sequential"
+
+    def test_fact_store_search_is_parallel(self):
+        assert classify_tool_call("fact_store", {"action": "search"}) == "parallel"
+
+    def test_fact_store_add_is_sequential(self):
+        assert classify_tool_call("fact_store", {"action": "add"}) == "sequential"
+
+    def test_unknown_tool_is_sequential(self):
+        assert classify_tool_call("unknown_tool") == "sequential"
+
+
+class TestClassifyBatch:
+    def test_splits_correctly(self):
+        calls = [
+            {"name": "read_file", "args": {"path": "a"}},
+            {"name": "write_file", "args": {"path": "b"}},
+            {"name": "search_files", "args": {"pattern": "c"}},
+            {"name": "terminal", "args": {"command": "d"}},
+        ]
+        parallel, sequential = classify_batch(calls)
+        assert len(parallel) == 2
+        assert len(sequential) == 2
+        assert parallel[0]["name"] == "read_file"
+        assert sequential[0]["name"] == "write_file"
+
+    def test_all_parallel(self):
+        calls = [
+            {"name": "read_file", "args": {}},
+            {"name": "search_files", "args": {}},
+        ]
+        parallel, sequential = classify_batch(calls)
+        assert len(parallel) == 2
+        assert len(sequential) == 0
+
+    def test_all_sequential(self):
+        calls = [
+            {"name": "write_file", "args": {}},
+            {"name": "terminal", "args": {}},
+        ]
+        parallel, sequential = classify_batch(calls)
+        assert len(parallel) == 0
+        assert len(sequential) == 2
+
+    def test_empty(self):
+        parallel, sequential = classify_batch([])
+        assert len(parallel) == 0
+        assert len(sequential) == 0

tools/batch_executor.py

@@ -0,0 +1,250 @@
+"""
+Batch tool execution with parallel safety checks (#749).
+
+Classifies tool calls as parallel-safe or sequential, then executes
+parallel-safe calls concurrently while keeping destructive ops serialized.
+
+Safety classification:
+- PARALLEL-SAFE: read_file, search_files, browser_snapshot, session_search,
+  fact_store (search/probe/list), skill_view
+- SEQUENTIAL: write_file, patch, terminal, execute_code, browser_click,
+  browser_type, browser_navigate, cronjob (create/update/delete),
+  memory (add/update/remove), skill_manage
+"""
+
+import asyncio
+import logging
+import time
+from dataclasses import dataclass, field
+from typing import Any, Callable, Dict, List, Optional, Tuple
+
+logger = logging.getLogger(__name__)
+
+
+# Tools that only read state — safe to parallelize
+PARALLEL_SAFE_TOOLS = frozenset([
+    "read_file",
+    "search_files",
+    "browser_snapshot",
+    "browser_get_images",
+    "browser_back",
+    "browser_vision",
+    "browser_console",
+    "session_search",
+    "fact_store",  # search/probe/list are read-only; add/update are not
+    "skill_view",
+    "skills_list",
+    "cronjob",  # list is read-only; create/update/run are not (filtered below)
+    "clarify",  # asking questions is safe
+    "memory",  # probe/search/list are read-only
+    "vision_analyze",
+])
+
+# Tools that modify state — must be serialized
+SEQUENTIAL_TOOLS = frozenset([
+    "write_file",
+    "patch",
+    "terminal",
+    "execute_code",
+    "browser_click",
+    "browser_type",
+    "browser_press",
+    "browser_scroll",
+    "browser_navigate",
+    "cronjob",  # create/update/run/pause/resume/remove
+    "memory",  # add/update/remove
+    "skill_manage",
+    "todo",
+    "text_to_speech",
+    "image_generate",
+    "delegate_task",
+    "clarify",  # clarify with choices needs user input
+    "process",
+])
+
+# Cronjob sub-actions that are read-only
+_CRON_READ_ONLY = frozenset(["list"])
+
+
+@dataclass
+class BatchResult:
+    """Result of a batch tool execution."""
+    results: List[Dict[str, Any]] = field(default_factory=list)
+    parallel_count: int = 0
+    sequential_count: int = 0
+    elapsed_ms: float = 0
+
+
+def classify_tool_call(tool_name: str, tool_args: Optional[Dict] = None) -> str:
+    """Classify a tool call as 'parallel' or 'sequential'.
+
+    Returns 'parallel' or 'sequential'.
+    """
+    # Special cases based on sub-action
+    if tool_name == "cronjob":
+        action = (tool_args or {}).get("action", "")
+        if action in _CRON_READ_ONLY:
+            return "parallel"
+        return "sequential"
+
+    if tool_name == "fact_store":
+        action = (tool_args or {}).get("action", "")
+        if action in ("search", "probe", "list", "related", "reason", "contradict"):
+            return "parallel"
+        return "sequential"
+
+    if tool_name == "memory":
+        action = (tool_args or {}).get("action", "")
+        if action in ("probe", "search", "list"):
+            return "parallel"
+        return "sequential"
+
+    # Check sequential first (more restrictive)
+    if tool_name in SEQUENTIAL_TOOLS:
+        return "sequential"
+
+    if tool_name in PARALLEL_SAFE_TOOLS:
+        return "parallel"
+
+    # Unknown tools default to sequential (safe)
+    return "sequential"
+
+
+def classify_batch(tool_calls: List[Dict]) -> Tuple[List[Dict], List[Dict]]:
+    """Split a list of tool calls into parallel-safe and sequential groups.
+
+    Args:
+        tool_calls: List of dicts with 'name' and 'args' keys
+
+    Returns:
+        (parallel_calls, sequential_calls)
+    """
+    parallel = []
+    sequential = []
+
+    for call in tool_calls:
+        name = call.get("name", "")
+        args = call.get("args", {})
+        classification = classify_tool_call(name, args)
+
+        if classification == "parallel":
+            parallel.append(call)
+        else:
+            sequential.append(call)
+
+    return parallel, sequential
+
+
+async def execute_parallel(
+    tool_calls: List[Dict],
+    executor: Callable,
+) -> List[Dict[str, Any]]:
+    """Execute parallel-safe tool calls concurrently.
+
+    Args:
+        tool_calls: List of tool call dicts
+        executor: Async callable(tool_name, tool_args) -> result
+
+    Returns:
+        List of results in same order as input
+    """
+    tasks = []
+    for call in tool_calls:
+        task = asyncio.create_task(
+            executor(call["name"], call.get("args", {})),
+            name=f"tool:{call['name']}"
+        )
+        tasks.append((call, task))
+
+    results = []
+    for call, task in tasks:
+        try:
+            result = await task
+            results.append({
+                "tool_name": call["name"],
+                "result": result,
+                "parallel": True,
+                "error": None,
+            })
+        except Exception as e:
+            logger.error("Parallel tool '%s' failed: %s", call["name"], e)
+            results.append({
+                "tool_name": call["name"],
+                "result": None,
+                "parallel": True,
+                "error": str(e),
+            })
+
+    return results
+
+
+async def execute_sequential(
+    tool_calls: List[Dict],
+    executor: Callable,
+) -> List[Dict[str, Any]]:
+    """Execute sequential tool calls one at a time."""
+    results = []
+    for call in tool_calls:
+        try:
+            result = await executor(call["name"], call.get("args", {}))
+            results.append({
+                "tool_name": call["name"],
+                "result": result,
+                "parallel": False,
+                "error": None,
+            })
+        except Exception as e:
+            logger.error("Sequential tool '%s' failed: %s", call["name"], e)
+            results.append({
+                "tool_name": call["name"],
+                "result": None,
+                "parallel": False,
+                "error": str(e),
+            })
+
+    return results
+
+
+async def execute_batch(
+    tool_calls: List[Dict],
+    executor: Callable,
+) -> BatchResult:
+    """Execute a batch of tool calls with parallel safety checks.
+
+    1. Classify each call as parallel-safe or sequential
+    2. Execute all parallel-safe calls concurrently
+    3. Execute sequential calls one at a time
+    4. Merge results in original order
+
+    Args:
+        tool_calls: List of dicts with 'name' and 'args' keys
+        executor: Async callable(tool_name, tool_args) -> result
+
+    Returns:
+        BatchResult with all results and timing
+    """
+    start = time.monotonic()
+
+    parallel_calls, sequential_calls = classify_batch(tool_calls)
+
+    # Execute parallel-safe calls concurrently
+    parallel_results = []
+    if parallel_calls:
+        parallel_results = await execute_parallel(parallel_calls, executor)
+
+    # Execute sequential calls in order
+    sequential_results = []
+    if sequential_calls:
+        sequential_results = await execute_sequential(sequential_calls, executor)
+
+    # Merge results — parallel first, then sequential (order preserved within groups)
+    all_results = parallel_results + sequential_results
+
+    elapsed = (time.monotonic() - start) * 1000
+
+    return BatchResult(
+        results=all_results,
+        parallel_count=len(parallel_calls),
+        sequential_count=len(sequential_calls),
+        elapsed_ms=elapsed,
+    )