agentpool 2.1.3__tar.gz → 2.3.6__tar.gz

{agentpool-2.1.3 → agentpool-2.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentpool
-Version: 2.1.3
+Version: 2.3.6
 Summary: Pydantic-AI based Multi-Agent Framework with YAML-based Agents, Teams, Workflows & Extended ACP / AGUI integration
 Keywords: 
 Author: Philipp Temminghoff
@@ -24,6 +24,7 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Dist: anyenv[httpx]>=0.3.0
+Requires-Dist: claude-agent-sdk>=0.1.18
 Requires-Dist: docler>=1.0.3
 Requires-Dist: docstring-parser>=0.17.0
 Requires-Dist: epregistry
@@ -34,14 +35,16 @@ Requires-Dist: fsspec
 Requires-Dist: httpx
 Requires-Dist: jinja2
 Requires-Dist: jinjarope
-Requires-Dist: llmling-models==1.4.1
+Requires-Dist: keyring>=25.6.0
+Requires-Dist: llmling-models>=1.4.1
 Requires-Dist: logfire
 Requires-Dist: mcp>=1.2.0
+Requires-Dist: pillow>=11.3.0
 Requires-Dist: platformdirs
 Requires-Dist: promptantic>=0.4.5
 Requires-Dist: psygnal>=0.11.1
 Requires-Dist: pydantic>=2.10.0
-Requires-Dist: pydantic-ai-slim>=1.0.0
+Requires-Dist: pydantic-ai-slim[openai,google,anthropic,mistral,retries]>=1.0.0
 Requires-Dist: pydocket==0.16.1
 Requires-Dist: python-dotenv>=1.0.1
 Requires-Dist: rich
@@ -54,15 +57,16 @@ Requires-Dist: structlog>=25.5.0
 Requires-Dist: tokonomics>=0.1.2
 Requires-Dist: toprompt>=0.0.1
 Requires-Dist: typer
-Requires-Dist: upathtools>=0.1.0
+Requires-Dist: upathtools[httpx]>=0.1.0
+Requires-Dist: watchfiles>=1.1.1
+Requires-Dist: websockets>=15.0
 Requires-Dist: yamling>=2.0.2
 Requires-Dist: fasta2a ; extra == 'a2a'
 Requires-Dist: starlette ; extra == 'a2a'
 Requires-Dist: ag-ui-protocol>=0.1.10 ; extra == 'ag-ui'
 Requires-Dist: braintrust ; extra == 'braintrust'
 Requires-Dist: autoevals ; extra == 'braintrust'
-Requires-Dist: claude-agent-sdk>=0.1.18 ; extra == 'claude'
-Requires-Dist: clipman ; extra == 'clipboard'
+Requires-Dist: copykitten ; extra == 'clipboard'
 Requires-Dist: rustworkx>=0.17.1 ; extra == 'coding'
 Requires-Dist: grep-ast ; extra == 'coding'
 Requires-Dist: ast-grep-py>=0.40.0 ; extra == 'coding'
@@ -78,27 +82,23 @@ Requires-Dist: tree-sitter-go>=0.23.0 ; extra == 'coding'
 Requires-Dist: tree-sitter-json>=0.24.0 ; extra == 'coding'
 Requires-Dist: tree-sitter-yaml>=0.6.0 ; extra == 'coding'
 Requires-Dist: composio ; extra == 'composio'
-Requires-Dist: pydantic-ai-slim[openai,google,anthropic,mistral,retries]>=1.0.0 ; extra == 'default'
 Requires-Dist: evented[all] ; extra == 'events'
 Requires-Dist: fsspec[git] ; extra == 'git'
 Requires-Dist: langfuse ; extra == 'langfuse'
 Requires-Dist: markitdown ; python_full_version < '3.14' and extra == 'markitdown'
+Requires-Dist: fastembed>=0.7.4 ; python_full_version < '3.14' and extra == 'mcp-discovery'
+Requires-Dist: lancedb>=0.26.0 ; python_full_version < '3.14' and extra == 'mcp-discovery'
+Requires-Dist: pyarrow>=19.0.0 ; python_full_version < '3.14' and extra == 'mcp-discovery'
 Requires-Dist: mcpx-py>=0.7.0 ; extra == 'mcp-run'
-Requires-Dist: typeagent>=0.3.3 ; extra == 'memory'
 Requires-Dist: apprise>=1.9.5 ; extra == 'notifications'
-Requires-Dist: keyring>=25.6.0 ; extra == 'oauth'
 Requires-Dist: promptlayer ; extra == 'promptlayer'
 Requires-Dist: logfire[fastapi] ; extra == 'server'
 Requires-Dist: fastapi ; extra == 'server'
 Requires-Dist: uvicorn[standard] ; extra == 'server'
 Requires-Dist: textual>=1.0.0 ; extra == 'textual'
 Requires-Dist: tiktoken ; extra == 'tiktoken'
-Requires-Dist: openai>=1.0.0 ; extra == 'tts'
-Requires-Dist: sounddevice>=0.5.0 ; extra == 'tts'
-Requires-Dist: numpy>=1.24.0 ; extra == 'tts'
-Requires-Dist: edge-tts>=7.0.0 ; extra == 'tts-edge'
-Requires-Dist: miniaudio>=1.60 ; extra == 'tts-edge'
-Requires-Dist: sounddevice>=0.5.0 ; extra == 'tts-edge'
+Requires-Dist: anyvoice[tts-edge,openai]>=0.0.2 ; extra == 'tts'
+Requires-Dist: zstandard>=0.23.0 ; extra == 'zed'
 Requires-Python: >=3.13
 Project-URL: Code coverage, https://app.codecov.io/gh/phil65/agentpool
 Project-URL: Discussions, https://github.com/phil65/agentpool/discussions
@@ -108,25 +108,22 @@ Project-URL: Source, https://github.com/phil65/agentpool
 Provides-Extra: a2a
 Provides-Extra: ag-ui
 Provides-Extra: braintrust
-Provides-Extra: claude
 Provides-Extra: clipboard
 Provides-Extra: coding
 Provides-Extra: composio
-Provides-Extra: default
 Provides-Extra: events
 Provides-Extra: git
 Provides-Extra: langfuse
 Provides-Extra: markitdown
+Provides-Extra: mcp-discovery
 Provides-Extra: mcp-run
-Provides-Extra: memory
 Provides-Extra: notifications
-Provides-Extra: oauth
 Provides-Extra: promptlayer
 Provides-Extra: server
 Provides-Extra: textual
 Provides-Extra: tiktoken
 Provides-Extra: tts
-Provides-Extra: tts-edge
+Provides-Extra: zed
 Description-Content-Type: text/markdown
 
 # AgentPool
@@ -169,16 +166,19 @@ flowchart TB
     end
     
     interface --> acp_server[ACP Server]
+    interface --> opencode_server[OpenCode Server]
     interface --> agui_server[AG-UI Server]
     
     acp_server --> clients1[Zed, Toad, ACP Clients]
-    agui_server --> clients2[AG-UI Clients]
+    opencode_server --> clients2[OpenCode TUI/Desktop]
+    agui_server --> clients3[AG-UI Clients]
 ```
 
 ## Quick Start
 
 ```bash
-uv tool install agentpool[default]
+uv tool install agentpool
+
 ```
 
 ### Minimal Configuration
@@ -210,7 +210,7 @@ agents:
   coordinator:
     type: native
     model: openai:gpt-4o
-    toolsets:
+    tools:
       - type: subagent  # Can delegate to all other agents
     system_prompt: "Coordinate tasks between available agents."
 
@@ -278,7 +278,7 @@ agents:
     model:
       type: fallback
       models: [openai:gpt-4o, anthropic:claude-sonnet-4-0]
-    toolsets:
+    tools:
       - type: subagent
       - type: resource_access
     mcp_servers:
@@ -293,11 +293,19 @@ agents:
           words: [error, warning]
 ```
 
-### Protocol Support
+### Server Protocols
+
+AgentPool can expose your agents through multiple server protocols:
+
+| Server | Command | Use Case |
+|--------|---------|----------|
+| **ACP** | `agentpool serve-acp` | IDE integration (Zed, Toad) - bidirectional communication with tool confirmations |
+| **OpenCode** | `agentpool serve-opencode` | OpenCode TUI/Desktop - supports remote filesystems via fsspec |
+| **MCP** | `agentpool serve-mcp` | Expose tools to other agents |
+| AG-UI | `agentpool serve-agui` | AG-UI compatible frontends |
+| OpenAI API | `agentpool serve-api` | Drop-in OpenAI API replacement |
 
-- **MCP**: Full support including elicitation, sampling, progress reporting
-- **ACP**: Serve agents to Zed, Toad, and other ACP clients
-- **AG-UI**: Expose agents through AG-UI protocol
+The **ACP server** is ideal for IDE integration - it provides real-time tool confirmations and session management. The **OpenCode server** enables the OpenCode TUI to control AgentPool agents, including agents operating on remote environments (Docker, SSH, cloud sandboxes).
 
 ### Additional Capabilities
 
@@ -313,7 +321,9 @@ agents:
 
 ```bash
 agentpool run agent_name "prompt"           # Single run
-agentpool serve-acp config.yml              # Start ACP server
+agentpool serve-acp config.yml              # ACP server for IDEs
+agentpool serve-opencode config.yml         # OpenCode TUI server
+agentpool serve-mcp config.yml              # MCP server
 agentpool watch --config agents.yml         # React to triggers
 agentpool history stats --group-by model    # View analytics
 ```

{agentpool-2.1.3 → agentpool-2.3.6}/README.md

@@ -38,16 +38,19 @@ flowchart TB
     end
     
     interface --> acp_server[ACP Server]
+    interface --> opencode_server[OpenCode Server]
     interface --> agui_server[AG-UI Server]
     
     acp_server --> clients1[Zed, Toad, ACP Clients]
-    agui_server --> clients2[AG-UI Clients]
+    opencode_server --> clients2[OpenCode TUI/Desktop]
+    agui_server --> clients3[AG-UI Clients]
 ```
 
 ## Quick Start
 
 ```bash
-uv tool install agentpool[default]
+uv tool install agentpool
+
 ```
 
 ### Minimal Configuration
@@ -79,7 +82,7 @@ agents:
   coordinator:
     type: native
     model: openai:gpt-4o
-    toolsets:
+    tools:
       - type: subagent  # Can delegate to all other agents
     system_prompt: "Coordinate tasks between available agents."
 
@@ -147,7 +150,7 @@ agents:
     model:
       type: fallback
       models: [openai:gpt-4o, anthropic:claude-sonnet-4-0]
-    toolsets:
+    tools:
       - type: subagent
       - type: resource_access
     mcp_servers:
@@ -162,11 +165,19 @@ agents:
           words: [error, warning]
 ```
 
-### Protocol Support
+### Server Protocols
+
+AgentPool can expose your agents through multiple server protocols:
+
+| Server | Command | Use Case |
+|--------|---------|----------|
+| **ACP** | `agentpool serve-acp` | IDE integration (Zed, Toad) - bidirectional communication with tool confirmations |
+| **OpenCode** | `agentpool serve-opencode` | OpenCode TUI/Desktop - supports remote filesystems via fsspec |
+| **MCP** | `agentpool serve-mcp` | Expose tools to other agents |
+| AG-UI | `agentpool serve-agui` | AG-UI compatible frontends |
+| OpenAI API | `agentpool serve-api` | Drop-in OpenAI API replacement |
 
-- **MCP**: Full support including elicitation, sampling, progress reporting
-- **ACP**: Serve agents to Zed, Toad, and other ACP clients
-- **AG-UI**: Expose agents through AG-UI protocol
+The **ACP server** is ideal for IDE integration - it provides real-time tool confirmations and session management. The **OpenCode server** enables the OpenCode TUI to control AgentPool agents, including agents operating on remote environments (Docker, SSH, cloud sandboxes).
 
 ### Additional Capabilities
 
@@ -182,7 +193,9 @@ agents:
 
 ```bash
 agentpool run agent_name "prompt"           # Single run
-agentpool serve-acp config.yml              # Start ACP server
+agentpool serve-acp config.yml              # ACP server for IDEs
+agentpool serve-opencode config.yml         # OpenCode TUI server
+agentpool serve-mcp config.yml              # MCP server
 agentpool watch --config agents.yml         # React to triggers
 agentpool history stats --group-by model    # View analytics
 ```

{agentpool-2.1.3 → agentpool-2.3.6}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "agentpool"
-version = "2.1.3"
+version = "2.3.6"
 description = "Pydantic-AI based Multi-Agent Framework with YAML-based Agents, Teams, Workflows & Extended ACP / AGUI integration"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -32,6 +32,7 @@ classifiers = [
 ]
 dependencies = [
   "anyenv[httpx]>=0.3.0",
+  "claude-agent-sdk>=0.1.18",
   "docler>=1.0.3",
   "docstring-parser>=0.17.0",
   "epregistry",
@@ -42,14 +43,16 @@ dependencies = [
   "httpx",
   "jinja2",
   "jinjarope",
-  "llmling-models==1.4.1",
+  "keyring>=25.6.0",
+  "llmling-models>=1.4.1",
   "logfire",
   "mcp>=1.2.0",
+  "pillow>=11.3.0",
   "platformdirs",
   "promptantic>=0.4.5",
   "psygnal>=0.11.1",
   "pydantic>=2.10.0",
-  "pydantic-ai-slim>=1.0.0",
+  "pydantic-ai-slim[openai,google,anthropic,mistral,retries]>=1.0.0",
   # Only add below (Copier)
   "pydocket==0.16.1",
   "python-dotenv>=1.0.1",
@@ -64,7 +67,9 @@ dependencies = [
   "tokonomics>=0.1.2",
   "toprompt>=0.0.1",
   "typer",
-  "upathtools>=0.1.0",
+  "upathtools[httpx]>=0.1.0",
+  "watchfiles>=1.1.1",
+  "websockets>=15.0",
   "yamling>=2.0.2",
 ]
 
@@ -93,8 +98,7 @@ acp = "acp.filesystem:ACPPath"
 a2a = ["fasta2a", "starlette"]  # A2A Server
 ag-ui = ["ag-ui-protocol>=0.1.10"]  # Ag-UI Agents
 braintrust = ["braintrust", "autoevals"]  # Braintrust Prompt Hub
-claude = ["claude-agent-sdk>=0.1.18"]
-clipboard = ["clipman"]  # Clipboard functionality
+clipboard = ["copykitten"]  # Clipboard functionality
 coding = [
   "rustworkx>=0.17.1",
   "grep-ast",
@@ -112,21 +116,19 @@ coding = [
   "tree-sitter-yaml>=0.6.0",
 ]  # Packages to allow coding functionality
 composio = ["composio"]  # Composio toolsets
-default = [
-  "pydantic-ai-slim[openai,google,anthropic,mistral,retries]>=1.0.0",
-]  # Set of commonly used AI providers
 events = ["evented[all]"]  # Event triggers for agents
 git = ["fsspec[git]"]  # Git support
 langfuse = ["langfuse"]  # Langfuse Prompt Hub
 markitdown = [
   "markitdown; python_version < '3.14'"
 ]  # MarkItDown Media Converter
+mcp-discovery = [
+  "fastembed>=0.7.4; python_version < '3.14'",
+  "lancedb>=0.26.0; python_version < '3.14'",
+  "pyarrow>=19.0.0; python_version < '3.14'",
+]  # MCP Discovery Toolset with semantic search
 mcp_run = ["mcpx-py>=0.7.0"]  # MCP.run Toolset
-memory = ["typeagent>=0.3.3"]  # TypeAgent semantic knowledge DB
 notifications = ["apprise>=1.9.5"]  # Notification Toolset
-oauth = [
-  "keyring>=25.6.0"
-]  # OAuth functionality (will be fixed dep for FastMCP >2.13)
 promptlayer = ["promptlayer"]  # PromptLayer Prompt Hub
 server = [
   "logfire[fastapi]",
@@ -135,22 +137,16 @@ server = [
 ]  # OpenAI Server functionality
 textual = ["textual>=1.0.0"]  # Textual CLI app to create configs
 tiktoken = ["tiktoken"]  # Exact token counting
-tts = [
-  "openai>=1.0.0",
-  "sounddevice>=0.5.0",
-  "numpy>=1.24.0"
-]  # Text-to-Speech with OpenAI
-tts-edge = [
-  "edge-tts>=7.0.0",
-  "miniaudio>=1.60",
-  "sounddevice>=0.5.0",
-]  # Text-to-Speech with Edge TTS (free, no API key)
+tts = ["anyvoice[tts-edge,openai]>=0.0.2"]  # Text-to-Speech using AnyVoice
+zed = ["zstandard>=0.23.0"]  # Zed IDE storage provider
 
 [dependency-groups]
 dev = [
   "alembic>=1.16.5",
   "check-jsonschema>=0.35.0",
   "devtools",
+  "fastembed>=0.7.4; python_version < '3.14'",
+  "lancedb>=0.26.0; python_version < '3.14'",
   "openapi_spec_validator",
   "pyinstaller>=6.17.0",
   "pyreadline3",
@@ -158,7 +154,9 @@ dev = [
   # Only add below (Copier)
   "pytest-asyncio>=0.24.0",
   "pytest-cov",
+  # "pytest-pretty>=1.3.0",
   "pytest-rerunfailures>=16.1",
+  "pytest-timeout>=2.4.0",
   "pytest-xdist",
   "syrupy>=4.0.0",
 ]
@@ -259,7 +257,7 @@ reportPrivateImportUsage = false
 reportUnusedExpression = false
 
 [tool.pytest]
-addopts = ["-m", "not slow and not acp_cli_snapshot"]
+addopts = ["-m", "not slow and not acp_snapshot"]
 filterwarnings = [
   "ignore::DeprecationWarning:psygnal.*",
   "ignore::DeprecationWarning:pydantic.*:",
@@ -270,7 +268,7 @@ log_date_format = "%Y-%m-%d %H:%M:%S"
 log_format = "%(asctime)s %(levelname)s %(message)s"
 log_level = "ERROR"
 markers = [
-  "acp_cli_snapshot: marks tests as ACP CLI snapshot tests (excluded by default)",
+  "acp_snapshot: marks tests as ACP snapshot tests (excluded by default)",
   "asyncio: mark test as async",
   "integration: marks tests as integration tests",
   "slow: marks tests as slow",
@@ -280,6 +278,7 @@ minversion = "9.0"
 python_files = ["test_*.py"]
 pythonpath = ["src"]
 testpaths = ["tests"]
+timeout = "180"
 asyncio_default_fixture_loop_scope = "function"
 asyncio_mode = "auto"
 
@@ -394,6 +393,11 @@ runtime-evaluated-decorators = [
   "pydantic.validate_call",
   "fastapi.FastAPI.get",
   "fastapi.FastAPI.post",
+  "fastapi.APIRouter.get",
+  "fastapi.APIRouter.post",
+  "fastapi.APIRouter.put",
+  "fastapi.APIRouter.delete",
+  "fastapi.APIRouter.patch",
   "fastmcp.FastMCP.tool",
   "typer.Typer.command",
 ]
@@ -411,7 +415,7 @@ max-complexity = 15
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["E402", "I001"]
 "scripts/*" = ["INP001"]
-"*tests/*" = ["D100"]
+"*tests/*" = ["D100", "PLR2004"]
 "docs/examples/**/*.py" = [
   "TC001",
 ]  # Examples don't need TYPE_CHECKING imports
@@ -460,4 +464,5 @@ source-exclude = [
 ]
 
 # [tool.uv.sources]
+# exxec = { path = "../exxec", editable = true }
 # schemez = { path = "../schemez", editable = true }

{agentpool-2.1.3 → agentpool-2.3.6}/src/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
@@ -73,6 +72,13 @@ from acp.schema import (
     ToolCall,
 )
 from acp.stdio import stdio_streams, run_agent, connect_to_agent
+from acp.transports import (
+    serve,
+    StdioTransport,
+    WebSocketTransport,
+    StreamTransport,
+    Transport,
+)
 from acp.exceptions import RequestError
 
 __version__ = "0.0.1"
@@ -166,7 +172,10 @@ __all__ = [  # noqa: RUF022
     "FileSystemCapability",
     # stdio helper
     "stdio_streams",
-    # filesystem
-    "ACPFileSystem",
-    "ACPPath",
+    # transport
+    "serve",
+    "StdioTransport",
+    "WebSocketTransport",
+    "StreamTransport",
+    "Transport",
 ]

{agentpool-2.1.3 → agentpool-2.3.6}/src/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)
 
@@ -125,19 +101,19 @@ class ACPRequests:
         """Create a new terminal session.
 
         Args:
-            command: Command to run in terminal
-            args: Command arguments
+            command: Command to run. For shell commands (pipes, redirects, etc.),
+                pass the full command string and omit args.
+            args: Command arguments, appended to command.
             cwd: Working directory for terminal
             env: Environment variables for terminal
             output_byte_limit: Maximum bytes to capture from output
-
-        Returns:
-            Terminal handle for managing the terminal session
         """
         request = CreateTerminalRequest(
             session_id=self.id,
             command=command,
-            args=args,
+            # Only include args if non-empty, following claude-code-acp pattern.
+            # When args is None/empty, ACP clients interpret command as a shell command.
+            args=args or None,
             cwd=cwd,
             env=[EnvVariable(name=k, value=v) for k, v in (env or {}).items()],
             output_byte_limit=output_byte_limit,
@@ -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,