feat(mcp): enhance tool execution with JSON argument parsing #330

- Modify `execute` method to parse JSON arguments for tool execution.
- Update `McpFunctionProvider` to include JSON schema in tool description.
- Simplify argument handling in `McpFunctionProvider` to use first argument as JSON string.

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/mcp/CustomMcpServerManager.kt

@@ -13,7 +13,11 @@ import io.modelcontextprotocol.kotlin.sdk.client.StdioClientTransport
 import kotlinx.io.asSink
 import kotlinx.io.asSource
 import kotlinx.io.buffered
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonObject
 import java.util.concurrent.CompletableFuture
+import kotlin.text.get
 
 @Serializable
 data class McpConfig(
@@ -119,14 +123,21 @@ class CustomMcpServerManager(val project: Project) {
         return tools
     }
 
-    fun execute(project: Project, tool: Tool, map: List<String>): Any {
+    fun execute(project: Project, tool: Tool, map: String): Any {
         toolClientMap[tool]?.let {
             val future = CompletableFuture<Any>()
             kotlinx.coroutines.runBlocking {
                 try {
-                    val result = it.callTool(tool.name, mapOf<String, Any?>(), true, null)
+                    val arguments = try {
+                        Json.decodeFromString<JsonObject>(map).jsonObject.mapValues { it.value }
+                    } catch (e: Exception) {
+                        logger<CustomMcpServerManager>().warn("Failed to parse arguments: $e")
+                        return@runBlocking future.complete("Invalid arguments: $e")
+                    }
+
+                    val result = it.callTool(tool.name, arguments, true, null)
                     future.complete(result)
-                } catch (e: java.lang.Error) {
+                } catch (e: Error) {
                     logger<CustomMcpServerManager>().warn("Failed to execute tool ${tool.name}: $e")
                     future.complete("Failed to execute tool ${tool.name}: $e")
                 }

core/src/main/kotlin/cc/unitmesh/devti/mcp/provider/McpFunctionProvider.kt

@@ -5,6 +5,9 @@ import cc.unitmesh.devti.mcp.CustomMcpServerManager
 import cc.unitmesh.devti.provider.toolchain.ToolchainFunctionProvider
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
+import io.modelcontextprotocol.kotlin.sdk.Tool.Input
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.encodeToString
 
 class McpFunctionProvider : ToolchainFunctionProvider {
     override fun funcNames(): List<String> {
@@ -17,7 +20,12 @@ class McpFunctionProvider : ToolchainFunctionProvider {
             ProjectManager.getInstance().openProjects.firstOrNull() ?: return emptyList()
         )
         return manager.collectServerInfos().map {
-            AgentTool(it.name, it.description ?: "", "")
+            val encodeToString = Json.encodeToString<Input>(it.inputSchema)
+            AgentTool(
+                it.name,
+                it.description ?: "",
+                "Here is command and JSON schema\n/${it.name}\n```json\n$encodeToString\n```"
+            )
         }
     }
 
@@ -36,6 +44,6 @@ class McpFunctionProvider : ToolchainFunctionProvider {
             return "No such tool: $prop"
         }
 
-        return CustomMcpServerManager.instance(project).execute(project, tool, args.map { it.toString() })
+        return CustomMcpServerManager.instance(project).execute(project, tool, args.firstOrNull().toString())
     }
 }