Merge branch 'main' into feature/streamable-http-missing-tests

Author: devcrocod

.claude/skills/kdoc/SKILL.md

@@ -0,0 +1,74 @@
+---
+name: kdoc
+description: "Add KDoc documentation to Kotlin public API. Use whenever the user asks to document Kotlin code, add KDoc, generate API docs, mentions undocumented public declarations, or wants to improve existing documentation. Also trigger when the user says 'add docs', 'document this class/file/module', 'write KDoc', or asks about missing documentation in Kotlin code."
+---
+
+# KDoc Generator
+
+Add KDoc comments to public Kotlin API declarations.
+
+## What to document
+
+All public declarations (no explicit `private`/`internal`/`protected`):
+- Classes, interfaces, objects, sealed classes/interfaces
+- Functions, extension functions
+- Properties
+- Enum classes and entries
+- Type aliases, annotation classes
+
+Include `@Deprecated` elements.
+
+## Context
+
+Read the implementation, not just the signature, to write accurate descriptions. Understanding what the code actually does prevents superficial or misleading documentation.
+
+## KDoc format
+
+**Class/interface example:**
+
+````kotlin
+/**
+ * Manages active client sessions and their lifecycle.
+ *
+ * Sessions are created on first connection and cleaned up
+ * when the transport closes.
+ *
+ * @property maxSessions upper limit on concurrent sessions
+ * @property timeout idle timeout before a session is evicted
+ */
+````
+
+**Function example:**
+
+````kotlin
+/**
+ * Registers a new tool with the given handler.
+ *
+ * Example:
+ * ```kotlin
+ * server.addTool(
+ *     name = "echo",
+ *     description = "Echoes input back",
+ * ) { request ->
+ *     CallToolResult(content = listOf(TextContent("Echo: ${request.arguments}")))
+ * }
+ * ```
+ *
+ * @param name unique tool identifier
+ * @param description human-readable tool description
+ * @param handler suspend function invoked when the tool is called
+ * @return the registered tool definition
+ */
+````
+
+## Rules
+
+- Summary: concise first sentence starting with a third-person verb ("Creates", "Returns", "Represents"). Expand to 2-3 sentences only when genuinely complex
+- **@property** in class-level KDoc for all public properties (never as individual KDoc on the property); **@param** for function parameters
+- **@return** for non-Unit return types
+- **Example block**: add for DSL builders, complex functions, extension functions with non-obvious usage. Skip for trivial one-liners and simple getters
+- **DSL builders**: always include an Example showing full usage with the receiver scope — this is critical for discoverability
+- KDoc links (`[ClassName]`, `[methodName]`): only where it adds clear navigational value
+- No **@throws** — don't document exceptions
+- No **suspend** notes — coroutine nature is visible from the signature
+- **Existing KDoc**: rewrite if incomplete (missing @param/@return/@property) or low quality

config/detekt/detekt.yml

@@ -22,3 +22,22 @@ empty-blocks:
   EmptyFunctionBlock:
     excludes: *testFolders
 
+comments:
+    UndocumentedPublicClass:
+      active: true
+      excludes: &testAndGeneratedFolders
+        - '**/test/**'
+        - '**/commonTest/**'
+        - '**/jvmTest/**'
+        - '**/jsTest/**'
+        - '**/iosTest/**'
+        - '**/generated-sources/**'
+      ignoreDefaultCompanionObject: true
+    UndocumentedPublicFunction:
+      active: true
+      excludes: *testAndGeneratedFolders
+    UndocumentedPublicProperty:
+      active: true
+      excludes: *testAndGeneratedFolders
+      searchProtectedProperty: false
+      ignoreEnumEntries: true

gradle.properties

@@ -8,4 +8,4 @@ kotlin.daemon.jvmargs=-Xmx4G
 kotlin.native.ignoreDisabledTargets=true
 
 group=io.modelcontextprotocol
-version=0.10.0
+version=0.11.0

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ openapi-generator = "7.21.0"
 awaitility = "4.3.0"
 collections-immutable = "0.4.0"
 coroutines = "1.10.2"
-kotest = "6.1.9"
+kotest = "6.1.11"
 kotlinx-io = "0.9.0"
 ktor = "3.3.3"
 logging = "8.0.01"

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

@@ -7,6 +7,8 @@ import io.kotest.matchers.string.shouldNotBeBlank
 import io.modelcontextprotocol.kotlin.sdk.types.CallToolRequest
 import io.modelcontextprotocol.kotlin.sdk.types.CallToolRequestParams
 import io.modelcontextprotocol.kotlin.sdk.types.ClientCapabilities
+import io.modelcontextprotocol.kotlin.sdk.types.ElicitationCompleteNotification
+import io.modelcontextprotocol.kotlin.sdk.types.ElicitationCompleteNotificationParams
 import io.modelcontextprotocol.kotlin.sdk.types.GetPromptRequest
 import io.modelcontextprotocol.kotlin.sdk.types.GetPromptRequestParams
 import io.modelcontextprotocol.kotlin.sdk.types.ListRootsRequest
@@ -77,6 +79,8 @@ class ClientConnectionTest : AbstractServerFeaturesTest() {
         val loggingMessage = onClientNotification<LoggingMessageNotification>(Method.Defined.NotificationsMessage)
         val resourceUpdated =
             onClientNotification<ResourceUpdatedNotification>(Method.Defined.NotificationsResourcesUpdated)
+        val elicitationComplete =
+            onClientNotification<ElicitationCompleteNotification>(Method.Defined.NotificationsElicitationComplete)
 
         init {
             onClientRequest<ListRootsRequest, ListRootsResult>(Method.Defined.RootsList) {
@@ -109,6 +113,12 @@ class ClientConnectionTest : AbstractServerFeaturesTest() {
                 withClue("sendResourceUpdated() delivered wrong URI") {
                     resourceUri shouldBe "test://res"
                 }
+                withClue("sendElicitationComplete() did not deliver a notification to the client") {
+                    elicitationComplete.isCompleted shouldBe true
+                }
+                withClue("sendElicitationComplete() delivered wrong elicitationId") {
+                    elicitationComplete.await().params.elicitationId shouldBe "elicit-123"
+                }
                 capturedSessionId.shouldNotBeBlank()
             }
         }
@@ -128,6 +138,9 @@ class ClientConnectionTest : AbstractServerFeaturesTest() {
             ),
         )
         sendResourceUpdated(ResourceUpdatedNotification(ResourceUpdatedNotificationParams("test://res")))
+        sendElicitationComplete(
+            ElicitationCompleteNotification(ElicitationCompleteNotificationParams(elicitationId = "elicit-123")),
+        )
         cap.sessionId.complete(sessionId)
     }
 

integration-test/src/jvmTest/typescript/package-lock.json

@@ -9,14 +9,14 @@
     "server:http": "tsx server/http-server.ts"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.28.0",
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "express": "^5.2.1",
     "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.6",
-    "@types/node": "^25.5.0",
+    "@types/node": "^25.5.2",
     "cors": "^2.8.6",
     "tsx": "^4.21.0",
     "typescript": "^6.0.2"

integration-test/src/jvmTest/typescript/package.json

@@ -51,7 +51,9 @@ private const val MCP_PROTOCOL_VERSION_HEADER = "mcp-protocol-version"
 private const val MCP_RESUMPTION_TOKEN_HEADER = "Last-Event-ID"
 
 /**
- * Error class for Streamable HTTP transport errors.
+ * Represents an error from the Streamable HTTP transport.
+ *
+ * @property code HTTP status code associated with the error, or `null` if unavailable
  */
 public class StreamableHttpError(public val code: Int? = null, message: String? = null) :
     Exception("Streamable HTTP error: $message")
@@ -66,6 +68,9 @@ private sealed interface ConnectResult {
  * Client transport for Streamable HTTP: this implements the MCP Streamable HTTP transport specification.
  * It will connect to a server using HTTP POST for sending messages and HTTP GET with Server-Sent Events
  * for receiving messages.
+ *
+ * @property sessionId session identifier assigned by the server after initialization, or `null` before connection
+ * @property protocolVersion MCP protocol version negotiated with the server, or `null` before connection
  */
 @Suppress("TooManyFunctions")
 public class StreamableHttpClientTransport(

kotlin-sdk-client/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/client/StreamableHttpClientTransport.kt

@@ -1417,6 +1417,65 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/ElicitResult$Compani
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
+public final class io/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification : io/modelcontextprotocol/kotlin/sdk/types/ServerNotification {
+	public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification$Companion;
+	public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;)V
+	public final fun component1 ()Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;
+	public final fun copy (Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;)Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification;
+	public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification;Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getMethod ()Lio/modelcontextprotocol/kotlin/sdk/types/Method;
+	public fun getParams ()Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;
+	public synthetic fun getParams ()Lio/modelcontextprotocol/kotlin/sdk/types/NotificationParams;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final synthetic class io/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+	public static final field INSTANCE Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification$$serializer;
+	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
+	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification;
+	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification;)V
+	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
+	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
+}
+
+public final class io/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotification$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public final class io/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams : io/modelcontextprotocol/kotlin/sdk/types/NotificationParams {
+	public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams$Companion;
+	public fun <init> (Ljava/lang/String;Lkotlinx/serialization/json/JsonObject;)V
+	public synthetic fun <init> (Ljava/lang/String;Lkotlinx/serialization/json/JsonObject;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Lkotlinx/serialization/json/JsonObject;
+	public final fun copy (Ljava/lang/String;Lkotlinx/serialization/json/JsonObject;)Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;
+	public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;Ljava/lang/String;Lkotlinx/serialization/json/JsonObject;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getElicitationId ()Ljava/lang/String;
+	public fun getMeta ()Lkotlinx/serialization/json/JsonObject;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final synthetic class io/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+	public static final field INSTANCE Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams$$serializer;
+	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
+	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;
+	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams;)V
+	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
+	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
+}
+
+public final class io/modelcontextprotocol/kotlin/sdk/types/ElicitationCompleteNotificationParams$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class io/modelcontextprotocol/kotlin/sdk/types/ElicitationKt {
 	public static final fun ElicitRequestParams-EDEVuBg (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/types/ElicitRequestParams$RequestedSchema;Lkotlinx/serialization/json/JsonObject;)Lio/modelcontextprotocol/kotlin/sdk/types/ElicitRequestFormParams;
 	public static synthetic fun ElicitRequestParams-EDEVuBg$default (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/types/ElicitRequestParams$RequestedSchema;Lkotlinx/serialization/json/JsonObject;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/types/ElicitRequestFormParams;
@@ -2939,6 +2998,7 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/Method$Defined : jav
 	public static final field Initialize Lio/modelcontextprotocol/kotlin/sdk/types/Method$Defined;
 	public static final field LoggingSetLevel Lio/modelcontextprotocol/kotlin/sdk/types/Method$Defined;
 	public static final field NotificationsCancelled Lio/modelcontextprotocol/kotlin/sdk/types/Method$Defined;
+	public static final field NotificationsElicitationComplete Lio/modelcontextprotocol/kotlin/sdk/types/Method$Defined;
 	public static final field NotificationsInitialized Lio/modelcontextprotocol/kotlin/sdk/types/Method$Defined;
 	public static final field NotificationsMessage Lio/modelcontextprotocol/kotlin/sdk/types/Method$Defined;
 	public static final field NotificationsProgress Lio/modelcontextprotocol/kotlin/sdk/types/Method$Defined;

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

@@ -2,4 +2,5 @@ package io.modelcontextprotocol.kotlin.sdk.internal
 
 import kotlinx.coroutines.CoroutineDispatcher
 
+/** Platform-specific [CoroutineDispatcher] for I/O-bound operations. */
 public expect val IODispatcher: CoroutineDispatcher