revert: McpException

Author: kpavlov

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

@@ -137,9 +137,10 @@ class ServerResourceTemplateTest : AbstractServerFeaturesTest() {
 
         val templates = server.resourceTemplates
 
-        templates.size shouldBe 2
-        templates shouldContainKey "test://a/{x}"
-        templates shouldContainKey "test://b/{y}"
+        templates shouldBe listOf(
+            ResourceTemplate("test://a/{x}", "A"),
+            ResourceTemplate("test://b/{y}", "B"),
+        )
     }
 
     @Test

kotlin-sdk-core/api/kotlin-sdk-core.api

@@ -2719,7 +2719,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/McpException : java/
 	public synthetic fun <init> (ILjava/lang/String;Lkotlinx/serialization/json/JsonElement;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getCode ()I
 	public final fun getData ()Lkotlinx/serialization/json/JsonElement;
-	public final fun getErrorMessage ()Ljava/lang/String;
 }
 
 public abstract interface class io/modelcontextprotocol/kotlin/sdk/types/MediaContent : io/modelcontextprotocol/kotlin/sdk/types/ContentBlock {

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

@@ -39,6 +39,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.encodeToJsonElement
+import kotlin.coroutines.cancellation.CancellationException
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -328,7 +329,7 @@ public abstract class Protocol(@PublishedApi internal val options: ProtocolOptio
 
             try {
                 val rpcError = if (cause is McpException) {
-                    RPCError(code = cause.code, message = cause.errorMessage, data = cause.data)
+                    RPCError(code = cause.code, message = cause.message.orEmpty(), data = cause.data)
                 } else {
                     RPCError(code = RPCError.ErrorCode.INTERNAL_ERROR, message = cause.message ?: "Internal error")
                 }

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

@@ -13,10 +13,7 @@ import kotlin.jvm.JvmOverloads
  */
 public class McpException @JvmOverloads public constructor(
     public val code: Int,
-    message: String,
+    message: String?,
     public val data: JsonElement? = null,
     cause: Throwable? = null,
-) : Exception("MCP error $code: $message", cause) {
-    /** The raw MCP error message (without the "MCP error $code:" prefix). */
-    public val errorMessage: String = message
-}
+) : Exception("MCP error $code: $message", cause)

kotlin-sdk-server/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/server/Server.kt

@@ -163,10 +163,9 @@ public open class Server(
 
     /**
      * Provides a snapshot of all resource templates currently registered in the server.
-     * Keys are URI template strings; values are the [ResourceTemplate] MCP type.
      */
-    public val resourceTemplates: Map<String, ResourceTemplate>
-        get() = resourceTemplateRegistry.values.mapValues { it.value.resourceTemplate }
+    public val resourceTemplates: List<ResourceTemplate>
+        get() = resourceTemplateRegistry.values.values.map { it.resourceTemplate }
 
     init {
         block(this)