agent-client-protocol 0.8.0__tar.gz → 0.9.0__tar.gz

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agent-client-protocol
-Version: 0.8.0
+Version: 0.9.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.8.0 → agent_client_protocol-0.9.0}/examples/client.py

@@ -28,7 +28,7 @@ from acp.schema import (
     EnvVariable,
     ImageContentBlock,
     Implementation,
-    KillTerminalCommandResponse,
+    KillTerminalResponse,
     PermissionOption,
     ReadTextFileResponse,
     ReleaseTerminalResponse,
@@ -86,9 +86,7 @@ class ExampleClient(Client):
     ) -> WaitForTerminalExitResponse:
         raise RequestError.method_not_found("terminal/wait_for_exit")
 
-    async def kill_terminal(
-        self, session_id: str, terminal_id: str, **kwargs: Any
-    ) -> KillTerminalCommandResponse | None:
+    async def kill_terminal(self, session_id: str, terminal_id: str, **kwargs: Any) -> KillTerminalResponse | None:
         raise RequestError.method_not_found("terminal/kill")
 
     async def session_update(

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/examples/echo_agent.py

@@ -1,3 +1,9 @@
+# /// script
+# requires-python = ">=3.10,<3.15"
+# dependencies = [
+#     "agent-client-protocol",
+# ]
+# ///
 import asyncio
 from typing import Any
 from uuid import uuid4

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/examples/gemini.py

@@ -33,8 +33,8 @@ from acp.schema import (
     EmbeddedResourceContentBlock,
     EnvVariable,
     FileEditToolCallContent,
-    FileSystemCapability,
-    KillTerminalCommandResponse,
+    FileSystemCapabilities,
+    KillTerminalResponse,
     PermissionOption,
     ReadTextFileResponse,
     ReleaseTerminalResponse,
@@ -183,11 +183,9 @@ class GeminiClient(Client):
         print(f"[Client] waitForTerminalExit: {session_id} {terminal_id}")
         return WaitForTerminalExitResponse()
 
-    async def kill_terminal(
-        self, session_id: str, terminal_id: str, **kwargs: Any
-    ) -> KillTerminalCommandResponse | None:
+    async def kill_terminal(self, session_id: str, terminal_id: str, **kwargs: Any) -> KillTerminalResponse | None:
         print(f"[Client] killTerminal: {session_id} {terminal_id}")
-        return KillTerminalCommandResponse()
+        return KillTerminalResponse()
 
 
 def _pick_preferred_option(options: Iterable[PermissionOption]) -> PermissionOption | None:
@@ -320,7 +318,7 @@ async def run(argv: list[str]) -> int:  # noqa: C901
         init_resp = await conn.initialize(
             protocol_version=PROTOCOL_VERSION,
             client_capabilities=ClientCapabilities(
-                fs=FileSystemCapability(read_text_file=True, write_text_file=True),
+                fs=FileSystemCapabilities(read_text_file=True, write_text_file=True),
                 terminal=True,
             ),
         )

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-client-protocol"
-version = "0.8.0"
+version = "0.9.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.8.0 → agent_client_protocol-0.9.0}/src/acp/__init__.py

@@ -45,8 +45,8 @@ from .schema import (
     CreateTerminalResponse,
     InitializeRequest,
     InitializeResponse,
-    KillTerminalCommandRequest,
-    KillTerminalCommandResponse,
+    KillTerminalRequest,
+    KillTerminalResponse,
     LoadSessionRequest,
     LoadSessionResponse,
     NewSessionRequest,
@@ -60,6 +60,8 @@ from .schema import (
     RequestPermissionRequest,
     RequestPermissionResponse,
     SessionNotification,
+    SetSessionConfigOptionResponse,
+    SetSessionConfigOptionSelectRequest,
     SetSessionModelRequest,
     SetSessionModelResponse,
     SetSessionModeRequest,
@@ -115,6 +117,8 @@ __all__ = [  # noqa: RUF022
     "SetSessionModeResponse",
     "SetSessionModelRequest",
     "SetSessionModelResponse",
+    "SetSessionConfigOptionSelectRequest",
+    "SetSessionConfigOptionResponse",
     # terminal types
     "CreateTerminalRequest",
     "CreateTerminalResponse",
@@ -122,8 +126,8 @@ __all__ = [  # noqa: RUF022
     "TerminalOutputResponse",
     "WaitForTerminalExitRequest",
     "WaitForTerminalExitResponse",
-    "KillTerminalCommandRequest",
-    "KillTerminalCommandResponse",
+    "KillTerminalRequest",
+    "KillTerminalResponse",
     "ReleaseTerminalRequest",
     "ReleaseTerminalResponse",
     # core

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/src/acp/agent/connection.py

@@ -17,8 +17,8 @@ from ..schema import (
     CreateTerminalResponse,
     CurrentModeUpdate,
     EnvVariable,
-    KillTerminalCommandRequest,
-    KillTerminalCommandResponse,
+    KillTerminalRequest,
+    KillTerminalResponse,
     PermissionOption,
     ReadTextFileRequest,
     ReadTextFileResponse,
@@ -191,15 +191,13 @@ class AgentSideConnection:
             WaitForTerminalExitResponse,
         )
 
-    @param_model(KillTerminalCommandRequest)
-    async def kill_terminal(
-        self, session_id: str, terminal_id: str, **kwargs: Any
-    ) -> KillTerminalCommandResponse | None:
+    @param_model(KillTerminalRequest)
+    async def kill_terminal(self, session_id: str, terminal_id: str, **kwargs: Any) -> KillTerminalResponse | None:
         return await request_optional_model(
             self._conn,
             CLIENT_METHODS["terminal_kill"],
-            KillTerminalCommandRequest(session_id=session_id, terminal_id=terminal_id, field_meta=kwargs or None),
-            KillTerminalCommandResponse,
+            KillTerminalRequest(session_id=session_id, terminal_id=terminal_id, field_meta=kwargs or None),
+            KillTerminalResponse,
         )
 
     async def ext_method(self, method: str, params: dict[str, Any]) -> dict[str, Any]:

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/src/acp/agent/router.py

@@ -2,13 +2,16 @@ from __future__ import annotations
 
 from typing import Any
 
+from pydantic import BaseModel
+
 from ..exceptions import RequestError
 from ..interfaces import Agent
 from ..meta import AGENT_METHODS
-from ..router import MessageRouter
+from ..router import MessageRouter, Route, _resolve_handler, _warn_legacy_handler
 from ..schema import (
     AuthenticateRequest,
     CancelNotification,
+    CloseSessionRequest,
     ForkSessionRequest,
     InitializeRequest,
     ListSessionsRequest,
@@ -16,14 +19,41 @@ from ..schema import (
     NewSessionRequest,
     PromptRequest,
     ResumeSessionRequest,
+    SetSessionConfigOptionBooleanRequest,
+    SetSessionConfigOptionSelectRequest,
     SetSessionModelRequest,
     SetSessionModeRequest,
 )
-from ..utils import normalize_result
+from ..utils import model_to_kwargs, normalize_result
 
 __all__ = ["build_agent_router"]
 
 
+_SET_CONFIG_OPTION_MODELS = (SetSessionConfigOptionBooleanRequest, SetSessionConfigOptionSelectRequest)
+
+
+def _validate_set_config_option_request(params: Any) -> BaseModel:
+    if isinstance(params, dict) and params.get("type") == "boolean":
+        return SetSessionConfigOptionBooleanRequest.model_validate(params)
+    return SetSessionConfigOptionSelectRequest.model_validate(params)
+
+
+def _make_set_config_option_handler(agent: Agent) -> Any:
+    func, attr, legacy_api = _resolve_handler(agent, "set_config_option")
+    if func is None:
+        return None
+
+    async def wrapper(params: Any) -> Any:
+        if legacy_api:
+            _warn_legacy_handler(agent, attr)
+        request = _validate_set_config_option_request(params)
+        if legacy_api:
+            return await func(request)
+        return await func(**model_to_kwargs(request, _SET_CONFIG_OPTION_MODELS))
+
+    return wrapper
+
+
 def build_agent_router(agent: Agent, use_unstable_protocol: bool = False) -> MessageRouter:
     router = MessageRouter(use_unstable_protocol=use_unstable_protocol)
 
@@ -36,7 +66,15 @@ def build_agent_router(agent: Agent, use_unstable_protocol: bool = False) -> Mes
         "load_session",
         adapt_result=normalize_result,
     )
-    router.route_request(AGENT_METHODS["session_list"], ListSessionsRequest, agent, "list_sessions", unstable=True)
+    router.route_request(AGENT_METHODS["session_list"], ListSessionsRequest, agent, "list_sessions")
+    router.route_request(
+        AGENT_METHODS["session_close"],
+        CloseSessionRequest,
+        agent,
+        "close_session",
+        adapt_result=normalize_result,
+        unstable=True,
+    )
     router.route_request(
         AGENT_METHODS["session_set_mode"],
         SetSessionModeRequest,
@@ -53,6 +91,14 @@ def build_agent_router(agent: Agent, use_unstable_protocol: bool = False) -> Mes
         adapt_result=normalize_result,
         unstable=True,
     )
+    router.add_route(
+        Route(
+            method=AGENT_METHODS["session_set_config_option"],
+            func=_make_set_config_option_handler(agent),
+            kind="request",
+            adapt_result=normalize_result,
+        )
+    )
     router.route_request(
         AGENT_METHODS["authenticate"],
         AuthenticateRequest,

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/src/acp/client/connection.py

@@ -13,6 +13,8 @@ from ..schema import (
     AuthenticateResponse,
     CancelNotification,
     ClientCapabilities,
+    CloseSessionRequest,
+    CloseSessionResponse,
     EmbeddedResourceContentBlock,
     ForkSessionRequest,
     ForkSessionResponse,
@@ -33,6 +35,9 @@ from ..schema import (
     ResourceContentBlock,
     ResumeSessionRequest,
     ResumeSessionResponse,
+    SetSessionConfigOptionBooleanRequest,
+    SetSessionConfigOptionResponse,
+    SetSessionConfigOptionSelectRequest,
     SetSessionModelRequest,
     SetSessionModelResponse,
     SetSessionModeRequest,
@@ -40,7 +45,7 @@ from ..schema import (
     SseMcpServer,
     TextContentBlock,
 )
-from ..utils import compatible_class, notify_model, param_model, request_model, request_model_from_dict
+from ..utils import compatible_class, notify_model, param_model, param_models, request_model, request_model_from_dict
 from .router import build_client_router
 
 __all__ = ["ClientSideConnection"]
@@ -150,6 +155,33 @@ class ClientSideConnection:
             SetSessionModelResponse,
         )
 
+    @param_models(SetSessionConfigOptionBooleanRequest, SetSessionConfigOptionSelectRequest)
+    async def set_config_option(
+        self, config_id: str, session_id: str, value: str | bool, **kwargs: Any
+    ) -> SetSessionConfigOptionResponse:
+        request = (
+            SetSessionConfigOptionBooleanRequest(
+                config_id=config_id,
+                session_id=session_id,
+                type="boolean",
+                value=value,
+                field_meta=kwargs or None,
+            )
+            if isinstance(value, bool)
+            else SetSessionConfigOptionSelectRequest(
+                config_id=config_id,
+                session_id=session_id,
+                value=value,
+                field_meta=kwargs or None,
+            )
+        )
+        return await request_model_from_dict(
+            self._conn,
+            AGENT_METHODS["session_set_config_option"],
+            request,
+            SetSessionConfigOptionResponse,
+        )
+
     @param_model(AuthenticateRequest)
     async def authenticate(self, method_id: str, **kwargs: Any) -> AuthenticateResponse:
         return await request_model_from_dict(
@@ -170,12 +202,18 @@ class ClientSideConnection:
             | 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, field_meta=kwargs or None),
+            PromptRequest(
+                prompt=prompt,
+                session_id=session_id,
+                message_id=message_id,
+                field_meta=kwargs or None,
+            ),
             PromptResponse,
         )
 
@@ -209,6 +247,15 @@ class ClientSideConnection:
             ResumeSessionResponse,
         )
 
+    @param_model(CloseSessionRequest)
+    async def close_session(self, session_id: str, **kwargs: Any) -> CloseSessionResponse | None:
+        return await request_model_from_dict(
+            self._conn,
+            AGENT_METHODS["session_close"],
+            CloseSessionRequest(session_id=session_id, field_meta=kwargs or None),
+            CloseSessionResponse,
+        )
+
     @param_model(CancelNotification)
     async def cancel(self, session_id: str, **kwargs: Any) -> None:
         await notify_model(

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/src/acp/client/router.py

@@ -8,7 +8,7 @@ from ..meta import CLIENT_METHODS
 from ..router import MessageRouter
 from ..schema import (
     CreateTerminalRequest,
-    KillTerminalCommandRequest,
+    KillTerminalRequest,
     ReadTextFileRequest,
     ReleaseTerminalRequest,
     RequestPermissionRequest,
@@ -68,7 +68,7 @@ def build_client_router(client: Client, use_unstable_protocol: bool = False) ->
     )
     router.route_request(
         CLIENT_METHODS["terminal_kill"],
-        KillTerminalCommandRequest,
+        KillTerminalRequest,
         client,
         "kill_terminal",
         optional=True,

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/src/acp/interfaces.py

@@ -12,6 +12,8 @@ from .schema import (
     AvailableCommandsUpdate,
     CancelNotification,
     ClientCapabilities,
+    CloseSessionRequest,
+    CloseSessionResponse,
     ConfigOptionUpdate,
     CreateTerminalRequest,
     CreateTerminalResponse,
@@ -25,8 +27,8 @@ from .schema import (
     Implementation,
     InitializeRequest,
     InitializeResponse,
-    KillTerminalCommandRequest,
-    KillTerminalCommandResponse,
+    KillTerminalRequest,
+    KillTerminalResponse,
     ListSessionsRequest,
     ListSessionsResponse,
     LoadSessionRequest,
@@ -48,6 +50,9 @@ from .schema import (
     ResumeSessionResponse,
     SessionInfoUpdate,
     SessionNotification,
+    SetSessionConfigOptionBooleanRequest,
+    SetSessionConfigOptionResponse,
+    SetSessionConfigOptionSelectRequest,
     SetSessionModelRequest,
     SetSessionModelResponse,
     SetSessionModeRequest,
@@ -66,7 +71,7 @@ from .schema import (
     WriteTextFileRequest,
     WriteTextFileResponse,
 )
-from .utils import param_model
+from .utils import param_model, param_models
 
 __all__ = ["Agent", "Client"]
 
@@ -130,10 +135,8 @@ class Client(Protocol):
         self, session_id: str, terminal_id: str, **kwargs: Any
     ) -> WaitForTerminalExitResponse: ...
 
-    @param_model(KillTerminalCommandRequest)
-    async def kill_terminal(
-        self, session_id: str, terminal_id: str, **kwargs: Any
-    ) -> KillTerminalCommandResponse | None: ...
+    @param_model(KillTerminalRequest)
+    async def kill_terminal(self, session_id: str, terminal_id: str, **kwargs: Any) -> KillTerminalResponse | None: ...
 
     async def ext_method(self, method: str, params: dict[str, Any]) -> dict[str, Any]: ...
 
@@ -179,6 +182,11 @@ class Agent(Protocol):
         self, model_id: str, session_id: str, **kwargs: Any
     ) -> SetSessionModelResponse | None: ...
 
+    @param_models(SetSessionConfigOptionBooleanRequest, SetSessionConfigOptionSelectRequest)
+    async def set_config_option(
+        self, config_id: str, session_id: str, value: str | bool, **kwargs: Any
+    ) -> SetSessionConfigOptionResponse | None: ...
+
     @param_model(AuthenticateRequest)
     async def authenticate(self, method_id: str, **kwargs: Any) -> AuthenticateResponse | None: ...
 
@@ -193,6 +201,7 @@ class Agent(Protocol):
             | EmbeddedResourceContentBlock
         ],
         session_id: str,
+        message_id: str | None = None,
         **kwargs: Any,
     ) -> PromptResponse: ...
 
@@ -214,6 +223,9 @@ class Agent(Protocol):
         **kwargs: Any,
     ) -> ResumeSessionResponse: ...
 
+    @param_model(CloseSessionRequest)
+    async def close_session(self, session_id: str, **kwargs: Any) -> CloseSessionResponse | None: ...
+
     @param_model(CancelNotification)
     async def cancel(self, session_id: str, **kwargs: Any) -> None: ...
 

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/src/acp/meta.py

@@ -1,9 +1,10 @@
 # Generated from schema/meta.json. Do not edit by hand.
-# Schema ref: refs/tags/v0.10.8
+# Schema ref: refs/tags/v0.11.2
 AGENT_METHODS = {
     "authenticate": "authenticate",
     "initialize": "initialize",
     "session_cancel": "session/cancel",
+    "session_close": "session/close",
     "session_fork": "session/fork",
     "session_list": "session/list",
     "session_load": "session/load",

{agent_client_protocol-0.8.0 → agent_client_protocol-0.9.0}/src/acp/router.py

@@ -20,6 +20,34 @@ RequestHandler = Callable[[str, dict[str, Any]], Awaitable[Any]]
 HandlerT = TypeVar("HandlerT", bound=RequestHandler)
 
 
+def _warn_legacy_handler(obj: Any, attr: str) -> None:
+    warnings.warn(
+        f"The old style method {type(obj).__name__}.{attr} is deprecated, please update to the snake-cased form.",
+        DeprecationWarning,
+        stacklevel=3,
+    )
+
+
+def _resolve_handler(obj: Any, attr: str) -> tuple[AsyncHandler | None, str, bool]:
+    legacy_api = False
+    func = getattr(obj, attr, None)
+    if func is None and "_" in attr:
+        attr = to_camel_case(attr)
+        func = getattr(obj, attr, None)
+        legacy_api = True
+    elif callable(func) and "_" not in attr:
+        original_func = func
+        if hasattr(func, "__func__"):
+            original_func = func.__func__
+        parameters = inspect.signature(original_func).parameters
+        if len(parameters) == 2 and "params" in parameters:
+            legacy_api = True
+
+    if func is None or not callable(func):
+        return None, attr, legacy_api
+    return func, attr, legacy_api
+
+
 @dataclass(slots=True)
 class Route:
     method: str
@@ -63,31 +91,13 @@ class MessageRouter:
             self._notifications[route.method] = route
 
     def _make_func(self, model: type[BaseModel], obj: Any, attr: str) -> AsyncHandler | None:
-        legacy_api = False
-        func = getattr(obj, attr, None)
-        if func is None and "_" in attr:
-            attr = to_camel_case(attr)
-            func = getattr(obj, attr, None)
-            legacy_api = True
-        elif callable(func) and "_" not in attr:
-            original_func = func
-            if hasattr(func, "__func__"):
-                original_func = func.__func__
-            parameters = inspect.signature(original_func).parameters
-            if len(parameters) == 2 and "params" in parameters:
-                legacy_api = True
-
-        if func is None or not callable(func):
+        func, attr, legacy_api = _resolve_handler(obj, attr)
+        if func is None:
             return None
 
         async def wrapper(params: Any) -> Any:
             if legacy_api:
-                warnings.warn(
-                    f"The old style method {type(obj).__name__}.{attr} is deprecated, "
-                    "please update to the snake-cased form.",
-                    DeprecationWarning,
-                    stacklevel=3,
-                )
+                _warn_legacy_handler(obj, attr)
             model_obj = model.model_validate(params)
             if legacy_api:
                 return await func(model_obj)  # type: ignore[arg-type]