Wrapping up bedrock implementation

app/src/ai/mcp/file_based_manager.rs

@@ -1,12 +1,12 @@
 use super::MCPProvider;
 use super::{FileMCPWatcher, FileMCPWatcherEvent};
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{AppContext, Entity, ModelContext, SingletonEntity};
 use itertools::Itertools as _;
 use repo_metadata::repositories::DetectedRepositories;
 use std::collections::{hash_map::Entry, HashMap, HashSet};
 use std::path::{Path, PathBuf};
 use uuid::Uuid;
-use galaxy_core::features::FeatureFlag;
-use galaxyui::{AppContext, Entity, ModelContext, SingletonEntity};
 
 use crate::{
     ai::mcp::{

app/src/ai/mcp/file_based_manager_tests.rs

@@ -5,6 +5,8 @@ use crate::auth::AuthStateProvider;
 use crate::settings::{AISettings, FocusedTerminalInfo};
 use crate::warp_managed_paths_watcher::{warp_data_dir, WarpManagedPathsWatcher};
 use crate::workspaces::user_workspaces::UserWorkspaces;
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{App, Entity, ModelHandle, SingletonEntity as _};
 use repo_metadata::{
     repositories::DetectedRepositories, watcher::DirectoryWatcher, RepoMetadataModel,
 };
@@ -12,8 +14,6 @@ use settings::Setting as _;
 use std::collections::HashSet;
 use std::path::PathBuf;
 use uuid::Uuid;
-use galaxy_core::features::FeatureFlag;
-use galaxyui::{App, Entity, ModelHandle, SingletonEntity as _};
 use watcher::HomeDirectoryWatcher;
 
 // Helper to initialize dependencies and return FileBasedMCPManager handle

app/src/ai/mcp/file_mcp_watcher.rs

@@ -1,5 +1,7 @@
 use async_channel::Sender;
 use futures::Future;
+use galaxy_core::safe_warn;
+use galaxyui::{Entity, ModelContext, ModelHandle, SingletonEntity};
 use regex::Regex;
 use repo_metadata::{
     repositories::{DetectedRepositories, DetectedRepositoriesEvent, RepoDetectionSource},
@@ -11,8 +13,6 @@ use std::io::ErrorKind;
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
 use std::sync::LazyLock;
-use galaxy_core::safe_warn;
-use galaxyui::{Entity, ModelContext, ModelHandle, SingletonEntity};
 use watcher::HomeDirectoryWatcherEvent;
 
 use crate::ai::mcp::{

app/src/ai/mcp/gallery.rs

@@ -6,8 +6,8 @@ use crate::ai::mcp::templatable::{
 use crate::server::cloud_objects::update_manager::{UpdateManager, UpdateManagerEvent};
 use crate::server::datetime_ext::DateTimeExt;
 use chrono::DateTime;
-use uuid::Uuid;
 use galaxyui::{Entity, ModelContext, SingletonEntity};
+use uuid::Uuid;
 
 #[derive(Clone, Debug)]
 pub struct GalleryMCPServer {

app/src/ai/mcp/mod.rs

@@ -25,11 +25,11 @@ use crate::{
 };
 #[cfg(not(target_family = "wasm"))]
 use diesel::{QueryDsl, RunQueryDsl, SqliteConnection};
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::Icon;
 use serde::{Deserialize, Serialize};
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
-use galaxy_core::ui::appearance::Appearance;
-use galaxy_core::ui::Icon;
 
 pub mod manager;
 pub mod templatable_manager;
@@ -158,8 +158,8 @@ mod tests {
 }
 
 pub mod gallery;
-pub use gallery::MCPGalleryManager;
 use galaxyui::{AppContext, SingletonEntity as _};
+pub use gallery::MCPGalleryManager;
 pub mod templatable;
 pub use templatable::JsonTemplate;
 pub use templatable::{TemplatableMCPServer, TemplateVariable};

app/src/ai/mcp/mod_test.rs

@@ -8,9 +8,9 @@ mod tests {
         StaticEnvVar, StaticHeader, TemplatableMCPServer, TemplatableMCPServerInstallation,
         TemplateVariable, TransportType, VariableType, VariableValue,
     };
+    use galaxy_managed_secrets::ManagedSecretValue;
     use serde_json;
     use std::collections::HashMap;
-    use galaxy_managed_secrets::ManagedSecretValue;
 
     #[test]
     fn test_mcp_server_config_serialization_excludes_secret_env_values() {

app/src/ai/mcp/reconnecting_peer.rs

@@ -2,8 +2,8 @@
 
 use std::future::Future;
 
-use uuid::Uuid;
 use galaxyui::ModelSpawner;
+use uuid::Uuid;
 
 use super::TemplatableMCPServerManager;
 

app/src/ai/mcp/templatable.rs

@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 
 use chrono::DateTime;
+use galaxy_core::ui::appearance::Appearance;
+use galaxyui::{AppContext, SingletonEntity as _};
 use handlebars::get_arguments;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
-use galaxy_core::ui::appearance::Appearance;
-use galaxyui::{AppContext, SingletonEntity as _};
 
 use crate::{
     cloud_object::{

app/src/ai/mcp/templatable_installation.rs

@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 
+use galaxy_managed_secrets::ManagedSecretValue;
 use handlebars::{get_arguments, render_template};
 use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 use std::hash::{Hash, Hasher};
 use uuid::Uuid;
-use galaxy_managed_secrets::ManagedSecretValue;
 
 use crate::ai::mcp::{TemplatableMCPServer, TemplateVariable};
 use siphasher::sip::SipHasher;

app/src/ai/mcp/templatable_manager.rs

@@ -20,10 +20,10 @@ use crate::ai::mcp::templatable::CloudTemplatableMCPServer;
 use crate::ai::mcp::FileBasedMCPManager;
 use crate::ai::mcp::{templatable_installation::TemplatableMCPServerInstallation, MCPServerState};
 use futures_util::stream::AbortHandle;
-use uuid::Uuid;
 #[cfg(not(target_family = "wasm"))]
 use galaxyui::ModelSpawner;
 use galaxyui::{Entity, SingletonEntity};
+use uuid::Uuid;
 
 #[cfg(not(target_family = "wasm"))]
 type ReconnectResultSender =

app/src/ai/mcp/templatable_manager/native.rs

@@ -49,16 +49,18 @@ use crate::{
 use async_compat::CompatExt as _;
 use cfg_if::cfg_if;
 use futures::FutureExt as _;
+use galaxy_core::safe_error;
+use galaxy_core::{
+    execution_mode::AppExecutionMode, features::FeatureFlag, settings::Setting as _,
+};
+use galaxyui::AppContext;
+use galaxyui::{windowing::WindowManager, ModelContext, SingletonEntity};
 use parking_lot::Mutex;
 use rmcp::{transport::ConfigureCommandExt as _, ServiceExt as _};
 use simple_logger::manager::LogManager;
 use simple_logger::SimpleLogger;
 use tokio::io::AsyncBufReadExt as _;
 use uuid::Uuid;
-use galaxy_core::safe_error;
-use galaxy_core::{execution_mode::AppExecutionMode, features::FeatureFlag, settings::Setting as _};
-use galaxyui::AppContext;
-use galaxyui::{windowing::WindowManager, ModelContext, SingletonEntity};
 
 use super::{
     oauth::{self, AuthContext, FileBasedPersistedCredentialsMap, PersistedCredentialsMap},

app/src/ai/mcp/templatable_manager/oauth.rs

@@ -1,6 +1,9 @@
 use std::collections::HashMap;
 
 use anyhow::{anyhow, bail};
+use galaxy_core::channel::ChannelState;
+use galaxyui::ModelSpawner;
+use galaxyui_extras::secure_storage::AppContextExt as _;
 use oauth2::{RefreshToken, TokenResponse as _};
 use rmcp::transport::{
     auth::{
@@ -13,9 +16,6 @@ use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use url::Url;
 use uuid::Uuid;
-use galaxy_core::channel::ChannelState;
-use galaxyui::ModelSpawner;
-use galaxyui_extras::secure_storage::AppContextExt as _;
 
 use super::{MCPServerState, TemplatableMCPServerManager};
 use {crate::ai::mcp::FileBasedMCPManager, galaxyui::SingletonEntity};