diff --git a/src/agent-client-protocol/examples/agent.rs b/src/agent-client-protocol/examples/agent.rs
index 1aa6ffe..fb1635e 100644
--- a/src/agent-client-protocol/examples/agent.rs
+++ b/src/agent-client-protocol/examples/agent.rs
@@ -14,7 +14,7 @@
 
 use std::cell::Cell;
 
-use agent_client_protocol::{self as acp, Client as _, SessionConfigOptionValue};
+use agent_client_protocol::{self as acp, Client as _};
 use serde_json::json;
 use tokio::sync::{mpsc, oneshot};
 use tokio_util::compat::{TokioAsyncReadCompatExt as _, TokioAsyncWriteCompatExt as _};
@@ -120,9 +120,11 @@ impl acp::Agent for ExampleAgent {
         args: acp::SetSessionConfigOptionRequest,
     ) -> Result<acp::SetSessionConfigOptionResponse, acp::Error> {
         log::info!("Received set session config option request {args:?}");
-        let SessionConfigOptionValue::ValueId { value } = args.value else {
-            return Err(acp::Error::invalid_params());
-        };
+        let value = args
+            .value
+            .as_value_id()
+            .ok_or(acp::Error::invalid_params())?
+            .clone();
         let option = acp::SessionConfigOption::select(
             args.config_id,
             "Example Option",
diff --git a/src/agent-client-protocol/src/rpc_tests.rs b/src/agent-client-protocol/src/rpc_tests.rs
index ecdbf2d..b0397fb 100644
--- a/src/agent-client-protocol/src/rpc_tests.rs
+++ b/src/agent-client-protocol/src/rpc_tests.rs
@@ -157,12 +157,7 @@ impl TestAgent {
 impl Agent for TestAgent {
     async fn initialize(&self, arguments: InitializeRequest) -> Result<InitializeResponse> {
         Ok(InitializeResponse::new(arguments.protocol_version)
-            .agent_capabilities(
-                AgentCapabilities::new().auth(
-                    agent_client_protocol_schema::AgentAuthCapabilities::new()
-                        .logout(agent_client_protocol_schema::LogoutCapabilities::new()),
-                ),
-            )
+            .agent_capabilities(AgentCapabilities::new())
             .agent_info(Implementation::new("test-agent", "0.0.0").title("Test Agent")))
     }
 
@@ -271,9 +266,11 @@ impl Agent for TestAgent {
         &self,
         args: agent_client_protocol_schema::SetSessionConfigOptionRequest,
     ) -> Result<agent_client_protocol_schema::SetSessionConfigOptionResponse> {
-        let SessionConfigOptionValue::ValueId { value } = args.value else {
-            return Err(Error::invalid_params());
-        };
+        let value = args
+            .value
+            .as_value_id()
+            .ok_or(agent_client_protocol_schema::Error::invalid_params())?
+            .clone();
         let option = agent_client_protocol_schema::SessionConfigOption::select(
             args.config_id,
             "Test Option",