support double instructions

Author: dsfaccini

pydantic_ai_slim/pydantic_ai/_cli/web.py

@@ -41,7 +41,9 @@ def run_web_command(  # noqa: C901
         port: Port to bind the server to.
         models: List of model strings (e.g., ['openai:gpt-5', 'anthropic:claude-sonnet-4-5']).
         tools: List of builtin tool IDs (e.g., ['web_search', 'code_execution']).
-        instructions: System instructions for generic agent.
+        instructions: System instructions. For generic agent (no agent_path), these become
+            the agent's instructions. With an agent, these are passed as extra instructions
+            to each run.
         mcp: Path to JSON file with MCP server configurations.
     """
     console = Console()
@@ -100,11 +102,16 @@ def run_web_command(  # noqa: C901
             console.print(f'[red]Error: {e}[/red]')
             return 1
 
+    # For generic agent, instructions are already in the agent.
+    # For provided agent, pass instructions as extra instructions for each run.
+    run_instructions = instructions if agent_path else None
+
     app = create_web_app(
         agent,
         models=models,
         builtin_tools=all_tool_instances or None,
         toolsets=mcp_servers or None,
+        instructions=run_instructions,
     )
 
     agent_desc = agent_path if agent_path else 'generic agent'

pydantic_ai_slim/pydantic_ai/builtin_tools.py

@@ -424,7 +424,7 @@ def _tool_discriminator(tool_data: dict[str, Any] | AbstractBuiltinTool) -> str:
         return tool_data.kind
 
 
-# This function exists primarily as a clean default_factory for ModelProfile.supported_builtin_tools
+# used in a couple places
 def get_builtin_tool_types() -> frozenset[type[AbstractBuiltinTool]]:
     """Get the set of all builtin tool types (excluding deprecated tools)."""
     return frozenset(cls for kind, cls in BUILTIN_TOOL_TYPES.items() if kind not in DEPRECATED_BUILTIN_TOOL_TYPES)

pydantic_ai_slim/pydantic_ai/models/function.py

@@ -204,9 +204,9 @@ def system(self) -> str:
     @classmethod
     def supported_builtin_tools(cls) -> frozenset[type[AbstractBuiltinTool]]:
         """FunctionModel supports all builtin tools for testing flexibility."""
-        from ..builtin_tools import BUILTIN_TOOL_TYPES, DEPRECATED_BUILTIN_TOOL_TYPES
+        from ..builtin_tools import get_builtin_tool_types
 
-        return frozenset(cls for kind, cls in BUILTIN_TOOL_TYPES.items() if kind not in DEPRECATED_BUILTIN_TOOL_TYPES)
+        return get_builtin_tool_types()
 
 
 @dataclass(frozen=True, kw_only=True)

tests/test_cli.py

@@ -555,6 +555,27 @@ def test_run_web_command_generic_agent_with_instructions(mocker: MockerFixture,
     assert 'You are a helpful assistant' in agent._instructions
 
 
+def test_run_web_command_agent_with_instructions(
+    mocker: MockerFixture, create_test_module: Callable[..., None], capfd: CaptureFixture[str]
+):
+    """Test run_web_command passes instructions to create_web_app when agent is provided."""
+
+    mock_uvicorn_run = mocker.patch('uvicorn.run')
+    mock_create_app = mocker.patch('pydantic_ai._cli.web.create_web_app')
+
+    test_agent = Agent(TestModel(custom_output_text='test'))
+    create_test_module(custom_agent=test_agent)
+
+    result = run_web_command(agent_path='test_module:custom_agent', instructions='Always respond in Spanish')
+
+    assert result == 0
+    mock_uvicorn_run.assert_called_once()
+
+    # Verify instructions were passed to create_web_app
+    call_kwargs = mock_create_app.call_args.kwargs
+    assert call_kwargs['instructions'] == 'Always respond in Spanish'
+
+
 def test_run_web_command_agent_load_failure(capfd: CaptureFixture[str]):
     """Test run_web_command returns error when agent path is invalid."""