Deprecate the session-model API for removal

Mark Pollack · Mark Pollack · commit 85fca4c5c7eb · 2026-06-09T00:43:23.000-04:00
The session/set_model method and related model types were removed from the ACP spec (June 2026, v0.13.5). Model selection now flows through session/set_config_option with a config option whose category is "model", which this SDK already supports. Mark the whole surface @deprecated(forRemoval = true) (and @UnstableAcpApi on the types/annotation), with Javadoc pointing to the replacement: - METHOD_SESSION_SET_MODEL, SetSessionModelRequest/Response - SessionModelState, ModelInfo, and the models field on the new/load/resume/ fork session responses - SetSessionModelHandler / SyncSetSessionModelHandler and their builder setters - AcpAsyncClient/AcpSyncClient.setSessionModel - @SetSessionModel and SetSessionModelRequestResolver Internal wiring that must keep referencing the surface during the deprecation window carries narrow @SuppressWarnings("removal"); main sources compile with no deprecation warnings. The method stays functional until a future release.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+Protocol currency: catching up to ACP spec v0.13.6 (June 2026).
+
+### Added
+
+- `logout` method (`AcpAsyncClient`/`AcpSyncClient.logout`, `@Logout`, agent handler) — clears
+  stored credentials.
+- `session/delete` method (`deleteSession`, `@DeleteSession`, agent handler) — permanently deletes a
+  stored session; gated on the `sessionCapabilities.delete` capability.
+- `additionalDirectories` on `session/new`, `session/load`, `session/resume`, `session/fork` requests
+  and on `SessionInfo` — extra workspace roots beyond `cwd`.
+- Per-chunk `messageId` on `AgentMessageChunk`, `AgentThoughtChunk`, `UserMessageChunk`.
+- `sessionCapabilities.delete` and `sessionCapabilities.additionalDirectories`, surfaced via
+  `NegotiatedCapabilities` (`supports*`/`require*`).
+
+### Deprecated
+
+- The session-model API — `session/set_model` (`setSessionModel`, `@SetSessionModel`, handler),
+  `SetSessionModelRequest`/`SetSessionModelResponse`, `SessionModelState`, `ModelInfo`, and the
+  `models` field on the new/load/resume/fork session responses — is deprecated for removal. The spec
+  removed it (June 2026, v0.13.5); expose model selection through `session/set_config_option` with a
+  config option whose `category` is `"model"` instead. Scheduled for removal in a future release.
+
 ## [0.9.0] - 2026-02-XX
 
 ### Added
diff --git a/acp-agent-support/src/main/java/com/agentclientprotocol/sdk/agent/support/AcpAgentSupport.java b/acp-agent-support/src/main/java/com/agentclientprotocol/sdk/agent/support/AcpAgentSupport.java
@@ -183,6 +183,7 @@ public AcpSyncAgent getAgent() {
 		return agent;
 	}
 
+	@SuppressWarnings("removal") // wires the deprecated-for-removal session/set_model handler
 	private void wireHandlers(AcpAgent.SyncAgentBuilder agentBuilder) {
 		// Initialize handler
 		AcpHandlerMethod initHandler = handlers.get("initialize");
@@ -470,6 +471,7 @@ public AcpAgentSupport build() {
 			return new AcpAgentSupport(this);
 		}
 
+		@SuppressWarnings("removal") // discovers the deprecated-for-removal @SetSessionModel
 		private void discoverHandlers(Class<?> agentClass, Supplier<Object> beanSupplier) {
 			if (!agentClass.isAnnotationPresent(
 					com.agentclientprotocol.sdk.annotation.AcpAgent.class)) {
@@ -538,6 +540,7 @@ private void discoverHandlers(Class<?> agentClass, Supplier<Object> beanSupplier
 			}
 		}
 
+		@SuppressWarnings("removal") // registers the deprecated-for-removal SetSessionModelRequestResolver
 		private void addDefaultResolvers() {
 			// Built-in resolvers (order matters - first match wins)
 			// Custom resolvers added via builder go first
diff --git a/acp-agent-support/src/main/java/com/agentclientprotocol/sdk/agent/support/handler/DirectResponseHandler.java b/acp-agent-support/src/main/java/com/agentclientprotocol/sdk/agent/support/handler/DirectResponseHandler.java
@@ -33,6 +33,7 @@
 public class DirectResponseHandler implements ReturnValueHandler {
 
 	@Override
+	@SuppressWarnings("removal") // recognizes the deprecated-for-removal SetSessionModelResponse
 	public boolean supportsReturnType(AcpMethodParameter returnType) {
 		Class<?> type = returnType.getParameterType();
 		return InitializeResponse.class.isAssignableFrom(type)
diff --git a/acp-agent-support/src/main/java/com/agentclientprotocol/sdk/agent/support/resolver/SetSessionModelRequestResolver.java b/acp-agent-support/src/main/java/com/agentclientprotocol/sdk/agent/support/resolver/SetSessionModelRequestResolver.java
@@ -13,7 +13,11 @@
  *
  * @author Mark Pollack
  * @since 1.0.0
+ * @deprecated The {@code session/set_model} method was removed from the ACP spec
+ * (June 2026). Slated for removal along with the rest of the session-model API.
  */
+@Deprecated(forRemoval = true)
+@SuppressWarnings("removal")
 public class SetSessionModelRequestResolver implements ArgumentResolver {
 
 	@Override
diff --git a/acp-agent-support/src/test/java/com/agentclientprotocol/sdk/agent/support/AcpAgentSupportTest.java b/acp-agent-support/src/test/java/com/agentclientprotocol/sdk/agent/support/AcpAgentSupportTest.java
@@ -339,6 +339,7 @@ SetSessionModeResponse setMode(SetSessionModeRequest req) {
 	}
 
 	@Test
+	@SuppressWarnings("removal") // exercises the deprecated-for-removal session/set_model handler
 	void setSessionModelHandlerInvoked() throws Exception {
 		AtomicReference<String> receivedModelId = new AtomicReference<>();
 
diff --git a/acp-annotations/src/main/java/com/agentclientprotocol/sdk/annotation/SetSessionModel.java b/acp-annotations/src/main/java/com/agentclientprotocol/sdk/annotation/SetSessionModel.java
@@ -42,7 +42,13 @@
  * @since 1.0.0
  * @see AcpAgent
  * @see SetSessionMode
+ * @deprecated The {@code session/set_model} method was removed from the ACP spec
+ * (June 2026). Expose model selection through {@code session/set_config_option} with a
+ * config option whose {@code category} is {@code "model"} instead (handled with
+ * {@link SetSessionConfigOption}). Slated for removal.
  */
+@Deprecated(forRemoval = true)
+@UnstableAcpApi
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/acp-core/src/main/java/com/agentclientprotocol/sdk/agent/AcpAgent.java b/acp-core/src/main/java/com/agentclientprotocol/sdk/agent/AcpAgent.java
@@ -8,6 +8,7 @@
 
 import java.util.concurrent.Executors;
 
+import com.agentclientprotocol.sdk.annotation.UnstableAcpApi;
 import com.agentclientprotocol.sdk.spec.AcpAgentTransport;
 import com.agentclientprotocol.sdk.spec.AcpSchema;
 import com.agentclientprotocol.sdk.util.Assert;
@@ -220,8 +221,15 @@ interface SetSessionModeHandler {
 
 	/**
 	 * Functional interface for handling set session model requests.
+	 *
+	 * @deprecated The {@code session/set_model} method was removed from the ACP spec
+	 * (June 2026). Use {@code session/set_config_option} with a {@code "model"} category
+	 * config option instead. Slated for removal.
 	 */
+	@Deprecated(forRemoval = true)
+	@UnstableAcpApi
 	@FunctionalInterface
+	@SuppressWarnings("removal")
 	interface SetSessionModelHandler {
 
 		Mono<AcpSchema.SetSessionModelResponse> handle(AcpSchema.SetSessionModelRequest request);
@@ -407,8 +415,15 @@ interface SyncSetSessionModeHandler {
 	/**
 	 * Synchronous functional interface for handling set session model requests.
 	 * Returns a plain value instead of Mono for use with sync agents.
+	 *
+	 * @deprecated The {@code session/set_model} method was removed from the ACP spec
+	 * (June 2026). Use {@code session/set_config_option} with a {@code "model"} category
+	 * config option instead. Slated for removal.
 	 */
+	@Deprecated(forRemoval = true)
+	@UnstableAcpApi
 	@FunctionalInterface
+	@SuppressWarnings("removal")
 	interface SyncSetSessionModelHandler {
 
 		AcpSchema.SetSessionModelResponse handle(AcpSchema.SetSessionModelRequest request);
@@ -513,6 +528,7 @@ class AsyncAgentBuilder {
 
 		private SetSessionModeHandler setSessionModeHandler;
 
+		@SuppressWarnings("removal")
 		private SetSessionModelHandler setSessionModelHandler;
 
 		private ListSessionsHandler listSessionsHandler;
@@ -619,7 +635,11 @@ public AsyncAgentBuilder setSessionModeHandler(SetSessionModeHandler handler) {
 		 * Sets the handler for set session model requests.
 		 * @param handler The set session model handler
 		 * @return This builder for chaining
+		 * @deprecated The {@code session/set_model} method was removed from the ACP spec
+		 * (June 2026). Use {@code session/set_config_option} with a {@code "model"} category
+		 * config option instead. Slated for removal.
 		 */
+		@Deprecated(forRemoval = true)
 		public AsyncAgentBuilder setSessionModelHandler(SetSessionModelHandler handler) {
 			this.setSessionModelHandler = handler;
 			return this;
@@ -821,7 +841,12 @@ public SyncAgentBuilder setSessionModeHandler(SyncSetSessionModeHandler handler)
 		 * Sets the synchronous handler for set session model requests.
 		 * @param handler The sync set session model handler (returns plain value)
 		 * @return This builder for chaining
+		 * @deprecated The {@code session/set_model} method was removed from the ACP spec
+		 * (June 2026). Use {@code session/set_config_option} with a {@code "model"} category
+		 * config option instead. Slated for removal.
 		 */
+		@Deprecated(forRemoval = true)
+		@SuppressWarnings("removal")
 		public SyncAgentBuilder setSessionModelHandler(SyncSetSessionModelHandler handler) {
 			asyncBuilder.setSessionModelHandler(fromSync(handler));
 			return this;
@@ -959,6 +984,8 @@ private static SetSessionModeHandler fromSync(SyncSetSessionModeHandler syncHand
 				.subscribeOn(SYNC_HANDLER_SCHEDULER);
 		}
 
+		@Deprecated(forRemoval = true)
+		@SuppressWarnings("removal")
 		private static SetSessionModelHandler fromSync(SyncSetSessionModelHandler syncHandler) {
 			if (syncHandler == null) {
 				return null;
diff --git a/acp-core/src/main/java/com/agentclientprotocol/sdk/agent/DefaultAcpAsyncAgent.java b/acp-core/src/main/java/com/agentclientprotocol/sdk/agent/DefaultAcpAsyncAgent.java
@@ -52,6 +52,7 @@ class DefaultAcpAsyncAgent implements AcpAsyncAgent {
 
 	private final AcpAgent.SetSessionModeHandler setSessionModeHandler;
 
+	@SuppressWarnings("removal")
 	private final AcpAgent.SetSessionModelHandler setSessionModelHandler;
 
 	private final AcpAgent.ListSessionsHandler listSessionsHandler;
@@ -75,6 +76,7 @@ class DefaultAcpAsyncAgent implements AcpAsyncAgent {
 	 */
 	private final AtomicReference<NegotiatedCapabilities> clientCapabilities = new AtomicReference<>();
 
+	@SuppressWarnings("removal") // accepts the deprecated-for-removal SetSessionModelHandler
 	DefaultAcpAsyncAgent(AcpAgentTransport transport, Duration requestTimeout,
 			AcpAgent.InitializeHandler initializeHandler, AcpAgent.AuthenticateHandler authenticateHandler,
 			AcpAgent.LogoutHandler logoutHandler, AcpAgent.NewSessionHandler newSessionHandler,
@@ -106,6 +108,7 @@ class DefaultAcpAsyncAgent implements AcpAsyncAgent {
 	}
 
 	@Override
+	@SuppressWarnings("removal") // registers the deprecated-for-removal session/set_model handler
 	public Mono<Void> start() {
 		return Mono.fromRunnable(() -> {
 			logger.info("Starting ACP async agent");
diff --git a/acp-core/src/main/java/com/agentclientprotocol/sdk/client/AcpAsyncClient.java b/acp-core/src/main/java/com/agentclientprotocol/sdk/client/AcpAsyncClient.java
@@ -102,6 +102,7 @@ public class AcpAsyncClient {
 	private static final TypeRef<AcpSchema.SetSessionModeResponse> SET_SESSION_MODE_RESPONSE_TYPE_REF = new TypeRef<>() {
 	};
 
+	@SuppressWarnings("removal")
 	private static final TypeRef<AcpSchema.SetSessionModelResponse> SET_SESSION_MODEL_RESPONSE_TYPE_REF = new TypeRef<>() {
 	};
 
@@ -343,7 +344,12 @@ public Mono<AcpSchema.SetSessionModeResponse> setSessionMode(AcpSchema.SetSessio
 	 * @param setModelRequest the set model request with session ID and desired model
 	 * @return a Mono emitting the response confirming the model change
 	 * @see AcpSchema#METHOD_SESSION_SET_MODEL
+	 * @deprecated The {@code session/set_model} method was removed from the ACP spec
+	 * (June 2026). Use {@link #setSessionConfigOption} with a {@code "model"} category config
+	 * option instead. Slated for removal.
 	 */
+	@Deprecated(forRemoval = true)
+	@SuppressWarnings("removal")
 	public Mono<AcpSchema.SetSessionModelResponse> setSessionModel(AcpSchema.SetSessionModelRequest setModelRequest) {
 		Assert.notNull(setModelRequest, "Set session model request must not be null");
 		logger.debug("Setting session model: {} for session: {}", setModelRequest.modelId(),
diff --git a/acp-core/src/main/java/com/agentclientprotocol/sdk/client/AcpSyncClient.java b/acp-core/src/main/java/com/agentclientprotocol/sdk/client/AcpSyncClient.java
@@ -255,7 +255,12 @@ public AcpSchema.SetSessionModeResponse setSessionMode(AcpSchema.SetSessionModeR
 	 * @param setModelRequest the set model request with session ID and desired model
 	 * @return the response confirming the model change
 	 * @see AcpSchema#METHOD_SESSION_SET_MODEL
+	 * @deprecated The {@code session/set_model} method was removed from the ACP spec
+	 * (June 2026). Use {@link #setSessionConfigOption} with a {@code "model"} category config
+	 * option instead. Slated for removal.
 	 */
+	@Deprecated(forRemoval = true)
+	@SuppressWarnings("removal")
 	public AcpSchema.SetSessionModelResponse setSessionModel(AcpSchema.SetSessionModelRequest setModelRequest) {
 		return this.delegate.setSessionModel(setModelRequest).block();
 	}
diff --git a/acp-core/src/main/java/com/agentclientprotocol/sdk/spec/AcpSchema.java b/acp-core/src/main/java/com/agentclientprotocol/sdk/spec/AcpSchema.java
@@ -93,6 +93,14 @@ else if (map.containsKey("result") || map.containsKey("error")) {
 
 	public static final String METHOD_SESSION_SET_MODE = "session/set_mode";
 
+	/**
+	 * @deprecated The {@code session/set_model} method was removed from the ACP spec
+	 * (June 2026, v0.13.5). Expose model selection through {@code session/set_config_option}
+	 * with a config option whose {@code category} is {@code "model"} instead. Slated for
+	 * removal in a future release.
+	 */
+	@Deprecated(forRemoval = true)
+	@UnstableAcpApi
 	public static final String METHOD_SESSION_SET_MODEL = "session/set_model";
 
 	public static final String METHOD_SESSION_CANCEL = "session/cancel";
@@ -316,6 +324,7 @@ public NewSessionRequest(String cwd, List<McpServer> mcpServers, List<String> ad
 	 */
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	@JsonInclude(JsonInclude.Include.NON_NULL)
+	@SuppressWarnings("removal") // 'models' references the deprecated-for-removal SessionModelState
 	public record NewSessionResponse(@JsonProperty("sessionId") String sessionId,
 			@JsonProperty("modes") SessionModeState modes, @JsonProperty("models") SessionModelState models,
 			@JsonProperty("_meta") Map<String, Object> meta) {
@@ -348,6 +357,7 @@ public LoadSessionRequest(String sessionId, String cwd, List<McpServer> mcpServe
 	 */
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	@JsonInclude(JsonInclude.Include.NON_NULL)
+	@SuppressWarnings("removal") // 'models' references the deprecated-for-removal SessionModelState
 	public record LoadSessionResponse(@JsonProperty("modes") SessionModeState modes,
 			@JsonProperty("models") SessionModelState models,
 			@JsonProperty("_meta") Map<String, Object> meta) {
@@ -441,17 +451,27 @@ public record SetSessionModeResponse() {
 	}
 
 	/**
-	 * Set session model request (UNSTABLE)
+	 * Set session model request.
+	 *
+	 * @deprecated The {@code session/set_model} method was removed from the ACP spec
+	 * (June 2026, v0.13.5). Use {@code session/set_config_option} with a {@code "model"}
+	 * category config option instead. Slated for removal in a future release.
 	 */
+	@Deprecated(forRemoval = true)
+	@UnstableAcpApi
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	@JsonInclude(JsonInclude.Include.NON_NULL)
 	public record SetSessionModelRequest(@JsonProperty("sessionId") String sessionId,
 			@JsonProperty("modelId") String modelId) {
 	}
 
 	/**
-	 * Set session model response (UNSTABLE)
+	 * Set session model response.
+	 *
+	 * @deprecated See {@link SetSessionModelRequest}. Slated for removal.
 	 */
+	@Deprecated(forRemoval = true)
+	@UnstableAcpApi
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	@JsonInclude(JsonInclude.Include.NON_NULL)
 	public record SetSessionModelResponse() {
@@ -563,6 +583,7 @@ public ResumeSessionRequest(String sessionId, String cwd, List<McpServer> mcpSer
 	 */
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	@JsonInclude(JsonInclude.Include.NON_NULL)
+	@SuppressWarnings("removal") // 'models' references the deprecated-for-removal SessionModelState
 	public record ResumeSessionResponse(@JsonProperty("modes") SessionModeState modes,
 			@JsonProperty("models") SessionModelState models,
 			@JsonProperty("_meta") Map<String, Object> meta) {
@@ -598,6 +619,7 @@ public ForkSessionRequest(String sessionId, String cwd, List<McpServer> mcpServe
 	@UnstableAcpApi
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	@JsonInclude(JsonInclude.Include.NON_NULL)
+	@SuppressWarnings("removal") // 'models' references the deprecated-for-removal SessionModelState
 	public record ForkSessionResponse(@JsonProperty("sessionId") String sessionId,
 			@JsonProperty("modes") SessionModeState modes, @JsonProperty("models") SessionModelState models,
 			@JsonProperty("configOptions") List<SessionConfigOption> configOptions,
@@ -1182,17 +1204,28 @@ public record SessionMode(@JsonProperty("id") String id, @JsonProperty("name") S
 	}
 
 	/**
-	 * Session model state (UNSTABLE)
+	 * Session model state.
+	 *
+	 * @deprecated The session-model API (including the {@code models} field on session
+	 * responses) was removed from the ACP spec (June 2026, v0.13.5). Model selection is now
+	 * carried by {@code session/set_config_option} with a {@code "model"} category config
+	 * option. Slated for removal in a future release.
 	 */
+	@Deprecated(forRemoval = true)
+	@UnstableAcpApi
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	@JsonInclude(JsonInclude.Include.NON_NULL)
 	public record SessionModelState(@JsonProperty("currentModelId") String currentModelId,
 			@JsonProperty("availableModels") List<ModelInfo> availableModels) {
 	}
 
 	/**
-	 * Model info (UNSTABLE)
+	 * Model info.
+	 *
+	 * @deprecated See {@link SessionModelState}. Slated for removal.
 	 */
+	@Deprecated(forRemoval = true)
+	@UnstableAcpApi
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	@JsonInclude(JsonInclude.Include.NON_NULL)
 	public record ModelInfo(@JsonProperty("modelId") String modelId, @JsonProperty("name") String name,
diff --git a/acp-core/src/test/java/com/agentclientprotocol/sdk/AcpTestFixtures.java b/acp-core/src/test/java/com/agentclientprotocol/sdk/AcpTestFixtures.java
@@ -111,6 +111,7 @@ public static AcpSchema.InitializeResponse createInitializeResponse() {
 	 * Creates a NewSessionResponse with test session ID.
 	 * @return NewSessionResponse with default test session
 	 */
+	@SuppressWarnings("removal")
 	public static AcpSchema.NewSessionResponse createNewSessionResponse() {
 		return new AcpSchema.NewSessionResponse("test-session-id", createSessionModeState(),
 				createSessionModelState());
@@ -121,6 +122,7 @@ public static AcpSchema.NewSessionResponse createNewSessionResponse() {
 	 * @param sessionId the session ID
 	 * @return NewSessionResponse with specified session ID
 	 */
+	@SuppressWarnings("removal")
 	public static AcpSchema.NewSessionResponse createNewSessionResponse(String sessionId) {
 		return new AcpSchema.NewSessionResponse(sessionId, createSessionModeState(), createSessionModelState());
 	}
@@ -137,6 +139,7 @@ public static AcpSchema.PromptResponse createPromptResponse() {
 	 * Creates a LoadSessionResponse with default session state.
 	 * @return LoadSessionResponse with test data
 	 */
+	@SuppressWarnings("removal")
 	public static AcpSchema.LoadSessionResponse createLoadSessionResponse() {
 		return new AcpSchema.LoadSessionResponse(createSessionModeState(), createSessionModelState());
 	}
@@ -239,6 +242,7 @@ public static AcpSchema.SessionModeState createSessionModeState() {
 	 * Creates a SessionModelState with test model.
 	 * @return SessionModelState with default model
 	 */
+	@SuppressWarnings("removal")
 	public static AcpSchema.SessionModelState createSessionModelState() {
 		AcpSchema.ModelInfo model = new AcpSchema.ModelInfo("test-model", "Test Model", "Test model description");
 		return new AcpSchema.SessionModelState("test-model", List.of(model));
diff --git a/acp-core/src/test/java/com/agentclientprotocol/sdk/spec/AcpSchemaSerializationTest.java b/acp-core/src/test/java/com/agentclientprotocol/sdk/spec/AcpSchemaSerializationTest.java
@@ -76,6 +76,7 @@ void newSessionRequestSerialization() throws IOException {
 	}
 
 	@Test
+	@SuppressWarnings("removal") // asserts on the deprecated-for-removal models field
 	void newSessionResponseSerialization() throws IOException {
 		AcpSchema.NewSessionResponse response = AcpTestFixtures.createNewSessionResponse();
 
@@ -271,6 +272,7 @@ void sessionModeStateSerialization() throws IOException {
 	}
 
 	@Test
+	@SuppressWarnings("removal") // exercises the deprecated-for-removal SessionModelState
 	void sessionModelStateSerialization() throws IOException {
 		AcpSchema.SessionModelState state = AcpTestFixtures.createSessionModelState();
 

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ public AcpSyncAgent getAgent() {`
`183`	`183`	`return agent;`
`184`	`184`	`}`
`185`	`185`
	`186`	`+ @SuppressWarnings("removal") // wires the deprecated-for-removal session/set_model handler`
`186`	`187`	`private void wireHandlers(AcpAgent.SyncAgentBuilder agentBuilder) {`
`187`	`188`	`// Initialize handler`
`188`	`189`	`AcpHandlerMethod initHandler = handlers.get("initialize");`
`@@ -470,6 +471,7 @@ public AcpAgentSupport build() {`
`470`	`471`	`return new AcpAgentSupport(this);`
`471`	`472`	`}`
`472`	`473`
	`474`	`+ @SuppressWarnings("removal") // discovers the deprecated-for-removal @SetSessionModel`
`473`	`475`	`private void discoverHandlers(Class<?> agentClass, Supplier<Object> beanSupplier) {`
`474`	`476`	`if (!agentClass.isAnnotationPresent(`
`475`	`477`	`com.agentclientprotocol.sdk.annotation.AcpAgent.class)) {`
`@@ -538,6 +540,7 @@ private void discoverHandlers(Class<?> agentClass, Supplier<Object> beanSupplier`
`538`	`540`	`}`
`539`	`541`	`}`
`540`	`542`
	`543`	`+ @SuppressWarnings("removal") // registers the deprecated-for-removal SetSessionModelRequestResolver`
`541`	`544`	`private void addDefaultResolvers() {`
`542`	`545`	`// Built-in resolvers (order matters - first match wins)`
`543`	`546`	`// Custom resolvers added via builder go first`
Original file line number	Diff line number	Diff line change
`@@ -339,6 +339,7 @@ SetSessionModeResponse setMode(SetSessionModeRequest req) {`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`@Test`
	`342`	`+ @SuppressWarnings("removal") // exercises the deprecated-for-removal session/set_model handler`
`342`	`343`	`void setSessionModelHandlerInvoked() throws Exception {`
`343`	`344`	`AtomicReference<String> receivedModelId = new AtomicReference<>();`
`344`	`345`