acp-sdk 0.10.0 → 0.11.0

data/sig/generated/acp/client_connection.rbs

@@ -1,7 +1,7 @@
 # Generated from lib/acp/client_connection.rb with RBS::Inline
 
 class ACP::ClientConnection
-  @transport: ACP::AgentConnection::_Transport
+  @transport: ACP::Transport::_Transport
 
   @permission: ACP::ClientConnection::_PermissionHandler
 
@@ -21,10 +21,6 @@ class ACP::ClientConnection
 
   @elicitation: (^(ACP::Types::CreateElicitationRequest) -> (ACP::Types::CreateElicitationResponse | ACP::RequestError))?
 
-  @complete_elicitation: (^(ACP::Types::CompleteElicitationNotification) -> void)?
-
-  @updates: ACP::ClientConnection::_UpdateHandler
-
   @mcp_message: (^(ACP::Types::Unstable::MessageMcpRequest) -> (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError))?
 
   @mcp_advertised: bool?
@@ -39,23 +35,68 @@ class ACP::ClientConnection
 
   @extension_notifications: Hash[String, ^(untyped) -> void]
 
-  @lock: Thread::Mutex
+  @streams: ACP::ClientConnection::Streams
 
-  @streams: Hash[String, Thread::Queue]
+  @logger: ACP::Transport::_Logger
 
-  @pending_permissions: Hash[String, Array[Thread::Queue]]
+  IGNORE: ^(ACP::Types::SessionNotification) -> void
 
-  @outstanding_elicitations: Hash[String, bool]
+  class Route
+    @label: String
 
-  @logger: ACP::Transport::_Logger
+    @key: String
 
-  PROTOCOL_VERSION: Integer
+    @refuse: Symbol
 
-  IGNORE: ^(ACP::Types::SessionNotification) -> void
+    @advertised: ^(untyped) -> (bool | nil)
+
+    @family: Symbol
+
+    @handler: Symbol
+
+    @type: ACP::Transport::_Parser
+
+    @wire: String
 
-  CANCELLED: ACP::Types::RequestPermissionResponse
+    # @rbs wire: String
+    # @rbs type: ACP::Transport::_Parser
+    # @rbs handler: Symbol
+    # @rbs family: Symbol
+    # @rbs key: String
+    # @rbs advertised: ^(untyped) -> (bool | nil)
+    # @rbs refuse: Symbol
+    # @rbs label: String?
+    # @rbs return: void
+    def initialize: (wire: String, type: ACP::Transport::_Parser, handler: Symbol, family: Symbol, key: String, ?advertised: ^(untyped) -> (bool | nil), ?refuse: Symbol, ?label: String?) -> void
 
-  # @rbs transport: ACP::AgentConnection::_Transport
+    # @dynamic wire, type, handler, family, advertised, refuse, key, label
+    attr_reader wire: String
+
+    attr_reader type: ACP::Transport::_Parser
+
+    attr_reader handler: Symbol
+
+    attr_reader family: Symbol
+
+    attr_reader advertised: ^(untyped) -> (bool | nil)
+
+    attr_reader refuse: Symbol
+
+    attr_reader key: String
+
+    attr_reader label: String
+  end
+
+  # The routes are registered at start, before connect records the
+  # advertisement, so each one answers its refusal until then. The terminal
+  # capability is a single bool, so its five routes share one gate.
+  #
+  # The terminal handlers may block for as long as the command runs, so the
+  # transport must serve each request on its own thread for this not to hold
+  # up others.
+  SERVE: Array[ACP::ClientConnection::Route]
+
+  # @rbs transport: ACP::Transport::_Transport
   # @rbs permission: ACP::ClientConnection::_PermissionHandler
   # @rbs read_text_file: (^(ACP::Types::ReadTextFileRequest) -> (ACP::Types::ReadTextFileResponse | ACP::RequestError))?
   # @rbs write_text_file: (^(ACP::Types::WriteTextFileRequest) -> (ACP::Types::WriteTextFileResponse | ACP::RequestError))?
@@ -73,9 +114,10 @@ class ACP::ClientConnection
   #   (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError))?
   # @rbs extension_requests: Hash[String, ^(untyped) -> untyped]
   # @rbs extension_notifications: Hash[String, ^(untyped) -> void]
+  # @rbs streams: ACP::ClientConnection::Streams?
   # @rbs logger: ACP::Transport::_Logger
   # @rbs return: void
-  def initialize: (transport: ACP::AgentConnection::_Transport, permission: ACP::ClientConnection::_PermissionHandler, ?read_text_file: (^(ACP::Types::ReadTextFileRequest) -> (ACP::Types::ReadTextFileResponse | ACP::RequestError))?, ?write_text_file: (^(ACP::Types::WriteTextFileRequest) -> (ACP::Types::WriteTextFileResponse | ACP::RequestError))?, ?create_terminal: (^(ACP::Types::CreateTerminalRequest) -> (ACP::Types::CreateTerminalResponse | ACP::RequestError))?, ?terminal_output: (^(ACP::Types::TerminalOutputRequest) -> (ACP::Types::TerminalOutputResponse | ACP::RequestError))?, ?wait_for_terminal_exit: (^(ACP::Types::WaitForTerminalExitRequest) -> (ACP::Types::WaitForTerminalExitResponse | ACP::RequestError))?, ?kill_terminal: (^(ACP::Types::KillTerminalRequest) -> (ACP::Types::KillTerminalResponse | ACP::RequestError))?, ?release_terminal: (^(ACP::Types::ReleaseTerminalRequest) -> (ACP::Types::ReleaseTerminalResponse | ACP::RequestError))?, ?elicitation: (^(ACP::Types::CreateElicitationRequest) -> (ACP::Types::CreateElicitationResponse | ACP::RequestError))?, ?complete_elicitation: (^(ACP::Types::CompleteElicitationNotification) -> void)?, ?updates: ACP::ClientConnection::_UpdateHandler, ?mcp_message: (^(ACP::Types::Unstable::MessageMcpRequest) -> (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError))?, ?extension_requests: Hash[String, ^(untyped) -> untyped], ?extension_notifications: Hash[String, ^(untyped) -> void], ?logger: ACP::Transport::_Logger) -> void
+  def initialize: (transport: ACP::Transport::_Transport, permission: ACP::ClientConnection::_PermissionHandler, ?read_text_file: (^(ACP::Types::ReadTextFileRequest) -> (ACP::Types::ReadTextFileResponse | ACP::RequestError))?, ?write_text_file: (^(ACP::Types::WriteTextFileRequest) -> (ACP::Types::WriteTextFileResponse | ACP::RequestError))?, ?create_terminal: (^(ACP::Types::CreateTerminalRequest) -> (ACP::Types::CreateTerminalResponse | ACP::RequestError))?, ?terminal_output: (^(ACP::Types::TerminalOutputRequest) -> (ACP::Types::TerminalOutputResponse | ACP::RequestError))?, ?wait_for_terminal_exit: (^(ACP::Types::WaitForTerminalExitRequest) -> (ACP::Types::WaitForTerminalExitResponse | ACP::RequestError))?, ?kill_terminal: (^(ACP::Types::KillTerminalRequest) -> (ACP::Types::KillTerminalResponse | ACP::RequestError))?, ?release_terminal: (^(ACP::Types::ReleaseTerminalRequest) -> (ACP::Types::ReleaseTerminalResponse | ACP::RequestError))?, ?elicitation: (^(ACP::Types::CreateElicitationRequest) -> (ACP::Types::CreateElicitationResponse | ACP::RequestError))?, ?complete_elicitation: (^(ACP::Types::CompleteElicitationNotification) -> void)?, ?updates: ACP::ClientConnection::_UpdateHandler, ?mcp_message: (^(ACP::Types::Unstable::MessageMcpRequest) -> (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError))?, ?extension_requests: Hash[String, ^(untyped) -> untyped], ?extension_notifications: Hash[String, ^(untyped) -> void], ?streams: ACP::ClientConnection::Streams?, ?logger: ACP::Transport::_Logger) -> void
 
   # @rbs return: Thread
   def start: () -> Thread
@@ -89,72 +131,74 @@ class ACP::ClientConnection
 
   # @rbs request: ACP::Types::NewSessionRequest
   # @rbs return: ACP::Types::NewSessionResponse | ACP::RequestError
-  def session_new: (ACP::Types::NewSessionRequest request) -> (ACP::Types::NewSessionResponse | ACP::RequestError)
+  def new_session: (ACP::Types::NewSessionRequest request) -> (ACP::Types::NewSessionResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::PromptRequest
   # @rbs &block: (ACP::Types::SessionUpdate::t) -> void
   # @rbs return: ACP::Types::PromptResponse | ACP::RequestError
-  def session_prompt: (ACP::Types::PromptRequest request) { (ACP::Types::SessionUpdate::t) -> void } -> (ACP::Types::PromptResponse | ACP::RequestError)
+  def prompt_session: (ACP::Types::PromptRequest request) { (ACP::Types::SessionUpdate::t) -> void } -> (ACP::Types::PromptResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::LoadSessionRequest
   # @rbs &block: (ACP::Types::SessionUpdate::t) -> void
   # @rbs return: ACP::Types::LoadSessionResponse | ACP::RequestError
-  def session_load: (ACP::Types::LoadSessionRequest request) { (ACP::Types::SessionUpdate::t) -> void } -> (ACP::Types::LoadSessionResponse | ACP::RequestError)
+  def load_session: (ACP::Types::LoadSessionRequest request) { (ACP::Types::SessionUpdate::t) -> void } -> (ACP::Types::LoadSessionResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::ListSessionsRequest
   # @rbs return: ACP::Types::ListSessionsResponse | ACP::RequestError
-  def session_list: (ACP::Types::ListSessionsRequest request) -> (ACP::Types::ListSessionsResponse | ACP::RequestError)
+  def list_sessions: (ACP::Types::ListSessionsRequest request) -> (ACP::Types::ListSessionsResponse | ACP::RequestError)
 
-  # The agent does not replay history on resume, so unlike session_load there
+  # The agent does not replay history on resume, so unlike load_session there
   # is nothing to stream and no block is taken.
   #
   # @rbs request: ACP::Types::ResumeSessionRequest
   # @rbs return: ACP::Types::ResumeSessionResponse | ACP::RequestError
-  def session_resume: (ACP::Types::ResumeSessionRequest request) -> (ACP::Types::ResumeSessionResponse | ACP::RequestError)
+  def resume_session: (ACP::Types::ResumeSessionRequest request) -> (ACP::Types::ResumeSessionResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::CloseSessionRequest
   # @rbs return: ACP::Types::CloseSessionResponse | ACP::RequestError
-  def session_close: (ACP::Types::CloseSessionRequest request) -> (ACP::Types::CloseSessionResponse | ACP::RequestError)
+  def close_session: (ACP::Types::CloseSessionRequest request) -> (ACP::Types::CloseSessionResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::DeleteSessionRequest
   # @rbs return: ACP::Types::DeleteSessionResponse | ACP::RequestError
-  def session_delete: (ACP::Types::DeleteSessionRequest request) -> (ACP::Types::DeleteSessionResponse | ACP::RequestError)
+  def delete_session: (ACP::Types::DeleteSessionRequest request) -> (ACP::Types::DeleteSessionResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::Unstable::ForkSessionRequest
   # @rbs return: (ACP::Types::Unstable::ForkSessionResponse | ACP::RequestError)
-  def session_fork: (ACP::Types::Unstable::ForkSessionRequest request) -> (ACP::Types::Unstable::ForkSessionResponse | ACP::RequestError)
+  def fork_session: (ACP::Types::Unstable::ForkSessionRequest request) -> (ACP::Types::Unstable::ForkSessionResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::Unstable::ListProvidersRequest
   # @rbs return: (ACP::Types::Unstable::ListProvidersResponse | ACP::RequestError)
-  def providers_list: (ACP::Types::Unstable::ListProvidersRequest request) -> (ACP::Types::Unstable::ListProvidersResponse | ACP::RequestError)
+  def list_providers: (ACP::Types::Unstable::ListProvidersRequest request) -> (ACP::Types::Unstable::ListProvidersResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::Unstable::SetProviderRequest
   # @rbs return: (ACP::Types::Unstable::SetProviderResponse | ACP::RequestError)
-  def providers_set: (ACP::Types::Unstable::SetProviderRequest request) -> (ACP::Types::Unstable::SetProviderResponse | ACP::RequestError)
+  # The name is the wire-mandated providers/set, not an attribute writer.
+  def set_provider: (ACP::Types::Unstable::SetProviderRequest request) -> (ACP::Types::Unstable::SetProviderResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::Unstable::DisableProviderRequest
   # @rbs return: (ACP::Types::Unstable::DisableProviderResponse | ACP::RequestError)
-  def providers_disable: (ACP::Types::Unstable::DisableProviderRequest request) -> (ACP::Types::Unstable::DisableProviderResponse | ACP::RequestError)
+  def disable_provider: (ACP::Types::Unstable::DisableProviderRequest request) -> (ACP::Types::Unstable::DisableProviderResponse | ACP::RequestError)
 
   # The spec requires a pending session/request_permission to be answered with
-  # the cancelled outcome once the turn is cancelled, so every queue registered
-  # for the session gets one before this returns. The notification goes first
-  # so the wire order is cancel, then the cancelled replies.
+  # the cancelled outcome once the turn is cancelled. The notification goes
+  # first so the wire order is cancel, then the cancelled replies.
   #
   # @rbs notification: ACP::Types::CancelNotification
   # @rbs return: void
-  def session_cancel: (ACP::Types::CancelNotification notification) -> void
+  def cancel_session: (ACP::Types::CancelNotification notification) -> void
 
   # @rbs request: ACP::Types::SetSessionModeRequest
   # @rbs return: ACP::Types::SetSessionModeResponse | ACP::RequestError
-  def session_set_mode: (ACP::Types::SetSessionModeRequest request) -> (ACP::Types::SetSessionModeResponse | ACP::RequestError)
+  # The name is the wire-mandated session/set_mode, not an attribute writer.
+  def set_session_mode: (ACP::Types::SetSessionModeRequest request) -> (ACP::Types::SetSessionModeResponse | ACP::RequestError)
 
   # The reply carries the session's complete option list, so it replaces any
   # state held from an earlier reply rather than merging into it.
   #
   # @rbs request: ACP::Types::SetSessionConfigOptionRequest
   # @rbs return: ACP::Types::SetSessionConfigOptionResponse | ACP::RequestError
-  def session_set_config_option: (ACP::Types::SetSessionConfigOptionRequest request) -> (ACP::Types::SetSessionConfigOptionResponse | ACP::RequestError)
+  # The name is the wire-mandated session/set_config_option, not an attribute writer.
+  def set_session_config_option: (ACP::Types::SetSessionConfigOptionRequest request) -> (ACP::Types::SetSessionConfigOptionResponse | ACP::RequestError)
 
   # @rbs request: ACP::Types::AuthenticateRequest
   # @rbs return: ACP::Types::AuthenticateResponse | ACP::RequestError
@@ -164,9 +208,7 @@ class ACP::ClientConnection
   # @rbs return: ACP::Types::LogoutResponse | ACP::RequestError
   def logout: (ACP::Types::LogoutRequest request) -> (ACP::Types::LogoutResponse | ACP::RequestError)
 
-  # Sends an extension request, keyed by its raw `_`-prefixed wire name, and
-  # returns the agent's reply as-is: extension methods have no schema to
-  # parse the result into.
+  # Extension methods have no schema to parse the result into.
   #
   # @rbs method: String
   # @rbs params: untyped
@@ -193,142 +235,41 @@ class ACP::ClientConnection
 
   private
 
-  # The route is only registered when a handler serves it, but the agent's
-  # advertisement is only known after connect, so an unadvertised request
-  # still reaches the route and is refused there.
-  #
-  # @rbs return: Hash[String, ACP::Transport::Stdio::_Handler]
-  def mcp_requests: () -> Hash[String, ACP::Transport::Stdio::_Handler]
-
-  # The stable McpCapabilities has no acp field, so the gate re-reads the raw
-  # initialize reply with the unstable types when they are opted into.
-  #
-  # @rbs result: (Hash[String, untyped] | ACP::RequestError)
-  # @rbs return: bool
-  def agent_mcp_advertised?: (Hash[String, untyped] | ACP::RequestError result) -> bool
-
-  # @rbs type: ACP::AgentConnection::_Parser
-  # @rbs result: (Hash[String, untyped] | ACP::RequestError)
-  # @rbs return: untyped
-  def parse: (ACP::AgentConnection::_Parser type, Hash[String, untyped] | ACP::RequestError result) -> untyped
+  # @rbs route: ACP::ClientConnection::Route
+  # @rbs return: ^(untyped) -> (untyped | ACP::RequestError)
+  def serve: (ACP::ClientConnection::Route route) -> ^(untyped) -> (untyped | ACP::RequestError)
 
-  # The request waits on its own thread so the caller's thread can yield each
-  # update as it arrives. The reader thread queues an update before it settles
-  # a reply sent after it, so the queue closes only after the last one.
-  #
-  # @rbs session_id: String
-  # @rbs method: String
-  # @rbs params: Hash[String, untyped]
-  # @rbs &block: (ACP::Types::SessionUpdate::t) -> void
-  # @rbs return: (Hash[String, untyped] | ACP::RequestError)
-  def stream: (String session_id, String method, Hash[String, untyped] params) { (ACP::Types::SessionUpdate::t) -> void } -> (Hash[String, untyped] | ACP::RequestError)
+  # @rbs route: ACP::ClientConnection::Route
+  # @rbs return: ACP::RequestError
+  def refuse: (ACP::ClientConnection::Route route) -> ACP::RequestError
 
-  # Pushes under the lock so a stream cannot close its queue between the
-  # lookup and the push. A malformed notification has no reply to carry the
-  # failure.
-  #
-  # @rbs params: untyped
+  # @rbs name: String
+  # @rbs family: Symbol
+  # @rbs capabilities: untyped
   # @rbs return: void
-  def dispatch: (untyped params) -> void
+  def check_served: (String name, Symbol family, untyped capabilities) -> void
 
-  # The handler runs on its own thread so a cancelled request is answered
-  # without waiting for it, and whatever it returns after that is pushed to a
-  # queue nobody reads.
+  # The unstable types are referenced while the row is built, so the route can
+  # only be served when the caller opted in with `require 'acp/types/unstable'`.
+  # It is registered only when a handler serves it: unlike the fs and terminal
+  # gates, the mcp gate reads the agent's advertisement, so nothing forces an
+  # advertised request to have a handler.
   #
-  # @rbs params: untyped
-  # @rbs return: (ACP::Types::RequestPermissionResponse | ACP::RequestError)
-  def request_permission: (untyped params) -> (ACP::Types::RequestPermissionResponse | ACP::RequestError)
-
-  # @rbs session_id: String
-  # @rbs replies: Thread::Queue
-  # @rbs return: void
-  def register_permission: (String session_id, Thread::Queue replies) -> void
+  # @rbs return: Hash[String, ^(untyped) -> (untyped | ACP::RequestError)]
+  def mcp_requests: () -> Hash[String, ^(untyped) -> (untyped | ACP::RequestError)]
 
-  # @rbs session_id: String
-  # @rbs replies: Thread::Queue
-  # @rbs return: void
-  def unregister_permission: (String session_id, Thread::Queue replies) -> void
-
-  # The routes are registered at start, before connect records the advertised
-  # capabilities, so each one answers -32601 until then.
-  #
-  # @rbs params: untyped
-  # @rbs return: (ACP::Types::ReadTextFileResponse | ACP::RequestError)
-  def read_text_file: (untyped params) -> (ACP::Types::ReadTextFileResponse | ACP::RequestError)
-
-  # @rbs params: untyped
-  # @rbs return: (ACP::Types::WriteTextFileResponse | ACP::RequestError)
-  def write_text_file: (untyped params) -> (ACP::Types::WriteTextFileResponse | ACP::RequestError)
-
-  # The terminal routes are registered at start, before connect records the
-  # advertised capability, so each one answers -32601 until then.
-  #
-  # @rbs params: untyped
-  # @rbs return: (ACP::Types::CreateTerminalResponse | ACP::RequestError)
-  def create_terminal: (untyped params) -> (ACP::Types::CreateTerminalResponse | ACP::RequestError)
-
-  # @rbs params: untyped
-  # @rbs return: (ACP::Types::TerminalOutputResponse | ACP::RequestError)
-  def terminal_output: (untyped params) -> (ACP::Types::TerminalOutputResponse | ACP::RequestError)
-
-  # The handler may block for as long as the command runs, so the transport
-  # must serve each request on its own thread for this not to hold up others.
-  #
-  # @rbs params: untyped
-  # @rbs return: (ACP::Types::WaitForTerminalExitResponse | ACP::RequestError)
-  def wait_for_terminal_exit: (untyped params) -> (ACP::Types::WaitForTerminalExitResponse | ACP::RequestError)
-
-  # @rbs params: untyped
-  # @rbs return: (ACP::Types::KillTerminalResponse | ACP::RequestError)
-  def kill_terminal: (untyped params) -> (ACP::Types::KillTerminalResponse | ACP::RequestError)
-
-  # @rbs params: untyped
-  # @rbs return: (ACP::Types::ReleaseTerminalResponse | ACP::RequestError)
-  def release_terminal: (untyped params) -> (ACP::Types::ReleaseTerminalResponse | ACP::RequestError)
-
-  # The route is registered at start, before connect records the agent's
-  # advertisement, so an unadvertised request answers -32601 until then.
-  #
-  # @rbs params: untyped
-  # @rbs return: (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError)
-  def mcp_message: (untyped params) -> (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError)
+  # @rbs type: ACP::Transport::_Parser
+  # @rbs result: (Hash[String, untyped] | ACP::RequestError)
+  # @rbs return: untyped
+  def parse: (ACP::Transport::_Parser type, Hash[String, untyped] | ACP::RequestError result) -> untyped
 
-  # The routes are registered at start, before connect records the advertised
+  # The route is registered at start, before connect records the advertised
   # capabilities, so a request for an unadvertised mode answers -32602.
   #
   # @rbs params: untyped
   # @rbs return: (ACP::Types::CreateElicitationResponse | ACP::RequestError)
   def create_elicitation: (untyped params) -> (ACP::Types::CreateElicitationResponse | ACP::RequestError)
 
-  # The spec requires a completion for an unknown or already-completed
-  # elicitation id to be ignored, so only an id registered by a served
-  # url-mode request reaches the handler. It runs on the transport's reader
-  # thread, so it must return quickly.
-  #
-  # @rbs params: untyped
-  # @rbs return: void
-  def complete_elicitation: (untyped params) -> void
-
-  # @rbs elicitation_id: String
-  # @rbs return: void
-  def register_elicitation: (String elicitation_id) -> void
-
-  # The fs capabilities initialize advertises that no injected handler serves.
-  #
-  # @rbs capabilities: ACP::Types::FileSystemCapabilities?
-  # @rbs return: Array[String]
-  def unserved_fs_methods: (ACP::Types::FileSystemCapabilities? capabilities) -> Array[String]
-
-  # The terminal capabilities initialize advertises that no injected handler
-  # serves.
-  #
-  # @rbs capabilities: bool?
-  # @rbs return: Array[String]
-  def unserved_terminal_methods: (bool? capabilities) -> Array[String]
-
-  # The elicitation capabilities initialize advertises that no injected
-  # handler serves.
-  #
   # @rbs capabilities: ACP::Types::ElicitationCapabilities?
   # @rbs return: Array[String]
   def unserved_elicitation_modes: (ACP::Types::ElicitationCapabilities? capabilities) -> Array[String]

data/sig/generated/acp/protocol.rbs

@@ -0,0 +1,9 @@
+# Generated from lib/acp/protocol.rb with RBS::Inline
+
+module ACP::Protocol
+  PROTOCOL_VERSION: Integer
+
+  # @rbs capabilities: (ACP::Types::AgentCapabilities | ACP::Types::Unstable::AgentCapabilities | Hash[String, untyped])
+  # @rbs return: bool
+  def mcp_acp_advertised?: (ACP::Types::AgentCapabilities | ACP::Types::Unstable::AgentCapabilities | Hash[String, untyped] capabilities) -> bool
+end

data/sig/generated/acp/request_error.rbs

@@ -1,8 +1,6 @@
 # Generated from lib/acp/request_error.rb with RBS::Inline
 
-# The schema's JSON-RPC Error object, named after the official SDKs'
-# RequestError: built by handlers and local refusals, and decoded from a
-# peer's error replies by the transport.
+# Named after the official SDKs' RequestError rather than the schema's Error.
 class ACP::RequestError
   PARSE_ERROR: Integer
 
@@ -52,28 +50,21 @@ class ACP::RequestError
   # @rbs return: ACP::RequestError
   def self.invalid_params: (?Array[String]? errors) -> ACP::RequestError
 
-  # The method-not-found code for a method the client's capabilities do not
-  # advertise, with a message that names the capability so it can be told
-  # apart from an unknown method.
+  # The message names the capability so the refusal can be told apart from an
+  # unknown method, though both use the -32601 code.
   #
   # @rbs capability: String
   # @rbs return: ACP::RequestError
   def self.unadvertised: (String capability) -> ACP::RequestError
 
-  # The invalid-params code for a request whose mode the client's
-  # capabilities do not advertise, with a message that names the mode so it
-  # can be told apart from malformed params. The spec gives elicitation a
-  # mode in its params, so an unadvertised one is invalid params rather than
-  # method not found.
+  # The message names the mode so the refusal can be told apart from malformed
+  # params. The spec gives elicitation a mode in its params, so an unadvertised
+  # one is invalid params rather than method not found.
   #
   # @rbs mode: String
   # @rbs return: ACP::RequestError
   def self.unadvertised_mode: (String mode) -> ACP::RequestError
 
-  # unadvertised names a capability of the client's, this one a capability of
-  # the agent's: the same method-not-found code, with a message naming which
-  # side's advertisement is missing.
-  #
   # @rbs capability: String
   # @rbs return: ACP::RequestError
   def self.unadvertised_agent: (String capability) -> ACP::RequestError
@@ -88,8 +79,7 @@ class ACP::RequestError
   # @rbs return: ACP::RequestError
   def self.invalid_response: (untyped response) -> ACP::RequestError
 
-  # A local refusal of an initialize reply that names a version the SDK does
-  # not speak; the message names both versions so logs can tell it from a
+  # The message names both versions so logs can tell this local refusal from a
   # peer's error.
   #
   # @rbs requested: Integer

data/sig/generated/acp/transport/cancellation.rbs

@@ -1,15 +1,8 @@
 # Generated from lib/acp/transport/cancellation.rb with RBS::Inline
 
-# Whether the peer cancelled one request. The transport creates one per served
-# request, marks it when the peer's $/cancel_request arrives, and hands it to
-# the serving thread, whose handler can observe it and end the request early.
 class ACP::Transport::Cancellation
   KEY: Symbol
 
-  # Connections read this to expose the serving state to their handlers and
-  # write it to carry serving identity onto a thread they spawn; nil off a
-  # serve thread.
-  #
   # @rbs return: ACP::Transport::Cancellation?
   def self.current: () -> ACP::Transport::Cancellation?
 

data/sig/generated/acp/transport/reply.rbs

@@ -1,7 +1,5 @@
 # Generated from lib/acp/transport/reply.rb with RBS::Inline
 
-# A request handler's outcome plus a callback the transport runs once that
-# outcome is on the wire, for messages the peer must only see after the reply.
 class ACP::Transport::Reply
   # @dynamic result
   attr_reader result: ACP::Transport::Stdio::_ToH

data/sig/generated/acp/transport/stderr_logger.rbs

@@ -1,7 +1,6 @@
 # Generated from lib/acp/transport/stderr_logger.rb with RBS::Inline
 
-# The default sink for dropped messages and swallowed errors: the spec
-# sanctions agents logging to stderr.
+# The spec sanctions agents logging to stderr.
 class ACP::Transport::StderrLogger
   # @rbs message: String
   # @rbs return: void

data/sig/generated/acp/transport/stdio.rbs

@@ -1,10 +1,9 @@
 # Generated from lib/acp/transport/stdio.rb with RBS::Inline
 
-# JSON-RPC 2.0 over newline-delimited JSON on an IO pair. A reader thread
-# dispatches inbound messages while outbound requests are pending, and each
-# inbound request is served on its own thread, so a handler can make an
-# outbound request mid-turn and still see notifications (e.g. session/cancel)
-# that arrive meanwhile.
+# A reader thread dispatches inbound messages while outbound requests are
+# pending, and each inbound request is served on its own thread, so a handler
+# can make an outbound request mid-turn and still see notifications (e.g.
+# session/cancel) that arrive meanwhile.
 class ACP::Transport::Stdio
   @logger: ACP::Transport::_Logger
 
@@ -32,9 +31,6 @@ class ACP::Transport::Stdio
   # @rbs return: void
   def initialize: (input: _Reader, output: _Writer, ?logger: ACP::Transport::_Logger) -> void
 
-  # Returns the reader thread, which ends at EOF on input after releasing any
-  # pending outbound requests.
-  #
   # @rbs requests: Hash[String, _Handler]
   # @rbs notifications: Hash[String, _NotificationHandler]
   # @rbs return: Thread
@@ -42,8 +38,8 @@ class ACP::Transport::Stdio
 
   # @rbs method: String
   # @rbs params: untyped
-  # @rbs return: (Hash[String, untyped] | ACP::RequestError)
-  def request: (String method, ?untyped params) -> (Hash[String, untyped] | ACP::RequestError)
+  # @rbs return: untyped
+  def request: (String method, ?untyped params) -> untyped
 
   # @rbs method: String
   # @rbs params: untyped
@@ -63,11 +59,6 @@ class ACP::Transport::Stdio
   # @rbs return: void
   def cancel_requests: () -> void
 
-  # The cancellation of the request the calling thread is serving, or nil off
-  # a serve thread. A handler observes the peer's $/cancel_request through it
-  # and can end early with ACP::RequestError.request_cancelled; whatever it
-  # returns, the transport sends exactly one response.
-  #
   # @rbs return: ACP::Transport::Cancellation?
   def cancellation: () -> ACP::Transport::Cancellation?
 
@@ -142,9 +133,6 @@ class ACP::Transport::Stdio
   # @rbs return: (_ToH | ACP::RequestError | ACP::Transport::Reply)
   def invoke: (_Handler handler, untyped params) -> (_ToH | ACP::RequestError | ACP::Transport::Reply)
 
-  # The success arm is whatever the handler returned, which the transport only
-  # knows serializes with to_h; RequestError picks the error arm of the reply.
-  #
   # @rbs id: untyped
   # @rbs outcome: (_ToH | ACP::RequestError)
   # @rbs return: void
@@ -155,9 +143,9 @@ class ACP::Transport::Stdio
   def register: (Thread::Queue queue) -> Integer?
 
   # @rbs id: untyped
-  # @rbs result: (Hash[String, untyped] | ACP::RequestError)
-  # @rbs return: void
-  def settle: (untyped id, Hash[String, untyped] | ACP::RequestError result) -> void
+  # @rbs result: untyped
+  # @rbs return: Thread::Queue?
+  def settle: (untyped id, untyped result) -> Thread::Queue?
 
   # @rbs return: void
   def close: () -> void

data/sig/generated/acp/types/audio_content.rbs

@@ -1,29 +1,3 @@
 # Generated from lib/acp/types/audio_content.rb with RBS::Inline
 
-class ACP::Types::AudioContent
-  # @dynamic annotations
-  attr_reader annotations: ACP::Types::Annotations?
-
-  # @dynamic data
-  attr_reader data: String
-
-  # @dynamic mime_type
-  attr_reader mime_type: String
-
-  # @dynamic meta
-  attr_reader meta: Hash[String, untyped]?
-
-  # @rbs annotations: ACP::Types::Annotations?
-  # @rbs data: String
-  # @rbs mime_type: String
-  # @rbs meta: Hash[String, untyped]?
-  # @rbs return: void
-  def initialize: (data: String, mime_type: String, ?annotations: ACP::Types::Annotations?, ?meta: Hash[String, untyped]?) -> void
-
-  # @rbs hash: Hash[String, untyped]
-  # @rbs return: ACP::Types::AudioContent
-  def self.from_h: (Hash[String, untyped] hash) -> ACP::Types::AudioContent
-
-  # @rbs return: Hash[String, untyped]
-  def to_h: () -> Hash[String, untyped]
-end
+class ACP::Types::AudioContent = ACP::Types::ContentBlock::Audio

data/sig/generated/acp/types/auth_method_terminal.rbs

@@ -1,37 +1,3 @@
 # Generated from lib/acp/types/auth_method_terminal.rb with RBS::Inline
 
-class ACP::Types::AuthMethodTerminal
-  # @dynamic id
-  attr_reader id: String
-
-  # @dynamic name
-  attr_reader name: String
-
-  # @dynamic description
-  attr_reader description: String?
-
-  # @dynamic args
-  attr_reader args: Array[String]?
-
-  # @dynamic env
-  attr_reader env: Hash[String, String]?
-
-  # @dynamic meta
-  attr_reader meta: Hash[String, untyped]?
-
-  # @rbs id: String
-  # @rbs name: String
-  # @rbs description: String?
-  # @rbs args: Array[String]?
-  # @rbs env: Hash[String, String]?
-  # @rbs meta: Hash[String, untyped]?
-  # @rbs return: void
-  def initialize: (id: String, name: String, ?description: String?, ?args: Array[String]?, ?env: Hash[String, String]?, ?meta: Hash[String, untyped]?) -> void
-
-  # @rbs hash: Hash[String, untyped]
-  # @rbs return: ACP::Types::AuthMethodTerminal
-  def self.from_h: (Hash[String, untyped] hash) -> ACP::Types::AuthMethodTerminal
-
-  # @rbs return: Hash[String, untyped]
-  def to_h: () -> Hash[String, untyped]
-end
+class ACP::Types::AuthMethodTerminal = ACP::Types::AuthMethod::Terminal

data/sig/generated/acp/types/available_commands_update.rbs

@@ -1,21 +1,3 @@
 # Generated from lib/acp/types/available_commands_update.rb with RBS::Inline
 
-class ACP::Types::AvailableCommandsUpdate
-  # @dynamic available_commands
-  attr_reader available_commands: Array[ACP::Types::AvailableCommand]
-
-  # @dynamic meta
-  attr_reader meta: Hash[String, untyped]?
-
-  # @rbs available_commands: Array[ACP::Types::AvailableCommand]
-  # @rbs meta: Hash[String, untyped]?
-  # @rbs return: void
-  def initialize: (available_commands: Array[ACP::Types::AvailableCommand], ?meta: Hash[String, untyped]?) -> void
-
-  # @rbs hash: Hash[String, untyped]
-  # @rbs return: ACP::Types::AvailableCommandsUpdate
-  def self.from_h: (Hash[String, untyped] hash) -> ACP::Types::AvailableCommandsUpdate
-
-  # @rbs return: Hash[String, untyped]
-  def to_h: () -> Hash[String, untyped]
-end
+class ACP::Types::AvailableCommandsUpdate = ACP::Types::SessionUpdate::AvailableCommandsUpdate