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
+38 -14
View File
@@ -1,9 +1,22 @@
use std::path::PathBuf;
use uuid::Uuid;
use galaxy_core::features::FeatureFlag;
use warpui::elements::{
ConstrainedBox, Container, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize,
ParentElement, Shrinkable, Text, Wrap,
};
use warpui::fonts::{Properties, Weight};
use warpui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use crate::ai::blocklist::BlocklistAIPermissions;
use crate::ai::execution_profiles::profiles::{
AIExecutionProfilesModel, AIExecutionProfilesModelEvent, ClientProfileId,
};
use crate::ai::execution_profiles::{
ActionPermission, AskUserQuestionPermission, WriteToPtyPermission,
ActionPermission, AskUserQuestionPermission, RunAgentsPermission, WriteToPtyPermission,
};
use crate::ai::llms::LLMPreferences;
use crate::appearance::Appearance;
@@ -12,19 +25,6 @@ use crate::settings::AISettings;
use crate::ui_components::icons::Icon;
use crate::view_components::action_button::{ActionButton, ButtonSize, SecondaryTheme};
use crate::TemplatableMCPServerManager;
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::ParentElement;
use galaxyui::SingletonEntity;
use galaxyui::{
elements::{
ConstrainedBox, Container, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize,
Shrinkable, Text, Wrap,
},
fonts::{Properties, Weight},
AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle,
};
use std::path::PathBuf;
use uuid::Uuid;
#[derive(Debug, Clone)]
pub enum ExecutionProfileViewAction {
@@ -304,6 +304,15 @@ impl View for ExecutionProfileView {
is_any_ai_enabled,
),
));
permissions_column.add_child(with_standard_vertical_margin(
render_run_agents_permission_line_with_icon(
Icon::Workflow,
"Run agents:",
&profile.run_agents,
appearance,
is_any_ai_enabled,
),
));
permissions_column.add_child(with_standard_vertical_margin(
render_action_permission_line_with_icon(
@@ -745,6 +754,21 @@ fn render_ask_user_question_permission_line_with_icon(
render_permission_line_with_icon(icon, label, permission_text, appearance, is_ai_enabled)
}
fn render_run_agents_permission_line_with_icon(
icon: Icon,
label: impl Into<String>,
permission: &RunAgentsPermission,
appearance: &Appearance,
is_ai_enabled: bool,
) -> Box<dyn Element> {
let permission_text = match permission {
RunAgentsPermission::NeverAllow | RunAgentsPermission::Unknown => "Never",
RunAgentsPermission::AlwaysAllow => "Always allow",
RunAgentsPermission::AlwaysAsk => "Always ask",
};
render_permission_line_with_icon(icon, label, permission_text, appearance, is_ai_enabled)
}
fn render_bool_permission_line_with_icon(
icon: Icon,
label: impl Into<String>,