update to match latest in master

Author: NormallyGaussian

libs/deepagents-cli/deepagents_cli/README.md

@@ -12,7 +12,7 @@ cli/
 ├── __main__.py      # Entry point for `python -m deepagents.cli`
 ├── main.py          # CLI loop, argument parsing, main orchestration
 ├── config.py        # Configuration, constants, colors, model creation
-├── tools.py         # Custom tools (http_request, web_search)
+├── tools.py         # Custom tools (http_request, parallel_search, tavily_search)
 ├── ui.py            # Display logic, TokenTracker, help screens
 ├── input.py         # Input handling, completers, prompt session
 ├── commands.py      # Slash command and bash command handlers

libs/deepagents-cli/deepagents_cli/agent.py

@@ -223,7 +223,9 @@ def _format_edit_file_description(tool_call: ToolCall, state: AgentState, runtim
     )
 
 
-def _format_tavily_search_description(tool_call: ToolCall, state: AgentState, runtime: Runtime) -> str:
+def _format_tavily_search_description(
+    tool_call: ToolCall, state: AgentState, runtime: Runtime
+) -> str:
     """Format tavily_search tool call for approval prompt."""
     args = tool_call["args"]
     query = args.get("query", "unknown")
@@ -238,30 +240,17 @@ def _format_tavily_search_description(tool_call: ToolCall, state: AgentState, ru
     )
 
 
-def _format_parallel_search_description(tool_call: ToolCall, state: AgentState, runtime: Runtime) -> str:
+def _format_parallel_search_description(
+    tool_call: ToolCall, state: AgentState, runtime: Runtime
+) -> str:
     """Format parallel_search tool call for approval prompt."""
     args = tool_call["args"]
     queries = args.get("queries", [])
     max_results = args.get("max_results", 5)
     objective = args.get("objective")
 
     description = f"Queries: {queries}\nMax results: {max_results}\n"
-    if objective:
-        description += f"Objective: {objective}\n"
-    description += "\n⚠️  This will use Parallel API credits"
-
-    return description
-
-def _format_parallel_search_description(tool_call: ToolCall, state: AgentState, runtime: Runtime) -> str:
-    """Format parallel_search tool call for approval prompt."""
-    args = tool_call.get("args", {})
-    queries = args.get("queries", "unknown")
-    max_results = args.get("max_results", 5)
-    objective = args.get("objective")
-
-    description = f"Queries: {queries}\nMax results: {max_results}\n"
-    if objective:
-        description += f"Objective: {objective}\n"
+    description += f"Objective: {objective}\n"
     description += "\n⚠️  This will use Parallel API credits"
 
     return description

libs/deepagents-cli/deepagents_cli/default_agent_prompt.md

@@ -95,8 +95,11 @@ Examples: `pytest /foo/bar/tests` (good), `cd /foo/bar && pytest tests` (bad)
 
 Always use absolute paths starting with /.
 
-### web_search
-Search for documentation, error solutions, and code examples.
+### parallel_search
+Search for documentation, error solutions, and code examples using Parallel.
+
+### tavily_search
+Search for documentation, error solutions, and code examples using Tavily.
 
 ### http_request
 Make HTTP requests to APIs (GET, POST, etc.).

libs/deepagents-cli/deepagents_cli/execution.py

@@ -210,7 +210,8 @@ async def execute_task(
         "grep": "🔎",
         "shell": "⚡",
         "execute": "🔧",
-        "web_search": "🌐",
+        "parallel_search": "🌐",
+        "tavily_search": "🌐",
         "http_request": "🌍",
         "task": "🤖",
         "write_todos": "📋",
@@ -372,7 +373,7 @@ def flush_text_buffer(*, final: bool = False) -> None:
                                 status.start()
                                 spinner_active = True
 
-                        # For all other tools (web_search, http_request, etc.),
+                        # For all other tools (parallel_search, http_request, etc.),
                         # results are hidden from user - agent will process and respond
                         continue
 

libs/deepagents-cli/deepagents_cli/tools.py

@@ -143,9 +143,9 @@ def tavily_search(
 
 
 def parallel_search(
+    objective: str,
     queries: list[str],
     max_results: int = 5,
-    objective: str | None = None,
     max_chars_per_excerpt: int = 1000,
 ) -> SearchResult:
     """Search the web using Parallel for current information and documentation.
@@ -155,11 +155,10 @@ def parallel_search(
     helpful response for the user.
 
     Args:
-        queries: A list of search queries (be specific and detailed)
-        max_results: Number of results to return (default: 5)
         objective: Natural-language description of what the web search is trying to find.
             May include guidance about preferred sources or freshness.
-            At least one of objective or search_queries must be provided.
+        queries: A list of search queries (be specific and detailed)
+        max_results: Number of results to return (default: 5)
         max_chars_per_excerpt: Maximum characters per excerpt (default: 1000)
 
     Returns:
@@ -200,28 +199,12 @@ def parallel_search(
         }
 
 
-def get_web_search_tool():
-    """Get the available web search tool based on configured API keys.
-
-    Returns tavily_search if TAVILY_API_KEY is set, otherwise parallel_search
-    if PARALLEL_API_KEY is set, otherwise None.
-
-    This is kept for backward compatibility. New code should use
-    tavily_search or parallel_search directly.
-    """
-    if tavily_client is not None:
-        return tavily_search
-    if parallel_client is not None:
-        return parallel_search
-    return None
-
-
 def web_search(
     query: str,
     max_results: int = 5,
     topic: Literal["general", "news", "finance"] = "general",
     include_raw_content: bool = False,
-) -> dict[str, Any]:
+):
     """Search the web using Tavily for current information and documentation.
 
     This is a backward compatibility wrapper for tavily_search.

libs/deepagents-cli/deepagents_cli/ui.py

@@ -36,7 +36,7 @@ def format_tool_display(tool_name: str, tool_args: dict) -> str:
 
     Examples:
         read_file(path="/long/path/file.py") → "read_file(file.py)"
-        web_search(query="how to code", max_results=5) → 'web_search("how to code")'
+        parallel_search(objective="how to code", max_results=5) → 'parallel_search("how to code")'
         shell(command="pip install foo") → 'shell("pip install foo")'
     """
 
@@ -79,13 +79,6 @@ def abbreviate_path(path_str: str, max_length: int = 60) -> str:
             path = abbreviate_path(str(path_value))
             return f"{tool_name}({path})"
 
-    elif tool_name == "web_search":
-        # Web search: show the query string (backward compatibility)
-        if "query" in tool_args:
-            query = str(tool_args["query"])
-            query = truncate_value(query, 100)
-            return f'{tool_name}("{query}")'
-
     elif tool_name == "tavily_search":
         # Tavily search: show the query string
         if "query" in tool_args:
@@ -94,19 +87,11 @@ def abbreviate_path(path_str: str, max_length: int = 60) -> str:
             return f'{tool_name}("{query}")'
 
     elif tool_name == "parallel_search":
-        # Parallel search: show the queries list
-        if "queries" in tool_args:
-            queries = tool_args["queries"]
-            if isinstance(queries, list):
-                # Show first query + count if multiple
-                if len(queries) == 1:
-                    return f'{tool_name}("{queries[0]}")'
-                else:
-                    first = truncate_value(str(queries[0]), 80)
-                    return f'{tool_name}("{first}" + {len(queries)-1} more)'
-            else:
-                queries_str = truncate_value(str(queries), 100)
-                return f'{tool_name}({queries_str})'
+        # Parallel search: show the objective
+        if "objective" in tool_args:
+            objective = str(tool_args["objective"])
+            objective = truncate_value(objective, 100)
+            return f'{tool_name}("{objective}")'
 
     elif tool_name == "grep":
         # Grep: show the search pattern

libs/deepagents-cli/tests/unit_tests/test_agent.py

@@ -8,7 +8,8 @@
     _format_fetch_url_description,
     _format_shell_description,
     _format_task_description,
-    _format_web_search_description,
+    _format_tavily_search_description,
+    _format_parallel_search_description,
     _format_write_file_description,
 )
 
@@ -103,10 +104,10 @@ def test_format_edit_file_description_all_occurrences():
     assert "Action: Replace text (all occurrences)" in description
 
 
-def test_format_web_search_description():
-    """Test web_search description formatting."""
+def test_format_tavily_search_description():
+    """Test tavily_search description formatting."""
     tool_call = {
-        "name": "web_search",
+        "name": "tavily_search",
         "args": {
             "query": "python async programming",
             "max_results": 10,
@@ -117,17 +118,17 @@ def test_format_web_search_description():
     state = Mock()
     runtime = Mock()
 
-    description = _format_web_search_description(tool_call, state, runtime)
+    description = _format_tavily_search_description(tool_call, state, runtime)
 
     assert "Query: python async programming" in description
     assert "Max results: 10" in description
     assert "⚠️  This will use Tavily API credits" in description
 
 
-def test_format_web_search_description_default_max_results():
-    """Test web_search description with default max_results."""
+def test_format_tavily_search_description_default_max_results():
+    """Test tavily_search description with default max_results."""
     tool_call = {
-        "name": "web_search",
+        "name": "tavily_search",
         "args": {
             "query": "langchain tutorial",
         },
@@ -137,12 +138,35 @@ def test_format_web_search_description_default_max_results():
     state = Mock()
     runtime = Mock()
 
-    description = _format_web_search_description(tool_call, state, runtime)
+    description = _format_tavily_search_description(tool_call, state, runtime)
 
     assert "Query: langchain tutorial" in description
     assert "Max results: 5" in description
 
 
+def test_format_parallel_search_description():
+    """Test parallel_search description formatting."""
+    tool_call = {
+        "name": "parallel_search",
+        "args": {
+            "objective": "Learn python async programming",
+            "queries": ["python async programming"],
+            "max_results": 10,
+        },
+        "id": "call-5",
+    }
+
+    state = Mock()
+    runtime = Mock()
+
+    description = _format_parallel_search_description(tool_call, state, runtime)
+
+    assert "Objective: Learn python async programming" in description
+    assert "Queries: ['python async programming']" in description
+    assert "Max results: 10" in description
+    assert "⚠️  This will use Parallel API credits" in description
+
+
 def test_format_fetch_url_description():
     """Test fetch_url description formatting."""
     tool_call = {

libs/deepagents-cli/tests/unit_tests/tools/test_parallel_search.py

@@ -0,0 +1,71 @@
+import pytest
+from parallel.types.beta.web_search_result import WebSearchResult
+
+from deepagents_cli import tools
+
+
+@pytest.fixture
+def mock_parallel_client():
+    original = tools.parallel_client
+    yield
+    tools.parallel_client = original
+
+
+def test_parallel_search_success(mock_parallel_client):
+    class MockResult:
+        results = [WebSearchResult(url="https://python.org", title="Python", excerpts=["Guide"])]
+        search_id = "123"
+
+    class MockBeta:
+        def search(self, *args, **kwargs):
+            return MockResult()
+
+    class MockClient:
+        beta = MockBeta()
+
+    tools.parallel_client = MockClient()
+    result = tools.parallel_search("Learn Python", ["python"])
+
+    assert result.search_id == "123"
+    assert len(result.results) == 1
+
+
+def test_parallel_search_with_objective(mock_parallel_client):
+    class MockResult:
+        results = []
+        search_id = "456"
+
+    class MockBeta:
+        def search(self, objective, search_queries, **kwargs):
+            assert objective == "Learn Python"
+            assert search_queries == ["python"]
+            return MockResult()
+
+    class MockClient:
+        beta = MockBeta()
+
+    tools.parallel_client = MockClient()
+    result = tools.parallel_search("Learn Python", ["python"])
+
+    assert result.search_id == "456"
+
+
+def test_parallel_search_no_client(mock_parallel_client):
+    tools.parallel_client = None
+    result = tools.parallel_search("Learn Python", ["python"])
+
+    assert "error" in result
+
+
+def test_parallel_search_error(mock_parallel_client):
+    class MockBeta:
+        def search(self, *args, **kwargs):
+            raise Exception("API error")
+
+    class MockClient:
+        beta = MockBeta()
+
+    tools.parallel_client = MockClient()
+    result = tools.parallel_search("Learn Python", ["python"])
+
+    assert "error" in result