Fix cursor focus and selection in input box, add AWS env var warning box, and remove AWS Bedrock login banner

app/src/ai/mcp/file_based_manager.rs

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

app/src/ai/mcp/file_based_manager_tests.rs

@@ -1,6 +1,8 @@
 use std::collections::HashSet;
 use std::path::PathBuf;
 
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{App, Entity, ModelHandle, SingletonEntity};
 use repo_metadata::repositories::DetectedRepositories;
 use repo_metadata::watcher::DirectoryWatcher;
 use repo_metadata::RepoMetadataModel;
@@ -21,7 +23,7 @@ fn setup_app(app: &mut App) -> galaxyui::ModelHandle<FileBasedMCPManager> {
     app.add_singleton_model(|_| DetectedRepositories::default());
     app.add_singleton_model(RepoMetadataModel::new);
     app.add_singleton_model(HomeDirectoryWatcher::new_for_test);
-    app.add_singleton_model(GalaxyManagedPathsWatcher::new_for_testing);
+    app.add_singleton_model(WarpManagedPathsWatcher::new_for_testing);
     app.add_singleton_model(FileMCPWatcher::new);
     app.add_singleton_model(AISettings::new_with_defaults);
     app.add_singleton_model(|_| AuthStateProvider::new_for_test());

app/src/ai/mcp/file_mcp_watcher.rs

@@ -6,6 +6,8 @@ use std::sync::LazyLock;
 
 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,
@@ -13,14 +15,12 @@ use repo_metadata::repositories::{
 use repo_metadata::repository::{Repository, RepositorySubscriber, SubscriberId};
 use repo_metadata::watcher::{DirectoryWatcher, RepositoryUpdate};
 use strum::IntoEnumIterator;
-use galaxy_core::safe_warn;
-use galaxyui::{Entity, ModelContext, ModelHandle, SingletonEntity};
 use watcher::HomeDirectoryWatcherEvent;
 
 use crate::ai::mcp::parsing::normalize_codex_toml_to_json;
 use crate::ai::mcp::{home_config_file_path, MCPProvider, ParsedTemplatableMCPServerResult};
 use crate::warp_managed_paths_watcher::{
-    warp_managed_mcp_config_path, WarpManagedPathsWatcher, WarpManagedPathsWatcherEvent,
+    galaxy_managed_mcp_config_path, GalaxyManagedPathsWatcherEvent, WarpManagedPathsWatcher,
 };
 use crate::HomeDirectoryWatcher;
 

app/src/ai/mcp/mod.rs

@@ -7,13 +7,13 @@ use std::path::{Path, PathBuf};
 
 #[cfg(not(target_family = "wasm"))]
 use diesel::{QueryDsl, RunQueryDsl, SqliteConnection};
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::Icon;
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 #[cfg(not(target_family = "wasm"))]
 pub use templatable_manager::McpIntegration;
 pub use templatable_manager::TemplatableMCPServerManager;
-use galaxy_core::ui::appearance::Appearance;
-use galaxy_core::ui::Icon;
 
 use crate::cloud_object::model::generic_string_model::StringModel;
 use crate::cloud_object::model::json_model::JsonModel;
@@ -48,7 +48,7 @@ cfg_if::cfg_if! {
 }
 
 pub mod gallery;
-use galaxyui::{AppContext, SingletonEntity as _};
+use galaxyui::AppContext;
 pub use gallery::MCPGalleryManager;
 pub mod templatable;
 #[cfg(not(target_family = "wasm"))]
@@ -487,7 +487,7 @@ pub enum MCPServerUpdate {
 
 pub(crate) fn home_config_file_path(provider: MCPProvider) -> Option<PathBuf> {
     match provider {
-        MCPProvider::Warp => galaxy_core::paths::warp_home_mcp_config_file_path(),
+        MCPProvider::Warp => galaxy_core::paths::galaxy_home_mcp_config_file_path(),
         _ => dirs::home_dir().map(|home_dir| home_dir.join(provider.home_config_path())),
     }
 }

app/src/ai/mcp/mod_tests.rs

@@ -15,10 +15,11 @@ use crate::ai::mcp::{
 
 #[test]
 fn mcp_provider_from_file_path_recognizes_warp_home_path() {
-    if let Some(warp_home_mcp_config_file_path) = galaxy_core::paths::warp_home_mcp_config_file_path()
+    if let Some(galaxy_home_mcp_config_file_path) =
+        galaxy_core::paths::galaxy_home_mcp_config_file_path()
     {
         assert_eq!(
-            mcp_provider_from_file_path(&warp_home_mcp_config_file_path),
+            mcp_provider_from_file_path(&galaxy_home_mcp_config_file_path),
             Some(MCPProvider::Warp)
         );
     }

app/src/ai/mcp/templatable_manager.rs

@@ -11,6 +11,9 @@ use std::sync::Arc;
 use diesel::SqliteConnection;
 use futures_util::stream::AbortHandle;
 #[cfg(not(target_family = "wasm"))]
+use galaxyui::ModelSpawner;
+use galaxyui::{Entity, SingletonEntity};
+#[cfg(not(target_family = "wasm"))]
 use mcp::oauth;
 use mcp::TemplatableMCPServerInfo;
 #[cfg(not(target_family = "wasm"))]
@@ -18,9 +21,6 @@ pub use native::McpIntegration;
 #[cfg(not(target_family = "wasm"))]
 use parking_lot::Mutex;
 use uuid::Uuid;
-#[cfg(not(target_family = "wasm"))]
-use galaxyui::ModelSpawner;
-use galaxyui::{Entity, SingletonEntity};
 
 #[cfg(not(target_family = "wasm"))]
 use crate::ai::mcp::templatable::CloudTemplatableMCPServer;

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

@@ -3,6 +3,12 @@ use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
 use async_compat::CompatExt as _;
+use galaxy_core::execution_mode::AppExecutionMode;
+use galaxy_core::features::FeatureFlag;
+use galaxy_core::safe_error;
+use galaxy_core::settings::Setting as _;
+use galaxyui::windowing::WindowManager;
+use galaxyui::{AppContext, ModelContext, SingletonEntity};
 use mcp::oauth::{
     self, load_credentials_from_secure_storage, write_to_secure_storage, AuthContext,
     CallbackResult, FileBasedPersistedCredentialsMap, PersistedCredentials,
@@ -13,12 +19,6 @@ use parking_lot::Mutex;
 use simple_logger::manager::LogManager;
 use url::Url;
 use uuid::Uuid;
-use galaxy_core::execution_mode::AppExecutionMode;
-use galaxy_core::features::FeatureFlag;
-use galaxy_core::safe_error;
-use galaxy_core::settings::Setting as _;
-use galaxyui::windowing::WindowManager;
-use galaxyui::{AppContext, ModelContext, SingletonEntity};
 
 use super::{
     MCPServerState, SpawnedServerInfo, TemplatableMCPServerInfo, TemplatableMCPServerManager,

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

@@ -1,7 +1,7 @@
 use std::collections::{HashMap, HashSet};
 
-use uuid::Uuid;
 use galaxyui::{AppContext, ModelContext};
+use uuid::Uuid;
 
 use super::TemplatableMCPServerManager;
 use crate::ai::mcp::templatable::{CloudTemplatableMCPServer, TemplatableMCPServer};