first pass of merging in warp (doesn't build)

app/src/ai/bedrock/convert_tests.rs

@@ -527,7 +527,6 @@ fn test_caching_enabled_has_cache_points() {
     );
 
     // Check that cache point exists in system
-    use aws_sdk_bedrockruntime::types::SystemContentBlock;
     let has_system_cache = result
         .system
         .iter()
@@ -536,7 +535,6 @@ fn test_caching_enabled_has_cache_points() {
 
     // Check that cache point exists in tools
     if let Some(tool_config) = result.tool_config {
-        use aws_sdk_bedrockruntime::types::Tool;
         let has_tool_cache = tool_config
             .tools()
             .iter()

app/src/ai/bedrock/integration_tests.rs

@@ -104,7 +104,6 @@ async fn collect_stream_output(
                                 Action::AppendToMessageContent(append) => {
                                     if let Some(msg) = append.message {
                                         if let Some(msg_content) = msg.message {
-                                            use warp_multi_agent_api::message::Message;
                                             if let Message::AgentOutput(output) = msg_content {
                                                 text.push_str(&output.text);
                                             }

app/src/ai/bedrock/request_translator.rs

@@ -728,7 +728,6 @@ fn ensure_starts_with_user_message(messages: &mut Vec<ConversationMessage>) {
 /// 4. Removes trailing assistant tool_use messages that have no following user message.
 /// 5. Ensures strict user/assistant role alternation.
 fn ensure_tool_results_paired(messages: &mut Vec<ConversationMessage>) {
-    use std::collections::HashSet;
 
     // Collect all tool_result IDs that exist anywhere in the conversation.
     let mut all_result_ids = HashSet::new();