Bump versions and fix MCP compatability problems

Author: NonoxyS

.github/workflows/build.yml

@@ -160,7 +160,7 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2025.1.1
+        uses: JetBrains/qodana-action@v2025.3.2
         with:
           cache-default-branch-only: true
 

gradle.properties

@@ -10,7 +10,7 @@ pluginVersion=0.0.4
 pluginSinceBuild = 252
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
-platformVersion = 2025.2
+platformVersion=2025.2.6.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP

gradle/libs.versions.toml

@@ -6,11 +6,11 @@ kotlinxSerialization = "1.7.3"
 opentest4j = "1.3.0"
 
 # plugins
-changelog = "2.4.0"
+changelog = "2.5.0"
 intelliJPlatform = "2.13.1"
 kotlin = "2.3.20"
-kover = "0.9.1"
-qodana = "2025.1.1"
+kover = "0.9.7"
+qodana = "2025.3.2"
 
 [libraries]
 freemarker = { group = "org.freemarker", name = "freemarker", version.ref = "freemarker" }

qodana.yml

@@ -2,7 +2,7 @@
 # https://www.jetbrains.com/help/qodana/qodana-yaml.html
 
 version: "1.0"
-linter: jetbrains/qodana-jvm-community:2024.3
+linter: jetbrains/qodana-jvm-community:2025.3
 projectJDK: "21"
 profile:
   name: qodana.recommended

src/main/kotlin/com/github/nonoxys/kmpmodulegenerator/mcp/KmpMcpToolset.kt

@@ -1,5 +1,8 @@
 package com.github.nonoxys.kmpmodulegenerator.mcp
 
+import com.github.nonoxys.kmpmodulegenerator.mcp.models.GenerationResultDTO
+import com.github.nonoxys.kmpmodulegenerator.mcp.models.TemplateDTO
+import com.github.nonoxys.kmpmodulegenerator.mcp.models.TemplateVariableDTO
 import com.github.nonoxys.kmpmodulegenerator.models.GenerationResult
 import com.github.nonoxys.kmpmodulegenerator.models.VariableType
 import com.github.nonoxys.kmpmodulegenerator.services.ModuleGeneratorService
@@ -8,31 +11,33 @@ import com.intellij.mcpserver.McpExpectedError
 import com.intellij.mcpserver.McpToolset
 import com.intellij.mcpserver.annotations.McpDescription
 import com.intellij.mcpserver.annotations.McpTool
-import com.intellij.mcpserver.project
-import com.intellij.openapi.application.ApplicationManager
+import com.intellij.mcpserver.mcpFail
+import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.project.Project
 import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
+import kotlin.coroutines.CoroutineContext
 
+@Suppress("UnstableApiUsage")
 class KmpMcpToolset : McpToolset {
 
     @McpTool(name = "kmp_list_templates")
     @McpDescription("List all available KMP module templates with their variables. Use this before calling kmp_generate_module to discover templateId values and required variables.")
-    suspend fun listTemplates(): List<TemplateDto> {
-        val project = currentCoroutineContext().project
+    suspend fun listTemplates(): List<TemplateDTO> {
+        val project = resolveProject(context = currentCoroutineContext()) ?: mcpFail("No project found")
         val templates = TemplateService.getInstance(project).getAllTemplates()
 
         if (templates.isEmpty()) {
             throw McpExpectedError("No templates found. Create templates in .idea/kmp-templates/ or configure a custom path in Settings > KMP Module Templates.")
         }
 
         return templates.map { template ->
-            TemplateDto(
+            TemplateDTO(
                 id = template.id,
                 name = template.name,
                 description = template.description,
                 variables = template.variables.map { v ->
-                    TemplateVariableDto(
+                    TemplateVariableDTO(
                         name = v.name,
                         displayName = v.displayName,
                         description = v.description,
@@ -52,16 +57,16 @@ class KmpMcpToolset : McpToolset {
         @McpDescription("Template ID from kmp_list_templates") templateId: String,
         @McpDescription("Absolute filesystem path where the module will be created") targetPath: String,
         @McpDescription("JSON object with variable values, e.g. {\"key\": \"value\"}") variables: String = "{}",
-    ): GenerationResultDto {
-        val project = currentCoroutineContext().project
+    ): GenerationResultDTO {
+        val project = resolveProject(context = currentCoroutineContext()) ?: mcpFail("No project found")
         val templateService = TemplateService.getInstance(project)
         val generatorService = ModuleGeneratorService.getInstance(project)
 
         val template = templateService.getTemplate(templateId)
             ?: throw McpExpectedError("Template '$templateId' not found. Use kmp_list_templates to see available templates.")
 
         val variablesMap = try {
-            if (variables.isBlank() || variables == "{}") emptyMap()
+            if (variables.isBlank()) emptyMap()
             else Json.decodeFromString<Map<String, String>>(variables)
         } catch (e: Exception) {
             throw McpExpectedError("Invalid variables JSON: ${e.message}. Expected format: {\"key\": \"value\"}")
@@ -74,52 +79,36 @@ class KmpMcpToolset : McpToolset {
             throw McpExpectedError("Validation failed:\n${validationErrors.joinToString("\n") { "- $it" }}")
         }
 
-        var result: GenerationResult? = null
-        ApplicationManager.getApplication().invokeAndWait {
-            result = generatorService.generateModule(configuration)
-        }
+        val result = writeAction { generatorService.generateModule(configuration) }
 
-        return when (val r = result) {
-            is GenerationResult.Success -> GenerationResultDto(
-                moduleName = r.moduleName,
-                location = r.moduleDirectory.path,
-                files = r.generatedFiles.map { it.path },
+        return when (result) {
+            is GenerationResult.Success -> GenerationResultDTO(
+                moduleName = result.moduleName,
+                location = result.moduleDirectory.path,
+                files = result.generatedFiles.map { it.path },
             )
-            is GenerationResult.Warning -> GenerationResultDto(
-                moduleName = r.moduleName,
-                location = r.moduleDirectory.path,
-                files = r.generatedFiles.map { it.path },
-                warnings = r.warnings,
+
+            is GenerationResult.Warning -> GenerationResultDTO(
+                moduleName = result.moduleName,
+                location = result.moduleDirectory.path,
+                files = result.generatedFiles.map { it.path },
+                warnings = result.warnings,
             )
-            is GenerationResult.Failure -> throw McpExpectedError(r.error)
-            null -> throw McpExpectedError("Generation produced no result (unexpected internal error)")
+
+            is GenerationResult.Failure -> throw McpExpectedError(result.error)
         }
     }
-}
-
-@Serializable
-data class TemplateDto(
-    val id: String,
-    val name: String,
-    val description: String,
-    val variables: List<TemplateVariableDto>,
-)
 
-@Serializable
-data class TemplateVariableDto(
-    val name: String,
-    val displayName: String,
-    val description: String,
-    val type: String,
-    val required: Boolean,
-    val defaultValue: String,
-    val options: List<String>? = null,
-)
-
-@Serializable
-data class GenerationResultDto(
-    val moduleName: String,
-    val location: String,
-    val files: List<String>,
-    val warnings: List<String> = emptyList(),
-)
+    private fun resolveProject(context: CoroutineContext): Project? {
+        return try {
+            val helperClass = Class.forName("com.intellij.mcpserver.McpCallInfoKt")
+            val helperMethod = helperClass.getMethod(
+                "getProjectOrNull",
+                CoroutineContext::class.java
+            )
+            helperMethod.invoke(null, context) as? Project
+        } catch (_: ReflectiveOperationException) {
+            null
+        }
+    }
+}

src/main/kotlin/com/github/nonoxys/kmpmodulegenerator/mcp/models/GenerationResultDTO.kt

@@ -0,0 +1,11 @@
+package com.github.nonoxys.kmpmodulegenerator.mcp.models
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GenerationResultDTO(
+    val moduleName: String,
+    val location: String,
+    val files: List<String>,
+    val warnings: List<String> = emptyList(),
+)

src/main/kotlin/com/github/nonoxys/kmpmodulegenerator/mcp/models/TemplateDTO.kt

@@ -0,0 +1,11 @@
+package com.github.nonoxys.kmpmodulegenerator.mcp.models
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TemplateDTO(
+    val id: String,
+    val name: String,
+    val description: String,
+    val variables: List<TemplateVariableDTO>,
+)

src/main/kotlin/com/github/nonoxys/kmpmodulegenerator/mcp/models/TemplateVariableDTO.kt

@@ -0,0 +1,14 @@
+package com.github.nonoxys.kmpmodulegenerator.mcp.models
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TemplateVariableDTO(
+    val name: String,
+    val displayName: String,
+    val description: String,
+    val type: String,
+    val required: Boolean,
+    val defaultValue: String,
+    val options: List<String>? = null,
+)