acp-sdk 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 367678f3b99c82b2f768879be0308249d9b32ce8ce94c3d4e6de6c12c4a1c043
-  data.tar.gz: 071e457b8e00fa19be760fff65cfd69998102e54b4b3d47f9b3cc0d80c359fc3
+  metadata.gz: e0b8b181c4cbd41a411868aecdf9f34d0356b490526c446a962287a5a3ae01cc
+  data.tar.gz: 1376e6d42bc4369de51a645ed423a563e7aa9b35c4c49b060c77a983cb2c603c
 SHA512:
-  metadata.gz: 706206bd29062ef6ecf1856b9e9671113e02bb6eb6ac837c2815bfcdbbff4bc07ac8d2c6394ec6f7b33c37a3832a9e0c4bb5c4e5c4699c1cdc129e875f693605
-  data.tar.gz: 5a73a945d099dedcf5837aa1c897b1dca0313a49d131337756b26c28731ddedb14b96c21722c7d6ecff3a21e6bed811e036551724c12bebcdf53f88a56121f8e
+  metadata.gz: 6c5d6271be17f17e203c178664ad6de2234c4b1a7b1857663c1ebb20bdbe1fa3c282db70ac6fe3c3e6b9647dfaadbe761bd018972943393a0cb3dec3d10bb2a3
+  data.tar.gz: 9ca3cae203c38496096dd020403054daaa4cb6797183c95b04a75c045f4a8aff89754a07af0fd74eb4c2a45f48dbc6d7c64352faf572000f118130d473283f0b

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.8.0](https://github.com/bottrall/acp-sdk/compare/v0.7.0...v0.8.0) (2026-10-06)
+
+
+### Features
+
+* elicitation handlers on ACP::ClientConnection ([#78](https://github.com/bottrall/acp-sdk/issues/78)) ([94ee653](https://github.com/bottrall/acp-sdk/commit/94ee65374a0b463ccbd7ed57e05fe1ad76b08a62))
+
+
+### Bug Fixes
+
+* validate primitive and enum types when parsing params ([#79](https://github.com/bottrall/acp-sdk/issues/79)) ([624be63](https://github.com/bottrall/acp-sdk/commit/624be63f667468fba7c1a61064b84f43c226b060))
+
+## [0.7.0](https://github.com/bottrall/acp-sdk/compare/v0.6.0...v0.7.0) (2026-10-05)
+
+
+### Features
+
+* terminal handlers on ACP::ClientConnection ([#77](https://github.com/bottrall/acp-sdk/issues/77)) ([8a42829](https://github.com/bottrall/acp-sdk/commit/8a428295d5cd7c92b56ec1b3ed1c900b485bbf01)), closes [#40](https://github.com/bottrall/acp-sdk/issues/40)
+
+
+### Bug Fixes
+
+* attach data to method-not-found and invalid-request replies ([#75](https://github.com/bottrall/acp-sdk/issues/75)) ([9bc201c](https://github.com/bottrall/acp-sdk/commit/9bc201c53d86f506bedb5b49183b865cf9b8f4fe)), closes [#29](https://github.com/bottrall/acp-sdk/issues/29)
+* don't send handler exception messages to the peer ([#74](https://github.com/bottrall/acp-sdk/issues/74)) ([af66b48](https://github.com/bottrall/acp-sdk/commit/af66b48cbab4a99244c28a9c6f6a12c9ea23efc7)), closes [#28](https://github.com/bottrall/acp-sdk/issues/28)
+
 ## [0.6.0](https://github.com/bottrall/acp-sdk/compare/v0.5.0...v0.6.0) (2026-10-04)
 
 

data/README.md

@@ -49,7 +49,8 @@ connection.start.join
 The agent's contract:
 
 - It defines `new_session`, `prompt` and `cancel`. `load_session`, `list_sessions`, `resume_session`, `close_session` and `delete_session` are required only when `capabilities` advertises `load_session` or `session_capabilities.list`, `.resume`, `.close` or `.delete`, and `authenticate` only when `auth_methods` is non-empty, and `logout` only when `capabilities` advertises `auth.logout`; `start` raises `ArgumentError` when one is advertised but missing, and a method that is not advertised is answered with `-32601`. `change_session_mode` and `change_session_config_option` are optional, since modes and config options are offered per session rather than in `initialize`; `session/set_mode` and `session/set_config_option` are answered with `-32601` when the agent does not define them. `session_created`, if defined, runs right after the `session/new` reply is sent.
-- Each request method returns its response type or an `ACP::RequestError`, which is sent as the error reply. Params that do not match the schema are answered with `-32602` before the agent sees them.
+- Each request method returns its response type or an `ACP::RequestError`, which is sent as the error reply. Params that do not match the schema are answered with `-32602` before the agent sees them, with `data` naming the failing path, e.g. `{ errors: ['sessionId: expected String, got Integer'] }`.
+- A handler that raises is answered with `-32603` and the message `Internal error`. Nothing from the exception reaches the peer — its class and message are logged to the transport's logger instead, since messages can interpolate paths, queries or credentials. Return an `ACP::RequestError` from the handler when the peer should see a real error message.
 - `cancel` runs on the transport's reader thread, so it must return quickly: set a flag and let the prompt notice it.
 - After a cancel, the agent must itself end the turn with `stopReason: cancelled`. `ACP::AgentConnection` does not enforce it.
 - `client.capabilities` is `nil` until the client sends `initialize`.
@@ -63,7 +64,7 @@ Extensions are `_`-prefixed methods outside the spec. `AgentConnection` takes `e
 
 ## Driving an agent
 
-`ACP::ClientConnection` is the other side of the same transport. Each method takes the request's generated `ACP::Types` object and returns its response type or the agent's `ACP::RequestError`. `connect` sends `initialize`, since Ruby reserves that name for the constructor, and `authenticate` and `logout` send their namesake methods. `session_set_mode` sends `session/set_mode`, and `session_set_config_option` sends `session/set_config_option` and returns the session's complete option list, which replaces any state held from an earlier reply.
+`ACP::ClientConnection` is the other side of the same transport. Each method takes the request's generated `ACP::Types` object and returns its response type or the agent's `ACP::RequestError`. `connect` sends `initialize`, since Ruby reserves that name for the constructor, and `authenticate` and `logout` send their namesake methods. `session_set_mode` sends `session/set_mode`, and `session_set_config_option` sends `session/set_config_option` and returns the session's complete option list, which replaces any state held from an earlier reply. A handler that raises is answered with `-32603` and the message `Internal error`, and the exception is only logged to the transport's logger.
 
 `ACP::AgentProcess.spawn` starts a command with args, env and cwd, wires its stdio to a new `ACP::ClientConnection` and starts it. The block receives the connection and the process handle (`pid`, plus `stderr` when captured), and the child is terminated — after its stdin is closed, with TERM and then KILL if it will not exit — when the block exits, so a raised block cannot leak the process. Without a block, `spawn` returns the process and calling `terminate` is yours. `stderr` is `:inherit` by default, so the child writes to your stderr; pass `:capture` to collect it on the process instead.
 
@@ -105,6 +106,8 @@ connection = ACP::ClientConnection.new(
 - `session_prompt` and `session_load` yield the session's updates on the calling thread as they arrive and return once the agent replies. Updates outside those calls, such as the available commands after `session/new`, go to `updates`, which runs on the reader thread and must return quickly. `session_resume` does not take a block: the agent must not replay history on resume, so unlike `session_load` there is nothing to stream. `session_close` and `session_delete` end the session, discarding it on the agent, and return once the agent replies.
 - `permission` answers `session/request_permission` with an `ACP::Types::RequestPermissionResponse` or an `ACP::RequestError`. It runs on its own thread, so it may block while the user decides, and `session_cancel` can be sent meanwhile.
 - `read_text_file` and `write_text_file` answer the agent's `fs/read_text_file` and `fs/write_text_file` with an `ACP::Types::ReadTextFileResponse`, an `ACP::Types::WriteTextFileResponse` or an `ACP::RequestError`. They are routed by the `fs` capabilities `connect` sends: a method the client does not advertise is answered with `-32601` without reaching the handler, and `connect` raises `ArgumentError` — before sending `initialize` — when the request advertises a capability that has no handler.
+- `create_terminal`, `terminal_output`, `wait_for_terminal_exit`, `kill_terminal` and `release_terminal` answer the agent's `terminal/create`, `terminal/output`, `terminal/wait_for_exit`, `terminal/kill` and `terminal/release` with the matching `ACP::Types` response or an `ACP::RequestError`. They are routed by the `terminal` capability `connect` sends, the same way as `fs`: a method the client does not advertise is answered with `-32601` without reaching the handler, and `connect` raises `ArgumentError` — before sending `initialize` — when the request advertises `terminal` with any of the five missing. The transport serves each request on its own thread, so `wait_for_terminal_exit` may block without holding up the others.
+- `elicitation` answers the agent's `elicitation/create` with an `ACP::Types::CreateElicitationResponse` or an `ACP::RequestError`, serving both form and url mode, and `complete_elicitation` receives the agent's `elicitation/complete` notification. They are routed by the `elicitation` capabilities `connect` sends: a request whose mode the client does not advertise is answered with `-32602` without reaching the handler, and `connect` raises `ArgumentError` — before sending `initialize` — when the request advertises `elicitation.form` or `elicitation.url` with no `elicitation` handler. The client tracks the elicitation ids of the url-mode requests it serves, so a completion for an unknown or already-completed id is ignored. `complete_elicitation` runs on the reader thread and must return quickly; it may be omitted, in which case completions are only tracked.
 
 Extensions work the same way in both directions: `extension_requests` and `extension_notifications` are hashes keyed by the raw `_`-prefixed wire name, `ext_request` sends one to the agent and returns its result as-is, and `ext_notify` sends an extension notification. A handler name without the `_` prefix raises `ArgumentError`, and an extension request nothing answers gets `-32601`.
 

data/lib/acp/agent_connection/client.rb

@@ -136,7 +136,7 @@ class ACP::AgentConnection::Client
     return result if result.is_a?(ACP::RequestError)
 
     type.from_h(result)
-  rescue KeyError, TypeError, NoMethodError
+  rescue ACP::Types::ParseError, KeyError, TypeError, NoMethodError
     ACP::RequestError.invalid_response(result)
   end
 

data/lib/acp/agent_connection.rb

@@ -117,7 +117,7 @@ class ACP::AgentConnection
   # @rbs return: void
   def cancel(agent, params)
     notification = ACP::Types::CancelNotification.from_h(params)
-  rescue KeyError, TypeError, NoMethodError => e
+  rescue ACP::Types::ParseError, KeyError, TypeError, NoMethodError => e
     @logger.warn("dropped malformed session/cancel: #{e.class}: #{e.message}")
   else
     agent.cancel(notification)
@@ -131,6 +131,8 @@ class ACP::AgentConnection
   def route(type, &)
     lambda do |params|
       request = type.from_h(params)
+    rescue ACP::Types::ParseError => e
+      ACP::RequestError.invalid_params([e.message])
     rescue KeyError, TypeError, NoMethodError
       ACP::RequestError.invalid_params
     else

data/lib/acp/client_connection.rb

@@ -5,13 +5,25 @@ class ACP::ClientConnection
   # @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_capabilities: ACP::Types::FileSystemCapabilities?
+  # @rbs @terminal: bool?
+  # @rbs @elicitation_capabilities: ACP::Types::ElicitationCapabilities?
   # @rbs @extension_requests: Hash[String, ^(untyped) -> untyped]
   # @rbs @extension_notifications: Hash[String, ^(untyped) -> void]
   # @rbs @lock: Thread::Mutex
   # @rbs @streams: Hash[String, Thread::Queue]
   # @rbs @pending_permissions: Hash[String, Array[Thread::Queue]]
+  # @rbs @outstanding_elicitations: Hash[String, bool]
   # @rbs @logger: ACP::Transport::_Logger
 
   PROTOCOL_VERSION = ACP::AgentConnection::PROTOCOL_VERSION #: Integer
@@ -26,6 +38,15 @@ class ACP::ClientConnection
   # @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 extension_requests: Hash[String, ^(untyped) -> untyped]
   # @rbs extension_notifications: Hash[String, ^(untyped) -> void]
@@ -36,6 +57,13 @@ class ACP::ClientConnection
     permission:,
     read_text_file: nil,
     write_text_file: nil,
+    create_terminal: nil,
+    terminal_output: nil,
+    wait_for_terminal_exit: nil,
+    kill_terminal: nil,
+    release_terminal: nil,
+    elicitation: nil,
+    complete_elicitation: nil,
     updates: IGNORE,
     extension_requests: {},
     extension_notifications: {},
@@ -45,8 +73,17 @@ class ACP::ClientConnection
     @permission = permission
     @read_text_file = read_text_file
     @write_text_file = write_text_file
+    @create_terminal = create_terminal
+    @terminal_output = terminal_output
+    @wait_for_terminal_exit = wait_for_terminal_exit
+    @kill_terminal = kill_terminal
+    @release_terminal = release_terminal
+    @elicitation = elicitation
+    @complete_elicitation = complete_elicitation
     @updates = updates
     @fs_capabilities = nil
+    @terminal = nil
+    @elicitation_capabilities = nil
     @extension_requests = extension_requests
     @extension_notifications = extension_notifications
     extension_requests.each_key { |name| ACP::Extensions.validate_name(name) }
@@ -54,6 +91,7 @@ class ACP::ClientConnection
     @lock = Mutex.new
     @streams = {}
     @pending_permissions = {}
+    @outstanding_elicitations = {}
     @logger = logger
   end
 
@@ -63,9 +101,16 @@ class ACP::ClientConnection
       requests: {
         'session/request_permission' => method(:request_permission),
         'fs/read_text_file' => method(:read_text_file),
-        'fs/write_text_file' => method(:write_text_file)
+        'fs/write_text_file' => method(:write_text_file),
+        'terminal/create' => method(:create_terminal),
+        'terminal/output' => method(:terminal_output),
+        'terminal/wait_for_exit' => method(:wait_for_terminal_exit),
+        'terminal/kill' => method(:kill_terminal),
+        'terminal/release' => method(:release_terminal),
+        'elicitation/create' => method(:create_elicitation)
       }.merge(@extension_requests),
-      notifications: { 'session/update' => method(:dispatch) }.merge(@extension_notifications)
+      notifications: { 'session/update' => method(:dispatch),
+                       'elicitation/complete' => method(:complete_elicitation) }.merge(@extension_notifications)
     )
   end
 
@@ -81,7 +126,21 @@ class ACP::ClientConnection
       raise ArgumentError, "initialize advertises fs methods no handler serves: #{unserved.join(', ')}"
     end
 
+    terminal = request.client_capabilities&.terminal
+    unserved = unserved_terminal_methods(terminal)
+    unless unserved.empty?
+      raise ArgumentError, "initialize advertises terminal methods no handler serves: #{unserved.join(', ')}"
+    end
+
+    elicitation = request.client_capabilities&.elicitation
+    unserved = unserved_elicitation_modes(elicitation)
+    unless unserved.empty?
+      raise ArgumentError, "initialize advertises elicitation modes no handler serves: #{unserved.join(', ')}"
+    end
+
     @fs_capabilities = capabilities
+    @terminal = terminal
+    @elicitation_capabilities = elicitation
     parse(ACP::Types::InitializeResponse, @transport.request('initialize', request.to_h)).then do |response|
       next response if response.is_a?(ACP::RequestError)
 
@@ -210,7 +269,7 @@ class ACP::ClientConnection
     return result if result.is_a?(ACP::RequestError)
 
     type.from_h(result)
-  rescue KeyError, TypeError, NoMethodError
+  rescue ACP::Types::ParseError, KeyError, TypeError, NoMethodError
     ACP::RequestError.invalid_response(result)
   end
 
@@ -259,7 +318,7 @@ class ACP::ClientConnection
   # @rbs return: void
   def dispatch(params)
     notification = ACP::Types::SessionNotification.from_h(params)
-  rescue KeyError, TypeError, NoMethodError => e
+  rescue ACP::Types::ParseError, KeyError, TypeError, NoMethodError => e
     @logger.warn("dropped malformed session/update: #{e.class}: #{e.message}")
   else
     queue = @lock.synchronize { @streams[notification.session_id]&.push(notification.update) }
@@ -274,6 +333,8 @@ class ACP::ClientConnection
   # @rbs return: (ACP::Types::RequestPermissionResponse | ACP::RequestError)
   def request_permission(params)
     request = ACP::Types::RequestPermissionRequest.from_h(params)
+  rescue ACP::Types::ParseError => e
+    ACP::RequestError.invalid_params([e.message])
   rescue KeyError, TypeError, NoMethodError
     ACP::RequestError.invalid_params
   else
@@ -327,6 +388,8 @@ class ACP::ClientConnection
     return ACP::RequestError.unadvertised('fs.readTextFile') unless @fs_capabilities&.read_text_file
 
     request = ACP::Types::ReadTextFileRequest.from_h(params)
+  rescue ACP::Types::ParseError => e
+    ACP::RequestError.invalid_params([e.message])
   rescue KeyError, TypeError, NoMethodError
     ACP::RequestError.invalid_params
   else
@@ -341,6 +404,8 @@ class ACP::ClientConnection
     return ACP::RequestError.unadvertised('fs.writeTextFile') unless @fs_capabilities&.write_text_file
 
     request = ACP::Types::WriteTextFileRequest.from_h(params)
+  rescue ACP::Types::ParseError => e
+    ACP::RequestError.invalid_params([e.message])
   rescue KeyError, TypeError, NoMethodError
     ACP::RequestError.invalid_params
   else
@@ -349,6 +414,130 @@ class ACP::ClientConnection
     handler.call(request)
   end
 
+  # 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(params)
+    return ACP::RequestError.unadvertised('terminal') unless @terminal
+
+    request = ACP::Types::CreateTerminalRequest.from_h(params)
+  rescue KeyError, TypeError, NoMethodError
+    ACP::RequestError.invalid_params
+  else
+    # Safe: connect refuses an advertised capability no handler serves.
+    handler = @create_terminal #: ^(ACP::Types::CreateTerminalRequest) -> (ACP::Types::CreateTerminalResponse | ACP::RequestError)
+    handler.call(request)
+  end
+
+  # @rbs params: untyped
+  # @rbs return: (ACP::Types::TerminalOutputResponse | ACP::RequestError)
+  def terminal_output(params)
+    return ACP::RequestError.unadvertised('terminal') unless @terminal
+
+    request = ACP::Types::TerminalOutputRequest.from_h(params)
+  rescue KeyError, TypeError, NoMethodError
+    ACP::RequestError.invalid_params
+  else
+    # Safe: connect refuses an advertised capability no handler serves.
+    handler = @terminal_output #: ^(ACP::Types::TerminalOutputRequest) -> (ACP::Types::TerminalOutputResponse | ACP::RequestError)
+    handler.call(request)
+  end
+
+  # 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(params)
+    return ACP::RequestError.unadvertised('terminal') unless @terminal
+
+    request = ACP::Types::WaitForTerminalExitRequest.from_h(params)
+  rescue KeyError, TypeError, NoMethodError
+    ACP::RequestError.invalid_params
+  else
+    # Safe: connect refuses an advertised capability no handler serves.
+    handler = @wait_for_terminal_exit #: ^(ACP::Types::WaitForTerminalExitRequest) -> (ACP::Types::WaitForTerminalExitResponse | ACP::RequestError)
+    handler.call(request)
+  end
+
+  # @rbs params: untyped
+  # @rbs return: (ACP::Types::KillTerminalResponse | ACP::RequestError)
+  def kill_terminal(params)
+    return ACP::RequestError.unadvertised('terminal') unless @terminal
+
+    request = ACP::Types::KillTerminalRequest.from_h(params)
+  rescue KeyError, TypeError, NoMethodError
+    ACP::RequestError.invalid_params
+  else
+    # Safe: connect refuses an advertised capability no handler serves.
+    handler = @kill_terminal #: ^(ACP::Types::KillTerminalRequest) -> (ACP::Types::KillTerminalResponse | ACP::RequestError)
+    handler.call(request)
+  end
+
+  # @rbs params: untyped
+  # @rbs return: (ACP::Types::ReleaseTerminalResponse | ACP::RequestError)
+  def release_terminal(params)
+    return ACP::RequestError.unadvertised('terminal') unless @terminal
+
+    request = ACP::Types::ReleaseTerminalRequest.from_h(params)
+  rescue KeyError, TypeError, NoMethodError
+    ACP::RequestError.invalid_params
+  else
+    # Safe: connect refuses an advertised capability no handler serves.
+    handler = @release_terminal #: ^(ACP::Types::ReleaseTerminalRequest) -> (ACP::Types::ReleaseTerminalResponse | ACP::RequestError)
+    handler.call(request)
+  end
+
+  # 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(params)
+    request = ACP::Types::CreateElicitationRequest.from_h(params)
+  rescue KeyError, TypeError, NoMethodError
+    ACP::RequestError.invalid_params
+  else
+    case request.mode
+    when ACP::Types::CreateElicitationRequest::Mode::Form
+      return ACP::RequestError.unadvertised_mode('elicitation.form') unless @elicitation_capabilities&.form
+    when ACP::Types::CreateElicitationRequest::Mode::Url
+      return ACP::RequestError.unadvertised_mode('elicitation.url') unless @elicitation_capabilities&.url
+
+      register_elicitation(request.mode.elicitation_id)
+    else
+      return ACP::RequestError.unadvertised_mode("elicitation.#{request.mode['mode']}")
+    end
+
+    # Safe: connect refuses an advertised mode no handler serves.
+    handler = @elicitation #: ^(ACP::Types::CreateElicitationRequest) -> (ACP::Types::CreateElicitationResponse | ACP::RequestError)
+    handler.call(request)
+  end
+
+  # 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(params)
+    notification = ACP::Types::CompleteElicitationNotification.from_h(params)
+  rescue KeyError, TypeError, NoMethodError => e
+    @logger.warn("dropped malformed elicitation/complete: #{e.class}: #{e.message}")
+  else
+    known = @lock.synchronize { @outstanding_elicitations.delete(notification.elicitation_id) }
+    @complete_elicitation&.call(notification) if known
+  end
+
+  # @rbs elicitation_id: String
+  # @rbs return: void
+  def register_elicitation(elicitation_id)
+    @lock.synchronize { @outstanding_elicitations[elicitation_id] = true }
+  end
+
   # The fs capabilities initialize advertises that no injected handler serves.
   #
   # @rbs capabilities: ACP::Types::FileSystemCapabilities?
@@ -359,4 +548,31 @@ class ACP::ClientConnection
       'fs.writeTextFile' => capabilities&.write_text_file && !@write_text_file
     }.select { |_, unserved| unserved }.keys
   end
+
+  # The terminal capabilities initialize advertises that no injected handler
+  # serves.
+  #
+  # @rbs capabilities: bool?
+  # @rbs return: Array[String]
+  def unserved_terminal_methods(capabilities)
+    {
+      'terminal.create' => capabilities && !@create_terminal,
+      'terminal.output' => capabilities && !@terminal_output,
+      'terminal.wait_for_exit' => capabilities && !@wait_for_terminal_exit,
+      'terminal.kill' => capabilities && !@kill_terminal,
+      'terminal.release' => capabilities && !@release_terminal
+    }.select { |_, unserved| unserved }.keys
+  end
+
+  # The elicitation capabilities initialize advertises that no injected
+  # handler serves.
+  #
+  # @rbs capabilities: ACP::Types::ElicitationCapabilities?
+  # @rbs return: Array[String]
+  def unserved_elicitation_modes(capabilities)
+    {
+      'elicitation.form' => capabilities&.form && !@elicitation,
+      'elicitation.url' => capabilities&.url && !@elicitation
+    }.select { |_, unserved| unserved }.keys
+  end
 end

data/lib/acp/request_error.rb

@@ -48,14 +48,16 @@ class ACP::RequestError
     new(code: INVALID_REQUEST, message: 'Invalid request')
   end
 
+  # @rbs method: String?
   # @rbs return: ACP::RequestError
-  def self.method_not_found
-    new(code: METHOD_NOT_FOUND, message: 'Method not found')
+  def self.method_not_found(method = nil)
+    new(code: METHOD_NOT_FOUND, message: 'Method not found', data: method && { method: method })
   end
 
+  # @rbs errors: Array[String]?
   # @rbs return: ACP::RequestError
-  def self.invalid_params
-    new(code: INVALID_PARAMS, message: 'Invalid params')
+  def self.invalid_params(errors = nil)
+    new(code: INVALID_PARAMS, message: 'Invalid params', data: errors && { errors: errors })
   end
 
   # The method-not-found code for a method the client's capabilities do not
@@ -68,6 +70,18 @@ class ACP::RequestError
     new(code: METHOD_NOT_FOUND, message: "Client does not advertise #{capability}")
   end
 
+  # 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(mode)
+    new(code: INVALID_PARAMS, message: "Client does not advertise #{mode}")
+  end
+
   # @rbs return: ACP::RequestError
   def self.internal_error
     new(code: INTERNAL_ERROR, message: 'Internal error')

data/lib/acp/transport/stdio.rb

@@ -92,7 +92,7 @@ class ACP::Transport::Stdio
     method = message['method']
     error = message['error']
     if method.is_a?(String) && message.key?('id')
-      serve(requests[method], message['id'], message['params'])
+      serve(requests[method], message['id'], message['params'], method)
     elsif method.is_a?(String)
       # Run on the reader thread so notifications (session/update) keep their
       # order; a JSON-RPC notification has no reply to carry a handler error.
@@ -104,10 +104,21 @@ class ACP::Transport::Stdio
       code, text, data = error.values_at('code', 'message', 'data')
       settle(message['id'], ACP::RequestError.new(code:, message: text, data:))
     else
-      reply(nil, ACP::RequestError.invalid_request)
+      reply(detectable_id(message), ACP::RequestError.invalid_request)
     end
   end
 
+  # JSON-RPC 2.0 says an error reply echoes the request id whenever it can be
+  # detected; ids outside the spec's String/Number/Null types are not, so
+  # those replies keep id null.
+  #
+  # @rbs message: Hash[String, untyped]
+  # @rbs return: untyped
+  def detectable_id(message)
+    id = message['id']
+    id.is_a?(String) || id.is_a?(Numeric) ? id : nil
+  end
+
   # @rbs line: String
   # @rbs return: Hash[String, untyped] | ACP::RequestError
   def parse(line)
@@ -122,10 +133,11 @@ class ACP::Transport::Stdio
   # @rbs handler: _Handler?
   # @rbs id: untyped
   # @rbs params: untyped
+  # @rbs method: String
   # @rbs return: void
-  def serve(handler, id, params)
+  def serve(handler, id, params, method)
     Thread.new do
-      outcome = handler ? invoke(handler, params) : ACP::RequestError.method_not_found
+      outcome = handler ? invoke(handler, params) : ACP::RequestError.method_not_found(method)
       case outcome
       when ACP::Transport::Reply
         reply(id, outcome.result)
@@ -149,7 +161,9 @@ class ACP::Transport::Stdio
   end
 
   # Handlers are application code at the protocol boundary: an exception
-  # becomes an error response instead of killing the thread serving it.
+  # becomes an error response instead of killing the thread serving it. The
+  # exception is only logged, not sent: its message can carry paths, SQL or
+  # anything else the handler interpolated, which must not reach the peer.
   #
   # @rbs handler: _Handler
   # @rbs params: untyped
@@ -157,7 +171,8 @@ class ACP::Transport::Stdio
   def invoke(handler, params)
     handler.call(params)
   rescue StandardError => e
-    ACP::RequestError.new(code: ACP::RequestError::INTERNAL_ERROR, message: e.message)
+    @logger.error("request handler raised #{e.class}: #{e.message}")
+    ACP::RequestError.internal_error
   end
 
   # The success arm is whatever the handler returned, which the transport only

data/lib/acp/types/agent_auth_capabilities.rb

@@ -21,7 +21,10 @@ class ACP::Types::AgentAuthCapabilities
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::AgentAuthCapabilities
   def self.from_h(hash)
-    new(logout: hash['logout']&.then { |value| ACP::Types::LogoutCapabilities.from_h(value) }, meta: hash['_meta'])
+    new(
+      logout: ACP::Types::Check.object(hash['logout'], 'logout', ACP::Types::LogoutCapabilities, allow_nil: true),
+      meta: hash['_meta']
+    )
   end
 
   # @rbs return: Hash[String, untyped]

data/lib/acp/types/agent_capabilities.rb

@@ -49,11 +49,26 @@ class ACP::Types::AgentCapabilities
   # @rbs return: ACP::Types::AgentCapabilities
   def self.from_h(hash)
     new(
-      load_session: hash['loadSession'],
-      prompt_capabilities: hash['promptCapabilities']&.then { |value| ACP::Types::PromptCapabilities.from_h(value) },
-      mcp_capabilities: hash['mcpCapabilities']&.then { |value| ACP::Types::McpCapabilities.from_h(value) },
-      session_capabilities: hash['sessionCapabilities']&.then { |value| ACP::Types::SessionCapabilities.from_h(value) },
-      auth: hash['auth']&.then { |value| ACP::Types::AgentAuthCapabilities.from_h(value) },
+      load_session: ACP::Types::Check.boolean(hash['loadSession'], 'loadSession', allow_nil: true),
+      prompt_capabilities: ACP::Types::Check.object(
+        hash['promptCapabilities'],
+        'promptCapabilities',
+        ACP::Types::PromptCapabilities,
+        allow_nil: true
+      ),
+      mcp_capabilities: ACP::Types::Check.object(
+        hash['mcpCapabilities'],
+        'mcpCapabilities',
+        ACP::Types::McpCapabilities,
+        allow_nil: true
+      ),
+      session_capabilities: ACP::Types::Check.object(
+        hash['sessionCapabilities'],
+        'sessionCapabilities',
+        ACP::Types::SessionCapabilities,
+        allow_nil: true
+      ),
+      auth: ACP::Types::Check.object(hash['auth'], 'auth', ACP::Types::AgentAuthCapabilities, allow_nil: true),
       meta: hash['_meta']
     )
   end

data/lib/acp/types/annotations.rb

@@ -31,10 +31,13 @@ class ACP::Types::Annotations
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::Annotations
   def self.from_h(hash)
+    audience = ACP::Types::Check.array(hash['audience'], 'audience', allow_nil: true) do |item, path|
+      ACP::Types::Check.enum(item, path, %w[assistant user])
+    end
     new(
-      audience: hash['audience'],
-      last_modified: hash['lastModified'],
-      priority: hash['priority'],
+      audience:,
+      last_modified: ACP::Types::Check.string(hash['lastModified'], 'lastModified', allow_nil: true),
+      priority: ACP::Types::Check.number(hash['priority'], 'priority', allow_nil: true),
       meta: hash['_meta']
     )
   end

data/lib/acp/types/audio_content.rb

@@ -32,9 +32,14 @@ class ACP::Types::AudioContent
   # @rbs return: ACP::Types::AudioContent
   def self.from_h(hash)
     new(
-      annotations: hash['annotations']&.then { |value| ACP::Types::Annotations.from_h(value) },
-      data: hash.fetch('data'),
-      mime_type: hash.fetch('mimeType'),
+      annotations: ACP::Types::Check.object(
+        hash['annotations'],
+        'annotations',
+        ACP::Types::Annotations,
+        allow_nil: true
+      ),
+      data: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'data'), 'data'),
+      mime_type: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'mimeType'), 'mimeType'),
       meta: hash['_meta']
     )
   end

data/lib/acp/types/auth_capabilities.rb

@@ -21,7 +21,7 @@ class ACP::Types::AuthCapabilities
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::AuthCapabilities
   def self.from_h(hash)
-    new(terminal: hash['terminal'], meta: hash['_meta'])
+    new(terminal: ACP::Types::Check.boolean(hash['terminal'], 'terminal', allow_nil: true), meta: hash['_meta'])
   end
 
   # @rbs return: Hash[String, untyped]

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

@@ -41,12 +41,18 @@ class ACP::Types::AuthMethod::Terminal
   # @rbs hash: Hash[String, untyped]
   # @rbs return: ACP::Types::AuthMethod::Terminal
   def self.from_h(hash)
+    args = ACP::Types::Check.array(hash['args'], 'args', allow_nil: true) do |item, path|
+      ACP::Types::Check.string(item, path)
+    end
+    env = ACP::Types::Check.hash(hash['env'], 'env', allow_nil: true) do |value, path|
+      ACP::Types::Check.string(value, path)
+    end
     new(
-      id: hash.fetch('id'),
-      name: hash.fetch('name'),
-      description: hash['description'],
-      args: hash['args'],
-      env: hash['env'],
+      id: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'id'), 'id'),
+      name: ACP::Types::Check.string(ACP::Types::Check.key(hash, 'name'), 'name'),
+      description: ACP::Types::Check.string(hash['description'], 'description', allow_nil: true),
+      args:,
+      env:,
       meta: hash['_meta']
     )
   end