acp-sdk 0.13.0 → 0.14.1

data/lib/acp/types.rb

@@ -9,4 +9,17 @@ module ACP::Types
   def self.unstable_enabled?
     !defined?(ACP::Types::Unstable).nil?
   end
+
+  # Generated from_h checks only nested values, so a payload that is not an
+  # object is rejected here: a String would answer nil for every key and parse
+  # as an empty object.
+  #
+  # @rbs type: ACP::Transport::_Parser
+  # @rbs payload: untyped
+  # @rbs return: untyped
+  def self.parse(type, payload)
+    ACP::Types::Check.object(payload, [], type)
+  rescue ACP::Types::ParseError => e
+    e
+  end
 end

data/lib/acp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ACP
-  VERSION = '0.13.0'
+  VERSION = '0.14.1'
 end

data/sig/generated/acp/agent_connection/optional_route.rbs

@@ -0,0 +1,35 @@
+# Generated from lib/acp/agent_connection/optional_route.rb with RBS::Inline
+
+class ACP::AgentConnection::OptionalRoute
+  # @dynamic rpc_method
+  attr_reader rpc_method: String
+
+  # @dynamic type
+  attr_reader type: ACP::Transport::_Parser
+
+  # @dynamic agent_method
+  attr_reader agent_method: Symbol
+
+  # @dynamic path
+  attr_reader path: Array[Symbol]?
+
+  # @dynamic handle
+  attr_reader handle: ^(ACP::AgentConnection::_FullAgent, untyped) -> (ACP::Transport::_Response | ACP::RequestError)
+
+  # @rbs rpc_method: String
+  # @rbs type: ACP::Transport::_Parser
+  # @rbs agent_method: Symbol
+  # @rbs path: Array[Symbol]?
+  # @rbs &handle: (ACP::AgentConnection::_FullAgent, untyped) -> (ACP::Transport::_Response | ACP::RequestError)
+  # @rbs return: void
+  def initialize: (rpc_method: String, type: ACP::Transport::_Parser, agent_method: Symbol, path: Array[Symbol]?) { (ACP::AgentConnection::_FullAgent, untyped) -> (ACP::Transport::_Response | ACP::RequestError) } -> void
+
+  # @rbs initialize_response: ACP::Types::InitializeResponse
+  # @rbs return: bool
+  def advertised?: (ACP::Types::InitializeResponse initialize_response) -> bool
+
+  # @rbs initialize_response: ACP::Types::InitializeResponse
+  # @rbs agent: ACP::AgentConnection::_Agent
+  # @rbs return: bool
+  def routed?: (ACP::Types::InitializeResponse initialize_response, ACP::AgentConnection::_Agent agent) -> bool
+end

data/sig/generated/acp/agent_connection.rbs

@@ -17,10 +17,7 @@ class ACP::AgentConnection
 
   @transport: ACP::Transport::Stdio
 
-  # The schema has no initialize capability for modes or config options: an
-  # agent offers them per session, in its session responses, so they are
-  # routed whenever the agent defines them.
-  PER_SESSION: Hash[String, Symbol]
+  OPTIONAL_ROUTES: Array[ACP::AgentConnection::OptionalRoute]
 
   # @rbs transport: ACP::Transport::Stdio
   # @rbs capabilities: ACP::Types::AgentCapabilities
@@ -40,23 +37,12 @@ class ACP::AgentConnection
 
   # @rbs agent: ACP::AgentConnection::_Agent
   # @rbs client: ACP::AgentConnection::Client
+  # @rbs optional: Array[ACP::AgentConnection::OptionalRoute]
   # @rbs return: Hash[String, ^(untyped) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)]
-  def requests: (ACP::AgentConnection::_Agent agent, ACP::AgentConnection::Client client) -> Hash[String, ^(untyped) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)]
+  def requests: (ACP::AgentConnection::_Agent agent, ACP::AgentConnection::Client client, Array[ACP::AgentConnection::OptionalRoute] optional) -> Hash[String, ^(untyped) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)]
 
-  # The unstable request types are referenced while the hash is built, so
-  # without the guard start would raise NameError even for an agent that never
-  # advertises fork or providers.
-  #
-  # @rbs full: ACP::AgentConnection::_FullAgent
-  # @rbs return: Hash[String, ^(untyped) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)]
-  def unstable_requests: (ACP::AgentConnection::_FullAgent full) -> Hash[String, ^(untyped) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)]
-
-  # The unstable specs pair with the unstable request routes, which reference
-  # the unstable request classes, so both are only probed after the caller
-  # opted in with `require 'acp/types/unstable'`.
-  #
-  # @rbs return: Array[ACP::AgentConnection::OptionalMethod::Spec]
-  def optional_methods: () -> Array[ACP::AgentConnection::OptionalMethod::Spec]
+  # @rbs return: Array[ACP::AgentConnection::OptionalRoute]
+  def unstable_routes: () -> Array[ACP::AgentConnection::OptionalRoute]
 
   # @rbs agent: ACP::AgentConnection::_Agent
   # @rbs return: Hash[String, ^(untyped) -> void]
@@ -79,8 +65,6 @@ class ACP::AgentConnection
   # @rbs return: void
   def mcp_message_notification: (ACP::AgentConnection::_Agent agent, untyped params) -> void
 
-  # Generated from_h raises on a missing key or a value of the wrong shape.
-  #
   # @rbs type: ACP::Transport::_Parser
   # @rbs &handle: (untyped) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)
   # @rbs return: ^(untyped) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)

data/sig/generated/acp/client_connection/elicitations.rbs

@@ -0,0 +1,29 @@
+# Generated from lib/acp/client_connection/elicitations.rb with RBS::Inline
+
+class ACP::ClientConnection::Elicitations
+  @handler: ACP::ClientConnection::_Elicitation?
+
+  @logger: ACP::Transport::_Logger
+
+  @lock: Thread::Mutex
+
+  @outstanding: Hash[String, bool]
+
+  # @rbs handler: ACP::ClientConnection::_Elicitation?
+  # @rbs logger: ACP::Transport::_Logger
+  # @rbs return: void
+  def initialize: (handler: ACP::ClientConnection::_Elicitation?, logger: ACP::Transport::_Logger) -> void
+
+  # @rbs elicitation_id: String
+  # @rbs return: void
+  def register: (String elicitation_id) -> void
+
+  # 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: (untyped params) -> void
+end

data/sig/generated/acp/client_connection/inbound.rbs

@@ -0,0 +1,109 @@
+# Generated from lib/acp/client_connection/inbound.rb with RBS::Inline
+
+class ACP::ClientConnection::Inbound
+  @capabilities: ACP::Types::ClientCapabilities?
+
+  @extension_notifications: Hash[String, ^(untyped) -> void]
+
+  @extension_requests: Hash[String, ^(untyped) -> untyped]
+
+  @mcp_message: (^(ACP::Types::Unstable::MessageMcpRequest) -> (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError))?
+
+  @elicitations: ACP::ClientConnection::Elicitations
+
+  @elicitation: ACP::ClientConnection::_Elicitation?
+
+  @terminal: ACP::ClientConnection::_Terminal?
+
+  @fs: ACP::ClientConnection::_FileSystem?
+
+  class Route < Data
+    attr_reader rpc_method(): String
+
+    attr_reader type(): ACP::Transport::_Parser
+
+    attr_reader handler_method(): Symbol
+
+    attr_reader path(): Array[Symbol]
+
+    attr_reader capability(): String
+
+    def self.new: (String rpc_method, ACP::Transport::_Parser type, Symbol handler_method, Array[Symbol] path, String capability) -> instance
+                | (rpc_method: String, type: ACP::Transport::_Parser, handler_method: Symbol, path: Array[Symbol], capability: String) -> instance
+
+    def self.members: () -> [ :rpc_method, :type, :handler_method, :path, :capability ]
+
+    def members: () -> [ :rpc_method, :type, :handler_method, :path, :capability ]
+  end
+
+  FS_ROUTES: Array[ACP::ClientConnection::Inbound::Route]
+
+  # The terminal capability is a single bool, so its five routes share one
+  # gate. Their 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.
+  TERMINAL_ROUTES: Array[ACP::ClientConnection::Inbound::Route]
+
+  # @dynamic mcp_advertised=
+  attr_writer mcp_advertised: bool
+
+  # @rbs elicitations: ACP::ClientConnection::Elicitations
+  # @rbs fs: ACP::ClientConnection::_FileSystem?
+  # @rbs terminal: ACP::ClientConnection::_Terminal?
+  # @rbs elicitation: ACP::ClientConnection::_Elicitation?
+  # @rbs mcp_message: (^(ACP::Types::Unstable::MessageMcpRequest) ->
+  #   (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError))?
+  # @rbs extension_requests: Hash[String, ^(untyped) -> untyped]
+  # @rbs extension_notifications: Hash[String, ^(untyped) -> void]
+  # @rbs return: void
+  def initialize: (elicitations: ACP::ClientConnection::Elicitations, ?fs: ACP::ClientConnection::_FileSystem?, ?terminal: ACP::ClientConnection::_Terminal?, ?elicitation: ACP::ClientConnection::_Elicitation?, ?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]) -> void
+
+  # @rbs return: Hash[String, ACP::Transport::Stdio::_Handler]
+  def requests: () -> Hash[String, ACP::Transport::Stdio::_Handler]
+
+  # @rbs return: Hash[String, ACP::Transport::Stdio::_NotificationHandler]
+  def notifications: () -> Hash[String, ACP::Transport::Stdio::_NotificationHandler]
+
+  # @rbs capabilities: ACP::Types::ClientCapabilities?
+  # @rbs return: void
+  def advertise: (ACP::Types::ClientCapabilities? capabilities) -> void
+
+  private
+
+  # @rbs route: ACP::ClientConnection::Inbound::Route
+  # @rbs handler: untyped
+  # @rbs return: ^(untyped) -> untyped
+  def serve: (ACP::ClientConnection::Inbound::Route route, untyped handler) -> ^(untyped) -> untyped
+
+  # @rbs type: ACP::Transport::_Parser
+  # @rbs params: untyped
+  # @rbs &block: (untyped) -> untyped
+  # @rbs return: untyped
+  def parsed: (ACP::Transport::_Parser type, untyped params) { (untyped) -> untyped } -> untyped
+
+  # @rbs routes: Array[ACP::ClientConnection::Inbound::Route]
+  # @rbs handler: untyped
+  # @rbs capabilities: ACP::Types::ClientCapabilities?
+  # @rbs return: Array[String]
+  def unserved: (Array[ACP::ClientConnection::Inbound::Route] routes, untyped handler, ACP::Types::ClientCapabilities? capabilities) -> Array[String]
+
+  # @rbs capabilities: ACP::Types::ElicitationCapabilities?
+  # @rbs return: Array[String]
+  def unserved_elicitation_modes: (ACP::Types::ElicitationCapabilities? capabilities) -> Array[String]
+
+  # @rbs what: String
+  # @rbs unserved: Array[String]
+  # @rbs return: void
+  def check_served: (String what, Array[String] unserved) -> void
+
+  # @rbs return: Hash[String, ^(untyped) -> untyped]
+  def mcp_requests: () -> Hash[String, ^(untyped) -> untyped]
+
+  # @rbs params: untyped
+  # @rbs return: (ACP::Types::CreateElicitationResponse | ACP::RequestError)
+  def create_elicitation: (untyped params) -> (ACP::Types::CreateElicitationResponse | ACP::RequestError)
+
+  # @rbs request: ACP::Types::CreateElicitationRequest
+  # @rbs return: ACP::RequestError?
+  def elicitation_refusal: (ACP::Types::CreateElicitationRequest request) -> ACP::RequestError?
+end

data/sig/generated/acp/client_connection/streams.rbs

@@ -1,36 +1,28 @@
 # Generated from lib/acp/client_connection/streams.rb with RBS::Inline
 
-# It holds no send facade of its own — requests go through the sender and
-# answers to the agent ride the connection's routes — so it is unit-testable
-# without a transport.
 class ACP::ClientConnection::Streams
   CANCELLED: ACP::Types::RequestPermissionResponse
 
-  @outstanding_elicitations: Hash[String, bool]
-
-  @pending_permissions: Hash[String, Array[Thread::Queue]]
+  @sender: ACP::Transport::Stdio
 
-  @streams: Hash[String, Thread::Queue]
+  @permission: ACP::ClientConnection::_PermissionHandler
 
-  @lock: Thread::Mutex
+  @updates: ACP::ClientConnection::_UpdateHandler
 
   @logger: ACP::Transport::_Logger
 
-  @complete_elicitation: (^(ACP::Types::CompleteElicitationNotification) -> void)?
-
-  @updates: ACP::ClientConnection::_UpdateHandler
+  @lock: Thread::Mutex
 
-  @permission: ACP::ClientConnection::_PermissionHandler
+  @streams: Hash[String, Thread::Queue]
 
-  @sender: ACP::Transport::Stdio
+  @pending_permissions: Hash[String, Array[Thread::Queue]]
 
   # @rbs sender: ACP::Transport::Stdio
   # @rbs permission: ACP::ClientConnection::_PermissionHandler
   # @rbs updates: ACP::ClientConnection::_UpdateHandler
   # @rbs logger: ACP::Transport::_Logger
-  # @rbs complete_elicitation: (^(ACP::Types::CompleteElicitationNotification) -> void)?
   # @rbs return: void
-  def initialize: (sender: ACP::Transport::Stdio, permission: ACP::ClientConnection::_PermissionHandler, updates: ACP::ClientConnection::_UpdateHandler, logger: ACP::Transport::_Logger, ?complete_elicitation: (^(ACP::Types::CompleteElicitationNotification) -> void)?) -> void
+  def initialize: (sender: ACP::Transport::Stdio, permission: ACP::ClientConnection::_PermissionHandler, updates: ACP::ClientConnection::_UpdateHandler, logger: ACP::Transport::_Logger) -> void
 
   # 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
@@ -67,19 +59,6 @@ class ACP::ClientConnection::Streams
   # @rbs return: void
   def cancel: (String session_id) -> void
 
-  # @rbs elicitation_id: String
-  # @rbs return: void
-  def register_elicitation: (String elicitation_id) -> void
-
-  # 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
-
   private
 
   # @rbs session_id: String

data/sig/generated/acp/client_connection.rbs

@@ -1,123 +1,33 @@
 # Generated from lib/acp/client_connection.rb with RBS::Inline
 
 class ACP::ClientConnection
-  @transport: ACP::Transport::Stdio
-
-  @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))?
-
-  @mcp_message: (^(ACP::Types::Unstable::MessageMcpRequest) -> (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError))?
-
-  @mcp_advertised: bool?
-
-  @fs_capabilities: ACP::Types::FileSystemCapabilities?
-
-  @terminal: bool?
-
-  @elicitation_capabilities: ACP::Types::ElicitationCapabilities?
-
-  @extension_requests: Hash[String, ^(untyped) -> untyped]
-
-  @extension_notifications: Hash[String, ^(untyped) -> void]
+  @inbound: ACP::ClientConnection::Inbound
 
   @streams: ACP::ClientConnection::Streams
 
-  @logger: ACP::Transport::_Logger
+  @transport: ACP::Transport::Stdio
 
   IGNORE: ^(ACP::Types::SessionNotification) -> void
 
-  class Route
-    @label: String
-
-    @key: String
-
-    @refuse: Symbol
-
-    @advertised: ^(untyped) -> (bool | nil)
-
-    @family: Symbol
-
-    @handler: Symbol
-
-    @type: ACP::Transport::_Parser
-
-    @wire: String
-
-    # @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
-
-    # @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::Stdio
   # @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))?
-  # @rbs create_terminal: (^(ACP::Types::CreateTerminalRequest) -> (ACP::Types::CreateTerminalResponse | ACP::RequestError))?
-  # @rbs terminal_output: (^(ACP::Types::TerminalOutputRequest) -> (ACP::Types::TerminalOutputResponse | ACP::RequestError))?
-  # @rbs wait_for_terminal_exit: (^(ACP::Types::WaitForTerminalExitRequest) ->
-  #   (ACP::Types::WaitForTerminalExitResponse | ACP::RequestError))?
-  # @rbs kill_terminal: (^(ACP::Types::KillTerminalRequest) -> (ACP::Types::KillTerminalResponse | ACP::RequestError))?
-  # @rbs release_terminal: (^(ACP::Types::ReleaseTerminalRequest) -> (ACP::Types::ReleaseTerminalResponse | ACP::RequestError))?
-  # @rbs elicitation: (^(ACP::Types::CreateElicitationRequest) ->
-  #   (ACP::Types::CreateElicitationResponse | ACP::RequestError))?
-  # @rbs complete_elicitation: (^(ACP::Types::CompleteElicitationNotification) -> void)?
   # @rbs updates: ACP::ClientConnection::_UpdateHandler
+  # @rbs fs: ACP::ClientConnection::_FileSystem?
+  # @rbs terminal: ACP::ClientConnection::_Terminal?
+  # @rbs elicitation: ACP::ClientConnection::_Elicitation?
   # @rbs mcp_message: (^(ACP::Types::Unstable::MessageMcpRequest) ->
   #   (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: ACP::ClientConnection
+  def self.build: (transport: ACP::Transport::Stdio, permission: ACP::ClientConnection::_PermissionHandler, ?updates: ACP::ClientConnection::_UpdateHandler, ?fs: ACP::ClientConnection::_FileSystem?, ?terminal: ACP::ClientConnection::_Terminal?, ?elicitation: ACP::ClientConnection::_Elicitation?, ?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) -> ACP::ClientConnection
+
+  # @rbs transport: ACP::Transport::Stdio
+  # @rbs streams: ACP::ClientConnection::Streams
+  # @rbs inbound: ACP::ClientConnection::Inbound
   # @rbs return: void
-  def initialize: (transport: ACP::Transport::Stdio, 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
+  def initialize: (transport: ACP::Transport::Stdio, streams: ACP::ClientConnection::Streams, inbound: ACP::ClientConnection::Inbound) -> void
 
   # @rbs return: Thread
   def start: () -> Thread
@@ -172,7 +82,6 @@ class ACP::ClientConnection
 
   # @rbs request: ACP::Types::Unstable::SetProviderRequest
   # @rbs return: (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
@@ -189,7 +98,6 @@ class ACP::ClientConnection
 
   # @rbs request: ACP::Types::SetSessionModeRequest
   # @rbs return: 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
@@ -197,7 +105,6 @@ class ACP::ClientConnection
   #
   # @rbs request: ACP::Types::SetSessionConfigOptionRequest
   # @rbs return: 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
@@ -235,42 +142,8 @@ class ACP::ClientConnection
 
   private
 
-  # @rbs route: ACP::ClientConnection::Route
-  # @rbs return: ^(untyped) -> (untyped | ACP::RequestError)
-  def serve: (ACP::ClientConnection::Route route) -> ^(untyped) -> (untyped | ACP::RequestError)
-
-  # @rbs route: ACP::ClientConnection::Route
-  # @rbs return: ACP::RequestError
-  def refuse: (ACP::ClientConnection::Route route) -> ACP::RequestError
-
-  # @rbs name: String
-  # @rbs family: Symbol
-  # @rbs capabilities: untyped
-  # @rbs return: void
-  def check_served: (String name, Symbol family, untyped capabilities) -> void
-
-  # 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 return: Hash[String, ^(untyped) -> (untyped | ACP::RequestError)]
-  def mcp_requests: () -> Hash[String, ^(untyped) -> (untyped | 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 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)
-
-  # @rbs capabilities: ACP::Types::ElicitationCapabilities?
-  # @rbs return: Array[String]
-  def unserved_elicitation_modes: (ACP::Types::ElicitationCapabilities? capabilities) -> Array[String]
 end

data/sig/generated/acp/extensions.rbs

@@ -6,4 +6,8 @@ module ACP::Extensions
   # @rbs name: String
   # @rbs return: void
   def validate_name: (String name) -> void
+
+  # @rbs names: Array[String]
+  # @rbs return: void
+  def validate_names: (Array[String] names) -> void
 end

data/sig/generated/acp/protocol.rbs

@@ -3,6 +3,14 @@
 module ACP::Protocol
   PROTOCOL_VERSION: Integer
 
+  # Readers missing along the chain count as unadvertised, so the stable
+  # capabilities answer false for the unstable-only paths (fork, providers).
+  #
+  # @rbs capabilities: untyped
+  # @rbs path: Array[Symbol]
+  # @rbs return: bool
+  def advertised?: (untyped capabilities, Array[Symbol] path) -> bool
+
   # @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

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

@@ -1,14 +1,16 @@
 # Generated from lib/acp/transport/reply.rb with RBS::Inline
 
-class ACP::Transport::Reply
-  # @dynamic result
-  attr_reader result: ACP::Transport::Stdio::_ToH
+module ACP::Transport
+  class Reply < Data
+    attr_reader result(): ACP::Transport::_Response
 
-  # @dynamic after
-  attr_reader after: ^() -> void
+    attr_reader after(): ^() -> void
 
-  # @rbs result: ACP::Transport::Stdio::_ToH
-  # @rbs after: ^() -> void
-  # @rbs return: void
-  def initialize: (ACP::Transport::Stdio::_ToH result, after: ^() -> void) -> void
+    def self.new: (ACP::Transport::_Response result, ^() -> void after) -> instance
+                | (result: ACP::Transport::_Response, after: ^() -> void) -> instance
+
+    def self.members: () -> [ :result, :after ]
+
+    def members: () -> [ :result, :after ]
+  end
 end

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

@@ -25,6 +25,19 @@ class ACP::Transport::Stdio
 
   CONNECTION_CLOSED: ACP::RequestError
 
+  class Serving < Data
+    attr_reader id(): untyped
+
+    attr_reader cancellation(): ACP::Transport::Cancellation
+
+    def self.new: (untyped id, ACP::Transport::Cancellation cancellation) -> instance
+                | (id: untyped, cancellation: ACP::Transport::Cancellation) -> instance
+
+    def self.members: () -> [ :id, :cancellation ]
+
+    def members: () -> [ :id, :cancellation ]
+  end
+
   # @rbs input: _Reader
   # @rbs output: _Writer
   # @rbs logger: ACP::Transport::_Logger
@@ -134,13 +147,13 @@ class ACP::Transport::Stdio
   #
   # @rbs handler: _Handler
   # @rbs params: untyped
-  # @rbs return: (_ToH | ACP::RequestError | ACP::Transport::Reply)
-  def invoke: (_Handler handler, untyped params) -> (_ToH | ACP::RequestError | ACP::Transport::Reply)
+  # @rbs return: (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)
+  def invoke: (_Handler handler, untyped params) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)
 
   # @rbs id: untyped
-  # @rbs outcome: (_ToH | ACP::RequestError)
+  # @rbs outcome: (ACP::Transport::_Response | ACP::RequestError)
   # @rbs return: void
-  def reply: (untyped id, _ToH | ACP::RequestError outcome) -> void
+  def reply: (untyped id, ACP::Transport::_Response | ACP::RequestError outcome) -> void
 
   # @rbs queue: Thread::Queue
   # @rbs return: Integer?

data/sig/generated/acp/types.rbs

@@ -7,4 +7,13 @@ module ACP::Types
   #
   # @rbs return: bool
   def self.unstable_enabled?: () -> bool
+
+  # Generated from_h checks only nested values, so a payload that is not an
+  # object is rejected here: a String would answer nil for every key and parse
+  # as an empty object.
+  #
+  # @rbs type: ACP::Transport::_Parser
+  # @rbs payload: untyped
+  # @rbs return: untyped
+  def self.parse: (ACP::Transport::_Parser type, untyped payload) -> untyped
 end