refactor(state): remove ToolStateManager and related state tracking #453

Eliminates ToolStateManager and execution state tracking from ToolOrchestrator, simplifying tool execution flow and relocating ToolCall to its own file.

Author: phodal

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

@@ -6,19 +6,14 @@ import cc.unitmesh.agent.core.SubAgentManager
 import cc.unitmesh.agent.tool.ToolResultFormatter
 import cc.unitmesh.agent.orchestrator.ToolExecutionResult
 import cc.unitmesh.agent.orchestrator.ToolOrchestrator
-import cc.unitmesh.agent.parser.ToolCallParser
-import cc.unitmesh.agent.recovery.ErrorRecoveryManager
 import cc.unitmesh.agent.render.CodingAgentRenderer
 import cc.unitmesh.agent.state.ToolCall
 import cc.unitmesh.agent.state.ToolExecutionState
 import cc.unitmesh.agent.tool.ToolResult
 import cc.unitmesh.agent.tool.ToolType
 import cc.unitmesh.agent.tool.toToolType
 import cc.unitmesh.llm.KoogLLMService
-import kotlinx.coroutines.flow.cancellable
 import kotlinx.coroutines.yield
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.datetime.Clock
 import cc.unitmesh.agent.orchestrator.ToolExecutionContext as OrchestratorContext

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

@@ -8,7 +8,6 @@ import cc.unitmesh.agent.policy.PolicyEngine
 import cc.unitmesh.agent.render.CodingAgentRenderer
 import cc.unitmesh.agent.state.ToolCall
 import cc.unitmesh.agent.state.ToolExecutionState
-import cc.unitmesh.agent.state.ToolStateManager
 import cc.unitmesh.agent.tool.*
 import cc.unitmesh.agent.tool.impl.WriteFileTool
 import cc.unitmesh.agent.tool.registry.ToolRegistry
@@ -27,7 +26,6 @@ class ToolOrchestrator(
     private val registry: ToolRegistry,
     private val policyEngine: PolicyEngine,
     private val renderer: CodingAgentRenderer,
-    private val stateManager: ToolStateManager = ToolStateManager(),
     private val mcpConfigService: McpToolConfigService? = null
 ) {
     private val logger = getLogger("ToolOrchestrator")
@@ -43,16 +41,12 @@ class ToolOrchestrator(
         val toolCall = ToolCall.create(toolName, params)
         val startTime = Clock.System.now().toEpochMilliseconds()
 
-        // Update state to pending
-        stateManager.updateState(ToolExecutionState.Pending(toolCall.id, toolCall))
-        
         try {
             // Check permissions
             val policyDecision = policyEngine.checkPermission(toolCall, context)
             when (policyDecision) {
                 PolicyDecision.DENY -> {
                     val error = "Tool execution denied by policy: $toolName"
-                    stateManager.updateState(ToolExecutionState.Failed(toolCall.id, error, 0))
                     return ToolExecutionResult.failure(
                         context.executionId, toolName, error, startTime, Clock.System.now().toEpochMilliseconds()
                     )
@@ -67,10 +61,6 @@ class ToolOrchestrator(
                 }
             }
 
-            // Update state to executing
-            stateManager.updateState(ToolExecutionState.Executing(toolCall.id, startTime))
-            
-            // Check for cancellation
             yield()
 
             // **关键改动**: 检查是否是 Shell 工具且支持 PTY
@@ -183,12 +173,8 @@ class ToolOrchestrator(
                 val errorMsg = getErrorMessage(result)
                 ToolExecutionState.Failed(toolCall.id, errorMsg, endTime - startTime)
             }
-            stateManager.updateState(finalState)
-            
-            // 从 ToolResult 中提取 metadata
+
             val metadata = result.extractMetadata()
-            
-            // 如果是 live session，添加标记以便跳过输出渲染
             val finalMetadata = if (liveSession != null) {
                 metadata + mapOf("isLiveSession" to "true", "sessionId" to liveSession.sessionId)
             } else {
@@ -209,8 +195,7 @@ class ToolOrchestrator(
         } catch (e: Exception) {
             val endTime = Clock.System.now().toEpochMilliseconds()
             val error = "Tool execution failed: ${e.message}"
-            stateManager.updateState(ToolExecutionState.Failed(toolCall.id, error, endTime - startTime))
-            
+
             return ToolExecutionResult.failure(
                 context.executionId, toolName, error, startTime, endTime, context.currentRetry
             )
@@ -246,31 +231,7 @@ class ToolOrchestrator(
 
         return results
     }
-    
-    /**
-     * Get current execution state
-     */
-    fun getExecutionState(callId: String): ToolExecutionState? {
-        return stateManager.getState(callId)
-    }
-    
-    /**
-     * Get all execution states
-     */
-    fun getAllExecutionStates(): Map<String, ToolExecutionState> {
-        return stateManager.getAllStates()
-    }
-    
-    /**
-     * Clear execution history
-     */
-    fun clearHistory() {
-        stateManager.clear()
-    }
 
-    /**
-     * Internal tool execution - delegates to registry
-     */
     private suspend fun executeToolInternal(
         toolName: String,
         params: Map<String, Any>,

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

@@ -0,0 +1,27 @@
+package cc.unitmesh.agent.state
+
+import kotlinx.datetime.Clock
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents a tool call to be executed
+ */
+@Serializable
+data class ToolCall(
+    val id: String,
+    val toolName: String,
+    val params: Map<String, String>,
+    val timestamp: Long = Clock.System.now().toEpochMilliseconds()
+) {
+    companion object {
+        private var counter = 0
+
+        fun create(toolName: String, params: Map<String, Any>): ToolCall {
+            return ToolCall(
+                id = "call_${Clock.System.now().toEpochMilliseconds()}_${++counter}",
+                toolName = toolName,
+                params = params.mapValues { it.value.toString() }
+            )
+        }
+    }
+}

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

@@ -2,7 +2,6 @@ package cc.unitmesh.agent.state
 
 import cc.unitmesh.agent.tool.ToolResult
 import kotlinx.serialization.Serializable
-import kotlinx.datetime.Clock
 
 /**
  * Represents the execution state of a tool call
@@ -54,88 +53,3 @@ sealed class ToolExecutionState {
     ) : ToolExecutionState()
 }
 
-/**
- * Represents a tool call to be executed
- */
-@Serializable
-data class ToolCall(
-    val id: String,
-    val toolName: String,
-    val params: Map<String, String>,
-    val timestamp: Long = Clock.System.now().toEpochMilliseconds()
-) {
-    companion object {
-        private var counter = 0
-        
-        fun create(toolName: String, params: Map<String, Any>): ToolCall {
-            return ToolCall(
-                id = "call_${Clock.System.now().toEpochMilliseconds()}_${++counter}",
-                toolName = toolName,
-                params = params.mapValues { it.value.toString() }
-            )
-        }
-    }
-}
-
-/**
- * State manager for tracking tool execution states
- */
-class ToolStateManager {
-    private val states = mutableMapOf<String, ToolExecutionState>()
-    private val history = mutableListOf<ToolExecutionState>()
-    
-    /**
-     * Update the state of a tool execution
-     */
-    fun updateState(state: ToolExecutionState) {
-        states[state.callId] = state
-        history.add(state)
-    }
-    
-    /**
-     * Get current state of a tool execution
-     */
-    fun getState(callId: String): ToolExecutionState? {
-        return states[callId]
-    }
-    
-    /**
-     * Get all current states
-     */
-    fun getAllStates(): Map<String, ToolExecutionState> {
-        return states.toMap()
-    }
-    
-    /**
-     * Get execution history
-     */
-    fun getHistory(): List<ToolExecutionState> {
-        return history.toList()
-    }
-    
-    /**
-     * Clear all states and history
-     */
-    fun clear() {
-        states.clear()
-        history.clear()
-    }
-    
-    /**
-     * Get pending tool calls
-     */
-    fun getPendingCalls(): List<ToolCall> {
-        return states.values
-            .filterIsInstance<ToolExecutionState.Pending>()
-            .map { it.toolCall }
-    }
-    
-    /**
-     * Get executing tool calls
-     */
-    fun getExecutingCalls(): List<String> {
-        return states.values
-            .filterIsInstance<ToolExecutionState.Executing>()
-            .map { it.callId }
-    }
-}