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
+17 -16
View File
@@ -2,6 +2,22 @@ use std::borrow::Cow;
use std::fs::File;
use std::path::PathBuf;
use ai::workspace::WorkspaceMetadata;
use csv::Writer;
use enclose::enclose;
use itertools::Itertools;
use settings::manager::SettingsManager;
use settings::Setting as _;
use galaxy_core::context_flag::ContextFlag;
use warp_util::path::user_friendly_path;
use warpui::actions::StandardAction;
use warpui::keymap::{Keystroke, Trigger};
use warpui::platform::menu::{
CustomMenuItem, Menu, MenuBar, MenuItem, MenuItemProperties, MenuItemPropertyChanges,
};
use warpui::windowing::WindowManager;
use warpui::{AppContext, SingletonEntity};
use crate::ai::persisted_workspace::PersistedWorkspace;
use crate::auth::AuthStateProvider;
use crate::default_terminal::DefaultTerminal;
@@ -20,21 +36,6 @@ use crate::util::bindings::{self, trigger_to_keystroke, CustomAction};
use crate::util::links;
use crate::workspace::sync_inputs::SyncedInputState;
use crate::{auth, report_if_error};
use ai::workspace::WorkspaceMetadata;
use csv::Writer;
use enclose::enclose;
use galaxy_core::context_flag::ContextFlag;
use galaxy_util::path::user_friendly_path;
use galaxyui::actions::StandardAction;
use galaxyui::keymap::{Keystroke, Trigger};
use galaxyui::platform::menu::{
CustomMenuItem, Menu, MenuBar, MenuItem, MenuItemProperties, MenuItemPropertyChanges,
};
use galaxyui::windowing::WindowManager;
use galaxyui::{AppContext, SingletonEntity};
use itertools::Itertools;
use settings::manager::SettingsManager;
use settings::Setting as _;
type CheckmarkStatusGetter = dyn 'static + Fn(&mut AppContext) -> bool;
@@ -381,8 +382,8 @@ fn make_new_view_menu(ctx: &AppContext) -> Menu {
updateable_custom_item_without_checkmark(CustomAction::NavigationPalette, ctx),
updateable_custom_item_without_checkmark(CustomAction::LaunchConfigPalette, ctx),
updateable_custom_item_without_checkmark(CustomAction::FilesPalette, ctx),
updateable_custom_item_without_checkmark(CustomAction::ToggleConversationListView, ctx),
updateable_custom_item_without_checkmark(CustomAction::ToggleProjectExplorer, ctx),
updateable_custom_item_without_checkmark(CustomAction::ToggleConversationListView, ctx),
updateable_custom_item_without_checkmark(CustomAction::ToggleGlobalSearch, ctx),
MenuItem::Separator,
updateable_custom_item_without_checkmark(CustomAction::History, ctx),