acp-sdk 0.7.0 → 0.8.0

data/lib/acp/types/terminal_exit_status.rb

@@ -26,7 +26,11 @@ class ACP::Types::TerminalExitStatus
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::TerminalExitStatus
   def self.from_h(hash)
-    new(exit_code: hash['exitCode'], signal: hash['signal'], meta: hash['_meta'])
+    new(
+      exit_code: ACP::Types::Check.integer(hash['exitCode'], 'exitCode', min: 0, allow_nil: true),
+      signal: ACP::Types::Check.string(hash['signal'], 'signal', allow_nil: true),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/terminal_output_request.rb

@@ -26,7 +26,11 @@ class ACP::Types::TerminalOutputRequest
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::TerminalOutputRequest
   def self.from_h(hash)
-    new(session_id: hash.fetch('sessionId'), terminal_id: hash.fetch('terminalId'), meta: hash['_meta'])
+    new(
+      session_id: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'sessionId'), 'sessionId'),
+      terminal_id: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'terminalId'), 'terminalId'),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/terminal_output_response.rb

@@ -32,9 +32,14 @@ class ACP::Types::TerminalOutputResponse
   # @rbs return: ACP::Types::TerminalOutputResponse
   def self.from_h(hash)
     new(
-      output: hash.fetch('output'),
-      truncated: hash.fetch('truncated'),
-      exit_status: hash['exitStatus']&.then { |value| ACP::Types::TerminalExitStatus.from_h(value) },
+      output: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'output'), 'output'),
+      truncated: ACP::Types::Check.boolean(ACP::Types::Check.key(hash, 'truncated'), 'truncated'),
+      exit_status: ACP::Types::Check.object(
+        hash['exitStatus'],
+        'exitStatus',
+        ACP::Types::TerminalExitStatus,
+        allow_nil: true
+      ),
       meta: hash['_meta']
     )
   end

data/lib/acp/types/text_content.rb

@@ -27,8 +27,13 @@ class ACP::Types::TextContent
   # @rbs return: ACP::Types::TextContent
   def self.from_h(hash)
     new(
-      annotations: hash['annotations']&.then { |value| ACP::Types::Annotations.from_h(value) },
-      text: hash.fetch('text'),
+      annotations: ACP::Types::Check.object(
+        hash['annotations'],
+        'annotations',
+        ACP::Types::Annotations,
+        allow_nil: true
+      ),
+      text: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'text'), 'text'),
       meta: hash['_meta']
     )
   end

data/lib/acp/types/text_resource_contents.rb

@@ -31,7 +31,12 @@ class ACP::Types::TextResourceContents
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::TextResourceContents
   def self.from_h(hash)
-    new(mime_type: hash['mimeType'], text: hash.fetch('text'), uri: hash.fetch('uri'), meta: hash['_meta'])
+    new(
+      mime_type: ACP::Types::Check.string(hash['mimeType'], 'mimeType', allow_nil: true),
+      text: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'text'), 'text'),
+      uri: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'uri'), 'uri'),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/titled_multi_select_items.rb

@@ -21,7 +21,10 @@ class ACP::Types::TitledMultiSelectItems
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::TitledMultiSelectItems
   def self.from_h(hash)
-    new(any_of: hash.fetch('anyOf').map { |item| ACP::Types::EnumOption.from_h(item) }, meta: hash['_meta'])
+    any_of = ACP::Types::Check.array(ACP::Types::Check.key(hash, 'anyOf'), 'anyOf') do |item, path|
+      ACP::Types::Check.object(item, path, ACP::Types::EnumOption)
+    end
+    new(any_of:, meta: hash['_meta'])
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/tool_call.rb

@@ -72,14 +72,30 @@ class ACP::Types::ToolCall
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::ToolCall
   def self.from_h(hash)
+    content = ACP::Types::Check.array(hash['content'], 'content', allow_nil: true) do |item, path|
+      ACP::Types::Check.object(item, path, ACP::Types::ToolCallContent)
+    end
+    locations = ACP::Types::Check.array(hash['locations'], 'locations', allow_nil: true) do |item, path|
+      ACP::Types::Check.object(item, path, ACP::Types::ToolCallLocation)
+    end
     new(
-      tool_call_id: hash.fetch('toolCallId'),
-      title: hash.fetch('title'),
-      name: hash['name'],
-      kind: hash['kind'],
-      status: hash['status'],
-      content: hash['content']&.map { |item| ACP::Types::ToolCallContent.from_h(item) },
-      locations: hash['locations']&.map { |item| ACP::Types::ToolCallLocation.from_h(item) },
+      tool_call_id: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'toolCallId'), 'toolCallId'),
+      title: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'title'), 'title'),
+      name: ACP::Types::Check.string(hash['name'], 'name', allow_nil: true),
+      kind: ACP::Types::Check.enum(
+        hash['kind'],
+        'kind',
+        %w[read edit delete move search execute think fetch switch_mode other],
+        allow_nil: true
+      ),
+      status: ACP::Types::Check.enum(
+        hash['status'],
+        'status',
+        %w[pending in_progress completed failed],
+        allow_nil: true
+      ),
+      content:,
+      locations:,
       raw_input: hash['rawInput'],
       raw_output: hash['rawOutput'],
       meta: hash['_meta']

data/lib/acp/types/tool_call_content/content.rb

@@ -21,7 +21,10 @@ class ACP::Types::ToolCallContent::Content
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::ToolCallContent::Content
   def self.from_h(hash)
-    new(content: ACP::Types::ContentBlock.from_h(hash.fetch('content')), meta: hash['_meta'])
+    new(
+      content: ACP::Types::Check.object(ACP::Types::Check.key(hash, 'content'), 'content', ACP::Types::ContentBlock),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/tool_call_content/diff.rb

@@ -31,7 +31,12 @@ class ACP::Types::ToolCallContent::Diff
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::ToolCallContent::Diff
   def self.from_h(hash)
-    new(path: hash.fetch('path'), old_text: hash['oldText'], new_text: hash.fetch('newText'), meta: hash['_meta'])
+    new(
+      path: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'path'), 'path'),
+      old_text: ACP::Types::Check.string(hash['oldText'], 'oldText', allow_nil: true),
+      new_text: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'newText'), 'newText'),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/tool_call_content/terminal.rb

@@ -21,7 +21,10 @@ class ACP::Types::ToolCallContent::Terminal
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::ToolCallContent::Terminal
   def self.from_h(hash)
-    new(terminal_id: hash.fetch('terminalId'), meta: hash['_meta'])
+    new(
+      terminal_id: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'terminalId'), 'terminalId'),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/tool_call_location.rb

@@ -26,7 +26,11 @@ class ACP::Types::ToolCallLocation
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::ToolCallLocation
   def self.from_h(hash)
-    new(path: hash.fetch('path'), line: hash['line'], meta: hash['_meta'])
+    new(
+      path: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'path'), 'path'),
+      line: ACP::Types::Check.integer(hash['line'], 'line', min: 0, allow_nil: true),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/tool_call_update.rb

@@ -72,14 +72,30 @@ class ACP::Types::ToolCallUpdate
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::ToolCallUpdate
   def self.from_h(hash)
+    content = ACP::Types::Check.array(hash['content'], 'content', allow_nil: true) do |item, path|
+      ACP::Types::Check.object(item, path, ACP::Types::ToolCallContent)
+    end
+    locations = ACP::Types::Check.array(hash['locations'], 'locations', allow_nil: true) do |item, path|
+      ACP::Types::Check.object(item, path, ACP::Types::ToolCallLocation)
+    end
     new(
-      tool_call_id: hash.fetch('toolCallId'),
-      kind: hash['kind'],
-      status: hash['status'],
-      title: hash['title'],
-      name: hash['name'],
-      content: hash['content']&.map { |item| ACP::Types::ToolCallContent.from_h(item) },
-      locations: hash['locations']&.map { |item| ACP::Types::ToolCallLocation.from_h(item) },
+      tool_call_id: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'toolCallId'), 'toolCallId'),
+      kind: ACP::Types::Check.enum(
+        hash['kind'],
+        'kind',
+        %w[read edit delete move search execute think fetch switch_mode other],
+        allow_nil: true
+      ),
+      status: ACP::Types::Check.enum(
+        hash['status'],
+        'status',
+        %w[pending in_progress completed failed],
+        allow_nil: true
+      ),
+      title: ACP::Types::Check.string(hash['title'], 'title', allow_nil: true),
+      name: ACP::Types::Check.string(hash['name'], 'name', allow_nil: true),
+      content:,
+      locations:,
       raw_input: hash['rawInput'],
       raw_output: hash['rawOutput'],
       meta: hash['_meta']

data/lib/acp/types/unstructured_command_input.rb

@@ -21,7 +21,7 @@ class ACP::Types::UnstructuredCommandInput
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::UnstructuredCommandInput
   def self.from_h(hash)
-    new(hint: hash.fetch('hint'), meta: hash['_meta'])
+    new(hint: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'hint'), 'hint'), meta: hash['_meta'])
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/usage_update.rb

@@ -32,9 +32,9 @@ class ACP::Types::UsageUpdate
   # @rbs return: ACP::Types::UsageUpdate
   def self.from_h(hash)
     new(
-      used: hash.fetch('used'),
-      size: hash.fetch('size'),
-      cost: hash['cost']&.then { |value| ACP::Types::Cost.from_h(value) },
+      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

data/lib/acp/types/wait_for_terminal_exit_request.rb

@@ -26,7 +26,11 @@ class ACP::Types::WaitForTerminalExitRequest
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::WaitForTerminalExitRequest
   def self.from_h(hash)
-    new(session_id: hash.fetch('sessionId'), terminal_id: hash.fetch('terminalId'), meta: hash['_meta'])
+    new(
+      session_id: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'sessionId'), 'sessionId'),
+      terminal_id: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'terminalId'), 'terminalId'),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/wait_for_terminal_exit_response.rb

@@ -26,7 +26,11 @@ class ACP::Types::WaitForTerminalExitResponse
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::WaitForTerminalExitResponse
   def self.from_h(hash)
-    new(exit_code: hash['exitCode'], signal: hash['signal'], meta: hash['_meta'])
+    new(
+      exit_code: ACP::Types::Check.integer(hash['exitCode'], 'exitCode', min: 0, allow_nil: true),
+      signal: ACP::Types::Check.string(hash['signal'], 'signal', allow_nil: true),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/write_text_file_request.rb

@@ -32,9 +32,9 @@ class ACP::Types::WriteTextFileRequest
   # @rbs return: ACP::Types::WriteTextFileRequest
   def self.from_h(hash)
     new(
-      session_id: hash.fetch('sessionId'),
-      path: hash.fetch('path'),
-      content: hash.fetch('content'),
+      session_id: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'sessionId'), 'sessionId'),
+      path: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'path'), 'path'),
+      content: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'content'), 'content'),
       meta: hash['_meta']
     )
   end

data/lib/acp/types.rb

@@ -1,4 +1,251 @@
 # 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
+  end
 end

data/lib/acp/version.rb

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

data/sig/generated/acp/client_connection.rbs

@@ -19,12 +19,18 @@ class ACP::ClientConnection
 
   @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
 
   @fs_capabilities: ACP::Types::FileSystemCapabilities?
 
   @terminal: bool?
 
+  @elicitation_capabilities: ACP::Types::ElicitationCapabilities?
+
   @extension_requests: Hash[String, ^(untyped) -> untyped]
 
   @extension_notifications: Hash[String, ^(untyped) -> void]
@@ -35,6 +41,8 @@ class ACP::ClientConnection
 
   @pending_permissions: Hash[String, Array[Thread::Queue]]
 
+  @outstanding_elicitations: Hash[String, bool]
+
   @logger: ACP::Transport::_Logger
 
   PROTOCOL_VERSION: Integer
@@ -53,12 +61,15 @@ class ACP::ClientConnection
   #   (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 extension_requests: Hash[String, ^(untyped) -> untyped]
   # @rbs extension_notifications: Hash[String, ^(untyped) -> void]
   # @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))?, ?updates: ACP::ClientConnection::_UpdateHandler, ?extension_requests: Hash[String, ^(untyped) -> untyped], ?extension_notifications: Hash[String, ^(untyped) -> void], ?logger: ACP::Transport::_Logger) -> 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, ?extension_requests: Hash[String, ^(untyped) -> untyped], ?extension_notifications: Hash[String, ^(untyped) -> void], ?logger: ACP::Transport::_Logger) -> void
 
   # @rbs return: Thread
   def start: () -> Thread
@@ -226,6 +237,26 @@ class ACP::ClientConnection
   # @rbs return: (ACP::Types::ReleaseTerminalResponse | ACP::RequestError)
   def release_terminal: (untyped params) -> (ACP::Types::ReleaseTerminalResponse | ACP::RequestError)
 
+  # The routes are 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?
@@ -238,4 +269,11 @@ class ACP::ClientConnection
   # @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]
 end

data/sig/generated/acp/request_error.rbs

@@ -48,8 +48,9 @@ class ACP::RequestError
   # @rbs return: ACP::RequestError
   def self.method_not_found: (?String? method) -> ACP::RequestError
 
+  # @rbs errors: Array[String]?
   # @rbs return: ACP::RequestError
-  def self.invalid_params: () -> 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
@@ -59,6 +60,16 @@ class ACP::RequestError
   # @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.
+  #
+  # @rbs mode: String
+  # @rbs return: ACP::RequestError
+  def self.unadvertised_mode: (String mode) -> ACP::RequestError
+
   # @rbs return: ACP::RequestError
   def self.internal_error: () -> ACP::RequestError