Fix cursor focus and selection in input box, add AWS env var warning box, and remove AWS Bedrock login banner
This commit is contained in:
+17
-17
@@ -7,21 +7,6 @@ use std::rc::Rc;
|
||||
use std::sync::mpsc::SyncSender;
|
||||
use std::sync::Arc;
|
||||
|
||||
use itertools::Itertools;
|
||||
use lazy_static::lazy_static;
|
||||
use markdown_parser::FormattedTextFragment;
|
||||
use parking_lot::FairMutex;
|
||||
use pathfinder_geometry::rect::RectF;
|
||||
use pathfinder_geometry::vector::{vec2f, Vector2F};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use session_sharing_protocol::common::{
|
||||
ParticipantId, Role, RoleRequestId, RoleRequestRejectedReason, RoleRequestResponse, SessionId,
|
||||
};
|
||||
use settings::Setting as _;
|
||||
use tree::DEFAULT_FLEX_VALUE;
|
||||
use typed_path::TypedPath;
|
||||
use url::Url;
|
||||
use uuid::Uuid;
|
||||
use galaxy_cli::agent::Harness;
|
||||
use galaxy_core::command::ExitCode;
|
||||
use galaxy_core::context_flag::ContextFlag;
|
||||
@@ -41,6 +26,21 @@ use galaxyui::{
|
||||
AppContext, Entity, EntityId, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
ViewHandle, WeakViewHandle, WindowId,
|
||||
};
|
||||
use itertools::Itertools;
|
||||
use lazy_static::lazy_static;
|
||||
use markdown_parser::FormattedTextFragment;
|
||||
use parking_lot::FairMutex;
|
||||
use pathfinder_geometry::rect::RectF;
|
||||
use pathfinder_geometry::vector::{vec2f, Vector2F};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use session_sharing_protocol::common::{
|
||||
ParticipantId, Role, RoleRequestId, RoleRequestRejectedReason, RoleRequestResponse, SessionId,
|
||||
};
|
||||
use settings::Setting as _;
|
||||
use tree::DEFAULT_FLEX_VALUE;
|
||||
use typed_path::TypedPath;
|
||||
use url::Url;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::ai::active_agent_views_model::ActiveAgentViewsModel;
|
||||
use crate::ai::agent::conversation::{AIAgentHarness, AIConversation, AIConversationId};
|
||||
@@ -85,7 +85,7 @@ use crate::code::view::{CodeView, CodeViewAction};
|
||||
use crate::code_review::comments::{AttachedReviewComment, PendingImportedReviewComment};
|
||||
use crate::code_review::diff_state::DiffMode;
|
||||
use crate::drive::items::WarpDriveItemId;
|
||||
use crate::drive::{CloudObjectTypeAndId, OpenWarpDriveObjectArgs};
|
||||
use crate::drive::{CloudObjectTypeAndId, OpenGalaxyDriveObjectArgs};
|
||||
use crate::env_vars::EnvVarCollectionType;
|
||||
use crate::features::FeatureFlag;
|
||||
use crate::launch_configs::launch_config::{self, PaneMode, PaneTemplateType};
|
||||
@@ -627,7 +627,7 @@ pub enum Event {
|
||||
},
|
||||
/// Clears the hovered tab index so it no longer appears as highlighted drop target
|
||||
ClearHoveredTabIndex,
|
||||
OpenWarpDriveObjectInPane(ObjectUid),
|
||||
OpenGalaxyDriveObjectInPane(ObjectUid),
|
||||
/// Tell the workspace to open the given child agent conversation in a
|
||||
/// fresh tab. Bubbled up by `TerminalView::Event::OpenChildAgentInNewTab`
|
||||
/// from the orchestration pill bar's 3-dot menu.
|
||||
|
||||
@@ -3,6 +3,7 @@ use std::collections::HashMap;
|
||||
use ai::index::full_source_code_embedding::manager::CodebaseIndexManager;
|
||||
use ai::project_context::model::ProjectContextModel;
|
||||
use chrono::Utc;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use pathfinder_geometry::rect::RectF;
|
||||
use persistence::model::{
|
||||
AgentConversation, AgentConversationData, AgentConversationRecord, ConversationUsageMetadata,
|
||||
@@ -14,7 +15,6 @@ use repo_metadata::RepoMetadataModel;
|
||||
use session_sharing_protocol::common::SessionId;
|
||||
use shared_session::permissions_manager::SessionPermissionsManager;
|
||||
use uuid::Uuid;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use warp_server_client::iap::IapManager;
|
||||
use warpui::platform::{WindowBounds, WindowStyle};
|
||||
use warpui::windowing::state::ApplicationStage;
|
||||
@@ -141,7 +141,7 @@ fn initialize_app(app: &mut App) {
|
||||
app.add_singleton_model(|_| DetectedRepositories::default());
|
||||
app.add_singleton_model(HomeDirectoryWatcher::new_for_test);
|
||||
app.add_singleton_model(DirectoryWatcher::new);
|
||||
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(|_| FileBasedMCPManager::default());
|
||||
|
||||
@@ -353,6 +353,7 @@ fn test_server_conversation_metadata(
|
||||
token_usage: vec![],
|
||||
tool_usage_metadata: Default::default(),
|
||||
context_window_segments: Vec::new(),
|
||||
..Default::default()
|
||||
},
|
||||
metadata: mock_server_metadata(),
|
||||
creator: None,
|
||||
@@ -396,6 +397,8 @@ fn persisted_remote_child_conversation(
|
||||
autoexecute_override: None,
|
||||
last_event_sequence: None,
|
||||
pinned: false,
|
||||
progressive_summary: None,
|
||||
messages_summarized_up_to: 0,
|
||||
})
|
||||
.expect("conversation data should serialize"),
|
||||
last_modified_at: Utc::now().naive_utc(),
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxy_core::ui::color::blend::Blend as _;
|
||||
use galaxy_core::ui::{self};
|
||||
@@ -14,6 +13,7 @@ use galaxyui::{
|
||||
AppContext, Element, Entity, ModelHandle, SingletonEntity as _, TypedActionView, View,
|
||||
ViewContext, ViewHandle,
|
||||
};
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
|
||||
use crate::coding_entrypoints::clone_repo_view::{CloneRepoEvent, CloneRepoView};
|
||||
use crate::coding_entrypoints::create_project_view::{CreateProjectEvent, CreateProjectView};
|
||||
|
||||
@@ -2,9 +2,9 @@ use std::ffi::OsString;
|
||||
use std::fs;
|
||||
use std::sync::Arc;
|
||||
|
||||
use tempfile::TempDir;
|
||||
use galaxy_cli::agent::Harness;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use tempfile::TempDir;
|
||||
|
||||
use super::{
|
||||
build_local_claude_child_command, build_local_codex_child_command,
|
||||
|
||||
@@ -32,8 +32,6 @@ pub mod workflow_pane;
|
||||
use std::any::Any;
|
||||
use std::fmt::Display;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use url::Url;
|
||||
use galaxy_util::remote_path::RemotePath;
|
||||
use galaxyui::elements::{DispatchEventResult, EventHandler, MouseInBehavior};
|
||||
use galaxyui::presenter::ChildView;
|
||||
@@ -41,6 +39,8 @@ use galaxyui::{
|
||||
Action, AppContext, Element, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity,
|
||||
View, ViewContext, ViewHandle, WeakModelHandle,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use url::Url;
|
||||
|
||||
pub use self::view::{PaneHeaderAction, PaneHeaderCustomAction, PaneView, PaneViewEvent};
|
||||
use super::{ActivationReason, LeafContents, PaneGroup, PaneGroupAction};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use anyhow::Context;
|
||||
use url::Url;
|
||||
use galaxyui::{AppContext, ModelHandle, SingletonEntity, ViewContext, ViewHandle};
|
||||
use url::Url;
|
||||
|
||||
use super::super::{DefaultSessionModeBehavior, Direction};
|
||||
use super::view::PaneView;
|
||||
@@ -13,7 +13,7 @@ use super::{
|
||||
use crate::app_state::{LeafContents, NotebookPaneSnapshot};
|
||||
use crate::cloud_object::Space;
|
||||
use crate::drive::items::WarpDriveItemId;
|
||||
use crate::drive::{CloudObjectTypeAndId, OpenWarpDriveObjectSettings};
|
||||
use crate::drive::{CloudObjectTypeAndId, OpenGalaxyDriveObjectSettings};
|
||||
use crate::notebooks::link::{LinkEvent, NotebookLinks};
|
||||
use crate::notebooks::manager::{NotebookManager, NotebookSource};
|
||||
use crate::notebooks::notebook::{NotebookEvent, NotebookView};
|
||||
|
||||
@@ -5,15 +5,15 @@ use std::sync::mpsc::SyncSender;
|
||||
|
||||
use base64::engine::general_purpose::STANDARD as BASE64_STANDARD;
|
||||
use base64::Engine as _;
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use session_sharing_protocol::sharer::SessionSourceType;
|
||||
use url::Url;
|
||||
use galaxy_cli::agent::Harness;
|
||||
use galaxy_core::execution_mode::AppExecutionMode;
|
||||
use warp_multi_agent_api as multi_agent_api;
|
||||
use galaxyui::{
|
||||
AppContext, EntityId, ModelHandle, SingletonEntity, ViewContext, ViewHandle, WindowId,
|
||||
};
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use session_sharing_protocol::sharer::SessionSourceType;
|
||||
use url::Url;
|
||||
use warp_multi_agent_api as multi_agent_api;
|
||||
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use super::local_harness_launch::{prepare_local_harness_child_launch, PreparedLocalHarnessLaunch};
|
||||
@@ -563,10 +563,11 @@ impl PaneContent for TerminalPane {
|
||||
.sync_id();
|
||||
|
||||
// Collect all conversation IDs for this terminal view
|
||||
let conversation_ids_to_restore = BlocklistAIHistoryModel::as_ref(app)
|
||||
.all_live_conversations_for_terminal_surface(self.terminal_view(app).id())
|
||||
.map(|conversation| conversation.id())
|
||||
.collect();
|
||||
let conversation_ids_to_restore: Vec<AIConversationId> =
|
||||
BlocklistAIHistoryModel::as_ref(app)
|
||||
.all_live_conversations_for_terminal_surface(self.terminal_view(app).id())
|
||||
.map(|conversation| conversation.id())
|
||||
.collect();
|
||||
|
||||
// Capture agent view state: if fullscreen, store the active conversation ID
|
||||
let active_conversation_id = view
|
||||
|
||||
@@ -1,10 +1,15 @@
|
||||
use std::fmt::Debug;
|
||||
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::settings::Setting;
|
||||
use galaxyui::presenter::ChildView;
|
||||
use galaxyui::{
|
||||
AppContext, Element, Entity, EntityId, ModelHandle, SingletonEntity, TypedActionView, View,
|
||||
ViewContext, ViewHandle,
|
||||
};
|
||||
use pathfinder_geometry::rect::RectF;
|
||||
use pathfinder_geometry::vector::{vec2f, Vector2F};
|
||||
use sharing::SharedPaneContent;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::settings::Setting;
|
||||
use warpui::elements::{
|
||||
AcceptedByDropTarget, Align, Border, ChildAnchor, Clipped, ConstrainedBox, Container,
|
||||
CornerRadius, CrossAxisAlignment, Dismiss, Draggable, DraggableState, Empty, Flex, Hoverable,
|
||||
@@ -12,15 +17,6 @@ use warpui::elements::{
|
||||
ParentElement, ParentOffsetBounds, PositionedElementAnchor, PositionedElementOffsetBounds,
|
||||
Radius, SavePosition, Shrinkable, Stack, Text,
|
||||
};
|
||||
use galaxyui::presenter::ChildView;
|
||||
use galaxyui::{
|
||||
AppContext, Element, Entity, EntityId, ModelHandle, SingletonEntity, TypedActionView, View,
|
||||
ViewContext, ViewHandle,
|
||||
};
|
||||
use pathfinder_geometry::{
|
||||
rect::RectF,
|
||||
vector::{vec2f, Vector2F},
|
||||
};
|
||||
|
||||
use super::header_content::{HeaderContent, HeaderRenderContext, StandardHeaderOptions};
|
||||
use super::PaneDropTargetData;
|
||||
|
||||
@@ -11,7 +11,7 @@ use super::{
|
||||
};
|
||||
use crate::app_state::{LeafContents, WorkflowPaneSnapshot};
|
||||
use crate::drive::items::WarpDriveItemId;
|
||||
use crate::drive::OpenWarpDriveObjectSettings;
|
||||
use crate::drive::OpenGalaxyDriveObjectSettings;
|
||||
use crate::server::ids::SyncId;
|
||||
use crate::workflows::manager::{WorkflowManager, WorkflowOpenSource};
|
||||
use crate::workflows::workflow_view::{WorkflowView, WorkflowViewEvent};
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
use std::collections::HashSet;
|
||||
use std::{fmt, iter, mem};
|
||||
|
||||
use pathfinder_geometry::rect::RectF;
|
||||
use pathfinder_geometry::vector::Vector2F;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxyui::elements::{
|
||||
ChildAnchor, ConstrainedBox, Container, DispatchEventResult, Element, Empty, EventHandler,
|
||||
@@ -12,11 +10,13 @@ use galaxyui::elements::{
|
||||
};
|
||||
use galaxyui::platform::Cursor;
|
||||
use galaxyui::{AppContext, EntityId, ViewContext};
|
||||
use pathfinder_geometry::rect::RectF;
|
||||
use pathfinder_geometry::vector::Vector2F;
|
||||
|
||||
use super::{ActivationReason, PaneGroup, PaneId};
|
||||
use crate::app_state;
|
||||
use crate::pane_group::{get_minimum_pane_size, DraggedBorder, PaneGroupAction};
|
||||
use crate::themes::theme::WarpTheme;
|
||||
use crate::themes::theme::GalaxyTheme;
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "tree_tests.rs"]
|
||||
|
||||
@@ -6,13 +6,13 @@ use std::path::Path;
|
||||
#[cfg(feature = "local_fs")]
|
||||
use std::path::PathBuf;
|
||||
|
||||
use galaxy_core::SessionId;
|
||||
#[cfg(feature = "local_fs")]
|
||||
use indexmap::IndexSet;
|
||||
#[cfg(feature = "local_fs")]
|
||||
use remote_server::manager::RemoteServerManager;
|
||||
#[cfg(feature = "local_fs")]
|
||||
use repo_metadata::repositories::DetectedRepositories;
|
||||
use galaxy_core::SessionId;
|
||||
#[cfg(feature = "local_fs")]
|
||||
use warp_util::remote_path::RemotePath;
|
||||
#[cfg(feature = "local_fs")]
|
||||
|
||||
Reference in New Issue
Block a user