Merge branch 'main' into dependabot/gradle/io.github.oshai-kotlin-logging-7.0.11

Author: kpavlov

.github/workflows/build.yml

@@ -0,0 +1,53 @@
+name: Build
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [ main ]
+  push:
+    branches: [ main ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  # Cancel only when the run is NOT on `main` branch
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main'  }}
+
+jobs:
+  validate-pr:
+    runs-on: macos-latest-xlarge
+    name: Validate PR
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          add-job-summary: 'always'
+          cache-read-only: true
+
+      - name: Build with Gradle
+        run: ./gradlew clean ktlintCheck build koverLog koverHtmlReport
+        env:
+          JAVA_OPTS: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g"
+
+      - name: Upload Reports
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: junit-results
+          path: |
+            **/build/test-results/test/*.xml
+            build/reports
+
+      - name: Disable Auto-Merge on Fail
+        if: failure() && github.event_name == 'pull_request'
+        run: gh pr merge --disable-auto "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql.yml

@@ -29,9 +29,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: '21'
@@ -52,14 +54,14 @@ jobs:
 
       - name: Build Kotlin sources
         run: |
-          ./gradlew \
+            ./gradlew \
             :kotlin-sdk-core:compileKotlinJvm \
             :kotlin-sdk-client:compileKotlinJvm \
             :kotlin-sdk-server:compileKotlinJvm \
             :kotlin-sdk:compileKotlinJvm \
             :kotlin-sdk-test:compileKotlinJvm \
             -Pkotlin.incremental=false \
-            --no-daemon --stacktrace
+            --no-daemon --stacktrace --rerun-tasks
 
       - name: Analyze
         uses: github/codeql-action/analyze@v3

.github/workflows/gradle-publish.yml

@@ -21,9 +21,9 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'

.github/workflows/validate-pr.yml

@@ -40,10 +40,23 @@ Add the dependency:
 
 ```kotlin
 dependencies {
-    // Use the badge above for the latest version
+    // See the badge above for the latest version
     implementation("io.modelcontextprotocol:kotlin-sdk:$mcpVersion")
 }
 ```
+MCP SDK uses [Ktor](https://ktor.io/), but does not come with a specific engine dependency.
+You should add [Ktor client](https://ktor.io/docs/client-dependencies.html#engine-dependency) 
+and/or [Ktor server](https://ktor.io/docs/client-dependencies.html#engine-dependency) dependency 
+to your project yourself, e.g.:
+```kotlin
+dependencies {
+    // for client:
+    implementation("io.ktor:ktor-client-cio:$ktorVersion")
+    // for server:
+    implementation("io.ktor:ktor-server-netty:$ktorVersion")
+    
+}
+```
 
 ## Quick Start
 

README.md

@@ -1,12 +1,38 @@
 plugins {
     alias(libs.plugins.ktlint)
+    alias(libs.plugins.kover)
 }
 
 allprojects {
     group = "io.modelcontextprotocol"
-    version = "0.6.0"
+    version = "0.7.0"
+}
+
+dependencies {
+    kover(project(":kotlin-sdk-core"))
+    kover(project(":kotlin-sdk-client"))
+    kover(project(":kotlin-sdk-server"))
+    kover(project(":kotlin-sdk-test"))
 }
 
 subprojects {
     apply(plugin = "org.jlleitschuh.gradle.ktlint")
+    apply(plugin = "org.jetbrains.kotlinx.kover")
+}
+
+kover {
+    reports {
+        filters {
+            includes.classes("io.modelcontextprotocol.kotlin.sdk.*")
+        }
+        total {
+            log {
+            }
+            verify {
+                rule {
+                    minBound(65)
+                }
+            }
+        }
+    }
 }

build.gradle.kts

@@ -9,3 +9,4 @@ kotlin.code.style=official
 kotlin.daemon.jvmargs=-Xmx4G
 # MPP
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.native.ignoreDisabledTargets=true

gradle.properties

@@ -4,6 +4,7 @@ kotlin = "2.2.0"
 dokka = "2.0.0"
 atomicfu = "0.29.0"
 ktlint = "13.0.0"
+kover = "0.9.1"
 
 # libraries version
 serialization = "1.9.0"
@@ -18,7 +19,7 @@ slf4j = "2.0.17"
 kotest = "5.9.1"
 
 # Samples
-mcp-kotlin = "0.6.0"
+mcp-kotlin = "0.7.0"
 anthropic = "0.8.0"
 shadow = "8.1.1"
 
@@ -38,10 +39,10 @@ kotlinx-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotli
 kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version.ref = "logging" }
 
 # Ktor
-ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
+ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
 ktor-server-sse = { group = "io.ktor", name = "ktor-server-sse", version.ref = "ktor" }
 ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", version.ref = "ktor" }
-ktor-server-cio = { group = "io.ktor", name = "ktor-server-cio", version.ref = "ktor" }
+ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
 
 # Testing
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -51,6 +52,8 @@ slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4
 kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest" }
 
 # Samples
+ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
+ktor-server-cio = { group = "io.ktor", name = "ktor-server-cio", version.ref = "ktor" }
 mcp-kotlin = { group = "io.modelcontextprotocol", name = "kotlin-sdk", version.ref = "mcp-kotlin" }
 anthropic-java = { group = "com.anthropic", name = "anthropic-java", version.ref = "anthropic" }
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
@@ -59,6 +62,7 @@ ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serializatio
 [plugins]
 kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompatibilityValidatorPlugin" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
+kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 
 # Samples
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

gradle/libs.versions.toml

@@ -33,7 +33,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":kotlin-sdk-core"))
-                api(libs.ktor.client.cio)
+                api(libs.ktor.client.core)
                 implementation(libs.kotlin.logging)
             }
         }
@@ -43,6 +43,7 @@ kotlin {
                 implementation(kotlin("test"))
                 implementation(libs.ktor.client.mock)
                 implementation(libs.kotlinx.coroutines.test)
+                runtimeOnly(libs.slf4j.simple)
             }
         }
     }

kotlin-sdk-client/build.gradle.kts

@@ -2,8 +2,8 @@ package io.modelcontextprotocol.kotlin.sdk.client
 
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.client.HttpClient
-import io.ktor.client.plugins.ClientRequestException
 import io.ktor.client.plugins.sse.ClientSSESession
+import io.ktor.client.plugins.sse.SSEClientException
 import io.ktor.client.plugins.sse.sseSession
 import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.client.request.accept
@@ -230,8 +230,8 @@ public class StreamableHttpClientTransport(
                 requestBuilder()
             }
             logger.debug { "Client SSE session started successfully." }
-        } catch (e: ClientRequestException) {
-            if (e.response.status == HttpStatusCode.MethodNotAllowed) {
+        } catch (e: SSEClientException) {
+            if (e.response?.status == HttpStatusCode.MethodNotAllowed) {
                 logger.info { "Server returned 405 for GET/SSE, stream disabled." }
                 return
             }