Refactor: Migrate unwrap calls to AppError in MCP handlers

server/src/handlers/ast.rs

@@ -21,13 +21,13 @@ impl McpTool for ReadFileSkeletonHandler {
         )
     }
 
-    async fn execute(&self, args: Value, _state: Arc<MemoryState>) -> Result<String, String> {
+    async fn execute(&self, args: Value, _state: Arc<MemoryState>) -> crate::error::Result<String> {
         let tool_args: ReadFileSkeletonTool = serde_json::from_value(args).map_err(|e| e.to_string())?;
         
         let file_path = tool_args.file_path.clone();
-        let result = tokio::task::spawn_blocking(move || -> Result<String, String> {
+        let result = tokio::task::spawn_blocking(move || -> crate::error::Result<String> {
             let code = std::fs::read_to_string(&file_path)
-                .map_err(|e| format!("Failed to read file: {}", e))?;
+                .map_err(|e| crate::error::AppError::Internal(format!("Failed to read file: {}", e)))?;
                 
             let mut parser = Parser::new();
             
@@ -49,7 +49,7 @@ impl McpTool for ReadFileSkeletonHandler {
             
             parser.set_language(&language.into()).map_err(|e| e.to_string())?;
             
-            let tree = parser.parse(&code, None).ok_or("Failed to parse code")?;
+            let tree = parser.parse(&code, None).ok_or_else(|| crate::error::AppError::Internal("Failed to parse code".to_string()))?;
             let mut result_skeleton = String::new();
             
             fn extract_skeleton(node: Node, code: &str, out: &mut String, depth: usize) {
@@ -97,7 +97,7 @@ impl McpTool for ReadFileSkeletonHandler {
             }
         })
         .await
-        .map_err(|e| format!("Task panic: {}", e))??;
+        .map_err(|e| crate::error::AppError::Internal(format!("Task panic: {}", e)))??;
 
         Ok(result)
     }
@@ -119,13 +119,13 @@ impl McpTool for ReplaceAstNodeHandler {
         )
     }
 
-    async fn execute(&self, args: Value, _state: Arc<MemoryState>) -> Result<String, String> {
+    async fn execute(&self, args: Value, _state: Arc<MemoryState>) -> crate::error::Result<String> {
         let tool_args: ReplaceAstNodeTool = serde_json::from_value(args).map_err(|e| e.to_string())?;
         
         let file_path = tool_args.file_path.clone();
-        let result = tokio::task::spawn_blocking(move || -> Result<String, String> {
+        let result = tokio::task::spawn_blocking(move || -> crate::error::Result<String> {
             let code = std::fs::read_to_string(&file_path)
-                .map_err(|e| format!("Failed to read file: {}", e))?;
+                .map_err(|e| crate::error::AppError::Internal(format!("Failed to read file: {}", e)))?;
                 
             let mut parser = Parser::new();
             
@@ -142,11 +142,11 @@ impl McpTool for ReplaceAstNodeHandler {
                 "c" | "h" => tree_sitter_c::LANGUAGE,
                 "cpp" | "cc" | "cxx" | "hpp" | "hxx" => tree_sitter_cpp::LANGUAGE,
                 "go" => tree_sitter_go::LANGUAGE,
-                _ => return Err(format!("Unsupported language for AST replacement: {}", ext)),
+                _ => return Err(crate::error::AppError::Internal(format!("Unsupported language for AST replacement: {}", ext))),
             };
             
             parser.set_language(&language.into()).map_err(|e| e.to_string())?;
-            let tree = parser.parse(&code, None).ok_or("Failed to parse code")?;
+            let tree = parser.parse(&code, None).ok_or_else(|| crate::error::AppError::Internal("Failed to parse code".to_string()))?;
             
             // Search for the node
             fn find_node<'a>(node: Node<'a>, code: &str, target_type: &str, target_name: &str) -> Option<Node<'a>> {
@@ -187,11 +187,11 @@ impl McpTool for ReplaceAstNodeHandler {
                 std::fs::write(&file_path, new_file_content).map_err(|e| e.to_string())?;
                 Ok(format!("Successfully replaced node {} of type {} in {}", tool_args.node_name, tool_args.node_type, file_path))
             } else {
-                Err(format!("Could not find node {} of type {}", tool_args.node_name, tool_args.node_type))
+                Err(crate::error::AppError::Internal(format!("Could not find node {} of type {}", tool_args.node_name, tool_args.node_type)))
             }
         })
         .await
-        .map_err(|e| format!("Task panic: {}", e))??;
+        .map_err(|e| crate::error::AppError::Internal(format!("Task panic: {}", e)))??;
 
         Ok(result)
     }