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

app/src/ai_assistant/requests.rs

@@ -2,29 +2,23 @@
 // app/src/ai/request_usage_model duplicates much of this logic.
 use std::sync::Arc;
 
+use anyhow::Result;
 use chrono::{OutOfRangeError, Utc};
 use futures::stream::AbortHandle;
 
 use galaxy_core::user_preferences::GetUserPreferences as _;
 use galaxyui::{AppContext, Entity, ModelContext, SingletonEntity};
 
-use crate::{
-    ai::{RequestLimitInfo, RequestUsageInfo},
-    ai_assistant::utils::{AssistantTranscriptPart, TranscriptPartSubType},
-    auth::AuthStateProvider,
-    send_telemetry_from_ctx,
-    server::{
-        server_api::{ai::AIClient, ServerApi},
-        telemetry::{TelemetryEvent, WarpAIRequestResult},
-    },
-    workspaces::user_workspaces::UserWorkspaces,
-};
-
-use super::{
-    execution_context::WarpAiExecutionContext,
-    utils::{markdown_segments_from_text, FormattedTranscriptMessage, TranscriptPart},
-};
-use anyhow::Result;
+use super::execution_context::WarpAiExecutionContext;
+use super::utils::{markdown_segments_from_text, FormattedTranscriptMessage, TranscriptPart};
+use crate::ai::{RequestLimitInfo, RequestUsageInfo};
+use crate::ai_assistant::utils::{AssistantTranscriptPart, TranscriptPartSubType};
+use crate::auth::AuthStateProvider;
+use crate::send_telemetry_from_ctx;
+use crate::server::server_api::ai::AIClient;
+use crate::server::server_api::ServerApi;
+use crate::server::telemetry::{TelemetryEvent, WarpAIRequestResult};
+use crate::workspaces::user_workspaces::UserWorkspaces;
 
 /// The key for the corresponding entry in UserDefaults.
 /// Not wiring through Settings for now since this data is only needed by the panel view.