acp-sdk 0.10.0 → 0.12.0

data/lib/acp/types/unstable.rb

@@ -19,8 +19,6 @@ require_relative 'unstable/client_session_capabilities'
 require_relative 'unstable/close_nes_request'
 require_relative 'unstable/close_nes_response'
 require_relative 'unstable/compaction_status'
-require_relative 'unstable/compaction_summary_chunk'
-require_relative 'unstable/compaction_update'
 require_relative 'unstable/did_change_document_notification'
 require_relative 'unstable/did_close_document_notification'
 require_relative 'unstable/did_focus_document_notification'
@@ -30,7 +28,6 @@ require_relative 'unstable/disable_provider_request'
 require_relative 'unstable/disable_provider_response'
 require_relative 'unstable/fork_session_request'
 require_relative 'unstable/fork_session_response'
-require_relative 'unstable/idle_state_update'
 require_relative 'unstable/initialize_response'
 require_relative 'unstable/list_providers_request'
 require_relative 'unstable/list_providers_response'
@@ -41,7 +38,6 @@ require_relative 'unstable/mcp_server'
 require_relative 'unstable/mcp_server/acp'
 require_relative 'unstable/mcp_server/http'
 require_relative 'unstable/mcp_server/sse'
-require_relative 'unstable/mcp_server_acp'
 require_relative 'unstable/message_mcp_notification'
 require_relative 'unstable/message_mcp_request'
 require_relative 'unstable/message_mcp_response'
@@ -60,11 +56,9 @@ require_relative 'unstable/nes_document_did_save_capabilities'
 require_relative 'unstable/nes_document_event_capabilities'
 require_relative 'unstable/nes_edit_history_capabilities'
 require_relative 'unstable/nes_edit_history_entry'
-require_relative 'unstable/nes_edit_suggestion'
 require_relative 'unstable/nes_event_capabilities'
 require_relative 'unstable/nes_excerpt'
 require_relative 'unstable/nes_jump_capabilities'
-require_relative 'unstable/nes_jump_suggestion'
 require_relative 'unstable/nes_open_file'
 require_relative 'unstable/nes_open_files_capabilities'
 require_relative 'unstable/nes_recent_file'
@@ -73,10 +67,8 @@ require_relative 'unstable/nes_reject_reason'
 require_relative 'unstable/nes_related_snippet'
 require_relative 'unstable/nes_related_snippets_capabilities'
 require_relative 'unstable/nes_rename_capabilities'
-require_relative 'unstable/nes_rename_suggestion'
 require_relative 'unstable/nes_repository'
 require_relative 'unstable/nes_search_and_replace_capabilities'
-require_relative 'unstable/nes_search_and_replace_suggestion'
 require_relative 'unstable/nes_suggest_context'
 require_relative 'unstable/nes_suggestion'
 require_relative 'unstable/nes_suggestion/edit'
@@ -87,14 +79,8 @@ require_relative 'unstable/nes_text_edit'
 require_relative 'unstable/nes_trigger_kind'
 require_relative 'unstable/nes_user_action'
 require_relative 'unstable/nes_user_actions_capabilities'
-require_relative 'unstable/notice'
 require_relative 'unstable/notice_severity'
 require_relative 'unstable/plan_capabilities'
-require_relative 'unstable/plan_file'
-require_relative 'unstable/plan_items'
-require_relative 'unstable/plan_markdown'
-require_relative 'unstable/plan_removed'
-require_relative 'unstable/plan_update'
 require_relative 'unstable/plan_update_content'
 require_relative 'unstable/plan_update_content/file'
 require_relative 'unstable/plan_update_content/items'
@@ -107,13 +93,9 @@ require_relative 'unstable/provider_info'
 require_relative 'unstable/providers_capabilities'
 require_relative 'unstable/range'
 require_relative 'unstable/reject_nes_notification'
-require_relative 'unstable/requires_action_state_update'
-require_relative 'unstable/running_state_update'
 require_relative 'unstable/session_cancel_capabilities'
 require_relative 'unstable/session_capabilities'
 require_relative 'unstable/session_fork_capabilities'
-require_relative 'unstable/session_message'
-require_relative 'unstable/session_message_chunk'
 require_relative 'unstable/session_update'
 require_relative 'unstable/session_update/agent_message_chunk'
 require_relative 'unstable/session_update/agent_thought_chunk'
@@ -145,11 +127,29 @@ require_relative 'unstable/state_update/running'
 require_relative 'unstable/state_update/unknown'
 require_relative 'unstable/subagent_capabilities'
 require_relative 'unstable/subagent_session_capabilities'
-require_relative 'unstable/subagent_update'
 require_relative 'unstable/suggest_nes_request'
 require_relative 'unstable/suggest_nes_response'
 require_relative 'unstable/text_document_content_change_event'
 require_relative 'unstable/text_document_sync_kind'
-require_relative 'unstable/unknown_state_update'
 require_relative 'unstable/usage'
 require_relative 'unstable/workspace_folder'
+require_relative 'unstable/compaction_summary_chunk'
+require_relative 'unstable/compaction_update'
+require_relative 'unstable/idle_state_update'
+require_relative 'unstable/mcp_server_acp'
+require_relative 'unstable/nes_edit_suggestion'
+require_relative 'unstable/nes_jump_suggestion'
+require_relative 'unstable/nes_rename_suggestion'
+require_relative 'unstable/nes_search_and_replace_suggestion'
+require_relative 'unstable/notice'
+require_relative 'unstable/plan_file'
+require_relative 'unstable/plan_items'
+require_relative 'unstable/plan_markdown'
+require_relative 'unstable/plan_removed'
+require_relative 'unstable/plan_update'
+require_relative 'unstable/requires_action_state_update'
+require_relative 'unstable/running_state_update'
+require_relative 'unstable/session_message'
+require_relative 'unstable/session_message_chunk'
+require_relative 'unstable/subagent_update'
+require_relative 'unstable/unknown_state_update'

data/lib/acp/types/usage_update.rb

@@ -2,45 +2,7 @@
 
 # Generated by bin/types from schema/schema.json. Do not edit.
 
-class ACP::Types::UsageUpdate
-  # @dynamic used
-  attr_reader :used #: Integer
+# @rbs!
+#   class ACP::Types::UsageUpdate = ACP::Types::SessionUpdate::UsageUpdate
 
-  # @dynamic size
-  attr_reader :size #: Integer
-
-  # @dynamic cost
-  attr_reader :cost #: ACP::Types::Cost?
-
-  # @dynamic meta
-  attr_reader :meta #: Hash[String, untyped]?
-
-  # @rbs used: Integer
-  # @rbs size: Integer
-  # @rbs cost: ACP::Types::Cost?
-  # @rbs meta: Hash[String, untyped]?
-  # @rbs return: void
-  def initialize(used:, size:, cost: nil, meta: nil)
-    @used = used
-    @size = size
-    @cost = cost
-    @meta = meta
-    freeze
-  end
-
-  # @rbs hash: Hash[String, untyped]
-  # @rbs return: ACP::Types::UsageUpdate
-  def self.from_h(hash)
-    new(
-      used: ACP::Types::Check.integer(ACP::Types::Check.key(hash, 'used'), 'used', min: 0),
-      size: ACP::Types::Check.integer(ACP::Types::Check.key(hash, 'size'), 'size', min: 0),
-      cost: ACP::Types::Check.object(hash['cost'], 'cost', ACP::Types::Cost, allow_nil: true),
-      meta: hash['_meta']
-    )
-  end
-
-  # @rbs return: Hash[String, untyped]
-  def to_h
-    { 'used' => used, 'size' => size, 'cost' => cost&.to_h, '_meta' => meta }.compact
-  end
-end
+ACP::Types::UsageUpdate = ACP::Types::SessionUpdate::UsageUpdate

data/lib/acp/types.rb

@@ -1,251 +1,12 @@
 # frozen_string_literal: true
 
 module ACP::Types
-  # Raised by the generated from_h when a param does not match its schema
-  # type; the connection boundaries rescue it into an invalid-params reply
-  # that names the failing path.
-  class ParseError < StandardError
-    # @rbs @segments: Array[String | Integer]
-    # @rbs @detail: String
-
-    # @rbs segments: Array[String | Integer]
-    # @rbs detail: String
-    # @rbs return: void
-    def initialize(segments, detail)
-      @segments = segments.freeze
-      @detail = detail
-      super("#{path}: #{detail}")
-    end
-
-    # @dynamic segments
-    attr_reader :segments #: Array[String | Integer]
-
-    # @rbs return: String
-    def path
-      segments.each_with_index.map do |segment, index|
-        if segment.is_a?(Integer) then "[#{segment}]"
-        elsif index.zero? then segment
-        else ".#{segment}"
-        end
-      end.join
-    end
-
-    # Prepends a container's segments so nested failures report an absolute path.
-    #
-    # @rbs *segments: (String | Integer)
-    # @rbs return: ACP::Types::ParseError
-    def prefix(*segments)
-      ParseError.new([*segments, *@segments], @detail)
-    end
-  end
-
-  # The guards the generated from_h methods call. Each takes the fetched value
-  # and the path to it, and raises ParseError naming that path when the value
-  # does not match the schema type. Nested from_h failures come back with the
-  # field path prepended, so the reported path is absolute.
-  module Check
-    # @rbs hash: Hash[String, untyped]
-    # @rbs key: String
-    # @rbs return: untyped
-    def self.key(hash, key)
-      hash.fetch(key)
-    rescue KeyError
-      raise ParseError.new([key], 'is required')
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs return: untyped
-    def self.string(value, path, allow_nil: false, allow_unset: false)
-      return value if value.is_a?(String) || skipped?(value, allow_nil, allow_unset)
-
-      raise ParseError.new(segments(path), "expected String, got #{describe(value)}")
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs return: untyped
-    def self.boolean(value, path, allow_nil: false, allow_unset: false)
-      return value if value == true || value == false || skipped?(value, allow_nil, allow_unset)
-
-      raise ParseError.new(segments(path), "expected boolean, got #{describe(value)}")
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs min: Integer?
-    # @rbs max: Integer?
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs return: untyped
-    def self.integer(value, path, min: nil, max: nil, allow_nil: false, allow_unset: false)
-      return value if (value.is_a?(Integer) && within?(value, min, max)) || skipped?(value, allow_nil, allow_unset)
-
-      raise ParseError.new(segments(path), "expected #{bounded('Integer', min, max)}, got #{describe(value)}")
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs min: Integer?
-    # @rbs max: Integer?
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs return: untyped
-    def self.number(value, path, min: nil, max: nil, allow_nil: false, allow_unset: false)
-      return value if (value.is_a?(Numeric) && within?(value, min, max)) || skipped?(value, allow_nil, allow_unset)
-
-      raise ParseError.new(segments(path), "expected #{bounded('Numeric', min, max)}, got #{describe(value)}")
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs values: Array[untyped]
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs return: untyped
-    def self.enum(value, path, values, allow_nil: false, allow_unset: false)
-      return value if values.include?(value) || skipped?(value, allow_nil, allow_unset)
-
-      expected = values.map(&:inspect).join(', ')
-      raise ParseError.new(segments(path), "expected one of #{expected}, got #{describe(value)}")
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs classes: Array[untyped]
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs ?&items: (untyped, Array[String | Integer]) -> void
-    # @rbs return: untyped
-    def self.one_of(value, path, classes, allow_nil: false, allow_unset: false, &items)
-      return value if skipped?(value, allow_nil, allow_unset)
-
-      matched = classes.any? { |klass| value.is_a?(klass) }
-      unless matched
-        raise ParseError.new(segments(path), "expected #{classes.map(&:name).join(' | ')}, got #{describe(value)}")
-      end
-
-      return value unless value.is_a?(Array) && items
-
-      value.each_with_index { |item, index| yield(item, [*segments(path), index]) }
-      value
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs &check: (untyped, Array[String | Integer]) -> void
-    # @rbs return: untyped
-    def self.hash(value, path, allow_nil: false, allow_unset: false, &check)
-      return value if skipped?(value, allow_nil, allow_unset)
-      raise ParseError.new(segments(path), "expected object, got #{describe(value)}") unless value.is_a?(Hash)
-
-      parsed = {} #: Hash[String, untyped]
-      value.each { |key, item| parsed[key] = yield(item, [*segments(path), key]) }
-      parsed
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs &check: (untyped, Array[String | Integer]) -> void
-    # @rbs return: untyped
-    def self.array(value, path, allow_nil: false, allow_unset: false, &check)
-      return value if skipped?(value, allow_nil, allow_unset)
-      raise ParseError.new(segments(path), "expected array, got #{describe(value)}") unless value.is_a?(Array)
-
-      value.each_with_index.map { |item, index| yield(item, [*segments(path), index]) }
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs klass: untyped
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs return: untyped
-    def self.object(value, path, klass, allow_nil: false, allow_unset: false)
-      return value if skipped?(value, allow_nil, allow_unset)
-      raise ParseError.new(segments(path), "expected object, got #{describe(value)}") unless value.is_a?(Hash)
-
-      begin
-        klass.from_h(value)
-      rescue ParseError => e
-        raise e.prefix(*segments(path))
-      end
-    end
-
-    # @rbs value: untyped
-    # @rbs path: String | Array[String | Integer]
-    # @rbs klass: untyped
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs return: untyped
-    def self.objects(value, path, klass, allow_nil: false, allow_unset: false)
-      return value if skipped?(value, allow_nil, allow_unset)
-      raise ParseError.new(segments(path), "expected array, got #{describe(value)}") unless value.is_a?(Array)
-
-      value.each_with_index do |item, index|
-        next if item.is_a?(Hash)
-
-        raise ParseError.new([*segments(path), index], "expected object, got #{describe(item)}")
-      end
-
-      begin
-        klass.from_a(value)
-      rescue ParseError => e
-        raise e.prefix(*segments(path))
-      end
-    end
-
-    # @rbs value: untyped
-    # @rbs allow_nil: bool
-    # @rbs allow_unset: bool
-    # @rbs return: bool
-    def self.skipped?(value, allow_nil, allow_unset)
-      (value.nil? && allow_nil) || (allow_unset && value.equal?(:unset))
-    end
-
-    # @rbs path: String | Array[String | Integer]
-    # @rbs return: Array[String | Integer]
-    def self.segments(path)
-      path.is_a?(Array) ? path : [path]
-    end
-
-    # @rbs value: untyped
-    # @rbs return: String
-    def self.describe(value)
-      case value
-      when nil then 'null'
-      when true then 'true'
-      when false then 'false'
-      else value.class.name
-      end
-    end
-
-    # @rbs value: Numeric
-    # @rbs min: Integer?
-    # @rbs max: Integer?
-    # @rbs return: bool
-    def self.within?(value, min, max)
-      (min.nil? || value >= min) && (max.nil? || value <= max)
-    end
-
-    # @rbs name: String
-    # @rbs min: Integer?
-    # @rbs max: Integer?
-    # @rbs return: String
-    def self.bounded(name, min, max)
-      if min && max then "#{name} between #{min} and #{max}"
-      elsif min then "#{name} >= #{min}"
-      elsif max then "#{name} <= #{max}"
-      else name
-      end
-    end
+  # Lives on ACP::Types rather than ACP::Types::Unstable because the callers
+  # run in the stable-only load, where even naming the inner module would raise
+  # NameError.
+  #
+  # @rbs return: bool
+  def self.unstable_enabled?
+    !defined?(ACP::Types::Unstable).nil?
   end
 end

data/lib/acp/version.rb

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

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

@@ -3,15 +3,15 @@
 class ACP::AgentConnection::Client
   @mcp_advertised: bool
 
-  @peer: ACP::AgentConnection::_Peer
+  @peer: ACP::Transport::_Peer
 
   # @dynamic capabilities, capabilities=
   attr_accessor capabilities: ACP::Types::ClientCapabilities?
 
-  # @rbs peer: ACP::AgentConnection::_Peer
+  # @rbs peer: ACP::Transport::_Peer
   # @rbs mcp_advertised: bool
   # @rbs return: void
-  def initialize: (peer: ACP::AgentConnection::_Peer, ?mcp_advertised: bool) -> void
+  def initialize: (peer: ACP::Transport::_Peer, ?mcp_advertised: bool) -> void
 
   # @rbs session_id: String
   # @rbs update: ACP::Types::SessionUpdate::t
@@ -23,9 +23,6 @@ class ACP::AgentConnection::Client
   # @rbs return: void
   def available_commands: (String session_id, Array[ACP::Types::AvailableCommand] commands) -> void
 
-  # Blocks the calling thread until the client answers or the connection
-  # closes.
-  #
   # @rbs request: ACP::Types::RequestPermissionRequest
   # @rbs return: ACP::Types::RequestPermissionResponse | ACP::RequestError
   def request_permission: (ACP::Types::RequestPermissionRequest request) -> (ACP::Types::RequestPermissionResponse | ACP::RequestError)
@@ -74,17 +71,11 @@ class ACP::AgentConnection::Client
   # @rbs return: void
   def complete_elicitation: (ACP::Types::CompleteElicitationNotification notification) -> void
 
-  # Sends one inner MCP operation to the client's declared ACP MCP server. The
-  # reply's result may be null, and a reply matching neither carrier branch
-  # comes back as the raw hash.
-  #
   # @rbs request: ACP::Types::Unstable::MessageMcpRequest
   # @rbs return: (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError)
   def mcp_message: (ACP::Types::Unstable::MessageMcpRequest request) -> (ACP::Types::Unstable::MessageMcpResponse::t | ACP::RequestError)
 
-  # Sends an extension request, keyed by its raw `_`-prefixed wire name, and
-  # returns the client'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
@@ -99,14 +90,14 @@ class ACP::AgentConnection::Client
   private
 
   # @rbs rpc_method: String
-  # @rbs type: ACP::AgentConnection::_Parser
-  # @rbs request: ACP::AgentConnection::_Response
+  # @rbs type: ACP::Transport::_Parser
+  # @rbs request: ACP::Transport::_Response
   # @rbs return: untyped
-  def call: (String rpc_method, ACP::AgentConnection::_Parser type, ACP::AgentConnection::_Response request) -> untyped
+  def call: (String rpc_method, ACP::Transport::_Parser type, ACP::Transport::_Response request) -> untyped
 
   # @rbs rpc_method: String
-  # @rbs type: ACP::AgentConnection::_Parser
-  # @rbs request: ACP::AgentConnection::_Response
+  # @rbs type: ACP::Transport::_Parser
+  # @rbs request: ACP::Transport::_Response
   # @rbs return: untyped
-  def terminal_call: (String rpc_method, ACP::AgentConnection::_Parser type, ACP::AgentConnection::_Response request) -> untyped
+  def terminal_call: (String rpc_method, ACP::Transport::_Parser type, ACP::Transport::_Response request) -> untyped
 end

data/sig/generated/acp/agent_connection/optional_method/spec.rbs

@@ -0,0 +1,32 @@
+# Generated from lib/acp/agent_connection/optional_method/spec.rb with RBS::Inline
+
+class ACP::AgentConnection::OptionalMethod::Spec
+  # @dynamic rpc_method
+  attr_reader rpc_method: String
+
+  # @dynamic agent_method
+  attr_reader agent_method: Symbol
+
+  # @dynamic path
+  attr_reader path: Array[Symbol]
+
+  # @rbs rpc_method: String
+  # @rbs agent_method: Symbol
+  # @rbs path: Array[Symbol]
+  # @rbs return: void
+  def initialize: (rpc_method: String, agent_method: Symbol, path: Array[Symbol]) -> void
+
+  # Readers missing along the chain count as unadvertised, so the stable
+  # capabilities answer false for the unstable-only paths (fork, providers).
+  #
+  # @rbs initialize_response: ACP::Types::InitializeResponse
+  # @rbs return: bool
+  def advertised?: (ACP::Types::InitializeResponse initialize_response) -> bool
+
+  private
+
+  # @rbs node: untyped
+  # @rbs name: Symbol
+  # @rbs return: untyped
+  def follow: (untyped node, Symbol name) -> untyped
+end

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

@@ -1,4 +1,7 @@
 # Generated from lib/acp/agent_connection/optional_method.rb with RBS::Inline
 
 module ACP::AgentConnection::OptionalMethod
+  SPECS: Array[Spec]
+
+  UNSTABLE_SPECS: Array[Spec]
 end

data/sig/generated/acp/agent_connection.rbs

@@ -15,18 +15,14 @@ class ACP::AgentConnection
 
   @capabilities: ACP::Types::AgentCapabilities
 
-  @transport: ACP::AgentConnection::_Transport
-
-  PROTOCOL_VERSION: Integer
-
-  OPTIONAL: Array[ACP::AgentConnection::_OptionalMethod]
+  @transport: ACP::Transport::_Transport
 
   # 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]
 
-  # @rbs transport: ACP::AgentConnection::_Transport
+  # @rbs transport: ACP::Transport::_Transport
   # @rbs capabilities: ACP::Types::AgentCapabilities
   # @rbs agent_info: ACP::Types::Implementation?
   # @rbs auth_methods: Array[ACP::Types::AuthMethod::t]
@@ -35,7 +31,7 @@ class ACP::AgentConnection
   # @rbs logger: ACP::Transport::_Logger
   # @rbs &factory: (ACP::AgentConnection::Client) -> ACP::AgentConnection::_Agent
   # @rbs return: void
-  def initialize: (transport: ACP::AgentConnection::_Transport, capabilities: ACP::Types::AgentCapabilities, ?agent_info: ACP::Types::Implementation?, ?auth_methods: Array[ACP::Types::AuthMethod::t], ?extension_requests: Hash[String, ^(untyped) -> untyped], ?extension_notifications: Hash[String, ^(untyped) -> void], ?logger: ACP::Transport::_Logger) { (ACP::AgentConnection::Client) -> ACP::AgentConnection::_Agent } -> void
+  def initialize: (transport: ACP::Transport::_Transport, capabilities: ACP::Types::AgentCapabilities, ?agent_info: ACP::Types::Implementation?, ?auth_methods: Array[ACP::Types::AuthMethod::t], ?extension_requests: Hash[String, ^(untyped) -> untyped], ?extension_notifications: Hash[String, ^(untyped) -> void], ?logger: ACP::Transport::_Logger) { (ACP::AgentConnection::Client) -> ACP::AgentConnection::_Agent } -> void
 
   # @rbs return: Thread
   def start: () -> Thread
@@ -44,23 +40,23 @@ class ACP::AgentConnection
 
   # @rbs agent: ACP::AgentConnection::_Agent
   # @rbs client: ACP::AgentConnection::Client
-  # @rbs return: Hash[String, ^(untyped) -> (ACP::AgentConnection::_Response | ACP::RequestError | ACP::Transport::Reply)]
-  def requests: (ACP::AgentConnection::_Agent agent, ACP::AgentConnection::Client client) -> Hash[String, ^(untyped) -> (ACP::AgentConnection::_Response | ACP::RequestError | ACP::Transport::Reply)]
+  # @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)]
 
   # 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::AgentConnection::_Response | ACP::RequestError | ACP::Transport::Reply)]
-  def unstable_requests: (ACP::AgentConnection::_FullAgent full) -> Hash[String, ^(untyped) -> (ACP::AgentConnection::_Response | ACP::RequestError | ACP::Transport::Reply)]
+  # @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)]
 
-  # ForkSession's and the provider methods' advertised? reference the unstable
-  # types, so they can only be probed when the caller opted in with
-  # `require 'acp/types/unstable'`.
+  # 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]
-  def optional_methods: () -> Array[ACP::AgentConnection::_OptionalMethod]
+  # @rbs return: Array[ACP::AgentConnection::OptionalMethod::Spec]
+  def optional_methods: () -> Array[ACP::AgentConnection::OptionalMethod::Spec]
 
   # @rbs agent: ACP::AgentConnection::_Agent
   # @rbs return: Hash[String, ^(untyped) -> void]
@@ -73,10 +69,6 @@ class ACP::AgentConnection
   # @rbs return: void
   def cancel: (ACP::AgentConnection::_Agent agent, untyped params) -> void
 
-  # The unstable gates reference the unstable types, so they can only be
-  # probed when the caller opted in with `require 'acp/types/unstable'`; the
-  # stable McpCapabilities has no acp field at all.
-  #
   # @rbs return: bool
   def mcp_acp_advertised?: () -> bool
 
@@ -89,10 +81,10 @@ class ACP::AgentConnection
 
   # Generated from_h raises on a missing key or a value of the wrong shape.
   #
-  # @rbs type: ACP::AgentConnection::_Parser
-  # @rbs &handle: (untyped) -> (ACP::AgentConnection::_Response | ACP::RequestError | ACP::Transport::Reply)
-  # @rbs return: ^(untyped) -> (ACP::AgentConnection::_Response | ACP::RequestError | ACP::Transport::Reply)
-  def route: (ACP::AgentConnection::_Parser type) { (untyped) -> (ACP::AgentConnection::_Response | ACP::RequestError | ACP::Transport::Reply) } -> ^(untyped) -> (ACP::AgentConnection::_Response | ACP::RequestError | ACP::Transport::Reply)
+  # @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)
+  def route: (ACP::Transport::_Parser type) { (untyped) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply) } -> ^(untyped) -> (ACP::Transport::_Response | ACP::RequestError | ACP::Transport::Reply)
 
   # @rbs client: ACP::AgentConnection::Client
   # @rbs request: ACP::Types::InitializeRequest

data/sig/generated/acp/agent_process.rbs

@@ -1,7 +1,5 @@
 # Generated from lib/acp/agent_process.rb with RBS::Inline
 
-# A child agent process and the ACP::ClientConnection wired to its stdio.
-# Spawn one with ACP::AgentProcess.spawn.
 class ACP::AgentProcess
   @stderr: String?
 
@@ -27,16 +25,9 @@ class ACP::AgentProcess
   # @dynamic connection
   attr_reader connection: ACP::ClientConnection
 
-  # Child stderr captured when spawn was given stderr: :capture, else nil.
-  #
   # @dynamic stderr
   attr_reader stderr: String?
 
-  # Starts a command with args, env and cwd, wires its stdio to a new
-  # ACP::ClientConnection and starts it. With a block, yields the connection
-  # and this process, then terminates the child when the block exits; without
-  # one, returns the process and terminate is the caller's job.
-  #
   # @rbs command: String
   # @rbs *args: String
   # @rbs env: Hash[String, String]?
@@ -48,10 +39,6 @@ class ACP::AgentProcess
   # @rbs return: (untyped | ACP::AgentProcess)
   def self.spawn: (String command, *String args, permission: ACP::ClientConnection::_PermissionHandler, ?env: Hash[String, String]?, ?cwd: String?, ?stderr: :inherit | :capture, ?updates: ACP::ClientConnection::_UpdateHandler) ?{ (ACP::ClientConnection, ACP::AgentProcess) -> untyped } -> (untyped | ACP::AgentProcess)
 
-  # Closes stdin, waits for the child to exit — sending TERM and then KILL if
-  # it will not — and joins the transport reader before closing the pipe it
-  # reads.
-  #
   # @rbs return: void
   def terminate: () -> void