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
+20 -8
View File
@@ -1,3 +1,9 @@
use onboarding::slides::{AgentAutonomy, AgentDevelopmentSettings};
use onboarding::{SelectedSettings, SessionDefault, UICustomizationSettings};
use settings::Setting as _;
use galaxy_core::features::FeatureFlag;
use warpui::{AppContext, SingletonEntity as _};
use crate::ai::execution_profiles::profiles::AIExecutionProfilesModel;
use crate::ai::execution_profiles::{ActionPermission, WriteToPtyPermission};
use crate::drive::settings::WarpDriveSettings;
@@ -6,14 +12,17 @@ use crate::settings::ai::DefaultSessionMode;
use crate::settings::{AISettings, CodeSettings};
use crate::workspace::tab_settings::TabSettings;
use crate::workspaces::user_workspaces::UserWorkspaces;
use galaxy_core::features::FeatureFlag;
use galaxyui::{AppContext, SingletonEntity as _};
use onboarding::slides::{AgentAutonomy, AgentDevelopmentSettings};
use onboarding::{SelectedSettings, SessionDefault, UICustomizationSettings};
use settings::Setting as _;
/// Applies onboarding settings based on the user's selected mode.
pub fn apply_onboarding_settings(selected_settings: &SelectedSettings, app: &mut AppContext) {
///
/// `has_account` indicates whether the user has (or is creating) a real Warp
/// account. Warp's AI features run on a Warp account, so agent intent only
/// enables AI when `has_account` is true; skipping login leaves AI off.
pub fn apply_onboarding_settings(
selected_settings: &SelectedSettings,
has_account: bool,
app: &mut AppContext,
) {
let is_ai_enabled = match selected_settings {
SelectedSettings::AgentDrivenDevelopment {
agent_settings,
@@ -21,11 +30,14 @@ pub fn apply_onboarding_settings(selected_settings: &SelectedSettings, app: &mut
..
} => {
apply_agent_settings(agent_settings, app);
let is_ai_enabled = !agent_settings.disable_oz;
if let Some(ui) = ui_customization {
apply_ui_customization_settings(ui, true, app);
}
is_ai_enabled
// Agent intent means the user wants AI, but Warp's AI features run
// on a Warp account, so AI is only enabled once they have one.
// Skipping login leaves AI off even for agent intent (including the
// bring-your-own-agents `disable_oz` path).
has_account
}
SelectedSettings::Terminal {
ui_customization,