Pass serializers to methods exolicitly to avoid inline/reified APIs (#12)

Fixes #5

Author: nerzhulart

acp-ktor-test/src/commonTest/kotlin/com/agentclientprotocol/ProtocolTest.kt

@@ -42,7 +42,7 @@ abstract class ProtocolTest(protocolDriver: ProtocolDriver) : ProtocolDriver by
     val cancellationMessage = "Cancelled from test"
 
     companion object {
-        object TestMethod : AcpMethod.AcpRequestResponseMethod<TestRequest, TestResponse>("test/testRequest")
+        object TestMethod : AcpMethod.AcpRequestResponseMethod<TestRequest, TestResponse>("test/testRequest", TestRequest.serializer(), TestResponse.serializer())
     }
 
     @Test

acp-model/api/acp-model.api

@@ -12,19 +12,22 @@ public class com/agentclientprotocol/model/AcpMethod {
 }
 
 public class com/agentclientprotocol/model/AcpMethod$AcpNotificationMethod : com/agentclientprotocol/model/AcpMethod {
-	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)V
+	public final fun getSerializer ()Lkotlinx/serialization/KSerializer;
 }
 
 public class com/agentclientprotocol/model/AcpMethod$AcpRequestResponseMethod : com/agentclientprotocol/model/AcpMethod {
-	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)V
+	public final fun getRequestSerializer ()Lkotlinx/serialization/KSerializer;
+	public final fun getResponseSerializer ()Lkotlinx/serialization/KSerializer;
 }
 
 public class com/agentclientprotocol/model/AcpMethod$AcpSessionNotificationMethod : com/agentclientprotocol/model/AcpMethod$AcpNotificationMethod {
-	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)V
 }
 
 public class com/agentclientprotocol/model/AcpMethod$AcpSessionRequestResponseMethod : com/agentclientprotocol/model/AcpMethod$AcpRequestResponseMethod {
-	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)V
 }
 
 public final class com/agentclientprotocol/model/AcpMethod$AgentMethods {

acp-model/src/commonMain/kotlin/com/agentclientprotocol/model/Methods.kt

@@ -3,6 +3,8 @@
 package com.agentclientprotocol.model
 
 import com.agentclientprotocol.rpc.MethodName
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.builtins.serializer
 
 /**
  * Base interface for ACP method enums.
@@ -11,47 +13,59 @@ import com.agentclientprotocol.rpc.MethodName
  */
 public open class AcpMethod(public val methodName: MethodName) {
 
-    public open class AcpRequestResponseMethod<TRequest: AcpRequest, TResponse: AcpResponse>(method: String) : AcpMethod(MethodName(method))
+    public open class AcpRequestResponseMethod<TRequest: AcpRequest, TResponse: AcpResponse>(
+        method: String,
+        public val requestSerializer: KSerializer<TRequest>,
+        public val responseSerializer: KSerializer<TResponse>
+    ) : AcpMethod(MethodName(method))
 
-    public open class AcpSessionRequestResponseMethod<TRequest, TResponse: AcpResponse>(method: String) : AcpRequestResponseMethod<TRequest, TResponse>(method)
+    public open class AcpSessionRequestResponseMethod<TRequest, TResponse: AcpResponse>(method: String,
+                                                                                        requestSerializer: KSerializer<TRequest>,
+                                                                                        responseSerializer: KSerializer<TResponse>
+    ) : AcpRequestResponseMethod<TRequest, TResponse>(method, requestSerializer, responseSerializer)
             where TRequest : AcpRequest, TRequest : AcpWithSessionId
 
-    public open class AcpNotificationMethod<TNotification: AcpNotification>(method: String) : AcpMethod(MethodName(method))
+    public open class AcpNotificationMethod<TNotification: AcpNotification>(
+        method: String,
+        public val serializer: KSerializer<TNotification>,
+    ) : AcpMethod(MethodName(method))
 
-    public open class AcpSessionNotificationMethod<TNotification>(method: String) : AcpNotificationMethod<TNotification>(method)
+    public open class AcpSessionNotificationMethod<TNotification>(method: String,
+                                                                  serializer: KSerializer<TNotification>
+    ) : AcpNotificationMethod<TNotification>(method, serializer)
             where TNotification : AcpNotification, TNotification : AcpWithSessionId
 
     public object MetaMethods {
-        public object CancelRequest : AcpNotificationMethod<CancelRequestNotification>("\$/cancelRequest")
+        public object CancelRequest : AcpNotificationMethod<CancelRequestNotification>("\$/cancelRequest", CancelRequestNotification.serializer())
     }
 
     public object AgentMethods {
         // Agent-side operations (methods that agents can call on clients)
-        public object Initialize : AcpRequestResponseMethod<InitializeRequest, InitializeResponse>("initialize")
-        public object Authenticate : AcpRequestResponseMethod<AuthenticateRequest, AuthenticateResponse>("authenticate")
-        public object SessionNew : AcpRequestResponseMethod<NewSessionRequest, NewSessionResponse>("session/new")
-        public object SessionLoad : AcpRequestResponseMethod<LoadSessionRequest, LoadSessionResponse>("session/load")
+        public object Initialize : AcpRequestResponseMethod<InitializeRequest, InitializeResponse>("initialize", InitializeRequest.serializer(), InitializeResponse.serializer())
+        public object Authenticate : AcpRequestResponseMethod<AuthenticateRequest, AuthenticateResponse>("authenticate", AuthenticateRequest.serializer(), AuthenticateResponse.serializer())
+        public object SessionNew : AcpRequestResponseMethod<NewSessionRequest, NewSessionResponse>("session/new", NewSessionRequest.serializer(), NewSessionResponse.serializer())
+        public object SessionLoad : AcpRequestResponseMethod<LoadSessionRequest, LoadSessionResponse>("session/load", LoadSessionRequest.serializer(), LoadSessionResponse.serializer())
 
         // session specific
-        public object SessionPrompt : AcpSessionRequestResponseMethod<PromptRequest, PromptResponse>("session/prompt")
-        public object SessionCancel : AcpSessionNotificationMethod<CancelNotification>("session/cancel")
-        public object SessionSetMode : AcpSessionRequestResponseMethod<SetSessionModeRequest, SetSessionModeResponse>("session/set_mode")
-        public object SessionSetModel : AcpSessionRequestResponseMethod<SetSessionModelRequest, SetSessionModelResponse>("session/set_model")
+        public object SessionPrompt : AcpSessionRequestResponseMethod<PromptRequest, PromptResponse>("session/prompt", PromptRequest.serializer(), PromptResponse.serializer())
+        public object SessionCancel : AcpSessionNotificationMethod<CancelNotification>("session/cancel", CancelNotification.serializer())
+        public object SessionSetMode : AcpSessionRequestResponseMethod<SetSessionModeRequest, SetSessionModeResponse>("session/set_mode", SetSessionModeRequest.serializer(), SetSessionModeResponse.serializer())
+        public object SessionSetModel : AcpSessionRequestResponseMethod<SetSessionModelRequest, SetSessionModelResponse>("session/set_model", SetSessionModelRequest.serializer(), SetSessionModelResponse.serializer())
     }
 
     public object ClientMethods {
         // Client-side operations (methods that clients can call on agents)
-        public object SessionRequestPermission : AcpSessionRequestResponseMethod<RequestPermissionRequest, RequestPermissionResponse>("session/request_permission")
-        public object SessionUpdate : AcpSessionNotificationMethod<SessionNotification>("session/update")
+        public object SessionRequestPermission : AcpSessionRequestResponseMethod<RequestPermissionRequest, RequestPermissionResponse>("session/request_permission", RequestPermissionRequest.serializer(), RequestPermissionResponse.serializer())
+        public object SessionUpdate : AcpSessionNotificationMethod<SessionNotification>("session/update", SessionNotification.serializer())
 
         // extensions
-        public object FsReadTextFile : AcpSessionRequestResponseMethod<ReadTextFileRequest, ReadTextFileResponse>("fs/read_text_file")
-        public object FsWriteTextFile : AcpSessionRequestResponseMethod<WriteTextFileRequest, WriteTextFileResponse>("fs/write_text_file")
-        public object TerminalCreate : AcpSessionRequestResponseMethod<CreateTerminalRequest, CreateTerminalResponse>("terminal/create")
-        public object TerminalOutput : AcpSessionRequestResponseMethod<TerminalOutputRequest, TerminalOutputResponse>("terminal/output")
-        public object TerminalRelease : AcpSessionRequestResponseMethod<ReleaseTerminalRequest, ReleaseTerminalResponse>("terminal/release")
-        public object TerminalWaitForExit : AcpSessionRequestResponseMethod<WaitForTerminalExitRequest, WaitForTerminalExitResponse>("terminal/wait_for_exit")
-        public object TerminalKill : AcpSessionRequestResponseMethod<KillTerminalCommandRequest, KillTerminalCommandResponse>("terminal/kill")
+        public object FsReadTextFile : AcpSessionRequestResponseMethod<ReadTextFileRequest, ReadTextFileResponse>("fs/read_text_file", ReadTextFileRequest.serializer(), ReadTextFileResponse.serializer())
+        public object FsWriteTextFile : AcpSessionRequestResponseMethod<WriteTextFileRequest, WriteTextFileResponse>("fs/write_text_file", WriteTextFileRequest.serializer(), WriteTextFileResponse.serializer())
+        public object TerminalCreate : AcpSessionRequestResponseMethod<CreateTerminalRequest, CreateTerminalResponse>("terminal/create", CreateTerminalRequest.serializer(), CreateTerminalResponse.serializer())
+        public object TerminalOutput : AcpSessionRequestResponseMethod<TerminalOutputRequest, TerminalOutputResponse>("terminal/output", TerminalOutputRequest.serializer(), TerminalOutputResponse.serializer())
+        public object TerminalRelease : AcpSessionRequestResponseMethod<ReleaseTerminalRequest, ReleaseTerminalResponse>("terminal/release", ReleaseTerminalRequest.serializer(), ReleaseTerminalResponse.serializer())
+        public object TerminalWaitForExit : AcpSessionRequestResponseMethod<WaitForTerminalExitRequest, WaitForTerminalExitResponse>("terminal/wait_for_exit", WaitForTerminalExitRequest.serializer(), WaitForTerminalExitResponse.serializer())
+        public object TerminalKill : AcpSessionRequestResponseMethod<KillTerminalCommandRequest, KillTerminalCommandResponse>("terminal/kill", KillTerminalCommandRequest.serializer(), KillTerminalCommandResponse.serializer())
     }
 
 

acp/api/acp.api

@@ -251,6 +251,15 @@ public class com/agentclientprotocol/protocol/ProtocolOptions {
 
 public final class com/agentclientprotocol/protocol/Protocol_extensionsKt {
 	public static final fun getJsonRpcRequest (Lkotlin/coroutines/CoroutineContext;)Lcom/agentclientprotocol/rpc/JsonRpcRequest;
+	public static final fun invoke (Lcom/agentclientprotocol/model/AcpMethod$AcpNotificationMethod;Lcom/agentclientprotocol/protocol/RpcMethodsOperations;Lcom/agentclientprotocol/model/AcpNotification;)V
+	public static final fun invoke (Lcom/agentclientprotocol/model/AcpMethod$AcpRequestResponseMethod;Lcom/agentclientprotocol/protocol/RpcMethodsOperations;Lcom/agentclientprotocol/model/AcpRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun sendNotification (Lcom/agentclientprotocol/protocol/RpcMethodsOperations;Lcom/agentclientprotocol/model/AcpMethod$AcpNotificationMethod;Lcom/agentclientprotocol/model/AcpNotification;)V
+	public static synthetic fun sendNotification$default (Lcom/agentclientprotocol/protocol/RpcMethodsOperations;Lcom/agentclientprotocol/model/AcpMethod$AcpNotificationMethod;Lcom/agentclientprotocol/model/AcpNotification;ILjava/lang/Object;)V
+	public static final fun sendRequest (Lcom/agentclientprotocol/protocol/RpcMethodsOperations;Lcom/agentclientprotocol/model/AcpMethod$AcpRequestResponseMethod;Lcom/agentclientprotocol/model/AcpRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun setNotificationHandler (Lcom/agentclientprotocol/protocol/RpcMethodsOperations;Lcom/agentclientprotocol/model/AcpMethod$AcpNotificationMethod;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)V
+	public static synthetic fun setNotificationHandler$default (Lcom/agentclientprotocol/protocol/RpcMethodsOperations;Lcom/agentclientprotocol/model/AcpMethod$AcpNotificationMethod;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
+	public static final fun setRequestHandler (Lcom/agentclientprotocol/protocol/RpcMethodsOperations;Lcom/agentclientprotocol/model/AcpMethod$AcpRequestResponseMethod;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)V
+	public static synthetic fun setRequestHandler$default (Lcom/agentclientprotocol/protocol/RpcMethodsOperations;Lcom/agentclientprotocol/model/AcpMethod$AcpRequestResponseMethod;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
 }
 
 public final class com/agentclientprotocol/protocol/RequestTimeoutException : java/lang/Exception {

acp/src/commonMain/kotlin/com/agentclientprotocol/protocol/Protocol.extensions.kt

@@ -17,59 +17,59 @@ import kotlin.coroutines.EmptyCoroutineContext
 /**
  *  Send a request and wait for the response.
  */
-public suspend inline fun <reified TRequest : AcpRequest, reified TResponse : AcpResponse> RpcMethodsOperations.sendRequest(
+public suspend fun <TRequest : AcpRequest, TResponse : AcpResponse> RpcMethodsOperations.sendRequest(
     method: AcpMethod.AcpRequestResponseMethod<TRequest, TResponse>,
     request: TRequest?
 ): TResponse {
-    val params = request?.let { ACPJson.encodeToJsonElement(request) }
+    val params = request?.let { ACPJson.encodeToJsonElement(method.requestSerializer, request) }
     val responseJson = this.sendRequestRaw(method.methodName, params)
-    return ACPJson.decodeFromJsonElement(responseJson)
+    return ACPJson.decodeFromJsonElement(method.responseSerializer, responseJson)
 }
 
 /**
  * Send a notification (no response expected).
  */
-public inline fun <reified TNotification: AcpNotification> RpcMethodsOperations.sendNotification(
+public fun <TNotification: AcpNotification> RpcMethodsOperations.sendNotification(
     method: AcpMethod.AcpNotificationMethod<TNotification>,
     notification: TNotification? = null,
 ) {
-    val params = notification?.let { ACPJson.encodeToJsonElement(notification) }
+    val params = notification?.let { ACPJson.encodeToJsonElement(method.serializer, notification) }
     this.sendNotificationRaw(method, params)
 }
 
 /**
  * Register a handler for incoming requests.
  */
-public inline fun<reified TRequest : AcpRequest, reified TResponse : AcpResponse> RpcMethodsOperations.setRequestHandler(
+public fun<TRequest : AcpRequest, TResponse : AcpResponse> RpcMethodsOperations.setRequestHandler(
     method: AcpMethod.AcpRequestResponseMethod<TRequest, TResponse>,
     additionalContext: CoroutineContext = EmptyCoroutineContext,
-    noinline handler: suspend (TRequest) -> TResponse
+    handler: suspend (TRequest) -> TResponse
 ) {
     this.setRequestHandlerRaw(method, additionalContext) { request ->
-        val requestParams = ACPJson.decodeFromJsonElement<TRequest>(request.params ?: JsonNull)
+        val requestParams = ACPJson.decodeFromJsonElement(method.requestSerializer, request.params ?: JsonNull)
         val responseObject = handler(requestParams)
-        ACPJson.encodeToJsonElement(responseObject)
+        ACPJson.encodeToJsonElement(method.responseSerializer, responseObject)
     }
 }
 /**
  * Register a handler for incoming notifications.
  */
-public inline fun<reified TNotification : AcpNotification> RpcMethodsOperations.setNotificationHandler(
+public fun<TNotification : AcpNotification> RpcMethodsOperations.setNotificationHandler(
     method: AcpMethod.AcpNotificationMethod<TNotification>,
     additionalContext: CoroutineContext = EmptyCoroutineContext,
-    noinline handler: suspend (TNotification) -> Unit
+    handler: suspend (TNotification) -> Unit
 ) {
     this.setNotificationHandlerRaw(method, additionalContext) { notification ->
-        val notificationParams = ACPJson.decodeFromJsonElement<TNotification>(notification.params ?: JsonNull)
+        val notificationParams = ACPJson.decodeFromJsonElement(method.serializer, notification.params ?: JsonNull)
         handler(notificationParams)
     }
 }
 
-public suspend inline operator fun <reified TRequest: AcpRequest, reified TResponse: AcpResponse> AcpMethod.AcpRequestResponseMethod<TRequest, TResponse>.invoke(rpc: RpcMethodsOperations, request: TRequest): TResponse {
+public suspend operator fun <TRequest: AcpRequest, TResponse: AcpResponse> AcpMethod.AcpRequestResponseMethod<TRequest, TResponse>.invoke(rpc: RpcMethodsOperations, request: TRequest): TResponse {
     return rpc.sendRequest(this, request)
 }
 
-public inline operator fun <reified TNotification : AcpNotification> AcpMethod.AcpNotificationMethod<TNotification>.invoke(rpc: RpcMethodsOperations, notification: TNotification) {
+public operator fun <TNotification : AcpNotification> AcpMethod.AcpNotificationMethod<TNotification>.invoke(rpc: RpcMethodsOperations, notification: TNotification) {
     return rpc.sendNotification(this, notification)
 }