Merge branch 'main' into task/support-local-builds-in-samples

Author: MarkusBillharz

.github/workflows/codeql.yml

@@ -0,0 +1,62 @@
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '0 4 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      matrix:
+        language: [ java-kotlin ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: manual
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+
+      - name: Build Kotlin sources
+        run: |
+          ./gradlew \
+            :build -Pkotlin.incremental=false \
+            --no-daemon --stacktrace --parallel
+
+      - name: Analyze
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: '/language:${{ matrix.language }}'

api/kotlin-sdk.api

@@ -8,8 +8,8 @@ atomicfu = "0.29.0"
 serialization = "1.9.0"
 collections-immutable = "0.4.0"
 coroutines = "1.10.2"
-ktor = "3.2.1"
-mockk = "1.14.4"
+ktor = "3.2.2"
+mockk = "1.14.5"
 logging = "7.0.7"
 jreleaser = "1.19.0"
 binaryCompatibilityValidatorPlugin = "0.18.1"

gradle/libs.versions.toml

@@ -558,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)
     }
 
@@ -568,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,