Deprecate _meta in favor of meta with fallback implementation; update tests to handle McpException.

Author: kpavlov

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

@@ -1,5 +1,7 @@
 package io.modelcontextprotocol.kotlin.sdk.types
 
+import io.modelcontextprotocol.kotlin.sdk.types.Icon.Theme.Dark
+import io.modelcontextprotocol.kotlin.sdk.types.Icon.Theme.Light
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
@@ -26,6 +28,14 @@ public val SUPPORTED_PROTOCOL_VERSIONS: List<String> = listOf(
 public sealed interface WithMeta {
     @SerialName("_meta")
     public val meta: JsonObject?
+
+    @Deprecated(
+        message = "Use 'meta' instead.",
+        replaceWith = ReplaceWith("meta"),
+    )
+    @Suppress("PropertyName", "VariableNaming")
+    public val _meta: JsonObject
+        get() = meta ?: EmptyJsonObject
 }
 
 // ============================================================================

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

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

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

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

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

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

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/server/OldSchemaServerPromptsTest.kt

@@ -15,6 +15,7 @@ import io.modelcontextprotocol.kotlin.sdk.Implementation
 import io.modelcontextprotocol.kotlin.sdk.Method
 import io.modelcontextprotocol.kotlin.sdk.Prompt
 import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
+import io.modelcontextprotocol.kotlin.sdk.types.McpException
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Nested
@@ -93,16 +94,15 @@ class OldSchemaServerPromptsTest : OldSchemaAbstractServerFeaturesTest() {
 
         // then
         assertTrue(result, "Prompt should be removed successfully")
-        val mcpException = shouldThrow<IllegalStateException> {
+        val mcpException = shouldThrow<McpException> {
             client.getPrompt(
                 GetPromptRequest(
                     name = testPrompt.name,
                     arguments = null,
                 ),
             )
         }
-        mcpException shouldHaveMessage
-            "JSONRPCError(code=InternalError, message=Prompt not found: ${testPrompt.name}, data={})"
+        mcpException shouldHaveMessage "MCP error -32603: Prompt not found: ${testPrompt.name}"
 
         client.listPrompts() shouldNotBeNull {
             prompts.firstOrNull { it.name == testPrompt.name } shouldBe null