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

Author: nerzhulart

.github/workflows/gradle-publish.yml

@@ -9,7 +9,7 @@ name: Release
 
 on:
   release:
-    types: [created]
+    types: [ created ]
 
 jobs:
   build:
@@ -27,12 +27,9 @@ jobs:
         with:
           java-version: '21'
           distribution: 'temurin'
-          server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
-          server-username: JRELEASER_MAVENCENTRAL_USERNAME
-          server-password: JRELEASER_MAVENCENTRAL_PASSWORD
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Verify publication configuration
         run: ./gradlew jreleaserConfig
@@ -52,13 +49,85 @@ jobs:
           JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
           JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
           JRELEASER_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+          GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+          SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
 
-      - name: Publish to OSSRH repository
-        run: ./gradlew publish jreleaserFullRelease
+      - name: Publish to Maven Central Portal
+        id: publish
+        run: ./gradlew publish jreleaserFullRelease --info --stacktrace -Djreleaser.verbose=true
         env:
           JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
           JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
           JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
           JRELEASER_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+          SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+
+      - name: Query Central Portal for validation errors
+        if: failure()
+        shell: bash
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+        run: |
+          set -euo pipefail
+          
+          OUTPUT_PROPS="build/jreleaser/output.properties"
+          
+          if [[ ! -f "$OUTPUT_PROPS" ]]; then
+            echo "::error title=File Missing::The file '$OUTPUT_PROPS' does not exist."
+            exit 1
+          fi
+          
+          DEPLOY_ID=$(grep '^deploymentId=' "$OUTPUT_PROPS" | cut -d= -f2 || true)
+          if [[ -z "$DEPLOY_ID" ]]; then
+            echo "::error title=Missing Deployment ID::The 'deploymentId' key was not found in '$OUTPUT_PROPS'."
+            exit 1
+          fi
+          
+          echo "Portal deploymentId: $DEPLOY_ID"
+          
+          if [ -z "$OSSRH_USERNAME" ]; then
+            echo "::error title='OSSRH_USERNAME' is not set."
+            exit 1
+          fi
+  
+          if [ -z "$OSSRH_TOKEN" ]; then
+            echo "::error title='OSSRH_TOKEN' is not set."
+            exit 1
+          fi
+          
+          AUTH=$(printf "%s:%s" "$OSSRH_USERNAME" "$OSSRH_TOKEN" | base64)
+          echo "::add-mask::$AUTH"
+          
+          STATUS_JSON=$(curl -sS \
+            -H "Authorization: Bearer $AUTH" \
+            -H "Content-Type: application/json" \
+            -X POST \
+            "https://central.sonatype.com/api/v1/publisher/status?id=$DEPLOY_ID")
+          
+          echo "$STATUS_JSON" | jq .
+          
+          echo "$STATUS_JSON" | jq -r '.errors[]?.message' |
+            while read -r MSG; do
+              echo "::error title=Sonatype validation::$MSG"
+            done
+          
+          {
+            echo "### Sonatype Central Portal validation result"
+            echo
+            echo '```json'
+            echo "$STATUS_JSON"
+            echo '```'
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Upload JReleaser artefacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: jreleaser-logs
+          path: |
+            build/jreleaser/trace.log
+            build/jreleaser/output.properties

build.gradle.kts

@@ -40,12 +40,13 @@ publishing {
 
 jreleaser {
     gitRootSearch = true
-    strict.set(true)
+    strict = true
 
     signing {
-        active.set(Active.ALWAYS)
-        armored.set(true)
-        artifacts.set(true)
+        active = Active.ALWAYS
+        armored = true
+        artifacts = true
+        files = true
     }
 
     deploy {
@@ -93,6 +94,7 @@ jreleaser {
 
     release {
         github {
+            changelog.enabled = false
             skipRelease = true
             skipTag = true
             overwrite = false
@@ -137,13 +139,12 @@ fun MavenPom.configureMavenCentralMetadata() {
 }
 
 fun MavenPublication.signPublicationIfKeyPresent() {
-    val keyId = project.getSensitiveProperty("SIGNING_KEY_ID")
-    val signingKey = project.getSensitiveProperty("SIGNING_KEY_PRIVATE")
+    val signingKey = project.getSensitiveProperty("GPG_SECRET_KEY")
     val signingKeyPassphrase = project.getSensitiveProperty("SIGNING_PASSPHRASE")
 
     if (!signingKey.isNullOrBlank()) {
         the<SigningExtension>().apply {
-            useInMemoryPgpKeys(keyId, signingKey, signingKeyPassphrase)
+            useInMemoryPgpKeys(signingKey, signingKeyPassphrase)
 
             sign(this@signPublicationIfKeyPresent)
         }

gradle.properties

@@ -1,9 +1,9 @@
 kotlin.code.style=official
-org.gradle.jvmargs=-XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 org.gradle.parallel=true
-org.gradle.configuration-cache.parallel=true
+org.gradle.caching=true
 
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
-kotlin.daemon.jvmargs=-Xmx2G
+kotlin.daemon.jvmargs=-Xmx4G

gradle/wrapper/gradle-wrapper.jar

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -465,10 +465,7 @@ public abstract class Protocol(
         val transport = this.transport ?: error("Not connected")
         assertNotificationCapability(notification.method)
 
-        val message = JSONRPCNotification(
-            notification.method.value,
-            params = McpJson.encodeToJsonElement<Notification>(notification) as JsonObject,
-        )
+        val message = notification.toJSON()
         transport.send(message)
     }
 

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

@@ -8,8 +8,10 @@ import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.jsonObject
 import kotlin.concurrent.atomics.AtomicLong
 import kotlin.concurrent.atomics.ExperimentalAtomicApi
 import kotlin.concurrent.atomics.incrementAndFetch
@@ -123,9 +125,10 @@ public sealed interface Request {
  * @return The JSON-RPC request representation.
  */
 internal fun Request.toJSON(): JSONRPCRequest {
+    val encoded = JsonObject(McpJson.encodeToJsonElement(this).jsonObject.minus("method"))
     return JSONRPCRequest(
         method = method.value,
-        params = McpJson.encodeToJsonElement(this),
+        params = encoded,
         jsonrpc = JSONRPC_VERSION,
     )
 }
@@ -135,10 +138,11 @@ internal fun Request.toJSON(): JSONRPCRequest {
  *
  * @return The decoded [Request] or null
  */
-internal fun JSONRPCRequest.fromJSON(): Request? {
-    val serializer = selectRequestDeserializer(method)
-    val params = params
-    return McpJson.decodeFromJsonElement<Request>(serializer, params)
+internal fun JSONRPCRequest.fromJSON(): Request {
+    val requestData = JsonObject(params.jsonObject.plus("method" to JsonPrimitive(method)))
+
+    val deserializer = selectRequestDeserializer(method)
+    return McpJson.decodeFromJsonElement(deserializer, requestData)
 }
 
 /**
@@ -163,7 +167,7 @@ public sealed interface Notification {
  * @return The JSON-RPC notification representation.
  */
 internal fun Notification.toJSON(): JSONRPCNotification {
-    val encoded = McpJson.encodeToJsonElement<Notification>(this)
+    val encoded = JsonObject(McpJson.encodeToJsonElement<Notification>(this).jsonObject.minus("method"))
     return JSONRPCNotification(
         method.value,
         params = encoded
@@ -176,7 +180,8 @@ internal fun Notification.toJSON(): JSONRPCNotification {
  * @return The decoded [Notification].
  */
 internal fun JSONRPCNotification.fromJSON(): Notification {
-    return McpJson.decodeFromJsonElement<Notification>(params)
+    val data = JsonObject(params.jsonObject.plus("method" to JsonPrimitive(method)))
+    return McpJson.decodeFromJsonElement<Notification>(data)
 }
 
 /**