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

acp/bridge/ws_server_cli.py

@@ -0,0 +1,89 @@
+"""CLI entry point for the ACP WebSocket server bridge.
+
+Usage:
+    python -m acp.bridge.ws_server_cli "uv run agentpool serve-acp"
+    python -m acp.bridge.ws_server_cli --port 8765 -- uv run agentpool serve-acp
+"""
+
+from __future__ import annotations
+
+import argparse
+import contextlib
+import logging
+import sys
+
+import anyio
+
+
+def main() -> None:
+    """Run the ACP WebSocket server bridge from command line."""
+    parser = argparse.ArgumentParser(
+        description="Bridge a stdio ACP agent to WebSocket transport.",
+        epilog=(
+            "Examples:\n"
+            '  acp-ws-server "uv run agentpool serve-acp"\n'
+            "  acp-ws-server --port 8765 -- uv run agentpool serve-acp\n"
+            "  acp-ws-server -H 0.0.0.0 -p 9000 -- uv run my-agent\n"
+        ),
+        formatter_class=argparse.RawTextHelpFormatter,
+    )
+
+    parser.add_argument("command", help="Command to spawn the ACP agent.")
+    parser.add_argument("args", nargs="*", help="Arguments for the agent command.")
+    parser.add_argument(
+        "-p",
+        "--port",
+        type=int,
+        default=8765,
+        help="Port for the WebSocket server. Default: 8765",
+    )
+    parser.add_argument(
+        "-H",
+        "--host",
+        default="localhost",
+        help="Host to bind the server to. Default: localhost",
+    )
+    parser.add_argument(
+        "--log-level",
+        choices=["DEBUG", "INFO", "WARNING", "ERROR"],
+        default="INFO",
+        help="Log level. Default: INFO",
+    )
+    parser.add_argument(
+        "--cwd",
+        default=None,
+        help="Working directory for the agent subprocess.",
+    )
+
+    parsed = parser.parse_args()
+
+    if not parsed.command:
+        parser.print_help()
+        sys.exit(1)
+
+    logging.basicConfig(
+        level=getattr(logging, parsed.log_level),
+        format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
+    )
+    # Reduce websockets noise
+    logging.getLogger("websockets").setLevel(logging.WARNING)
+
+    from acp.bridge.ws_server import ACPWebSocketServer
+
+    server = ACPWebSocketServer(
+        command=parsed.command,
+        args=parsed.args,
+        host=parsed.host,
+        port=parsed.port,
+        cwd=parsed.cwd,
+    )
+
+    print(f"🔗 ACP WebSocket bridge starting on ws://{parsed.host}:{parsed.port}")
+    print(f"   Agent command: {parsed.command} {' '.join(parsed.args)}")
+
+    with contextlib.suppress(KeyboardInterrupt):
+        anyio.run(server.serve)
+
+
+if __name__ == "__main__":
+    main()

acp/client/connection.py

@@ -7,8 +7,35 @@ from typing import TYPE_CHECKING, Any, Self
 
 import logfire
 
+from acp.agent.protocol import Agent
+from acp.connection import Connection
+from acp.exceptions import RequestError
+from acp.schema import (
+    AuthenticateResponse,
+    CreateTerminalRequest,
+    ForkSessionResponse,
+    InitializeResponse,
+    KillTerminalCommandRequest,
+    ListSessionsResponse,
+    LoadSessionResponse,
+    NewSessionResponse,
+    PromptResponse,
+    ReadTextFileRequest,
+    ReleaseTerminalRequest,
+    RequestPermissionRequest,
+    ResumeSessionResponse,
+    SessionNotification,
+    SetSessionConfigOptionResponse,
+    SetSessionModelResponse,
+    SetSessionModeResponse,
+    TerminalOutputRequest,
+    WaitForTerminalExitRequest,
+    WriteTextFileRequest,
+)
+
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
     from types import TracebackType
 
     from anyio.abc import ByteReceiveStream, ByteSendStream
@@ -31,6 +58,7 @@ if TYPE_CHECKING:
         ReleaseTerminalResponse,
         RequestPermissionResponse,
         ResumeSessionRequest,
+        SetSessionConfigOptionRequest,
         SetSessionModelRequest,
         SetSessionModeRequest,
         TerminalOutputResponse,
@@ -38,35 +66,6 @@ if TYPE_CHECKING:
         WriteTextFileResponse,
     )
 
-from acp.agent.protocol import Agent
-from acp.connection import Connection
-from acp.exceptions import RequestError
-from acp.schema import (
-    AuthenticateResponse,
-    CreateTerminalRequest,
-    ForkSessionResponse,
-    InitializeResponse,
-    KillTerminalCommandRequest,
-    ListSessionsResponse,
-    LoadSessionResponse,
-    NewSessionResponse,
-    PromptResponse,
-    ReadTextFileRequest,
-    ReleaseTerminalRequest,
-    RequestPermissionRequest,
-    ResumeSessionResponse,
-    SessionNotification,
-    SetSessionModelResponse,
-    SetSessionModeResponse,
-    TerminalOutputRequest,
-    WaitForTerminalExitRequest,
-    WriteTextFileRequest,
-)
-
-
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
 
 class ClientSideConnection(Agent):
     """Client-side connection.
@@ -151,6 +150,16 @@ class ClientSideConnection(Agent):
         payload = resp if isinstance(resp, dict) else {}
         return SetSessionModelResponse.model_validate(payload)
 
+    async def set_session_config_option(
+        self, params: SetSessionConfigOptionRequest
+    ) -> SetSessionConfigOptionResponse:
+        dct = params.model_dump(
+            mode="json", by_alias=True, exclude_none=True, exclude_defaults=True
+        )
+        resp = await self._conn.send_request("session/set_config_option", dct)
+        payload = resp if isinstance(resp, dict) else {}
+        return SetSessionConfigOptionResponse.model_validate(payload)
+
     async def authenticate(self, params: AuthenticateRequest) -> AuthenticateResponse:
         dct = params.model_dump(
             mode="json", by_alias=True, exclude_none=True, exclude_defaults=True

acp/client/implementations/default_client.py

@@ -9,9 +9,10 @@ from __future__ import annotations
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
+import structlog
+
 from acp.client import Client
 from acp.schema import ReadTextFileResponse, RequestPermissionResponse, WriteTextFileResponse
-from agentpool import log
 
 
 if TYPE_CHECKING:
@@ -34,7 +35,7 @@ if TYPE_CHECKING:
         WriteTextFileRequest,
     )
 
-logger = log.get_logger(__name__)
+logger = structlog.get_logger(__name__)
 
 
 class DefaultACPClient(Client):

acp/client/implementations/headless_client.py

@@ -12,6 +12,7 @@ from typing import TYPE_CHECKING, Any
 import uuid
 
 from anyenv import ProcessManager
+import structlog
 
 from acp.client.protocol import Client
 from acp.schema import (
@@ -24,7 +25,6 @@ from acp.schema import (
     WaitForTerminalExitResponse,
     WriteTextFileResponse,
 )
-from agentpool.log import get_logger
 
 
 if TYPE_CHECKING:
@@ -40,7 +40,7 @@ if TYPE_CHECKING:
         WriteTextFileRequest,
     )
 
-logger = get_logger(__name__)
+logger = structlog.get_logger(__name__)
 
 
 class HeadlessACPClient(Client):

acp/connection.py

@@ -15,6 +15,7 @@ import anyenv
 import anyio
 from anyio.streams.text import TextReceiveStream
 from pydantic import BaseModel, ValidationError
+import structlog
 
 from acp.exceptions import RequestError
 from acp.task import (
@@ -31,7 +32,6 @@ from acp.task import (
     RpcTaskKind,
     TaskSupervisor,
 )
-from agentpool import log
 
 
 if TYPE_CHECKING:
@@ -49,7 +49,7 @@ DispatcherFactory = Callable[
 ]
 
 
-logger = log.get_logger(__name__)
+logger = structlog.get_logger(__name__)
 
 
 StreamDirection = Literal["incoming", "outgoing"]

acp/notifications.py

@@ -6,6 +6,7 @@ from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any, assert_never
 
 from pydantic_ai import ModelRequest, ModelResponse, ToolReturnPart, UserPromptPart
+import structlog
 
 from acp.schema import (
     AgentMessageChunk,
@@ -33,7 +34,7 @@ from acp.schema import (
 from acp.schema.tool_call import ToolCallLocation
 from acp.tool_call_reporter import ToolCallReporter
 from acp.utils import generate_tool_title, infer_tool_kind, to_acp_content_blocks
-from agentpool.log import get_logger
+from agentpool.utils.pydantic_ai_helpers import safe_args_as_dict
 
 
 if TYPE_CHECKING:
@@ -52,7 +53,7 @@ if TYPE_CHECKING:
 
     ContentType = Sequence[ToolCallContent | str]
 
-logger = get_logger(__name__)
+logger = structlog.get_logger(__name__)
 
 
 class ACPNotifications:
@@ -133,11 +134,11 @@ class ACPNotifications:
     async def tool_call(
         self,
         tool_name: str,
+        tool_call_id: str,
         *,
         tool_input: dict[str, Any],
         tool_output: Any,
         status: ToolCallStatus = "completed",
-        tool_call_id: str | None = None,
     ) -> None:
         """Send tool execution as ACP tool call update.
 
@@ -175,11 +176,10 @@ class ACPNotifications:
 
         # Generate a descriptive title from tool name and inputs
         title = generate_tool_title(tool_name, tool_input)
-
         # Use appropriate notification type based on status
         if status == "pending":
             await self.tool_call_start(
-                tool_call_id=tool_call_id or f"{tool_name}_{hash(str(tool_input))}",
+                tool_call_id=tool_call_id,
                 title=title,
                 kind=infer_tool_kind(tool_name),
                 locations=locations or None,
@@ -189,7 +189,7 @@ class ACPNotifications:
         else:
             # For in_progress, completed, and failed statuses
             await self.tool_call_progress(
-                tool_call_id=tool_call_id or f"{tool_name}_{hash(str(tool_input))}",
+                tool_call_id=tool_call_id,
                 title=title,
                 status=status,
                 locations=locations or None,
@@ -606,36 +606,24 @@ class ACPNotifications:
                             match block:
                                 case TextContentBlock(text=text):
                                     await self.send_user_message(text)
-                                case ImageContentBlock() as img_block:
+                                case ImageContentBlock(annotations=annots) as img_block:
                                     await self.send_user_image(
                                         data=img_block.data,
                                         mime_type=img_block.mime_type,
                                         uri=img_block.uri,
-                                        audience=img_block.annotations.audience
-                                        if img_block.annotations
-                                        else None,
-                                        last_modified=img_block.annotations.last_modified
-                                        if img_block.annotations
-                                        else None,
-                                        priority=img_block.annotations.priority
-                                        if img_block.annotations
-                                        else None,
+                                        audience=annots.audience if annots else None,
+                                        last_modified=annots.last_modified if annots else None,
+                                        priority=annots.priority if annots else None,
                                     )
-                                case AudioContentBlock() as audio_block:
+                                case AudioContentBlock(annotations=annots) as audio_block:
                                     await self.send_user_audio(
                                         data=audio_block.data,
                                         mime_type=audio_block.mime_type,
-                                        audience=audio_block.annotations.audience
-                                        if audio_block.annotations
-                                        else None,
-                                        last_modified=audio_block.annotations.last_modified
-                                        if audio_block.annotations
-                                        else None,
-                                        priority=audio_block.annotations.priority
-                                        if audio_block.annotations
-                                        else None,
+                                        audience=annots.audience if annots else None,
+                                        last_modified=annots.last_modified if annots else None,
+                                        priority=annots.priority if annots else None,
                                     )
-                                case ResourceContentBlock() as resource_block:
+                                case ResourceContentBlock(annotations=annots) as resource_block:
                                     await self.send_user_resource(
                                         uri=resource_block.uri,
                                         name=resource_block.name,
@@ -643,15 +631,9 @@ class ACPNotifications:
                                         mime_type=resource_block.mime_type,
                                         size=resource_block.size,
                                         title=resource_block.title,
-                                        audience=resource_block.annotations.audience
-                                        if resource_block.annotations
-                                        else None,
-                                        last_modified=resource_block.annotations.last_modified
-                                        if resource_block.annotations
-                                        else None,
-                                        priority=resource_block.annotations.priority
-                                        if resource_block.annotations
-                                        else None,
+                                        audience=annots.audience if annots else None,
+                                        last_modified=annots.last_modified if annots else None,
+                                        priority=annots.priority if annots else None,
                                     )
                                 case EmbeddedResourceContentBlock() as embedded_block:
                                     # Handle embedded resources with proper
@@ -677,14 +659,12 @@ class ACPNotifications:
                     tool_input = self._tool_call_inputs.get(tool_call_id, {})
                     await self.tool_call(
                         tool_name=tool_name,
+                        tool_call_id=tool_call_id,
                         tool_input=tool_input,
                         tool_output=converted_content,
                         status="completed",
-                        tool_call_id=tool_call_id,
                     )
-                    # Clean up stored input
                     self._tool_call_inputs.pop(tool_call_id, None)
-
                 case _:
                     typ = type(part).__name__
                     self.log.debug("Unhandled request part type", part_type=typ)
@@ -703,7 +683,7 @@ class ACPNotifications:
 
                 case ToolCallPart(tool_call_id=tool_call_id):
                     # Store tool call inputs for later use with ToolReturnPart
-                    tool_input = part.args_as_dict()
+                    tool_input = safe_args_as_dict(part)
                     self._tool_call_inputs[tool_call_id] = tool_input
                     # Skip sending notification - ACP protocol overrides previous
                     # tool call state
@@ -753,16 +733,6 @@ class ACPNotifications:
         notification = SessionNotification(session_id=self.id, update=update)
         await self.client.session_update(notification)  # pyright: ignore[reportArgumentType]  # ty: ignore[invalid-argument-type]
 
-    # async def update_session_model(self, model_id: str) -> None:
-    #     """Send a session model update notification.
-
-    #     Args:
-    #         model_id: Unique identifier for the model
-    #     """
-    #     update = CurrentModelUpdate(current_model_id=model_id)
-    #     notification = SessionNotification(session_id=self.id, update=update)
-    #     await self.client.session_update(notification)
-
     async def send_agent_audio(
         self,
         data: str | bytes,

acp/schema/__init__.py

@@ -96,6 +96,7 @@ from acp.schema.notifications import (
 from acp.schema.session_state import (
     ModelInfo,
     SessionConfigOption,
+    SessionConfigOptionCategory,
     SessionConfigSelect,
     SessionConfigSelectGroup,
     SessionConfigSelectOption,
@@ -222,6 +223,7 @@ __all__ = [
     "ResumeSessionResponse",
     "SessionCapabilities",
     "SessionConfigOption",
+    "SessionConfigOptionCategory",
     "SessionConfigSelect",
     "SessionConfigSelectGroup",
     "SessionConfigSelectOption",

acp/schema/agent_responses.py

@@ -9,6 +9,7 @@ from acp.schema.base import Response
 from acp.schema.capabilities import AgentCapabilities
 from acp.schema.common import AuthMethod, Implementation  # noqa: TC001
 from acp.schema.session_state import (  # noqa: TC001
+    SessionConfigOption,
     SessionInfo,
     SessionModelState,
     SessionModeState,
@@ -58,6 +59,14 @@ class NewSessionResponse(Response):
     See protocol docs: [Session Modes](https://agentclientprotocol.com/protocol/session-modes)
     """
 
+    config_options: Sequence[SessionConfigOption] | None = None
+    """**UNSTABLE**
+
+    Configuration options for this session.
+
+    See RFD: Session Config Options
+    """
+
     session_id: str
     """Unique identifier for the created session.
 
@@ -82,6 +91,9 @@ class LoadSessionResponse(Response):
     See protocol docs: [Session Modes](https://agentclientprotocol.com/protocol/session-modes)
     """
 
+    config_options: Sequence[SessionConfigOption] = []
+    """The full list of config options with updated values."""
+
 
 class ForkSessionResponse(Response):
     """**UNSTABLE**: This capability is not part of the spec yet.
@@ -106,6 +118,9 @@ class ForkSessionResponse(Response):
     session_id: str
     """Unique identifier for the newly created forked session."""
 
+    config_options: Sequence[SessionConfigOption] = []
+    """The full list of config options with updated values."""
+
 
 class ResumeSessionResponse(Response):
     """**UNSTABLE**: This capability is not part of the spec yet.
@@ -127,6 +142,9 @@ class ResumeSessionResponse(Response):
     See protocol docs: [Session Modes](https://agentclientprotocol.com/protocol/session-modes)
     """
 
+    config_options: Sequence[SessionConfigOption] = []
+    """The full list of config options with updated values."""
+
 
 class SetSessionModeResponse(Response):
     """Response to `session/set_mode` method."""
@@ -135,6 +153,9 @@ class SetSessionModeResponse(Response):
 class SetSessionConfigOptionResponse(Response):
     """Response to `session/set_config_option` method."""
 
+    config_options: Sequence[SessionConfigOption] = []
+    """The full list of config options with updated values."""
+
 
 class PromptResponse(Response):
     """Response from processing a user prompt.

acp/schema/client_requests.py

@@ -33,7 +33,7 @@ class NewSessionRequest(Request):
     cwd: str
     """The working directory for this session. Must be an absolute path."""
 
-    mcp_servers: Sequence[McpServer]
+    mcp_servers: Sequence[McpServer] | None = None
     """List of MCP (Model Context Protocol) servers the agent should connect to."""
 
 
@@ -48,7 +48,7 @@ class LoadSessionRequest(Request):
     cwd: str
     """The working directory for this session."""
 
-    mcp_servers: Sequence[McpServer]
+    mcp_servers: Sequence[McpServer] | None = None
     """List of MCP servers to connect to for this session."""
 
     session_id: str
@@ -176,7 +176,7 @@ class SetSessionConfigOptionRequest(Request):
     session_id: str
     """The ID of the session to set the config option for."""
 
-    value_id: str
+    value: str = Field(serialization_alias="valueId")
     """The ID of the value to set for this configuration option."""
 
 

acp/schema/session_state.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Sequence
-from typing import Annotated, Literal
+from typing import Literal
 
 from pydantic import Field
 
@@ -21,6 +21,24 @@ SessionConfigGroupId = str
 """Unique identifier for a group of values within a configuration option."""
 
 
+SessionConfigOptionCategory = Literal["mode", "model", "thought_level", "other"]
+"""**UNSTABLE**: This capability is not part of the spec yet.
+
+Semantic category for a session configuration option.
+
+This is intended to help Clients distinguish broadly common selectors (e.g. model selector vs
+session mode selector vs thought/reasoning level) for UX purposes (keyboard shortcuts, icons,
+placement). It MUST NOT be required for correctness. Clients MUST handle missing or unknown
+categories gracefully (treat as `other`).
+
+Values:
+    - "mode": Session mode selector
+    - "model": Model selector
+    - "thought_level": Thought/reasoning level selector
+    - "other": Unknown / uncategorized selector
+"""
+
+
 class ModelInfo(AnnotatedObject):
     """**UNSTABLE**: This capability is not part of the spec yet.
 
@@ -98,63 +116,79 @@ class SessionInfo(AnnotatedObject):
 class SessionConfigSelectOption(AnnotatedObject):
     """A possible value for a configuration selector."""
 
-    id: SessionConfigValueId
-    """Unique identifier for this value."""
+    value: SessionConfigValueId
+    """Unique identifier for this option value."""
 
-    label: str
-    """Human-readable label for this value."""
+    name: str
+    """Human-readable label for this option value."""
 
     description: str | None = None
-    """Optional description explaining this value."""
+    """Optional description for this option value."""
 
 
 class SessionConfigSelectGroup(AnnotatedObject):
     """A group of possible values for a configuration selector."""
 
-    id: SessionConfigGroupId
+    group: SessionConfigGroupId
     """Unique identifier for this group."""
 
-    label: str
+    name: str
     """Human-readable label for this group."""
 
     options: Sequence[SessionConfigSelectOption]
-    """The options within this group."""
+    """The set of option values in this group."""
 
 
-SessionConfigSelectOptions = Sequence[SessionConfigSelectOption | SessionConfigSelectGroup]
+SessionConfigSelectOptions = (
+    Sequence[SessionConfigSelectOption] | Sequence[SessionConfigSelectGroup]
+)
 """The possible values for a configuration selector, optionally organized into groups."""
 
 
 class SessionConfigSelect(AnnotatedObject):
-    """A configuration option that allows selecting a single value from a list.
+    """A single-value selector (dropdown) session configuration option payload."""
+
+    current_value: SessionConfigValueId
+    """The currently selected value."""
+
+    options: SessionConfigSelectOptions
+    """The set of selectable options."""
 
-    Similar to a dropdown/select UI element.
-    """
+
+class SessionConfigKind(AnnotatedObject):
+    """Type-specific session configuration option payload."""
 
     type: Literal["select"] = Field(default="select", init=False)
     """Discriminator for the config option type."""
 
+    # Flattened SessionConfigSelect fields
+    current_value: SessionConfigValueId
+    """The currently selected value."""
+
+    options: SessionConfigSelectOptions
+    """The set of selectable options."""
+
+
+class SessionConfigOption(AnnotatedObject):
+    """A session configuration option selector and its current state."""
+
     id: SessionConfigId
-    """Unique identifier for this configuration option."""
+    """Unique identifier for the configuration option."""
 
-    label: str
-    """Human-readable label for this option."""
+    name: str
+    """Human-readable label for the option."""
 
     description: str | None = None
-    """Optional description explaining this option."""
+    """Optional description for the Client to display to the user."""
 
-    options: SessionConfigSelectOptions
-    """The possible values for this option."""
-
-    value: SessionConfigValueId
-    """The currently selected value ID."""
+    category: SessionConfigOptionCategory | None = None
+    """Optional semantic category for this option (UX only)."""
 
+    type: Literal["select"] = Field(default="select", init=False)
+    """Discriminator for the config option type (flattened from kind)."""
 
-SessionConfigOption = Annotated[
-    SessionConfigSelect,
-    Field(discriminator="type"),
-]
-"""A session configuration option.
+    current_value: SessionConfigValueId
+    """The currently selected value (flattened from kind.select)."""
 
-Currently only supports select-type options, but designed for extensibility.
-"""
+    options: SessionConfigSelectOptions
+    """The set of selectable options (flattened from kind.select)."""