agentpool 2.2.3__py3-none-any.whl → 2.5.0__py3-none-any.whl

agentpool/agents/interactions.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Mapping
+from contextlib import asynccontextmanager
 from typing import TYPE_CHECKING, Any, Literal, cast, overload
 
 from schemez import Schema
@@ -12,7 +13,7 @@ from agentpool.messaging import ChatMessage
 
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import AsyncIterator, Sequence
 
     from toprompt import AnyPromptType
 
@@ -90,6 +91,33 @@ class Interactions:
     def __init__(self, agent: SupportsStructuredOutput) -> None:
         self.agent = agent
 
+    @asynccontextmanager
+    async def _with_structured_output[T](
+        self, output_type: type[T]
+    ) -> AsyncIterator[SupportsStructuredOutput]:
+        """Context manager to temporarily set structured output type and restore afterwards.
+
+        Args:
+            output_type: The type to structure output as
+
+        Yields:
+            The agent configured for structured output
+
+        Example:
+            async with interactions._with_structured_output(MyType) as agent:
+                result = await agent.run(prompt)
+        """
+        # Save original output type
+        old_output_type = getattr(self.agent, "_output_type", None)
+        try:
+            # Configure structured output
+            structured_agent = self.agent.to_structured(output_type)
+            yield structured_agent
+        finally:
+            # Restore original output type
+            if hasattr(self.agent, "_output_type"):
+                self.agent._output_type = old_output_type
+
     # async def conversation(
     #     self,
     #     other: MessageNode[Any, Any],
@@ -218,8 +246,9 @@ Available options:
 
 Select ONE option by its exact label."""
 
-        # Get LLM's string-based decision
-        result = await self.agent.run(prompt or default_prompt, output_type=LLMPick)
+        # Get LLM's string-based decision using structured output
+        async with self._with_structured_output(LLMPick) as structured_agent:
+            result = await structured_agent.run(prompt or default_prompt)
 
         # Convert to type-safe decision
         if result.content.selection not in label_map:
@@ -328,7 +357,9 @@ Available options:
 {picks_info} options by their exact labels.
 List your selections, one per line, followed by your reasoning."""
 
-        result = await self.agent.run(prompt or default_prompt, output_type=LLMMultiPick)
+        # Get LLM's multi-selection using structured output
+        async with self._with_structured_output(LLMMultiPick) as structured_agent:
+            result = await structured_agent.run(prompt or default_prompt)
 
         # Validate selections
         invalid = [s for s in result.content.selections if s not in label_map]
@@ -368,7 +399,9 @@ List your selections, one per line, followed by your reasoning."""
             instance: item_model  # type: ignore
             # explanation: str | None = None
 
-        result = await self.agent.run(final_prompt, output_type=Extraction)
+        # Use structured output via context manager
+        async with self._with_structured_output(Extraction) as structured_agent:
+            result = await structured_agent.run(final_prompt)
         return as_type(**result.content.instance.model_dump())
 
     async def extract_multiple[T](
@@ -404,7 +437,9 @@ List your selections, one per line, followed by your reasoning."""
             instances: list[item_model]  # type: ignore
             # explanation: str | None = None
 
-        result = await self.agent.run(final_prompt, output_type=Extraction)
+        # Use structured output via context manager
+        async with self._with_structured_output(Extraction) as structured_agent:
+            result = await structured_agent.run(final_prompt)
         num_instances = len(result.content.instances)  # Validate counts
         if len(result.content.instances) < min_items:
             msg = f"Found only {num_instances} instances, need {min_items}"

agentpool/agents/modes.py

@@ -7,6 +7,7 @@ to clients. Each agent type can define its own mode categories.
 from __future__ import annotations
 
 from dataclasses import dataclass, field
+from typing import Literal
 
 
 @dataclass
@@ -52,3 +53,15 @@ class ModeCategory:
 
     current_mode_id: str = ""
     """ID of the currently active mode."""
+
+    category: Literal["mode", "model", "thought_level", "other"] | None = None
+    """Optional semantic category for UX purposes (keyboard shortcuts, icons, placement).
+
+    This helps clients distinguish common selector types:
+    - 'mode': Session mode selector
+    - 'model': Model selector
+    - 'thought_level': Thought/reasoning level selector
+    - 'other': Unknown/uncategorized
+
+    MUST NOT be required for correctness. Clients should handle gracefully.
+    """

agentpool/agents/slashed_agent.py

@@ -7,10 +7,6 @@ import re
 from typing import TYPE_CHECKING, Any, cast
 
 import anyio
-from slashed.events import (
-    CommandExecutedEvent,
-    CommandOutputEvent as SlashedCommandOutputEvent,
-)
 
 from agentpool.agents.events import CommandCompleteEvent, CommandOutputEvent
 from agentpool.log import get_logger
@@ -112,6 +108,11 @@ class SlashedAgent[TDeps, OutputDataT]:
         Yields:
             Command output and completion events
         """
+        from slashed.events import (
+            CommandExecutedEvent,
+            CommandOutputEvent as SlashedCommandOutputEvent,
+        )
+
         parsed = _parse_slash_command(command_text)
         if not parsed:
             logger.warning("Invalid slash command", command=command_text)

agentpool/agents/tool_wrapping.py

@@ -9,9 +9,11 @@ import time
 from typing import TYPE_CHECKING, Any
 
 from pydantic_ai import RunContext
+from pydantic_ai.messages import ToolReturn
 
 from agentpool.agents.context import AgentContext
 from agentpool.tasks import ChainAbortedError, RunAbortedError, ToolSkippedError
+from agentpool.tools.base import ToolResult
 from agentpool.utils.inspection import execute, get_argument_key
 from agentpool.utils.signatures import create_modified_signature, update_signature
 
@@ -27,7 +29,7 @@ def wrap_tool[TReturn](  # noqa: PLR0915
     tool: Tool[TReturn],
     agent_ctx: AgentContext,
     hooks: AgentHooks | None = None,
-) -> Callable[..., Awaitable[TReturn | None]]:
+) -> Callable[..., Awaitable[TReturn | ToolReturn | None]]:
     """Wrap tool with confirmation handling and hooks.
 
     Strategy:
@@ -41,7 +43,7 @@ def wrap_tool[TReturn](  # noqa: PLR0915
         agent_ctx: Agent context for confirmation handling and dependency injection.
         hooks: Optional AgentHooks for pre/post tool execution hooks.
     """
-    fn = tool.callable
+    fn = tool.get_callable()
     run_ctx_key = get_argument_key(fn, RunContext)
     agent_ctx_key = get_argument_key(fn, AgentContext)
 
@@ -58,7 +60,7 @@ def wrap_tool[TReturn](  # noqa: PLR0915
         tool_input: dict[str, Any],
         *args: Any,
         **kwargs: Any,
-    ) -> TReturn | None:
+    ) -> TReturn | None | ToolReturn:
         """Execute tool with pre/post hooks."""
         # Pre-tool hooks
         if hooks:
@@ -79,9 +81,17 @@ def wrap_tool[TReturn](  # noqa: PLR0915
 
         # Execute the tool
         start_time = time.perf_counter()
-        result = await execute_fn(*args, **kwargs)
+        result: TReturn | ToolResult | ToolReturn = await execute_fn(*args, **kwargs)
         duration_ms = (time.perf_counter() - start_time) * 1000
 
+        # Convert AgentPool ToolResult to pydantic-ai ToolReturn
+        if isinstance(result, ToolResult):
+            result = ToolReturn(
+                return_value=result.structured_content or result.content,
+                content=result.content,
+                metadata=result.metadata,
+            )
+
         # Post-tool hooks
         if hooks:
             await hooks.run_post_tool_hooks(
@@ -97,7 +107,9 @@ def wrap_tool[TReturn](  # noqa: PLR0915
 
     if run_ctx_key or agent_ctx_key:
         # Tool has RunContext and/or AgentContext
-        async def wrapped(ctx: RunContext, *args: Any, **kwargs: Any) -> TReturn | None:  # pyright: ignore
+        async def wrapped(
+            ctx: RunContext, *args: Any, **kwargs: Any
+        ) -> TReturn | None | ToolReturn:  # pyright: ignore
             result = await agent_ctx.handle_confirmation(tool, kwargs)
             if result == "allow":
                 # Populate AgentContext with RunContext data if needed
@@ -135,7 +147,7 @@ def wrap_tool[TReturn](  # noqa: PLR0915
 
     else:
         # Tool has no context - normal function call
-        async def wrapped(*args: Any, **kwargs: Any) -> TReturn | None:  # type: ignore[misc]
+        async def wrapped(*args: Any, **kwargs: Any) -> TReturn | None | ToolReturn:  # type: ignore[misc]
             result = await agent_ctx.handle_confirmation(tool, kwargs)
             if result == "allow":
                 tool_input = kwargs.copy()

agentpool/common_types.py

@@ -28,15 +28,13 @@ if TYPE_CHECKING:
     from uuid import UUID
 
     from agentpool.agents.events import RichAgentStreamEvent
-    from agentpool.messaging import ChatMessage
-    from agentpool.messaging.messagenode import MessageNode
     from agentpool.tools.base import Tool
 
-    # Type alias for team streaming return type (node + event tuples)
-    type TeamStreamEvent = tuple[MessageNode[Any, Any], RichAgentStreamEvent[Any]]
     type AnyTransformFn[T] = Callable[[T], T | Awaitable[T]]
     type OptionalAwaitable[T] = T | Awaitable[T]
-    type ToolType = str | AnyCallable | Tool
+    # Import path string for dynamic tool loading (e.g., "mymodule:my_tool")
+    type ImportPathString = str
+    type ToolType = ImportPathString | AnyCallable | Tool
     # Define what we consider JSON-serializable
     type JsonPrimitive = None | bool | int | float | str
     type SessionIdType = str | UUID | None
@@ -76,7 +74,7 @@ TeamName = str
 AgentName = str
 MessageRole = Literal["user", "assistant"]
 PartType = Literal["text", "image", "audio", "video"]
-ModelType = Model | ModelId | str | None
+ModelType = Model | ModelId | str
 EnvironmentType = Literal["file", "inline"]
 ToolSource = Literal["agent", "builtin", "dynamic", "task", "mcp", "toolset"]
 AnyCallable = Callable[..., Any]
@@ -99,30 +97,46 @@ QueueStrategy = Literal["concat", "latest", "buffer"]
 """
 
 
-class SupportsStructuredOutput(Protocol):
-    """Protocol for nodes that support structured output via run().
-
-    This protocol is used for components that need to call run() with
-    an output_type parameter (e.g., picker agents, Interactions).
-    """
-
-    async def run(self, *prompts: Any, output_type: Any = ...) -> ChatMessage[Any]: ...
-
-
 @runtime_checkable
 class SupportsRunStream[TResult](Protocol):
     """Protocol for nodes that support streaming via run_stream().
 
     Used by Team and TeamRun to check if a node can be streamed.
-
-    Return type is a union because:
-    - Agent returns `AsyncIterator[RichAgentStreamEvent[TResult]]`
-    - Team/TeamRun return `AsyncIterator[tuple[MessageNode, RichAgentStreamEvent]]`
+    All streaming nodes return RichAgentStreamEvent, with subagent/team
+    activity wrapped in SubAgentEvent.
     """
 
     def run_stream(
         self, *prompts: Any, **kwargs: Any
-    ) -> AsyncIterator[RichAgentStreamEvent[TResult] | TeamStreamEvent]: ...
+    ) -> AsyncIterator[RichAgentStreamEvent[TResult]]: ...
+
+
+@runtime_checkable
+class SupportsStructuredOutput(Protocol):
+    """Protocol for agents that support structured output via to_structured().
+
+    Used by Interactions class for pick/extract operations that require
+    structured output from agents.
+    """
+
+    def to_structured[T](self, output_type: type[T]) -> SupportsStructuredOutput:
+        """Create a copy of this agent configured for structured output.
+
+        Args:
+            output_type: The type to structure output as
+
+        Returns:
+            New agent instance configured for structured output
+        """
+        ...
+
+    async def run(self, *prompts: Any, **kwargs: Any) -> Any:
+        """Run the agent with the given prompts.
+
+        Returns:
+            ChatMessage with content typed according to output_type from to_structured
+        """
+        ...
 
 
 class BaseCode(BaseModel):

agentpool/config_resources/acp_assistant.yml

@@ -17,8 +17,8 @@ agents:
         You are a helpful AI assistant with access to the file system and can execute code.
         You can help with coding, writing, analysis, file operations, and more.
         Be concise but thorough in your responses.
-    toolsets:
-      - type: execution
+    tools:
+      - type: process_management
       - type: file_access
       - type: code
       - type: search

agentpool/config_resources/agents.yml

@@ -47,6 +47,7 @@ responses:
 
 agents:
   url_opener:
+    type: native
     tools:
       - type: import
         import_path: "webbrowser.open"
@@ -63,6 +64,7 @@ agents:
         Always confirm what you're about to open.
 
   system_inspector:
+    type: native
     tools:
       - type: import
         import_path: "platform.platform"
@@ -84,6 +86,7 @@ agents:
         Format it using the template from the system_template resource.
 
   file_explorer:
+    type: native
     tools:
       - type: import
         import_path: "os.listdir"

agentpool/config_resources/agents_template.yml

@@ -1,6 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/phil65/agentpool/refs/heads/main/schema/config-schema.json
 agents:
   simple_agent:
+    type: native
     description: "Basic agent with one tool to open webbrowsers."
     model: openai:gpt-5-mini
     tools:

agentpool/config_resources/claude_code_agent.yml

@@ -1,19 +1,20 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/phil65/agentpool/refs/heads/main/schema/config-schema.json
-# Default ACP assistant configuration
-# Used when starting ACP server without explicit config file
 
 agents:
   claude:
     type: claude_code
     display_name: "AI Assistant"
-    builtin_tools: []
-    env:
-      ANTHROPIC_API_KEY: ""
+    builtin_tools: [] # we use our own tools.
+    use_subscription: true
     description: "Claude code agent with enhanced tools"
-    toolsets:
-      - type: execution
+    tools:
+      - type: bash
+      - type: agent_cli
+      - type: process_management
       - type: file_access
         edit_tool: batch
-      - type: code
+      # - type: code
       - type: search
       - type: plan
+      - type: question
+      # - type: debug

agentpool/config_resources/external_acp_agents.yml

@@ -9,9 +9,10 @@ agents:
     env: # override to make sure subscription is used
       ANTHROPIC_API_KEY: ""
 
-    toolsets:
+    tools:
       - type: code
       - type: subagent
+      - type: plan
   codex:
     type: acp
     provider: codex

agentpool/delegation/base_team.py

@@ -22,7 +22,7 @@ from agentpool_config.teams import TeamConfig
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator, Sequence
 
-    from evented.configs import EventConfig
+    from evented_config import EventConfig
     from psygnal.containers._evented_list import ListEvents
     from toprompt import AnyPromptType
 
@@ -31,7 +31,6 @@ if TYPE_CHECKING:
         ModelType,
         ProcessorCallback,
         PromptCompatible,
-        SupportsStructuredOutput,
         ToolType,
     )
     from agentpool.delegation.teamrun import ExtendedTeamTalk, TeamRun
@@ -66,9 +65,6 @@ class BaseTeam[TDeps, TResult](MessageNode[TDeps, TResult]):
         display_name: str | None = None,
         shared_prompt: str | None = None,
         mcp_servers: list[str | MCPServerConfig] | None = None,
-        picker: SupportsStructuredOutput | None = None,
-        num_picks: int | None = None,
-        pick_prompt: str | None = None,
         event_configs: Sequence[EventConfig] | None = None,
         agent_pool: AgentPool | None = None,
     ) -> None:
@@ -97,28 +93,6 @@ class BaseTeam[TDeps, TResult](MessageNode[TDeps, TResult]):
         self.shared_prompt = shared_prompt
         self._main_task: asyncio.Task[ChatMessage[Any] | None] | None = None
         self._infinite = False
-        self.picker = picker
-        self.num_picks = num_picks
-        self.pick_prompt = pick_prompt
-
-    async def pick_agents(self, task: str) -> Sequence[MessageNode[Any, Any]]:
-        """Pick agents to run."""
-        from agentpool.agents.interactions import Interactions
-
-        if self.picker:
-            interactions = Interactions(self.picker)
-            if self.num_picks == 1:
-                result = await interactions.pick(self, task, self.pick_prompt)
-                return [result.selection]
-            multi_result = await interactions.pick_multiple(
-                self,
-                task,
-                min_picks=self.num_picks or 1,
-                max_picks=self.num_picks,
-                prompt=self.pick_prompt,
-            )
-            return multi_result.selections
-        return list(self.nodes)
 
     def _on_node_changed(
         self, index: int, old: MessageNode[Any, Any], new: MessageNode[Any, Any]
@@ -382,7 +356,7 @@ class BaseTeam[TDeps, TResult](MessageNode[TDeps, TResult]):
                         team_config = shared_pool.manifest.teams.get(self.name)
         if not team_config:
             mode = "parallel" if isinstance(self, Team) else "sequential"
-            team_config = TeamConfig(name=self.name, mode=mode, members=[])
+            team_config = TeamConfig(name=self.name, mode=mode, members=[])  # type: ignore[call-arg]
         if not pool_ids:
             logger.debug("No pool found for team.", team=self.name)
             return TeamContext(
@@ -495,8 +469,8 @@ if __name__ == "__main__":
     async def main() -> None:
         from agentpool import Agent, Team
 
-        agent = Agent("My Agent")
-        agent_2 = Agent("My Agent")
+        agent = Agent("My Agent", model="openai:gpt-5-nano")
+        agent_2 = Agent("My Agent", model="openai:gpt-5-nano")
         team = Team([agent, agent_2], mcp_servers=["uvx mcp-server-git"])
         async with team:
             print(await agent.tools.get_tools())