Revert "Internal MCP Crate Cleanup (#4800)" (#4883)

2025-09-29 14:21:30 -04:00
parent 2cfef016e2
commit b9ba8dca29
78 changed files with 1090 additions and 844 deletions
@@ -1050,10 +1050,11 @@ impl CliSession {
                                                    }
                                                })
                                            })
-                                            .unwrap_or_else(|| "unknown".to_string().into());
+                                            .unwrap_or_else(|| "unknown".to_string());

                                        let success = tool_response.tool_result.is_ok();
                                        let result_status = if success { "success" } else { "error" };
+
                                        tracing::info!(
                                            counter.goose.tool_completions = 1,
                                            tool_name = %tool_name,
@@ -1327,12 +1328,7 @@ impl CliSession {
            let mut response_message = Message::user();
            let last_tool_name = tool_requests
                .last()
-                .and_then(|(_, tool_call)| {
-                    tool_call
-                        .as_ref()
-                        .ok()
-                        .map(|tool| tool.name.to_string().clone())
-                })
+                .and_then(|(_, tool_call)| tool_call.as_ref().ok().map(|tool| tool.name.clone()))
                .unwrap_or_else(|| "tool".to_string());

            let notification = if interrupt {