Merge pull request #473 from phodal/master

feat: add basic MPP IDEA support #471

Author: phodal

AGENTS.md

@@ -43,6 +43,27 @@ Rest:
 1. Build MPP Core: `cd /Volumes/source/ai/autocrud && ./gradlew :mpp-core:assembleJsPackage`
 2. Build and run MPP CLI: `cd mpp-ui && npm run build && npm run start`
 
+## IntelliJ IDEA Plugin (mpp-idea)
+
+`mpp-idea` is a standalone Gradle project with `includeBuild` dependency on parent project.
+
+**Build Commands:**
+```bash
+# Compile (from project root)
+cd mpp-idea && ../gradlew compileKotlin
+
+# Run tests (JewelRendererTest uses JUnit 5, no IntelliJ Platform required)
+cd mpp-idea && ../gradlew test --tests "cc.unitmesh.devins.idea.renderer.JewelRendererTest"
+
+# Build plugin
+cd mpp-idea && ../gradlew buildPlugin
+```
+
+**Notes:**
+- Do NOT use `./gradlew :mpp-idea:compileKotlin` from root - use `cd mpp-idea && ../gradlew` instead
+- `IdeaAgentViewModelTest` requires IntelliJ Platform Test Framework
+- `JewelRendererTest` can run standalone with JUnit 5
+
 ## Release
 
 1. modify version in `gradle.properties`

core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/AutoDevInput.kt

@@ -11,6 +11,7 @@ import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.editor.EditorModificationUtil
 import com.intellij.openapi.editor.actions.EnterAction
 import com.intellij.openapi.editor.actions.IncrementalFindAction
@@ -181,7 +182,9 @@ class AutoDevInput(
         val id = UUID.randomUUID()
         val file = LightVirtualFile("AutoDevInput-$id", language, "")
 
-        val document = file.findDocument() ?: throw IllegalStateException("Can't create in-memory document")
+        val document = ReadAction.compute<Document, Throwable> {
+            EditorFactory.getInstance().createDocument("")
+        }
 
         initializeDocumentListeners(document)
         setDocument(document)

mpp-core/src/commonMain/kotlin/cc/unitmesh/agent/orchestrator/ToolOrchestrator.kt

@@ -585,13 +585,28 @@ class ToolOrchestrator(
         context: cc.unitmesh.agent.tool.ToolExecutionContext
     ): ToolResult {
         return try {
-            // Cast to ExecutableTool (all new tools should implement this)
+            // For SubAgent, we need to validate input first
+            if (tool is cc.unitmesh.agent.core.SubAgent<*, *>) {
+                @Suppress("UNCHECKED_CAST")
+                val subAgent = tool as cc.unitmesh.agent.core.SubAgent<Any, ToolResult>
+
+                // Validate and convert Map to proper input type
+                val validatedInput = subAgent.validateInput(params)
+
+                // Create invocation with validated input
+                val invocation = subAgent.createInvocation(validatedInput)
+
+                // Execute the tool
+                return invocation.execute(context)
+            }
+
+            // For other ExecutableTools, use params directly
             @Suppress("UNCHECKED_CAST")
             val executableTool = tool as? ExecutableTool<Any, ToolResult>
                 ?: return ToolResult.Error("Tool ${tool.name} does not implement ExecutableTool interface")
 
             val invocation = executableTool.createInvocation(params)
-            
+
             // Execute the tool
             invocation.execute(context)
         } catch (e: Exception) {

mpp-core/src/commonMain/kotlin/cc/unitmesh/agent/subagent/DomainDictAgent.kt

@@ -341,10 +341,14 @@ class DomainDictAgent(
     /**
      * Extract package path from file path
      * e.g., "src/main/kotlin/cc/unitmesh/agent/Tool.kt" -> "cc/unitmesh/agent"
+     * Handles both Unix (/) and Windows (\) path separators.
      */
     private fun extractPackagePath(filePath: String): String {
+        // Normalize path separators to forward slash for cross-platform compatibility
+        val normalizedPath = filePath.replace('\\', '/')
+
         // Remove common source prefixes
-        val cleanPath = filePath
+        val cleanPath = normalizedPath
             .replace(Regex("^.*/src/(main|common)/(kotlin|java|scala)/"), "")
             .replace(Regex("^.*/src/"), "")
             .replace(Regex("^src/(main|common)/(kotlin|java|scala)/"), "")
@@ -368,7 +372,10 @@ class DomainDictAgent(
         val prioritizedFiles = if (importantPackages.isNotEmpty()) {
             insights.hotFiles.sortedByDescending { file ->
                 val pkg = extractPackagePath(file.path)
-                if (importantPackages.any { pkg.startsWith(it) || it.startsWith(pkg) }) 2 else 1
+                // Skip empty package paths to avoid matching all entries
+                if (pkg.isEmpty()) 1
+                else if (importantPackages.any { pkg.startsWith(it) || it.startsWith(pkg) }) 2
+                else 1
             }
         } else {
             insights.hotFiles

mpp-idea/build.gradle.kts

@@ -2,14 +2,15 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 plugins {
     id("java")
-    kotlin("jvm") version "2.2.0"
-    id("org.jetbrains.intellij.platform") version "2.10.2"
-    kotlin("plugin.compose") version "2.2.0"
-    kotlin("plugin.serialization") version "2.2.0"
+    kotlin("jvm")
+    id("org.jetbrains.intellij.platform")
+    kotlin("plugin.compose")
+    kotlin("plugin.serialization")
 }
 
 group = "cc.unitmesh.devins"
-version = project.findProperty("mppVersion") as String? ?: "0.3.2"
+val mppVersion = project.findProperty("mppVersion") as String? ?: "0.3.2"
+version = mppVersion
 
 kotlin {
     jvmToolchain(21)
@@ -25,19 +26,96 @@ kotlin {
 
 repositories {
     mavenCentral()
+    google()
+    // Required for mpp-ui's webview dependencies (jogamp)
+    maven("https://jogamp.org/deployment/maven")
+    maven("https://oss.sonatype.org/content/repositories/snapshots/")
+    maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/")
 
     intellijPlatform {
         defaultRepositories()
     }
-    google()
 }
 
 dependencies {
-    // Kotlinx serialization for JSON
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
+    // Depend on mpp-ui and mpp-core JVM targets for shared UI components and ConfigManager
+    // For KMP projects, we need to depend on the JVM target specifically
+    // IMPORTANT: Exclude ALL transitive dependencies that conflict with IntelliJ's bundled libraries
+    implementation("cc.unitmesh.devins:mpp-ui-jvm") {
+        // Exclude all Compose dependencies - IntelliJ provides its own via bundledModules
+        exclude(group = "org.jetbrains.compose")
+        exclude(group = "org.jetbrains.compose.runtime")
+        exclude(group = "org.jetbrains.compose.foundation")
+        exclude(group = "org.jetbrains.compose.material3")
+        exclude(group = "org.jetbrains.compose.material")
+        exclude(group = "org.jetbrains.compose.ui")
+        exclude(group = "org.jetbrains.compose.desktop")
+        exclude(group = "org.jetbrains.compose.components")
+        exclude(group = "org.jetbrains.compose.animation")
+        exclude(group = "org.jetbrains.skiko")
+        // Exclude kotlinx libraries - IntelliJ provides its own
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core-jvm")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-swing")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json-jvm")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json-io")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json-io-jvm")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-core")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-core-jvm")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-io-core")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-io-core-jvm")
+        // Exclude webview/KCEF - not needed in IntelliJ and causes issues
+        exclude(group = "io.github.kevinnzou")
+        exclude(group = "dev.datlag")
+        // Exclude other UI libraries that may conflict
+        exclude(group = "com.mohamedrejeb.richeditor")
+        exclude(group = "cafe.adriel.bonsai")
+        exclude(group = "com.mikepenz")
+        exclude(group = "org.jetbrains.jediterm")
+        exclude(group = "org.jetbrains.pty4j")
+        exclude(group = "io.github.vinceglb")
+        // Exclude SQLDelight - not needed in IntelliJ plugin
+        exclude(group = "app.cash.sqldelight")
+    }
+    implementation("cc.unitmesh.devins:mpp-core-jvm") {
+        // Exclude Compose dependencies from mpp-core as well
+        exclude(group = "org.jetbrains.compose")
+        exclude(group = "org.jetbrains.compose.runtime")
+        exclude(group = "org.jetbrains.compose.foundation")
+        exclude(group = "org.jetbrains.compose.material3")
+        exclude(group = "org.jetbrains.compose.material")
+        exclude(group = "org.jetbrains.compose.ui")
+        exclude(group = "org.jetbrains.skiko")
+        // Exclude kotlinx libraries - IntelliJ provides its own
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core-jvm")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json-jvm")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json-io")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json-io-jvm")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-core")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-core-jvm")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-io-core")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-io-core-jvm")
+    }
+
+    // Use platform-provided kotlinx libraries to avoid classloader conflicts
+    compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
+    compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
+
+    // Ktor HTTP Client for LLM API calls - use compileOnly for libraries that may conflict
+    compileOnly("io.ktor:ktor-client-core:3.2.2")
+    compileOnly("io.ktor:ktor-client-cio:3.2.2")
+    compileOnly("io.ktor:ktor-client-content-negotiation:3.2.2")
+    compileOnly("io.ktor:ktor-serialization-kotlinx-json:3.2.2")
+    compileOnly("io.ktor:ktor-client-logging:3.2.2")
 
     testImplementation(kotlin("test"))
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")
+    // JUnit 4 is required by IntelliJ Platform test infrastructure (JUnit5TestEnvironmentInitializer)
+    testRuntimeOnly("junit:junit:4.13.2")
 
     intellijPlatform {
         // Target IntelliJ IDEA 2025.2+ for Compose support
@@ -55,14 +133,19 @@ dependencies {
             "intellij.platform.compose"
         )
 
-        testFramework(TestFrameworkType.Platform)
+        // Note: testFramework(TestFrameworkType.Platform) is removed because:
+        // 1. It requires JUnit 4 (junit.framework.TestCase) which conflicts with JUnit 5
+        // 2. JewelRendererTest uses JUnit 5 and doesn't need IntelliJ Platform
+        // 3. IdeaAgentViewModelTest (which needs Platform) is temporarily disabled
+        // To run platform tests, uncomment testFramework and add JUnit 4 dependency
+        // testFramework(TestFrameworkType.Platform)
     }
 }
 
 intellijPlatform {
     pluginConfiguration {
         name = "AutoDev Compose UI"
-        version = project.findProperty("mppVersion") as String? ?: "0.3.2"
+        version = mppVersion
 
         ideaVersion {
             sinceBuild = "252"
@@ -77,4 +160,51 @@ tasks {
     test {
         useJUnitPlatform()
     }
+
+    // Task to verify no conflicting dependencies are included
+    register("verifyNoDuplicateDependencies") {
+        group = "verification"
+        description = "Verifies that no Compose/Kotlinx dependencies are included that would conflict with IntelliJ's bundled versions"
+
+        doLast {
+            val forbiddenPatterns = listOf(
+                "org.jetbrains.compose",
+                "org.jetbrains.skiko",
+                "kotlinx-coroutines-core",
+                "kotlinx-coroutines-swing",
+                "kotlinx-serialization-json",
+                "kotlinx-serialization-core"
+            )
+
+            val runtimeClasspath = configurations.getByName("runtimeClasspath")
+            val violations = mutableListOf<String>()
+
+            runtimeClasspath.resolvedConfiguration.resolvedArtifacts.forEach { artifact ->
+                val id = artifact.moduleVersion.id
+                val fullName = "${id.group}:${id.name}:${id.version}"
+                forbiddenPatterns.forEach { pattern ->
+                    if (fullName.contains(pattern)) {
+                        violations.add(fullName)
+                    }
+                }
+            }
+
+            if (violations.isNotEmpty()) {
+                throw GradleException("""
+                    |DEPENDENCY CONFLICT DETECTED!
+                    |The following dependencies will conflict with IntelliJ's bundled libraries:
+                    |${violations.joinToString("\n") { "  - $it" }}
+                    |
+                    |These dependencies must be excluded from mpp-ui and mpp-core.
+                """.trimMargin())
+            } else {
+                println("✓ No conflicting dependencies found in runtime classpath")
+            }
+        }
+    }
+
+    // Run verification before build
+    named("build") {
+        dependsOn("verifyNoDuplicateDependencies")
+    }
 }

mpp-idea/settings.gradle.kts

@@ -1,16 +1,28 @@
 rootProject.name = "mpp-idea"
 
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
 pluginManagement {
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
+
+    plugins {
+        kotlin("jvm") version "2.1.20"
+        kotlin("plugin.compose") version "2.1.20"
+        kotlin("plugin.serialization") version "2.1.20"
+        id("org.jetbrains.intellij.platform") version "2.10.2"
+    }
 }
 
-dependencyResolutionManagement {
-    repositories {
-        google()
-        mavenCentral()
+// Include mpp-ui from parent project for shared UI components and ConfigManager
+// For KMP projects, we substitute the JVM target artifacts
+includeBuild("..") {
+    dependencySubstitution {
+        substitute(module("cc.unitmesh.devins:mpp-ui-jvm")).using(project(":mpp-ui"))
+        substitute(module("cc.unitmesh.devins:mpp-core-jvm")).using(project(":mpp-core"))
     }
 }
+