refactor(tool): replace ToolNames with ToolType throughout codebase #453

Replaces deprecated ToolNames constants with ToolType sealed class for tool identification and registration. Updates usages in agents, tools, tests, and JS exports for consistency and type safety. Removes legacy ToolNames references.

Author: phodal

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

@@ -7,6 +7,7 @@ import cc.unitmesh.agent.model.RunConfig
 import cc.unitmesh.agent.model.ToolConfig
 import cc.unitmesh.agent.tool.ToolResult
 import cc.unitmesh.agent.tool.ToolNames
+import cc.unitmesh.agent.tool.ToolType
 import cc.unitmesh.llm.KoogLLMService
 import cc.unitmesh.llm.ModelConfig
 import kotlinx.serialization.Serializable
@@ -48,7 +49,7 @@ class CodebaseInvestigatorAgent(
     private val llmService: KoogLLMService
 ) : SubAgent<InvestigationContext, ToolResult.AgentResult>(
     AgentDefinition(
-        name = ToolNames.CODEBASE_INVESTIGATOR,
+        name = ToolType.CodebaseInvestigator.name,
         displayName = "Codebase Investigator",
         description = "Analyzes codebase structure and provides insights using code analysis",
         promptConfig = PromptConfig(
@@ -192,9 +193,6 @@ class CodebaseInvestigatorAgent(
         )
     }
 
-    /**
-     * Build a summary of the investigation results
-     */
     private fun buildSummary(query: String, findings: List<String>, recommendations: List<String>): String {
         return buildString {
             appendLine("### Investigation Summary")
@@ -220,10 +218,7 @@ class CodebaseInvestigatorAgent(
             }
         }
     }
-    
-    /**
-     * Analyze the investigation query to determine intent and extract keywords
-     */
+
     private fun analyzeQuery(query: String): QueryAnalysis {
         val lowerQuery = query.lowercase()
 
@@ -250,9 +245,6 @@ class CodebaseInvestigatorAgent(
             .filter { it.isNotBlank() }
     }
 
-    /**
-     * Find relevant elements based on keywords and type
-     */
     private fun findRelevantElements(keywords: List<String>, elementType: String): List<String> {
         // Simplified implementation - in a real scenario, this would scan actual files
         val findings = mutableListOf<String>()
@@ -276,9 +268,6 @@ class CodebaseInvestigatorAgent(
         return findings
     }
 
-    /**
-     * Analyze dependency patterns for given keywords
-     */
     private fun analyzeDependencyPatterns(keywords: List<String>): List<String> {
         val findings = mutableListOf<String>()
 

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

@@ -7,6 +7,7 @@ import cc.unitmesh.agent.model.RunConfig
 import cc.unitmesh.agent.platform.GitOperations
 import cc.unitmesh.agent.tool.ToolResult
 import cc.unitmesh.agent.tool.ToolNames
+import cc.unitmesh.agent.tool.ToolType
 import cc.unitmesh.llm.KoogLLMService
 import cc.unitmesh.llm.ModelConfig
 import kotlinx.serialization.Serializable
@@ -336,7 +337,7 @@ $context
 
     companion object {
         private fun createDefinition() = AgentDefinition(
-            name = ToolNames.ERROR_RECOVERY,
+            name = ToolType.ErrorRecovery.name,
             displayName = "Error Recovery SubAgent",
             description = "Analyzes command failures and provides recovery plans",
             promptConfig = PromptConfig(

mpp-core/src/commonMain/kotlin/cc/unitmesh/agent/tool/ToolNames.kt

@@ -1,25 +1,6 @@
 package cc.unitmesh.agent.tool
 
-/**
- * Constants for tool names - DEPRECATED
- *
- * Use ToolType sealed class instead for type-safe tool handling.
- * This object is kept for backward compatibility.
- *
- * @deprecated Use ToolType sealed class instead
- */
 @Deprecated("Use ToolType sealed class instead", ReplaceWith("ToolType"))
 object ToolNames {
-    const val WRITE_FILE = "write-file"
-
-    // Search tools
-    const val GREP = "grep"
-    const val GLOB = "glob"
-
-    // Execution tools
-    const val SHELL = "shell"
-
-    // SubAgent tools
-    const val ERROR_RECOVERY = "error-recovery"
     const val CODEBASE_INVESTIGATOR = "codebase-investigator"
 }

mpp-core/src/commonMain/kotlin/cc/unitmesh/agent/tool/impl/GlobTool.kt

@@ -234,7 +234,7 @@ class GlobTool(
     private val fileSystem: ToolFileSystem
 ) : BaseExecutableTool<GlobParams, ToolResult>() {
 
-    override val name: String = ToolNames.GLOB
+    override val name: String = ToolType.Glob.name
     override val description: String = """
         Find files and directories using glob patterns with wildcard support.
         Supports recursive search (**), character classes ([abc]), alternatives ({a,b}),

mpp-core/src/commonMain/kotlin/cc/unitmesh/agent/tool/impl/GrepTool.kt

@@ -278,7 +278,7 @@ class GrepTool(
     private val fileSystem: ToolFileSystem
 ) : BaseExecutableTool<GrepParams, ToolResult>() {
 
-    override val name: String = ToolNames.GREP
+    override val name: String = ToolType.Grep.name
     override val description: String = """
         Search for patterns in file contents using regular expressions.
         Supports file filtering with include/exclude patterns, case-sensitive/insensitive search,

mpp-core/src/commonMain/kotlin/cc/unitmesh/devins/completion/providers/ToolBasedCommandCompletionProvider.kt

@@ -1,6 +1,5 @@
 package cc.unitmesh.devins.completion.providers
 
-import cc.unitmesh.agent.tool.ToolNames
 import cc.unitmesh.agent.tool.ToolType
 import cc.unitmesh.agent.tool.toToolType
 import cc.unitmesh.agent.tool.registry.GlobalToolRegistry
@@ -32,46 +31,31 @@ class ToolBasedCommandCompletionProvider(
         return filterAndSort(completionItems, query)
     }
 
-    /**
-     * 根据工具名称获取对应的图标 - 现在使用 ToolType 系统
-     */
-    private fun getToolIcon(toolName: String): String {
-        val toolType = toolName.toToolType()
-        return toolType?.tuiEmoji ?: when (toolName) {
-            // Fallback for legacy tools
-            ToolType.ReadFile.name -> "📄"
-            ToolType.WriteFile.name -> "✏️"
-            "grep" -> "🔍"
-            "glob" -> "🌐"
-            "shell" -> "💻"
-            else -> "🔧"
-        }
-    }
+    private fun getToolIcon(toolName: String): String = toolName.toToolType()?.tuiEmoji ?: "🔧"
 
-    /**
-     * 创建命令插入处理器
-     * 根据命令类型决定插入空格还是冒号
-     */
     private fun createCommandInsertHandler(commandName: String): (String, Int) -> InsertResult {
         return { fullText, cursorPos ->
             val slashPos = fullText.lastIndexOf('/', cursorPos - 1)
             if (slashPos >= 0) {
-                val before = fullText.substring(0, slashPos)
+                val before = fullText.take(slashPos)
                 val after = fullText.substring(cursorPos)
 
-                // 根据命令类型决定后缀
                 val suffix = when {
-                    // 需要参数的命令使用冒号
-                    commandName in listOf("read-file", "write-file", "file", "write", "read") -> ":"
-                    // 其他命令使用空格
+                    commandName in listOf(
+                        ToolType.ReadFile.name,
+                        ToolType.WriteFile.name,
+                        ToolType.Glob.name,
+                        ToolType.Grep.name
+                    ) -> ":"
+
                     else -> " "
                 }
 
                 val newText = before + "/$commandName$suffix" + after
                 InsertResult(
                     newText = newText,
                     newCursorPosition = before.length + commandName.length + 2,
-                    shouldTriggerNextCompletion = suffix == ":" // 如果是冒号，触发下一级补全
+                    shouldTriggerNextCompletion = suffix == ":"
                 )
             } else {
                 InsertResult(fullText, cursorPos)

mpp-core/src/commonTest/kotlin/cc/unitmesh/agent/tool/ToolRegistryTest.kt

@@ -27,9 +27,9 @@ class ToolRegistryTest {
         val allTools = registry.getAllTools()
         assertTrue(allTools.isNotEmpty(), "Should have registered tools")
         assertTrue(ToolType.ReadFile.name in allTools.keys, "Should contain read-file tool")
-        assertTrue(ToolNames.WRITE_FILE in allTools.keys, "Should contain write-file tool")
-        assertTrue(ToolNames.GREP in allTools.keys, "Should contain grep tool")
-        assertTrue(ToolNames.GLOB in allTools.keys, "Should contain glob tool")
+        assertTrue(ToolType.WriteFile.name in allTools.keys, "Should contain write-file tool")
+        assertTrue(ToolType.Grep.name in allTools.keys, "Should contain grep tool")
+        assertTrue(ToolType.Glob.name in allTools.keys, "Should contain glob tool")
     }
 
     @Test
@@ -56,7 +56,7 @@ class ToolRegistryTest {
     @Test
     fun testHasToolNamed() {
         assertTrue(registry.hasToolNamed(ToolType.ReadFile.name), "Should have read-file tool")
-        assertTrue(registry.hasToolNamed(ToolNames.WRITE_FILE), "Should have write-file tool")
+        assertTrue(registry.hasToolNamed(ToolType.WriteFile.name), "Should have write-file tool")
         assertTrue(!registry.hasToolNamed("non-existent-tool"), "Should not have non-existent tool")
     }
 

mpp-core/src/jsMain/kotlin/cc/unitmesh/llm/JsExports.kt

@@ -2,6 +2,13 @@
 
 package cc.unitmesh.llm
 
+import cc.unitmesh.agent.tool.ToolType
+import cc.unitmesh.agent.tool.filesystem.DefaultToolFileSystem
+import cc.unitmesh.agent.tool.impl.GrepParams
+import cc.unitmesh.agent.tool.impl.ShellParams
+import cc.unitmesh.agent.tool.registry.ToolRegistry
+import cc.unitmesh.agent.tool.shell.JsShellExecutor
+import cc.unitmesh.devins.compiler.DevInsCompilerFacade
 import cc.unitmesh.devins.filesystem.EmptyFileSystem
 import cc.unitmesh.devins.filesystem.ProjectFileSystem
 import cc.unitmesh.devins.llm.Message
@@ -495,7 +502,7 @@ class JsDevInsCompiler {
                     emptyMap()
                 }
 
-                val result = cc.unitmesh.devins.compiler.DevInsCompilerFacade.compile(source, varsMap)
+                val result = DevInsCompilerFacade.compile(source, varsMap)
 
                 JsDevInsResult(
                     success = result.isSuccess(),
@@ -523,7 +530,7 @@ class JsDevInsCompiler {
     fun compileToString(source: String): Promise<String> {
         return GlobalScope.promise {
             try {
-                cc.unitmesh.devins.compiler.DevInsCompilerFacade.compileToString(source)
+                DevInsCompilerFacade.compileToString(source)
             } catch (e: Exception) {
                 throw e
             }
@@ -571,12 +578,12 @@ private fun CompletionItem.toJsItem(triggerType: CompletionTriggerType, index: I
  */
 @JsExport
 class JsToolRegistry(projectPath: String) {
-    private val registry: cc.unitmesh.agent.tool.registry.ToolRegistry
+    private val registry: ToolRegistry
 
     init {
-        val fileSystem = cc.unitmesh.agent.tool.filesystem.DefaultToolFileSystem(projectPath)
-        val shellExecutor = cc.unitmesh.agent.tool.shell.JsShellExecutor()
-        registry = cc.unitmesh.agent.tool.registry.ToolRegistry(fileSystem, shellExecutor)
+        val fileSystem = DefaultToolFileSystem(projectPath)
+        val shellExecutor = JsShellExecutor()
+        registry = ToolRegistry(fileSystem, shellExecutor)
     }
 
     /**
@@ -591,7 +598,7 @@ class JsToolRegistry(projectPath: String) {
                     startLine = startLine,
                     endLine = endLine
                 )
-                val result = registry.executeTool(cc.unitmesh.agent.tool.ToolType.ReadFile.name, params)
+                val result = registry.executeTool(ToolType.ReadFile.name, params)
                 result.toJsToolResult()
             } catch (e: Exception) {
                 JsToolResult(
@@ -616,7 +623,7 @@ class JsToolRegistry(projectPath: String) {
                     content = content,
                     createDirectories = createDirectories
                 )
-                val result = registry.executeTool(cc.unitmesh.agent.tool.ToolNames.WRITE_FILE, params)
+                val result = registry.executeTool(ToolType.WriteFile.name, params)
                 result.toJsToolResult()
             } catch (e: Exception) {
                 JsToolResult(
@@ -641,7 +648,7 @@ class JsToolRegistry(projectPath: String) {
                     path = path,
                     includeFileInfo = includeFileInfo
                 )
-                val result = registry.executeTool(cc.unitmesh.agent.tool.ToolNames.GLOB, params)
+                val result = registry.executeTool(ToolType.Glob.name, params)
                 result.toJsToolResult()
             } catch (e: Exception) {
                 JsToolResult(
@@ -668,15 +675,15 @@ class JsToolRegistry(projectPath: String) {
     ): Promise<JsToolResult> {
         return GlobalScope.promise {
             try {
-                val params = cc.unitmesh.agent.tool.impl.GrepParams(
+                val params = GrepParams(
                     pattern = pattern,
                     path = path,
                     include = include,
                     exclude = exclude,
                     recursive = recursive,
                     caseSensitive = caseSensitive
                 )
-                val result = registry.executeTool(cc.unitmesh.agent.tool.ToolNames.GREP, params)
+                val result = registry.executeTool(ToolType.Grep.name, params)
                 result.toJsToolResult()
             } catch (e: Exception) {
                 JsToolResult(
@@ -700,12 +707,12 @@ class JsToolRegistry(projectPath: String) {
     ): Promise<JsToolResult> {
         return GlobalScope.promise {
             try {
-                val params = cc.unitmesh.agent.tool.impl.ShellParams(
+                val params = ShellParams(
                     command = command,
                     workingDirectory = workingDirectory,
                     timeoutMs = timeoutMs.toLong()
                 )
-                val result = registry.executeTool(cc.unitmesh.agent.tool.ToolNames.SHELL, params)
+                val result = registry.executeTool(ToolType.Shell.name, params)
                 result.toJsToolResult()
             } catch (e: Exception) {
                 JsToolResult(