agent-client-protocol 0.10.0__tar.gz → 0.11.0__tar.gz

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agent-client-protocol
-Version: 0.10.0
+Version: 0.11.0
 Summary: A Python implement of Agent Client Protocol (ACP, by Zed Industries)
 Keywords: python
 Author-Email: Chojan Shang <psiace@apache.org>, Frost Ming <me@frostming.com>

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/examples/agent.py

@@ -89,12 +89,13 @@ class ExampleAgent(Agent):
         self._sessions.add(session_id)
         return LoadSessionResponse()
 
-    async def set_session_mode(self, mode_id: str, session_id: str, **kwargs: Any) -> SetSessionModeResponse | None:
+    async def set_session_mode(self, session_id: str, mode_id: str, **kwargs: Any) -> SetSessionModeResponse | None:
         logging.info("Received set session mode request %s -> %s", session_id, mode_id)
         return SetSessionModeResponse()
 
     async def prompt(
         self,
+        session_id: str,
         prompt: list[
             TextContentBlock
             | ImageContentBlock
@@ -102,8 +103,6 @@ class ExampleAgent(Agent):
             | ResourceContentBlock
             | EmbeddedResourceContentBlock
         ],
-        session_id: str,
-        message_id: str | None = None,
         **kwargs: Any,
     ) -> PromptResponse:
         logging.info("Received prompt request for session %s", session_id)
@@ -113,7 +112,7 @@ class ExampleAgent(Agent):
         await self._send_agent_message(session_id, text_block("Client sent:"))
         for block in prompt:
             await self._send_agent_message(session_id, block)
-        return PromptResponse(stop_reason="end_turn", user_message_id=message_id)
+        return PromptResponse(stop_reason="end_turn")
 
     async def cancel(self, session_id: str, **kwargs: Any) -> None:
         logging.info("Received cancel notification for session %s", session_id)

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/examples/client.py

@@ -6,7 +6,6 @@ import os
 import sys
 from pathlib import Path
 from typing import Any
-from uuid import uuid4
 
 from acp import (
     PROTOCOL_VERSION,
@@ -18,14 +17,19 @@ from acp import (
 from acp.core import ClientSideConnection
 from acp.schema import (
     AgentMessageChunk,
+    AgentPlanContentUpdate,
+    AgentPlanRemovedUpdate,
     AgentPlanUpdate,
     AgentThoughtChunk,
     AudioContentBlock,
     AvailableCommandsUpdate,
     ClientCapabilities,
     ConfigOptionUpdate,
+    CreateElicitationResponse,
     CreateTerminalResponse,
     CurrentModeUpdate,
+    DeclineElicitationResponse,
+    ElicitationMode,
     EmbeddedResourceContentBlock,
     EnvVariable,
     ImageContentBlock,
@@ -51,27 +55,27 @@ from acp.schema import (
 
 class ExampleClient(Client):
     async def request_permission(
-        self, options: list[PermissionOption], session_id: str, tool_call: ToolCallUpdate, **kwargs: Any
+        self, session_id: str, tool_call: ToolCallUpdate, options: list[PermissionOption], **kwargs: Any
     ) -> RequestPermissionResponse:
         raise RequestError.method_not_found("session/request_permission")
 
     async def write_text_file(
-        self, content: str, path: str, session_id: str, **kwargs: Any
+        self, session_id: str, path: str, content: str, **kwargs: Any
     ) -> WriteTextFileResponse | None:
         raise RequestError.method_not_found("fs/write_text_file")
 
     async def read_text_file(
-        self, path: str, session_id: str, limit: int | None = None, line: int | None = None, **kwargs: Any
+        self, session_id: str, path: str, line: int | None = None, limit: int | None = None, **kwargs: Any
     ) -> ReadTextFileResponse:
         raise RequestError.method_not_found("fs/read_text_file")
 
     async def create_terminal(
         self,
-        command: str,
         session_id: str,
+        command: str,
         args: list[str] | None = None,
-        cwd: str | None = None,
         env: list[EnvVariable] | None = None,
+        cwd: str | None = None,
         output_byte_limit: int | None = None,
         **kwargs: Any,
     ) -> CreateTerminalResponse:
@@ -93,6 +97,13 @@ class ExampleClient(Client):
     async def kill_terminal(self, session_id: str, terminal_id: str, **kwargs: Any) -> KillTerminalResponse | None:
         raise RequestError.method_not_found("terminal/kill")
 
+    async def create_elicitation(self, message: str, mode: ElicitationMode, **kwargs: Any) -> CreateElicitationResponse:
+        print(f"| Agent requested input: {message} ({type(mode).__name__})")
+        return DeclineElicitationResponse(action="decline")
+
+    async def complete_elicitation(self, elicitation_id: str, **kwargs: Any) -> None:
+        print(f"| Agent completed elicitation: {elicitation_id}")
+
     async def session_update(
         self,
         session_id: str,
@@ -102,6 +113,8 @@ class ExampleClient(Client):
         | ToolCallStart
         | ToolCallProgress
         | AgentPlanUpdate
+        | AgentPlanContentUpdate
+        | AgentPlanRemovedUpdate
         | AvailableCommandsUpdate
         | CurrentModeUpdate
         | ConfigOptionUpdate
@@ -158,7 +171,6 @@ async def interactive_loop(conn: ClientSideConnection, session_id: str) -> None:
             await conn.prompt(
                 session_id=session_id,
                 prompt=[text_block(line)],
-                message_id=str(uuid4()),
             )
         except Exception as exc:
             logging.error("Prompt failed: %s", exc)  # noqa: TRY400

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/examples/echo_agent.py

@@ -58,6 +58,7 @@ class EchoAgent(Agent):
 
     async def prompt(
         self,
+        session_id: str,
         prompt: list[
             TextContentBlock
             | ImageContentBlock
@@ -65,8 +66,6 @@ class EchoAgent(Agent):
             | ResourceContentBlock
             | EmbeddedResourceContentBlock
         ],
-        session_id: str,
-        message_id: str | None = None,
         **kwargs: Any,
     ) -> PromptResponse:
         for block in prompt:
@@ -76,7 +75,7 @@ class EchoAgent(Agent):
             chunk.content.field_meta = {"echo": True}
 
             await self._conn.session_update(session_id=session_id, update=chunk, source="echo_agent")
-        return PromptResponse(stop_reason="end_turn", user_message_id=message_id)
+        return PromptResponse(stop_reason="end_turn")
 
 
 async def main() -> None:

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/examples/gemini.py

@@ -22,15 +22,20 @@ from acp import (
 from acp.core import ClientSideConnection
 from acp.schema import (
     AgentMessageChunk,
+    AgentPlanContentUpdate,
+    AgentPlanRemovedUpdate,
     AgentPlanUpdate,
     AgentThoughtChunk,
     AllowedOutcome,
     AvailableCommandsUpdate,
     ClientCapabilities,
     ConfigOptionUpdate,
+    CreateElicitationResponse,
     CreateTerminalResponse,
     CurrentModeUpdate,
+    DeclineElicitationResponse,
     DeniedOutcome,
+    ElicitationMode,
     EmbeddedResourceContentBlock,
     EnvVariable,
     FileEditToolCallContent,
@@ -62,7 +67,7 @@ class GeminiClient(Client):
         self._auto_approve = auto_approve
 
     async def request_permission(
-        self, options: list[PermissionOption], session_id: str, tool_call: ToolCallUpdate, **kwargs: Any
+        self, session_id: str, tool_call: ToolCallUpdate, options: list[PermissionOption], **kwargs: Any
     ) -> RequestPermissionResponse:
         if self._auto_approve:
             option = _pick_preferred_option(options)
@@ -93,7 +98,7 @@ class GeminiClient(Client):
             print("Invalid selection, try again.")
 
     async def write_text_file(
-        self, content: str, path: str, session_id: str, **kwargs: Any
+        self, session_id: str, path: str, content: str, **kwargs: Any
     ) -> WriteTextFileResponse | None:
         pathlib_path = Path(path)
         if not pathlib_path.is_absolute():
@@ -104,7 +109,7 @@ class GeminiClient(Client):
         return WriteTextFileResponse()
 
     async def read_text_file(
-        self, path: str, session_id: str, limit: int | None = None, line: int | None = None, **kwargs: Any
+        self, session_id: str, path: str, line: int | None = None, limit: int | None = None, **kwargs: Any
     ) -> ReadTextFileResponse:
         pathlib_path = Path(path)
         if not pathlib_path.is_absolute():
@@ -124,6 +129,8 @@ class GeminiClient(Client):
         | ToolCallStart
         | ToolCallProgress
         | AgentPlanUpdate
+        | AgentPlanContentUpdate
+        | AgentPlanRemovedUpdate
         | AvailableCommandsUpdate
         | CurrentModeUpdate
         | ConfigOptionUpdate
@@ -143,6 +150,10 @@ class GeminiClient(Client):
             print("\n[plan]")
             for entry in update.entries:
                 print(f" - {entry.status.upper():<10} {entry.content}")
+        elif isinstance(update, AgentPlanContentUpdate):
+            print(f"\n[plan update] {update.plan.id}")
+        elif isinstance(update, AgentPlanRemovedUpdate):
+            print(f"\n[plan removed] {update.id}")
         elif isinstance(update, ToolCallStart):
             print(f"\n🔧 {update.title} ({update.status or 'pending'})")
         elif isinstance(update, ToolCallProgress):
@@ -162,17 +173,24 @@ class GeminiClient(Client):
     # Optional / terminal-related methods ---------------------------------
     async def create_terminal(
         self,
-        command: str,
         session_id: str,
+        command: str,
         args: list[str] | None = None,
-        cwd: str | None = None,
         env: list[EnvVariable] | None = None,
+        cwd: str | None = None,
         output_byte_limit: int | None = None,
         **kwargs: Any,
     ) -> CreateTerminalResponse:
         print(f"[Client] createTerminal: {command} {args or []} (cwd={cwd})")
         return CreateTerminalResponse(terminal_id="term-1")
 
+    async def create_elicitation(self, message: str, mode: ElicitationMode, **kwargs: Any) -> CreateElicitationResponse:
+        print(f"\n[elicitation] {message} ({type(mode).__name__})")
+        return DeclineElicitationResponse(action="decline")
+
+    async def complete_elicitation(self, elicitation_id: str, **kwargs: Any) -> None:
+        print(f"\n[elicitation complete] {elicitation_id}")
+
     async def terminal_output(self, session_id: str, terminal_id: str, **kwargs: Any) -> TerminalOutputResponse:
         print(f"[Client] terminalOutput: {session_id} {terminal_id}")
         return TerminalOutputResponse(output="", truncated=False)
@@ -328,7 +346,8 @@ async def run(argv: list[str]) -> int:  # noqa: C901
             *cmd,
             stdin=asyncio.subprocess.PIPE,
             stdout=asyncio.subprocess.PIPE,
-            stderr=None,
+            # Suppress Gemini CLI diagnostic noise unless debugging
+            stderr=None if args.debug else asyncio.subprocess.DEVNULL,
         )
     except FileNotFoundError as exc:
         print(f"Failed to start Gemini CLI: {exc}", file=sys.stderr)
@@ -412,6 +431,10 @@ def _print_request_error(stage: str, err: RequestError) -> None:
 async def _shutdown(proc: asyncio.subprocess.Process, conn: ClientSideConnection) -> None:
     with contextlib.suppress(Exception):
         await asyncio.wait_for(conn.close(), timeout=2)
+    if proc.stdin is not None:
+        with contextlib.suppress(Exception):
+            proc.stdin.close()
+            await asyncio.wait_for(proc.stdin.wait_closed(), timeout=2)
     if proc.returncode is None:
         proc.terminate()
         try:
@@ -424,7 +447,10 @@ async def _shutdown(proc: asyncio.subprocess.Process, conn: ClientSideConnection
 
 def main(argv: list[str] | None = None) -> int:
     args = sys.argv if argv is None else argv
-    return asyncio.run(run(list(args)))
+    try:
+        return asyncio.run(run(list(args)))
+    except KeyboardInterrupt:
+        return 1
 
 
 if __name__ == "__main__":

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-client-protocol"
-version = "0.10.0"
+version = "0.11.0"
 description = "A Python implement of Agent Client Protocol (ACP, by Zed Industries)"
 authors = [
     { name = "Chojan Shang", email = "psiace@apache.org" },

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/src/acp/__init__.py

@@ -38,11 +38,37 @@ from .meta import (
     PROTOCOL_VERSION,
 )
 from .schema import (
+    AcceptElicitationResponse,
     AuthenticateRequest,
     AuthenticateResponse,
+    CancelElicitationResponse,
     CancelNotification,
+    CompleteElicitationNotification,
+    CreateElicitationRequest,
+    CreateElicitationResponse,
+    CreateFormElicitationRequest,
+    CreateFormRequestElicitationRequest,
+    CreateFormSessionElicitationRequest,
     CreateTerminalRequest,
     CreateTerminalResponse,
+    CreateUrlElicitationRequest,
+    CreateUrlRequestElicitationRequest,
+    CreateUrlSessionElicitationRequest,
+    DeclineElicitationResponse,
+    ElicitationBooleanPropertySchema,
+    ElicitationCapabilities,
+    ElicitationFormCapabilities,
+    ElicitationFormRequestMode,
+    ElicitationFormSessionMode,
+    ElicitationIntegerPropertySchema,
+    ElicitationMode,
+    ElicitationMultiSelectPropertySchema,
+    ElicitationNumberPropertySchema,
+    ElicitationSchema,
+    ElicitationStringPropertySchema,
+    ElicitationUrlCapabilities,
+    ElicitationUrlRequestMode,
+    ElicitationUrlSessionMode,
     InitializeRequest,
     InitializeResponse,
     KillTerminalRequest,
@@ -62,8 +88,6 @@ from .schema import (
     SessionNotification,
     SetSessionConfigOptionResponse,
     SetSessionConfigOptionSelectRequest,
-    SetSessionModelRequest,
-    SetSessionModelResponse,
     SetSessionModeRequest,
     SetSessionModeResponse,
     TerminalOutputRequest,
@@ -115,10 +139,35 @@ __all__ = [  # noqa: RUF022
     "SessionNotification",
     "SetSessionModeRequest",
     "SetSessionModeResponse",
-    "SetSessionModelRequest",
-    "SetSessionModelResponse",
     "SetSessionConfigOptionSelectRequest",
     "SetSessionConfigOptionResponse",
+    # elicitation types
+    "ElicitationMode",
+    "ElicitationSchema",
+    "ElicitationCapabilities",
+    "ElicitationFormCapabilities",
+    "ElicitationUrlCapabilities",
+    "ElicitationFormSessionMode",
+    "ElicitationFormRequestMode",
+    "ElicitationUrlSessionMode",
+    "ElicitationUrlRequestMode",
+    "ElicitationStringPropertySchema",
+    "ElicitationNumberPropertySchema",
+    "ElicitationIntegerPropertySchema",
+    "ElicitationBooleanPropertySchema",
+    "ElicitationMultiSelectPropertySchema",
+    "CreateElicitationRequest",
+    "CreateElicitationResponse",
+    "CreateFormElicitationRequest",
+    "CreateFormSessionElicitationRequest",
+    "CreateFormRequestElicitationRequest",
+    "CreateUrlElicitationRequest",
+    "CreateUrlSessionElicitationRequest",
+    "CreateUrlRequestElicitationRequest",
+    "AcceptElicitationResponse",
+    "DeclineElicitationResponse",
+    "CancelElicitationResponse",
+    "CompleteElicitationNotification",
     # terminal types
     "CreateTerminalRequest",
     "CreateTerminalResponse",

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/src/acp/agent/connection.py

@@ -4,18 +4,38 @@ import asyncio
 from collections.abc import Callable
 from typing import Any, cast, final
 
+from pydantic import TypeAdapter
+
 from ..connection import Connection
 from ..interfaces import Agent, Client
 from ..meta import CLIENT_METHODS
 from ..schema import (
+    AcceptElicitationResponse,
     AgentMessageChunk,
+    AgentPlanContentUpdate,
+    AgentPlanRemovedUpdate,
     AgentPlanUpdate,
     AgentThoughtChunk,
     AvailableCommandsUpdate,
+    CancelElicitationResponse,
+    CompleteElicitationNotification,
     ConfigOptionUpdate,
+    CreateElicitationResponse,
+    CreateFormElicitationRequest,
+    CreateFormRequestElicitationRequest,
+    CreateFormSessionElicitationRequest,
     CreateTerminalRequest,
     CreateTerminalResponse,
+    CreateUrlElicitationRequest,
+    CreateUrlRequestElicitationRequest,
+    CreateUrlSessionElicitationRequest,
     CurrentModeUpdate,
+    DeclineElicitationResponse,
+    ElicitationFormRequestMode,
+    ElicitationFormSessionMode,
+    ElicitationMode,
+    ElicitationUrlRequestMode,
+    ElicitationUrlSessionMode,
     EnvVariable,
     KillTerminalRequest,
     KillTerminalResponse,
@@ -40,11 +60,12 @@ from ..schema import (
     WriteTextFileRequest,
     WriteTextFileResponse,
 )
-from ..utils import compatible_class, notify_model, param_model, request_model, request_optional_model
+from ..utils import compatible_class, notify_model, param_model, request_model, request_optional_model, serialize_params
 from .router import build_agent_router
 
 __all__ = ["AgentSideConnection"]
 _AGENT_CONNECTION_ERROR = "AgentSideConnection requires asyncio StreamWriter/StreamReader"
+_CREATE_ELICITATION_RESPONSE_ADAPTER = TypeAdapter(CreateElicitationResponse)
 
 
 @final
@@ -86,6 +107,8 @@ class AgentSideConnection:
         | ToolCallStart
         | ToolCallProgress
         | AgentPlanUpdate
+        | AgentPlanContentUpdate
+        | AgentPlanRemovedUpdate
         | AvailableCommandsUpdate
         | CurrentModeUpdate
         | ConfigOptionUpdate
@@ -101,7 +124,7 @@ class AgentSideConnection:
 
     @param_model(RequestPermissionRequest)
     async def request_permission(
-        self, options: list[PermissionOption], session_id: str, tool_call: ToolCallUpdate, **kwargs: Any
+        self, session_id: str, tool_call: ToolCallUpdate, options: list[PermissionOption], **kwargs: Any
     ) -> RequestPermissionResponse:
         return await request_model(
             self._conn,
@@ -114,7 +137,7 @@ class AgentSideConnection:
 
     @param_model(ReadTextFileRequest)
     async def read_text_file(
-        self, path: str, session_id: str, limit: int | None = None, line: int | None = None, **kwargs: Any
+        self, session_id: str, path: str, line: int | None = None, limit: int | None = None, **kwargs: Any
     ) -> ReadTextFileResponse:
         return await request_model(
             self._conn,
@@ -125,7 +148,7 @@ class AgentSideConnection:
 
     @param_model(WriteTextFileRequest)
     async def write_text_file(
-        self, content: str, path: str, session_id: str, **kwargs: Any
+        self, session_id: str, path: str, content: str, **kwargs: Any
     ) -> WriteTextFileResponse | None:
         return await request_optional_model(
             self._conn,
@@ -137,11 +160,11 @@ class AgentSideConnection:
     @param_model(CreateTerminalRequest)
     async def create_terminal(
         self,
-        command: str,
         session_id: str,
+        command: str,
         args: list[str] | None = None,
-        cwd: str | None = None,
         env: list[EnvVariable] | None = None,
+        cwd: str | None = None,
         output_byte_limit: int | None = None,
         **kwargs: Any,
     ) -> CreateTerminalResponse:
@@ -200,6 +223,21 @@ class AgentSideConnection:
             KillTerminalResponse,
         )
 
+    async def create_elicitation(
+        self, message: str, mode: ElicitationMode, **kwargs: Any
+    ) -> AcceptElicitationResponse | DeclineElicitationResponse | CancelElicitationResponse:
+        request = _create_elicitation_request(message, mode, kwargs or None)
+        response = await self._conn.send_request(CLIENT_METHODS["elicitation_create"], serialize_params(request))
+        return _CREATE_ELICITATION_RESPONSE_ADAPTER.validate_python(response)
+
+    @param_model(CompleteElicitationNotification)
+    async def complete_elicitation(self, elicitation_id: str, **kwargs: Any) -> None:
+        await notify_model(
+            self._conn,
+            CLIENT_METHODS["elicitation_complete"],
+            CompleteElicitationNotification(elicitation_id=elicitation_id, field_meta=kwargs or None),
+        )
+
     async def ext_method(self, method: str, params: dict[str, Any]) -> dict[str, Any]:
         return await self._conn.send_request(f"_{method}", params)
 
@@ -217,3 +255,18 @@ class AgentSideConnection:
 
     def on_connect(self, conn: Agent) -> None:
         pass
+
+
+def _create_elicitation_request(
+    message: str, mode: ElicitationMode, field_meta: dict[str, Any] | None
+) -> CreateFormElicitationRequest | CreateUrlElicitationRequest:
+    mode_fields = mode.model_dump(mode="json", exclude_none=True)
+    if isinstance(mode, ElicitationFormSessionMode):
+        return CreateFormSessionElicitationRequest(message=message, mode="form", field_meta=field_meta, **mode_fields)
+    if isinstance(mode, ElicitationFormRequestMode):
+        return CreateFormRequestElicitationRequest(message=message, mode="form", field_meta=field_meta, **mode_fields)
+    if isinstance(mode, ElicitationUrlSessionMode):
+        return CreateUrlSessionElicitationRequest(message=message, mode="url", field_meta=field_meta, **mode_fields)
+    if isinstance(mode, ElicitationUrlRequestMode):
+        return CreateUrlRequestElicitationRequest(message=message, mode="url", field_meta=field_meta, **mode_fields)
+    raise TypeError(f"Unsupported elicitation mode: {type(mode).__name__}")

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/src/acp/agent/router.py

@@ -21,7 +21,6 @@ from ..schema import (
     ResumeSessionRequest,
     SetSessionConfigOptionBooleanRequest,
     SetSessionConfigOptionSelectRequest,
-    SetSessionModelRequest,
     SetSessionModeRequest,
 )
 from ..utils import model_to_kwargs, normalize_result
@@ -83,14 +82,6 @@ def build_agent_router(agent: Agent, use_unstable_protocol: bool = False) -> Mes
         adapt_result=normalize_result,
     )
     router.route_request(AGENT_METHODS["session_prompt"], PromptRequest, agent, "prompt")
-    router.route_request(
-        AGENT_METHODS["session_set_model"],
-        SetSessionModelRequest,
-        agent,
-        "set_session_model",
-        adapt_result=normalize_result,
-        unstable=True,
-    )
     router.add_route(
         Route(
             method=AGENT_METHODS["session_set_config_option"],

{agent_client_protocol-0.10.0 → agent_client_protocol-0.11.0}/src/acp/client/connection.py

@@ -8,6 +8,7 @@ from ..connection import Connection
 from ..interfaces import Agent, Client
 from ..meta import AGENT_METHODS
 from ..schema import (
+    AcpMcpServer,
     AudioContentBlock,
     AuthenticateRequest,
     AuthenticateResponse,
@@ -38,8 +39,6 @@ from ..schema import (
     SetSessionConfigOptionBooleanRequest,
     SetSessionConfigOptionResponse,
     SetSessionConfigOptionSelectRequest,
-    SetSessionModelRequest,
-    SetSessionModelResponse,
     SetSessionModeRequest,
     SetSessionModeResponse,
     SseMcpServer,
@@ -101,7 +100,7 @@ class ClientSideConnection:
         self,
         cwd: str,
         additional_directories: list[str] | None = None,
-        mcp_servers: list[HttpMcpServer | SseMcpServer | McpServerStdio] | None = None,
+        mcp_servers: list[HttpMcpServer | SseMcpServer | AcpMcpServer | McpServerStdio] | None = None,
         **kwargs: Any,
     ) -> NewSessionResponse:
         resolved_mcp_servers = mcp_servers or []
@@ -122,8 +121,8 @@ class ClientSideConnection:
         self,
         cwd: str,
         session_id: str,
+        mcp_servers: list[HttpMcpServer | SseMcpServer | AcpMcpServer | McpServerStdio] | None = None,
         additional_directories: list[str] | None = None,
-        mcp_servers: list[HttpMcpServer | SseMcpServer | McpServerStdio] | None = None,
         **kwargs: Any,
     ) -> LoadSessionResponse:
         resolved_mcp_servers = mcp_servers or []
@@ -142,23 +141,17 @@ class ClientSideConnection:
 
     @param_model(ListSessionsRequest)
     async def list_sessions(
-        self,
-        additional_directories: list[str] | None = None,
-        cursor: str | None = None,
-        cwd: str | None = None,
-        **kwargs: Any,
+        self, cwd: str | None = None, cursor: str | None = None, **kwargs: Any
     ) -> ListSessionsResponse:
         return await request_model_from_dict(
             self._conn,
             AGENT_METHODS["session_list"],
-            ListSessionsRequest(
-                additional_directories=additional_directories, cursor=cursor, cwd=cwd, field_meta=kwargs or None
-            ),
+            ListSessionsRequest(cursor=cursor, cwd=cwd, field_meta=kwargs or None),
             ListSessionsResponse,
         )
 
     @param_model(SetSessionModeRequest)
-    async def set_session_mode(self, mode_id: str, session_id: str, **kwargs: Any) -> SetSessionModeResponse:
+    async def set_session_mode(self, session_id: str, mode_id: str, **kwargs: Any) -> SetSessionModeResponse:
         return await request_model_from_dict(
             self._conn,
             AGENT_METHODS["session_set_mode"],
@@ -166,15 +159,6 @@ class ClientSideConnection:
             SetSessionModeResponse,
         )
 
-    @param_model(SetSessionModelRequest)
-    async def set_session_model(self, model_id: str, session_id: str, **kwargs: Any) -> SetSessionModelResponse:
-        return await request_model_from_dict(
-            self._conn,
-            AGENT_METHODS["session_set_model"],
-            SetSessionModelRequest(model_id=model_id, session_id=session_id, field_meta=kwargs or None),
-            SetSessionModelResponse,
-        )
-
     @param_models(SetSessionConfigOptionBooleanRequest, SetSessionConfigOptionSelectRequest)
     async def set_config_option(
         self, config_id: str, session_id: str, value: str | bool, **kwargs: Any
@@ -204,6 +188,7 @@ class ClientSideConnection:
     @param_model(PromptRequest)
     async def prompt(
         self,
+        session_id: str,
         prompt: list[
             TextContentBlock
             | ImageContentBlock
@@ -211,24 +196,22 @@ class ClientSideConnection:
             | ResourceContentBlock
             | EmbeddedResourceContentBlock
         ],
-        session_id: str,
-        message_id: str | None = None,
         **kwargs: Any,
     ) -> PromptResponse:
         return await request_model(
             self._conn,
             AGENT_METHODS["session_prompt"],
-            PromptRequest(prompt=prompt, session_id=session_id, message_id=message_id, field_meta=kwargs or None),
+            PromptRequest(prompt=prompt, session_id=session_id, field_meta=kwargs or None),
             PromptResponse,
         )
 
     @param_model(ForkSessionRequest)
     async def fork_session(
         self,
-        cwd: str,
         session_id: str,
+        cwd: str,
         additional_directories: list[str] | None = None,
-        mcp_servers: list[HttpMcpServer | SseMcpServer | McpServerStdio] | None = None,
+        mcp_servers: list[HttpMcpServer | SseMcpServer | AcpMcpServer | McpServerStdio] | None = None,
         **kwargs: Any,
     ) -> ForkSessionResponse:
         return await request_model(
@@ -247,10 +230,10 @@ class ClientSideConnection:
     @param_model(ResumeSessionRequest)
     async def resume_session(
         self,
-        cwd: str,
         session_id: str,
+        cwd: str,
         additional_directories: list[str] | None = None,
-        mcp_servers: list[HttpMcpServer | SseMcpServer | McpServerStdio] | None = None,
+        mcp_servers: list[HttpMcpServer | SseMcpServer | AcpMcpServer | McpServerStdio] | None = None,
         **kwargs: Any,
     ) -> ResumeSessionResponse:
         return await request_model(