Deprecate _meta in favor of meta, add alternative constructors in prompts.

Author: kpavlov

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/shared/Transport.kt

@@ -1,7 +1,6 @@
 package io.modelcontextprotocol.kotlin.sdk.shared
 
 import io.modelcontextprotocol.kotlin.sdk.types.JSONRPCMessage
-import kotlinx.coroutines.CompletableDeferred
 
 /**
  * Describes the minimal contract for MCP transport that a client or server can communicate over.
@@ -47,53 +46,3 @@ public interface Transport {
      */
     public fun onMessage(block: suspend (JSONRPCMessage) -> Unit)
 }
-
-/**
- * Implements [onClose], [onError] and [onMessage] functions of [Transport] providing
- * corresponding [_onClose], [_onError] and [_onMessage] properties to use for an implementation.
- */
-@Suppress("PropertyName")
-public abstract class AbstractTransport : Transport {
-    protected var _onClose: (() -> Unit) = {}
-        private set
-    protected var _onError: ((Throwable) -> Unit) = {}
-        private set
-
-    // to not skip messages
-    private val _onMessageInitialized = CompletableDeferred<Unit>()
-    protected var _onMessage: (suspend ((JSONRPCMessage) -> Unit)) = {
-        _onMessageInitialized.await()
-        _onMessage.invoke(it)
-    }
-        private set
-
-    override fun onClose(block: () -> Unit) {
-        val old = _onClose
-        _onClose = {
-            old()
-            block()
-        }
-    }
-
-    override fun onError(block: (Throwable) -> Unit) {
-        val old = _onError
-        _onError = { e ->
-            old(e)
-            block(e)
-        }
-    }
-
-    override fun onMessage(block: suspend (JSONRPCMessage) -> Unit) {
-        val old: suspend (JSONRPCMessage) -> Unit = when (_onMessageInitialized.isCompleted) {
-            true -> _onMessage
-            false -> { _ -> }
-        }
-
-        _onMessage = { message ->
-            old(message)
-            block(message)
-        }
-
-        _onMessageInitialized.complete(Unit)
-    }
-}

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/prompts.kt

@@ -113,6 +113,22 @@ public data class GetPromptRequest(override val params: GetPromptRequestParams)
     @EncodeDefault
     override val method: Method = Method.Defined.PromptsGet
 
+    @Deprecated(
+        message = "Use constructor with GetPromptRequestParams instead",
+        replaceWith = ReplaceWith("GetPromptRequest(GetPromptRequestParams(name, arguments, meta))"),
+    )
+    public constructor(
+        name: String,
+        arguments: Map<String, String>? = null,
+        meta: RequestMeta? = null,
+    ) : this(
+        GetPromptRequestParams(
+            name = name,
+            arguments = arguments,
+            meta = meta,
+        ),
+    )
+
     /**
      * The name of the prompt or prompt template to retrieve.
      */
@@ -221,4 +237,13 @@ public data class ListPromptsResult(
     @SerialName("_meta")
     override val meta: JsonObject? = null,
 ) : ServerResult,
-    PaginatedResult
+    PaginatedResult {
+
+    @Deprecated(
+        message = "Use 'meta' instead.",
+        replaceWith = ReplaceWith("meta"),
+    )
+    @Suppress("PropertyName", "VariableNaming")
+    public val _meta: JsonObject?
+        get() = meta
+}

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/resources.kt

@@ -223,7 +223,16 @@ public data class ListResourcesResult(
     @SerialName("_meta")
     override val meta: JsonObject? = null,
 ) : ServerResult,
-    PaginatedResult
+    PaginatedResult {
+
+    @Deprecated(
+        message = "Use 'meta' instead.",
+        replaceWith = ReplaceWith("meta"),
+    )
+    @Suppress("PropertyName", "VariableNaming")
+    public val _meta: JsonObject?
+        get() = meta
+}
 
 // ============================================================================
 // resources/read
@@ -433,4 +442,13 @@ public data class ListResourceTemplatesResult(
     @SerialName("_meta")
     override val meta: JsonObject? = null,
 ) : ServerResult,
-    PaginatedResult
+    PaginatedResult {
+
+    @Deprecated(
+        message = "Use 'meta' instead.",
+        replaceWith = ReplaceWith("meta"),
+    )
+    @Suppress("PropertyName", "VariableNaming")
+    public val _meta: JsonObject?
+        get() = meta
+}

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/tools.kt

@@ -259,4 +259,13 @@ public data class ListToolsResult(
     @SerialName("_meta")
     override val meta: JsonObject? = null,
 ) : ServerResult,
-    PaginatedResult
+    PaginatedResult {
+
+    @Deprecated(
+        message = "Use 'meta' instead.",
+        replaceWith = ReplaceWith("meta"),
+    )
+    @Suppress("PropertyName", "VariableNaming")
+    public val _meta: JsonObject?
+        get() = meta
+}