diff --git a/.idea/libraries/io_modelcontextprotocol_kotlin_sdk.xml b/.idea/libraries/io_modelcontextprotocol_kotlin_sdk.xml
index f59511419db5..ec858215f3cf 100644
--- a/.idea/libraries/io_modelcontextprotocol_kotlin_sdk.xml
+++ b/.idea/libraries/io_modelcontextprotocol_kotlin_sdk.xml
@@ -1,18 +1,18 @@
 <component name="libraryTable">
   <library name="io.modelcontextprotocol.kotlin.sdk" type="repository">
-    <properties include-transitive-deps="false" maven-id="io.modelcontextprotocol:kotlin-sdk-jvm:0.5.0">
+    <properties include-transitive-deps="false" maven-id="io.modelcontextprotocol:kotlin-sdk-jvm:0.6.0">
       <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/modelcontextprotocol/kotlin-sdk-jvm/0.5.0/kotlin-sdk-jvm-0.5.0.jar">
-          <sha256sum>d3f56ac2562dc7883043fcbf6b7624196952cf17d41f864db5197d8e9f8b183c</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/modelcontextprotocol/kotlin-sdk-jvm/0.6.0/kotlin-sdk-jvm-0.6.0.jar">
+          <sha256sum>10b00c7af47c7a0fb510fb9d7519a9d2476f8e815a5005282734821082f9dc21</sha256sum>
         </artifact>
       </verification>
     </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/modelcontextprotocol/kotlin-sdk-jvm/0.5.0/kotlin-sdk-jvm-0.5.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/modelcontextprotocol/kotlin-sdk-jvm/0.6.0/kotlin-sdk-jvm-0.6.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/modelcontextprotocol/kotlin-sdk-jvm/0.5.0/kotlin-sdk-jvm-0.5.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/modelcontextprotocol/kotlin-sdk-jvm/0.6.0/kotlin-sdk-jvm-0.6.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel
index 0fec31eb1fce..42e5afe57f95 100644
--- a/lib/BUILD.bazel
+++ b/lib/BUILD.bazel
@@ -2282,8 +2282,8 @@ jvm_import(
 
 jvm_import(
   name = "io-modelcontextprotocol-kotlin-sdk",
-  jar = "@kotlin-sdk-jvm-0_5_0_http//file",
-  source_jar = "@kotlin-sdk-jvm-0_5_0-sources_http//file",
+  jar = "@kotlin-sdk-jvm-0_6_0_http//file",
+  source_jar = "@kotlin-sdk-jvm-0_6_0-sources_http//file",
   visibility = ["//visibility:public"]
 )
 
diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel
index 47feef826bb9..2a79cf65ca68 100644
--- a/lib/MODULE.bazel
+++ b/lib/MODULE.bazel
@@ -3023,17 +3023,17 @@ http_file(
 )
 
 http_file(
-  name = "kotlin-sdk-jvm-0_5_0_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/modelcontextprotocol/kotlin-sdk-jvm/0.5.0/kotlin-sdk-jvm-0.5.0.jar",
-  sha256 = "d3f56ac2562dc7883043fcbf6b7624196952cf17d41f864db5197d8e9f8b183c",
-  downloaded_file_path = "kotlin-sdk-jvm-0.5.0.jar"
+  name = "kotlin-sdk-jvm-0_6_0_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/modelcontextprotocol/kotlin-sdk-jvm/0.6.0/kotlin-sdk-jvm-0.6.0.jar",
+  sha256 = "10b00c7af47c7a0fb510fb9d7519a9d2476f8e815a5005282734821082f9dc21",
+  downloaded_file_path = "kotlin-sdk-jvm-0.6.0.jar"
 )
 
 http_file(
-  name = "kotlin-sdk-jvm-0_5_0-sources_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/modelcontextprotocol/kotlin-sdk-jvm/0.5.0/kotlin-sdk-jvm-0.5.0-sources.jar",
-  sha256 = "cd753e33d2aa5308eefa4ee2542f829d4be85805c9d0a8fbaf504a66492d5f1e",
-  downloaded_file_path = "kotlin-sdk-jvm-0.5.0-sources.jar"
+  name = "kotlin-sdk-jvm-0_6_0-sources_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/modelcontextprotocol/kotlin-sdk-jvm/0.6.0/kotlin-sdk-jvm-0.6.0-sources.jar",
+  sha256 = "a7dec8c0b7df080e7e234f5ca683b28a6e6a4b7bfcdafa75a8aeca20b753ea81",
+  downloaded_file_path = "kotlin-sdk-jvm-0.6.0-sources.jar"
 )
 
 http_file(
diff --git a/plugins/mcp-server/mcpserver.stdio/src/McpStdioRunner.kt b/plugins/mcp-server/mcpserver.stdio/src/McpStdioRunner.kt
index b8fb2d034cd6..927488cf636a 100644
--- a/plugins/mcp-server/mcpserver.stdio/src/McpStdioRunner.kt
+++ b/plugins/mcp-server/mcpserver.stdio/src/McpStdioRunner.kt
@@ -30,7 +30,7 @@ suspend fun main() {
     install(SSE)
   }
 
-  val sseClientTransport = SseClientTransport(httpClient, "http://localhost:$port/")
+  val sseClientTransport = SseClientTransport(httpClient, "http://localhost:$port/sse")
 
   val projectPath = System.getenv(IJ_MCP_SERVER_PROJECT_PATH)
 
diff --git a/plugins/mcp-server/src/com/intellij/mcpserver/impl/McpServerService.kt b/plugins/mcp-server/src/com/intellij/mcpserver/impl/McpServerService.kt
index 8917e2361b5d..6f21519a8892 100644
--- a/plugins/mcp-server/src/com/intellij/mcpserver/impl/McpServerService.kt
+++ b/plugins/mcp-server/src/com/intellij/mcpserver/impl/McpServerService.kt
@@ -184,7 +184,9 @@ private fun McpTool.mcpToolToRegisteredTool(): RegisteredTool {
                   description = descriptor.description,
                   inputSchema = Tool.Input(
                     properties = descriptor.inputSchema.properties,
-                    required = descriptor.inputSchema.requiredParameters.toList()))
+                    required = descriptor.inputSchema.requiredParameters.toList()),
+                  outputSchema = null,
+                  annotations = null)
   return RegisteredTool(tool) { request ->
     val projectPath = (request._meta[IJ_MCP_SERVER_PROJECT_PATH] as? JsonPrimitive)?.content
     val project = if (!projectPath.isNullOrBlank()) {
@@ -304,7 +306,7 @@ private fun McpTool.mcpToolToRegisteredTool(): RegisteredTool {
         is McpToolCallResultContent.Text -> TextContent(content.text)
       }
     }
-    return@RegisteredTool CallToolResult(content = contents, callResult.isError)}
+    return@RegisteredTool CallToolResult(content = contents, structuredContent = null, isError = callResult.isError)}
   }
 }
 
diff --git a/plugins/mcp-server/test/com/intellij/mcpserver/TransportTest.kt b/plugins/mcp-server/test/com/intellij/mcpserver/TransportTest.kt
index cfda996d7592..d972e91b848a 100644
--- a/plugins/mcp-server/test/com/intellij/mcpserver/TransportTest.kt
+++ b/plugins/mcp-server/test/com/intellij/mcpserver/TransportTest.kt
@@ -132,7 +132,7 @@ class SseTransportHolder(project: Project) : TransportHolder() {
   override val transport: AbstractTransport by lazy {
     SseClientTransport(HttpClient {
       install(SSE)
-    }, "http://localhost:${McpServerService.getInstance().port}/")
+    }, "http://localhost:${McpServerService.getInstance().port}/sse")
   }
 
   override fun toString(): String {