Merge branch 'main' into n500/add-receiver-mcp-dsl

Author: nerzhulart

.github/workflows/validate-pr.yml

@@ -3,7 +3,11 @@ name: Validate PR
 on:
   workflow_dispatch:
   pull_request:
-    types: [auto_merge_enabled]
+    branches: [main]
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
 
 jobs:
   validate-pr:
@@ -17,7 +21,7 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Clean Build with Gradle
         run: ./gradlew clean build

api/kotlin-sdk.api

@@ -12,7 +12,7 @@ ktor = "3.2.1"
 mockk = "1.14.4"
 logging = "7.0.7"
 jreleaser = "1.19.0"
-binaryCompatibilityValidatorPlugin = "0.18.0"
+binaryCompatibilityValidatorPlugin = "0.18.1"
 slf4j = "2.0.17"
 kotest = "5.9.1"
 

gradle/libs.versions.toml

@@ -206,6 +206,7 @@ public open class Server(
      * Registers a single tool. The client can then call this tool.
      *
      * @param name The name of the tool.
+     * @param title An optional human-readable name of the tool for display purposes.
      * @param description A human-readable description of what the tool does.
      * @param inputSchema The expected input schema for the tool.
      * @param outputSchema The optional expected output schema for the tool.
@@ -217,11 +218,12 @@ public open class Server(
         name: String,
         description: String,
         inputSchema: Tool.Input = Tool.Input(),
+        title: String? = null,
         outputSchema: Tool.Output? = null,
         toolAnnotations: ToolAnnotations? = null,
         handler: suspend (CallToolRequest) -> CallToolResult
     ) {
-        val tool = Tool(name, description, inputSchema, outputSchema, toolAnnotations)
+        val tool = Tool(name, title, description, inputSchema, outputSchema, toolAnnotations)
         addTool(tool, handler)
     }
 
@@ -556,7 +558,7 @@ public open class Server(
      * @param params The logging message notification parameters.
      */
     public suspend fun sendLoggingMessage(params: LoggingMessageNotification) {
-        logger.trace { "Sending logging message: ${params.data}" }
+        logger.trace { "Sending logging message: ${params.params.data}" }
         notification(params)
     }
 
@@ -566,7 +568,7 @@ public open class Server(
      * @param params Details of the updated resource.
      */
     public suspend fun sendResourceUpdated(params: ResourceUpdatedNotification) {
-        logger.debug { "Sending resource updated notification for: ${params.uri}" }
+        logger.debug { "Sending resource updated notification for: ${params.params.uri}" }
         notification(params)
     }
 

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

@@ -292,11 +292,11 @@ public abstract class Protocol(
     }
 
     private fun onProgress(notification: ProgressNotification) {
-        LOGGER.trace { "Received progress notification: token=${notification.progressToken}, progress=${notification.progress}/${notification.total}" }
-        val progress = notification.progress
-        val total = notification.total
-        val message = notification.message
-        val progressToken = notification.progressToken
+        LOGGER.trace { "Received progress notification: token=${notification.params.progressToken}, progress=${notification.params.progress}/${notification.params.total}" }
+        val progress = notification.params.progress
+        val total = notification.params.total
+        val message = notification.params.message
+        val progressToken = notification.params.progressToken
 
         val handler = _progressHandlers.value[progressToken]
         if (handler == null) {
@@ -424,7 +424,12 @@ public abstract class Protocol(
             _responseHandlers.update { current -> current.remove(messageId) }
             _progressHandlers.update { current -> current.remove(messageId) }
 
-            val notification = CancelledNotification(requestId = messageId, reason = reason.message ?: "Unknown")
+            val notification = CancelledNotification(
+                params = CancelledNotification.Params(
+                    requestId = messageId, 
+                    reason = reason.message ?: "Unknown"
+                )
+            )
 
             val serialized = JSONRPCNotification(
                 notification.method.value,