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

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
+18 -5
View File
@@ -1,3 +1,10 @@
use std::sync::Arc;
use strum_macros::IntoStaticStr;
use warp_util::path::LineAndColumnArg;
use warpui::keymap::BindingId;
use warpui::{EntityId, WindowId};
use crate::ai::agent::conversation::AIConversationId;
use crate::drive::CloudObjectTypeAndId;
use crate::launch_configs::launch_config::LaunchConfig;
@@ -6,11 +13,6 @@ use crate::search::mixer::SearchMixer;
use crate::server::ids::SyncId;
use crate::util::bindings::CommandBinding;
use crate::workspace::PaneViewLocator;
use galaxy_util::path::LineAndColumnArg;
use galaxyui::keymap::BindingId;
use galaxyui::{EntityId, WindowId};
use std::sync::Arc;
use strum_macros::IntoStaticStr;
pub type CommandPaletteMixer = SearchMixer<CommandPaletteItemAction>;
@@ -37,6 +39,11 @@ pub enum CommandPaletteItemAction {
pane_view_locator: PaneViewLocator,
window_id: WindowId,
},
/// Navigate to a specific tab identified by its pane_group EntityId.
NavigateToTab {
pane_group_id: EntityId,
window_id: WindowId,
},
/// Navigate to a specific conversation.
NavigateToConversation {
pane_view_locator: Option<PaneViewLocator>,
@@ -94,6 +101,9 @@ impl CommandPaletteItemAction {
} => ItemSummary::Session {
pane_view_locator: *pane_view_locator,
},
CommandPaletteItemAction::NavigateToTab { pane_group_id, .. } => ItemSummary::Tab {
pane_group_id: *pane_group_id,
},
CommandPaletteItemAction::NavigateToConversation {
conversation_id, ..
} => ItemSummary::Conversation {
@@ -169,6 +179,9 @@ pub enum ItemSummary {
Session {
pane_view_locator: PaneViewLocator,
},
Tab {
pane_group_id: EntityId,
},
NewSession {
id: NewSessionOptionId,
},