refactor(tool): use ToolType enum for tool name checks #453

Replaces string literals with ToolType enum references for tool name comparisons and pattern matching across the codebase, improving type safety and consistency. Removes legacy fallback logic for unknown tools.

Author: phodal

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

@@ -9,6 +9,7 @@ import cc.unitmesh.agent.orchestrator.ToolOrchestrator
 import cc.unitmesh.agent.policy.DefaultPolicyEngine
 import cc.unitmesh.agent.render.CodingAgentRenderer
 import cc.unitmesh.agent.render.DefaultCodingAgentRenderer
+import cc.unitmesh.agent.subagent.CodebaseInvestigatorAgent
 import cc.unitmesh.agent.subagent.ErrorRecoveryAgent
 import cc.unitmesh.agent.subagent.LogSummaryAgent
 import cc.unitmesh.agent.tool.ToolResult
@@ -53,14 +54,14 @@ class CodingAgent(
         shellExecutor = shellExecutor ?: DefaultShellExecutor()
     )
 
-    // New orchestration components
     private val policyEngine = DefaultPolicyEngine()
     private val toolOrchestrator = ToolOrchestrator(toolRegistry, policyEngine, renderer)
 
-    // SubAgents
     private val errorRecoveryAgent = ErrorRecoveryAgent(projectPath, llmService)
     private val logSummaryAgent = LogSummaryAgent(llmService, threshold = 2000)
 
+    private val codebaseInvestigatorAgent = CodebaseInvestigatorAgent(projectPath, llmService)
+
     // 执行器
     private val executor = CodingAgentExecutor(
         projectPath = projectPath,
@@ -74,25 +75,22 @@ class CodingAgent(
         // 注册 SubAgents（作为 Tools）
         registerTool(errorRecoveryAgent)
         registerTool(logSummaryAgent)
+        registerTool(codebaseInvestigatorAgent)
 
-        // ToolRegistry 已经在 init 中注册了内置 tools（read-file, write-file, shell, glob）
+        /// TODO 注册 MCP Tools
     }
 
     override suspend fun execute(
         input: AgentTask,
         onProgress: (String) -> Unit
     ): ToolResult.AgentResult {
-        // 初始化工作空间
         initializeWorkspace(input.projectPath)
 
-        // 构建系统提示词
         val context = buildContext(input)
         val systemPrompt = buildSystemPrompt(context)
 
-        // 使用执行器执行任务
         val result = executor.execute(input, systemPrompt, onProgress)
 
-        // 返回结果
         return ToolResult.AgentResult(
             success = result.success,
             content = result.message,

mpp-core/src/commonMain/kotlin/cc/unitmesh/agent/executor/CodingAgentExecutor.kt

@@ -152,7 +152,7 @@ class CodingAgentExecutor(
                 ToolType.ReadFile, ToolType.WriteFile -> 3
                 ToolType.Shell -> 2
                 else -> when (toolName) {
-                    "read-file", "write-file" -> 3
+                    ToolType.ReadFile.name, ToolType.WriteFile.name -> 3
                     "shell" -> 2
                     else -> 2
                 }

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

@@ -172,17 +172,6 @@ class ToolOrchestrator(
             ToolType.WriteFile -> executeWriteFileTool(tool, params, basicContext)
             ToolType.Glob -> executeGlobTool(tool, params, basicContext)
             ToolType.Grep -> executeGrepTool(tool, params, basicContext)
-            null -> {
-                // Fallback for unknown tools or legacy string matching
-                when (toolName) {
-                    "shell" -> executeShellTool(tool, params, basicContext)
-                    "read-file" -> executeReadFileTool(tool, params, basicContext)
-                    "write-file" -> executeWriteFileTool(tool, params, basicContext)
-                    "glob" -> executeGlobTool(tool, params, basicContext)
-                    "grep" -> executeGrepTool(tool, params, basicContext)
-                    else -> ToolResult.Error("Unknown tool: $toolName")
-                }
-            }
             else -> ToolResult.Error("Tool not implemented: ${toolType.displayName}")
         }
     }

mpp-core/src/commonMain/kotlin/cc/unitmesh/agent/parser/ToolCallParser.kt

@@ -26,8 +26,7 @@ class ToolCallParser {
             if (firstBlock != null) {
                 val toolCall = parseToolCallFromDevinBlock(firstBlock)
                 if (toolCall != null) {
-                    // For write-file tools, try to extract content from the surrounding context
-                    if (toolCall.toolName == "write-file" && !toolCall.params.containsKey("content")) {
+                    if (toolCall.toolName == ToolType.WriteFile.name && !toolCall.params.containsKey("content")) {
                         val contentFromContext = extractContentFromContext(llmResponse, firstBlock)
                         if (contentFromContext != null) {
                             val updatedParams = toolCall.params.toMutableMap()
@@ -46,10 +45,6 @@ class ToolCallParser {
         return toolCalls
     }
 
-    fun parseDevinBlocks(content: String): List<DevinBlock> {
-        return devinParser.extractDevinBlocks(content)
-    }
-
     private fun parseToolCallFromDevinBlock(block: DevinBlock): ToolCall? {
         val lines = block.content.lines()
 
@@ -65,10 +60,7 @@ class ToolCallParser {
 
         return null
     }
-    
-    /**
-     * Parse a direct tool call (without DevIn blocks)
-     */
+
     private fun parseDirectToolCall(response: String): ToolCall? {
         val toolPattern = Regex("""/(\w+(?:-\w+)*)(.*)""", RegexOption.MULTILINE)
         val match = toolPattern.find(response) ?: return null
@@ -79,9 +71,6 @@ class ToolCallParser {
         return parseToolCallFromLine("/$toolName $rest")
     }
 
-    /**
-     * Parse a tool call from a single line
-     */
     private fun parseToolCallFromLine(line: String): ToolCall? {
         val toolPattern = Regex("""/(\w+(?:-\w+)*)(.*)""")
         val match = toolPattern.find(line) ?: return null
@@ -93,10 +82,7 @@ class ToolCallParser {
 
         return ToolCall.create(toolName, params)
     }
-    
-    /**
-     * Parse parameters from the rest of the tool call line
-     */
+
     private fun parseParameters(toolName: String, rest: String): Map<String, Any> {
         val params = mutableMapOf<String, Any>()
 
@@ -108,10 +94,7 @@ class ToolCallParser {
 
         return params
     }
-    
-    /**
-     * Parse key="value" style parameters
-     */
+
     private fun parseKeyValueParameters(rest: String, params: MutableMap<String, Any>) {
         val remaining = rest.toCharArray().toList()
         var i = 0
@@ -157,11 +140,9 @@ class ToolCallParser {
      * Parse simple parameter (single value without key)
      */
     private fun parseSimpleParameter(toolName: String, rest: String, params: MutableMap<String, Any>) {
-        if (toolName == "shell") {
+        if (toolName == ToolType.Shell.name) {
             params["command"] = escapeProcessor.processEscapeSequences(rest.trim())
-        } else if (toolName == "write-file") {
-            // For write-file, if only one parameter is provided, it's the path
-            // The content should be provided in a separate parameter or in the LLM context
+        } else if (toolName == ToolType.WriteFile.name) {
             val firstLine = rest.lines().firstOrNull()?.trim()
             if (firstLine != null && firstLine.isNotEmpty()) {
                 params["path"] = escapeProcessor.processEscapeSequences(firstLine)

mpp-core/src/commonMain/kotlin/cc/unitmesh/agent/policy/DefaultPolicyEngine.kt

@@ -2,6 +2,7 @@ package cc.unitmesh.agent.policy
 
 import cc.unitmesh.agent.orchestrator.ToolExecutionContext
 import cc.unitmesh.agent.state.ToolCall
+import cc.unitmesh.agent.tool.ToolType
 
 /**
  * Default implementation of PolicyEngine
@@ -131,7 +132,7 @@ class DefaultPolicyEngine : PolicyEngine {
         addRule(PolicyRule(
             name = "allow_read_file",
             description = "Allow reading files",
-            toolPattern = "read-file",
+            toolPattern = ToolType.ReadFile.name,
             decision = PolicyDecision.ALLOW,
             riskLevel = RiskLevel.LOW,
             priority = 10
@@ -140,7 +141,7 @@ class DefaultPolicyEngine : PolicyEngine {
         addRule(PolicyRule(
             name = "allow_write_file",
             description = "Allow writing files",
-            toolPattern = "write-file",
+            toolPattern = ToolType.WriteFile.name,
             decision = PolicyDecision.ALLOW,
             riskLevel = RiskLevel.MEDIUM,
             priority = 10
@@ -149,7 +150,7 @@ class DefaultPolicyEngine : PolicyEngine {
         addRule(PolicyRule(
             name = "allow_glob",
             description = "Allow file globbing",
-            toolPattern = "glob",
+            toolPattern = ToolType.Glob.name,
             decision = PolicyDecision.ALLOW,
             riskLevel = RiskLevel.LOW,
             priority = 10
@@ -158,7 +159,7 @@ class DefaultPolicyEngine : PolicyEngine {
         addRule(PolicyRule(
             name = "allow_grep",
             description = "Allow text searching",
-            toolPattern = "grep",
+            toolPattern = ToolType.Grep.name,
             decision = PolicyDecision.ALLOW,
             riskLevel = RiskLevel.LOW,
             priority = 10
@@ -168,7 +169,7 @@ class DefaultPolicyEngine : PolicyEngine {
         addRule(PolicyRule(
             name = "allow_shell",
             description = "Allow shell commands",
-            toolPattern = "shell",
+            toolPattern = ToolType.Shell.name,
             decision = PolicyDecision.ALLOW,
             riskLevel = RiskLevel.HIGH,
             priority = 5

mpp-core/src/commonMain/kotlin/cc/unitmesh/agent/recovery/ErrorRecoveryManager.kt

@@ -1,6 +1,7 @@
 package cc.unitmesh.agent.recovery
 
 import cc.unitmesh.agent.subagent.ErrorRecoveryAgent
+import cc.unitmesh.agent.tool.ToolType
 import cc.unitmesh.llm.KoogLLMService
 
 /**
@@ -60,12 +61,12 @@ class ErrorRecoveryManager(private val projectPath: String, private val llmServi
      */
     private fun shouldAttemptRecovery(toolName: String, errorMessage: String): Boolean {
         // 对于 shell 命令错误，总是尝试恢复
-        if (toolName == "shell") {
+        if (toolName == ToolType.Shell.name) {
             return true
         }
 
         // 对于文件操作错误，如果是权限或路径问题，尝试恢复
-        if (toolName in listOf("write-file", "read-file")) {
+        if (toolName in listOf(ToolType.ReadFile.name, ToolType.WriteFile.name)) {
             val recoverableErrors = listOf(
                 "permission denied",
                 "no such file or directory",

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

@@ -6,7 +6,6 @@ import cc.unitmesh.agent.model.PromptConfig
 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
@@ -68,8 +67,6 @@ class CodebaseInvestigatorAgent(
         )
     )
 ) {
-
-    // Simple in-memory cache for analysis results
     private var analysisCache: Map<String, String> = emptyMap()
 
     override fun validateInput(input: Map<String, Any>): InvestigationContext {
@@ -141,17 +138,13 @@ class CodebaseInvestigatorAgent(
         }
     }
 
-    /**
-     * Process the investigation query using simple text analysis
-     */
     private suspend fun processInvestigationQuery(
         input: InvestigationContext,
         onProgress: (String) -> Unit
     ): InvestigationResult {
         val findings = mutableListOf<String>()
         val recommendations = mutableListOf<String>()
 
-        // Analyze query intent and extract relevant information
         val queryAnalysis = analyzeQuery(input.query)
 
         when (input.scope) {

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

@@ -280,7 +280,6 @@ $context
      */
     private fun parseRecoveryResponse(response: String): RecoveryResult {
         return try {
-            // Try to extract JSON from response
             val jsonMatch = Regex("```json\\s*([\\s\\S]*?)\\s*```").find(response)?.groupValues?.get(1)
                 ?: Regex("\\{[\\s\\S]*?\\}").find(response)?.value