Wrapping up bedrock implementation

app/src/ai/blocklist/action_model/execute/call_mcp_tool.rs

@@ -15,9 +15,9 @@ use crate::{
     send_telemetry_from_app_ctx, TelemetryEvent,
 };
 #[cfg(not(target_family = "wasm"))]
-use itertools::Itertools;
-#[cfg(not(target_family = "wasm"))]
 use galaxyui::SingletonEntity;
+#[cfg(not(target_family = "wasm"))]
+use itertools::Itertools;
 
 pub struct CallMCPToolExecutor {
     _active_session: ModelHandle<ActiveSession>,

app/src/ai/blocklist/action_model/execute/edit_documents.rs

@@ -1,7 +1,7 @@
 use ai::diff_validation::DiffDelta;
 use futures::{future::BoxFuture, FutureExt};
-use std::collections::HashMap;
 use galaxyui::{Entity, ModelContext, SingletonEntity};
+use std::collections::HashMap;
 
 use crate::ai::{
     agent::{

app/src/ai/blocklist/action_model/execute/file_glob.rs

@@ -4,9 +4,9 @@ use std::time::Duration;
 
 use futures::future::BoxFuture;
 use futures::FutureExt;
-use itertools::Itertools;
 use galaxyui::r#async::FutureExt as AsyncFutureExt;
 use galaxyui::{AppContext, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
+use itertools::Itertools;
 
 use crate::ai::agent::{
     conversation::AIConversationId, AIAgentAction, AIAgentActionType, FileGlobResult,

app/src/ai/blocklist/action_model/execute/read_skill_tests.rs

@@ -8,13 +8,13 @@ use crate::ai::blocklist::action_model::AIConversationId;
 use crate::ai::skills::SkillManager;
 use crate::warp_managed_paths_watcher::WarpManagedPathsWatcher;
 use ai::skills::{parse_skill, SkillReference};
+use galaxyui::App;
 use repo_metadata::{
     repositories::DetectedRepositories, watcher::DirectoryWatcher, RepoMetadataModel,
 };
 use std::fs;
 use std::io::Write;
 use tempfile::TempDir;
-use galaxyui::App;
 use watcher::HomeDirectoryWatcher;
 
 fn initialize_app(app: &mut App) {

app/src/ai/blocklist/action_model/execute/request_file_edits.rs

@@ -9,10 +9,10 @@ use std::path::PathBuf;
 
 use ai::diff_validation::AIRequestedCodeDiff;
 use futures::{channel::oneshot, future::BoxFuture, FutureExt};
-use itertools::Itertools;
-use vec1::{vec1, Vec1};
 use galaxy_core::send_telemetry_from_ctx;
 use galaxyui::{Entity, EntityId, ModelContext, ModelHandle, SingletonEntity as _, ViewHandle};
+use itertools::Itertools;
+use vec1::{vec1, Vec1};
 
 use apply_diff_model::ApplyDiffModel;
 pub(crate) use diff_application::apply_edits;

app/src/ai/blocklist/action_model/execute/request_file_edits/apply_diff_model.rs

@@ -10,9 +10,9 @@
 
 use ai::diff_validation::AIRequestedCodeDiff;
 use futures::FutureExt;
-use vec1::Vec1;
 use galaxyui::r#async::BoxFuture;
 use galaxyui::{Entity, ModelContext, ModelHandle, SingletonEntity as _};
+use vec1::Vec1;
 
 use crate::ai::agent::{AIIdentifiers, FileEdit};
 use crate::ai::blocklist::SessionContext;

app/src/ai/blocklist/action_model/execute/request_file_edits/diff_application.rs

@@ -11,9 +11,9 @@ use ai::diff_validation::{
     fuzzy_match_diffs, fuzzy_match_v4a_diffs, AIRequestedCodeDiff, DiffDelta, DiffMatchFailures,
     DiffType, ParsedDiff, SearchAndReplace, V4AHunk,
 };
+use galaxyui::r#async::executor::Background;
 use itertools::Itertools;
 use vec1::Vec1;
-use galaxyui::r#async::executor::Background;
 
 use crate::{
     ai::{

app/src/ai/blocklist/action_model/execute/request_file_edits/diff_application_tests.rs

@@ -3,9 +3,9 @@ use std::sync::Arc;
 
 use ai::diff_validation::{DiffDelta, ParsedDiff, V4AHunk};
 use async_io::block_on;
+use galaxyui::App;
 use tempfile::NamedTempFile;
 use vec1::vec1;
-use galaxyui::App;
 
 use crate::ai::agent::{AIIdentifiers, FileEdit};
 use crate::ai::blocklist::SessionContext;

app/src/ai/blocklist/action_model/execute/request_file_edits/telemetry.rs

@@ -3,10 +3,10 @@
 /// This distinguishes the legacy search/replace edit format from the structured
 /// V4A patch format used by `apply_patch`.
 use ai::diff_validation::DiffMatchFailures;
+use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
 use serde::Serialize;
 use serde_json::json;
 use strum_macros::{EnumDiscriminants, EnumIter};
-use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
 
 use crate::ai::{agent::AIIdentifiers, blocklist::RequestedEditResolution};
 

app/src/ai/blocklist/action_model/execute/search_codebase.rs

@@ -4,8 +4,8 @@ use std::{
 };
 
 use futures::{channel::oneshot, future::BoxFuture, FutureExt};
-use itertools::Itertools;
 use galaxyui::{AppContext, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
+use itertools::Itertools;
 
 use crate::{
     ai::{

app/src/ai/blocklist/action_model/execute/shell_command.rs

@@ -7,13 +7,13 @@ use futures::channel::oneshot;
 use futures::future::BoxFuture;
 use futures::{select, FutureExt};
 use futures_lite::pin;
-use itertools::Itertools;
-use parking_lot::FairMutex;
 use galaxy_core::command::ExitCode;
 use galaxy_core::execution_mode::AppExecutionMode;
 use galaxy_util::path::ShellFamily;
 use galaxyui::r#async::{Spawnable, Timer};
 use galaxyui::{Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
+use itertools::Itertools;
+use parking_lot::FairMutex;
 
 use crate::ai::agent::{
     AIAgentActionId, AIAgentActionType, AIAgentPtyWriteMode, ReadShellCommandOutputResult,