Refactor: Migrate unwrap calls to AppError in MCP handlers

server/src/handlers/env.rs

@@ -20,7 +20,7 @@ impl McpTool for UpdateEnvFingerprintHandler {
         )
     }
 
-    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 req: UpdateEnvFingerprintTool =
             serde_json::from_value(args).map_err(|e| e.to_string())?;
         state.env_fingerprints.modify(|fps| {
@@ -54,14 +54,14 @@ impl McpTool for ReadEnvFingerprintHandler {
         )
     }
 
-    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 req: ReadEnvFingerprintTool =
             serde_json::from_value(args).map_err(|e| e.to_string())?;
         let data = state
             .env_fingerprints
             .read_with(|fps| fps.get(&req.namespace).cloned());
         if let Some(fp) = data {
-            let data = serde_json::to_string(&fp).map_err(|e| e.to_string())?;
+            let data = Ok::<String, crate::error::AppError>(serde_json::to_string(&fp)?)?;
             Ok(data)
         } else {
             Ok("{}".to_string())
@@ -84,7 +84,7 @@ impl McpTool for LogEnvRequirementHandler {
         )
     }
 
-    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 req: LogEnvRequirementTool = serde_json::from_value(args).map_err(|e| e.to_string())?;
         state.env_requirements.modify(|reqs| {
             reqs.retain(|r| !(r.namespace == req.namespace && r.key == req.key));
@@ -114,7 +114,7 @@ impl McpTool for RegisterEnvironmentHandler {
         )
     }
 
-    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 req: RegisterEnvironmentTool =
             serde_json::from_value(args).map_err(|e| e.to_string())?;
         state.environments.modify(|envs| {
@@ -147,7 +147,7 @@ impl McpTool for GetEnvironmentDetailsHandler {
         )
     }
 
-    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 req: GetEnvironmentDetailsTool =
             serde_json::from_value(args).map_err(|e| e.to_string())?;
         let data = state.environments.read_with(|envs| {
@@ -155,7 +155,7 @@ impl McpTool for GetEnvironmentDetailsHandler {
                 .iter()
                 .filter(|e| e.namespace == req.namespace)
                 .collect();
-            serde_json::to_string(&filtered).map_err(|e| e.to_string())
+            Ok::<String, crate::error::AppError>(serde_json::to_string(&filtered)?)
         })?;
         Ok(data)
     }
@@ -180,14 +180,13 @@ mod tests {
             }
         });
 
-        let res = update_handler.execute(args, state.clone()).await.unwrap();
+        let res = update_handler.execute(args, state.clone()).await.map_err(|e| crate::error::AppError::Internal(e.to_string()))?;
         assert_eq!(res, "Env fingerprint updated");
 
         let read_handler = ReadEnvFingerprintHandler;
         let res2 = read_handler
             .execute(json!({"namespace": "global"}), state.clone())
-            .await
-            .unwrap();
+            .await.map_err(|e| crate::error::AppError::Internal(e.to_string()))?;
         assert!(res2.contains("rustc"));
         assert!(res2.contains("1.70.0"));
     }
@@ -212,8 +211,7 @@ mod tests {
         let handler = GetEnvironmentDetailsHandler;
         let res = handler
             .execute(json!({"namespace": "global"}), state.clone())
-            .await
-            .unwrap();
+            .await.map_err(|e| crate::error::AppError::Internal(e.to_string()))?;
 
         assert!(res.contains("global"));
     }
@@ -232,7 +230,7 @@ mod tests {
             "context": "For database access",
             "namespace": "global"
         });
-        let res1 = req_handler.execute(args_req, state.clone()).await.unwrap();
+        let res1 = req_handler.execute(args_req, state.clone()).await.map_err(|e| crate::error::AppError::Internal(e.to_string()))?;
         assert_eq!(res1, "Env requirement logged");
 
         let reg_handler = RegisterEnvironmentHandler;
@@ -243,14 +241,13 @@ mod tests {
             "requires_vpn": true,
             "namespace": "global"
         });
-        let res2 = reg_handler.execute(args_reg, state.clone()).await.unwrap();
+        let res2 = reg_handler.execute(args_reg, state.clone()).await.map_err(|e| crate::error::AppError::Internal(e.to_string()))?;
         assert_eq!(res2, "Environment registered");
 
         let get_handler = GetEnvironmentDetailsHandler;
         let res3 = get_handler
             .execute(json!({"namespace": "global"}), state.clone())
-            .await
-            .unwrap();
+            .await.map_err(|e| crate::error::AppError::Internal(e.to_string()))?;
         assert!(res3.contains("prod.local"));
         assert!(!res3.is_empty());
     }