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

acp/__init__.py

@@ -3,7 +3,6 @@
 from acp.client import DefaultACPClient, HeadlessACPClient, NoOpClient, ClientSideConnection
 from acp.agent import AgentSideConnection
 from acp.bridge import ACPBridge, BridgeSettings
-from acp.filesystem import ACPFileSystem, ACPPath
 from acp.agent.protocol import Agent
 from acp.client.protocol import Client
 from acp.terminal_handle import TerminalHandle
@@ -173,9 +172,6 @@ __all__ = [  # noqa: RUF022
     "FileSystemCapability",
     # stdio helper
     "stdio_streams",
-    # filesystem
-    "ACPFileSystem",
-    "ACPPath",
     # transport
     "serve",
     "StdioTransport",

acp/acp_requests.py

@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 import asyncio
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
+
+import structlog
 
 from acp.schema import (
     CreateTerminalRequest,
@@ -19,7 +21,6 @@ from acp.schema import (
     WriteTextFileRequest,
 )
 from acp.terminal_handle import TerminalHandle
-from agentpool.log import get_logger
 
 
 if TYPE_CHECKING:
@@ -30,20 +31,10 @@ if TYPE_CHECKING:
         WaitForTerminalExitResponse,
     )
 
-logger = get_logger(__name__)
+logger = structlog.get_logger(__name__)
 
 
-RULES_FILE_NAMES = [
-    ".rules",
-    "CLAUDE.md",
-    "AGENT.md",
-    "AGENTS.md",
-    "GEMINI.md",
-    ".cursorrules",
-    ".windsurfrules",
-    ".clinerules",
-    ".github/copilot-instructions.md",
-]
+RULES_FILE_NAMES = ["CLAUDE.md", "AGENTS.md"]
 
 
 class ACPRequests:
@@ -54,12 +45,7 @@ class ACPRequests:
     """
 
     def __init__(self, client: Client, session_id: str) -> None:
-        """Initialize requests helper.
-
-        Args:
-            client: ACP client
-            session_id: Session ID
-        """
+        """Initialize requests helper."""
         self.client = client
         self.id = session_id
 
@@ -80,12 +66,7 @@ class ACPRequests:
         Returns:
             File content as string
         """
-        request = ReadTextFileRequest(
-            session_id=self.id,
-            path=path,
-            limit=limit,
-            line=line,
-        )
+        request = ReadTextFileRequest(session_id=self.id, path=path, limit=limit, line=line)
         response = await self.client.read_text_file(request)
         return response.content
 
@@ -104,12 +85,7 @@ class ACPRequests:
         return None
 
     async def write_text_file(self, path: str, content: str) -> None:
-        """Write text content to a file.
-
-        Args:
-            path: File path to write
-            content: Text content to write
-        """
+        """Write text content to a file."""
         request = WriteTextFileRequest(session_id=self.id, path=path, content=content)
         await self.client.write_text_file(request)
 
@@ -146,47 +122,22 @@ class ACPRequests:
         return TerminalHandle(terminal_id=response.terminal_id, requests=self)
 
     async def terminal_output(self, terminal_id: str) -> TerminalOutputResponse:
-        """Get output from a terminal session.
-
-        Args:
-            terminal_id: Terminal identifier
-
-        Returns:
-            Terminal output response
-        """
+        """Get output from a terminal session."""
         request = TerminalOutputRequest(session_id=self.id, terminal_id=terminal_id)
         return await self.client.terminal_output(request)
 
-    async def wait_for_terminal_exit(
-        self,
-        terminal_id: str,
-    ) -> WaitForTerminalExitResponse:
-        """Wait for a terminal to exit.
-
-        Args:
-            terminal_id: Terminal identifier
-
-        Returns:
-            Terminal exit response with exit_code
-        """
+    async def wait_for_terminal_exit(self, terminal_id: str) -> WaitForTerminalExitResponse:
+        """Wait for a terminal to exit."""
         request = WaitForTerminalExitRequest(session_id=self.id, terminal_id=terminal_id)
         return await self.client.wait_for_terminal_exit(request)
 
     async def kill_terminal(self, terminal_id: str) -> None:
-        """Kill a terminal session.
-
-        Args:
-            terminal_id: Terminal identifier to kill
-        """
+        """Kill a terminal session."""
         request = KillTerminalCommandRequest(session_id=self.id, terminal_id=terminal_id)
         await self.client.kill_terminal(request)
 
     async def release_terminal(self, terminal_id: str) -> None:
-        """Release a terminal session.
-
-        Args:
-            terminal_id: Terminal identifier to release
-        """
+        """Release a terminal session."""
         request = ReleaseTerminalRequest(session_id=self.id, terminal_id=terminal_id)
         await self.client.release_terminal(request)
 
@@ -228,10 +179,8 @@ class ACPRequests:
         try:
             if timeout_seconds:  # Wait for completion (with optional timeout)
                 try:
-                    exit_result = await asyncio.wait_for(
-                        self.wait_for_terminal_exit(terminal_id),
-                        timeout=timeout_seconds,
-                    )
+                    coro = self.wait_for_terminal_exit(terminal_id)
+                    exit_result = await asyncio.wait_for(coro, timeout=timeout_seconds)
                 except TimeoutError:  # Kill on timeout and get partial output
                     await self.kill_terminal(terminal_id)
                     output_response = await self.terminal_output(terminal_id)
@@ -250,6 +199,7 @@ class ACPRequests:
         tool_call_id: str,
         *,
         title: str | None = None,
+        raw_input: Any | None = None,
         options: list[PermissionOption] | None = None,
     ) -> RequestPermissionResponse:
         """Request permission from user before executing a tool call.
@@ -257,6 +207,7 @@ class ACPRequests:
         Args:
             tool_call_id: Unique identifier for the tool call
             title: Human-readable description of the operation
+            raw_input: The raw input parameters for the tool call
             options: Available permission options (defaults to allow/reject once)
 
         Returns:
@@ -264,19 +215,11 @@ class ACPRequests:
         """
         if options is None:
             options = [
-                PermissionOption(
-                    option_id="allow-once",
-                    name="Allow once",
-                    kind="allow_once",
-                ),
-                PermissionOption(
-                    option_id="reject-once",
-                    name="Reject",
-                    kind="reject_once",
-                ),
+                PermissionOption(option_id="allow-once", name="Allow once", kind="allow_once"),
+                PermissionOption(option_id="reject-once", name="Reject", kind="reject_once"),
             ]
 
-        tool_call = ToolCall(tool_call_id=tool_call_id, title=title)
+        tool_call = ToolCall(tool_call_id=tool_call_id, title=title, raw_input=raw_input)
         request = RequestPermissionRequest(
             session_id=self.id,
             tool_call=tool_call,

acp/agent/connection.py

@@ -30,6 +30,7 @@ from acp.schema import (
     RequestPermissionRequest,
     RequestPermissionResponse,
     SessionNotification,
+    SetSessionConfigOptionRequest,
     SetSessionModelRequest,
     SetSessionModeRequest,
     TerminalOutputRequest,
@@ -243,6 +244,13 @@ async def _agent_handler(  # noqa: PLR0911
                 if (model_result := await agent.set_session_model(set_model_request))
                 else {}
             )
+        case "session/set_config_option":
+            set_config_request = SetSessionConfigOptionRequest.model_validate(params)
+            return (
+                config_result.model_dump(by_alias=True, exclude_none=True)
+                if (config_result := await agent.set_session_config_option(set_config_request))
+                else {}
+            )
         case "authenticate":
             p = AuthenticateRequest.model_validate(params)
             result = await agent.authenticate(p)

acp/agent/implementations/debug_server/debug_server.py

@@ -25,6 +25,7 @@ import anyio
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import HTMLResponse
 from pydantic import BaseModel, Field
+import structlog
 import uvicorn
 
 from acp import AgentSideConnection
@@ -57,7 +58,6 @@ from acp.schema import (
     WriteTextFileResponse,
 )
 from acp.stdio import stdio_streams
-from agentpool.log import get_logger
 
 
 if TYPE_CHECKING:
@@ -81,7 +81,7 @@ if TYPE_CHECKING:
     )
 
 
-logger = get_logger(__name__)
+logger = structlog.get_logger(__name__)
 MOCK_FILE = """\
 # Mock file: {path}
 # Generated by ACP Debug Server
@@ -190,6 +190,10 @@ class MockAgent(Agent):
         """Mock session model change."""
         logger.info("Mock session model change")
 
+    async def set_session_config_option(self, params: Any) -> None:
+        """Mock session config option change."""
+        logger.info("Mock session config option change")
+
     async def ext_notification(self, method: str, params: dict[str, Any]) -> None:
         """Mock extensibility notification."""
         logger.info("Mock ext notification", method=method)

acp/agent/protocol.py

@@ -24,6 +24,8 @@ if TYPE_CHECKING:
         PromptResponse,
         ResumeSessionRequest,
         ResumeSessionResponse,
+        SetSessionConfigOptionRequest,
+        SetSessionConfigOptionResponse,
         SetSessionModelRequest,
         SetSessionModelResponse,
         SetSessionModeRequest,
@@ -60,6 +62,10 @@ class Agent(Protocol):
         self, params: SetSessionModelRequest
     ) -> SetSessionModelResponse | None: ...
 
+    async def set_session_config_option(
+        self, params: SetSessionConfigOptionRequest
+    ) -> SetSessionConfigOptionResponse | None: ...
+
     async def ext_method(self, method: str, params: dict[str, Any]) -> dict[str, Any]: ...
 
     async def ext_notification(self, method: str, params: dict[str, Any]) -> None: ...

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,6 @@ 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
 
 
@@ -53,7 +53,7 @@ if TYPE_CHECKING:
 
     ContentType = Sequence[ToolCallContent | str]
 
-logger = get_logger(__name__)
+logger = structlog.get_logger(__name__)
 
 
 class ACPNotifications:
@@ -134,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.
 
@@ -176,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,
@@ -190,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,
@@ -607,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,
@@ -644,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
@@ -678,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)
@@ -754,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.