diff --git a/src/agent-client-protocol/examples/agent.rs b/src/agent-client-protocol/examples/agent.rs
index fb1635e..7eb32ba 100644
--- a/src/agent-client-protocol/examples/agent.rs
+++ b/src/agent-client-protocol/examples/agent.rs
@@ -120,11 +120,14 @@ impl acp::Agent for ExampleAgent {
         args: acp::SetSessionConfigOptionRequest,
     ) -> Result<acp::SetSessionConfigOptionResponse, acp::Error> {
         log::info!("Received set session config option request {args:?}");
+        #[cfg(feature = "unstable_boolean_config")]
         let value = args
             .value
             .as_value_id()
             .ok_or(acp::Error::invalid_params())?
             .clone();
+        #[cfg(not(feature = "unstable_boolean_config"))]
+        let value: acp::SessionConfigValueId = args.value.into();
         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 9977b22..14b9b5b 100644
--- a/src/agent-client-protocol/src/rpc_tests.rs
+++ b/src/agent-client-protocol/src/rpc_tests.rs
@@ -156,7 +156,10 @@ impl TestAgent {
 #[async_trait::async_trait(?Send)]
 impl Agent for TestAgent {
     async fn initialize(&self, arguments: InitializeRequest) -> Result<InitializeResponse> {
+        #[cfg(feature = "unstable_logout")]
         let mut capabilities = AgentCapabilities::new();
+        #[cfg(not(feature = "unstable_logout"))]
+        let capabilities = AgentCapabilities::new();
         #[cfg(feature = "unstable_logout")]
         {
             capabilities.auth.logout =
@@ -272,11 +275,14 @@ impl Agent for TestAgent {
         &self,
         args: agent_client_protocol_schema::SetSessionConfigOptionRequest,
     ) -> Result<agent_client_protocol_schema::SetSessionConfigOptionResponse> {
+        #[cfg(feature = "unstable_boolean_config")]
         let value = args
             .value
             .as_value_id()
             .ok_or(agent_client_protocol_schema::Error::invalid_params())?
             .clone();
+        #[cfg(not(feature = "unstable_boolean_config"))]
+        let value: agent_client_protocol_schema::SessionConfigValueId = args.value.into();
         let option = agent_client_protocol_schema::SessionConfigOption::select(
             args.config_id,
             "Test Option",