Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

agent: Add use_modifier_to_send section in the settings view (#34866)

Browse source 
This PR also converts all of these switch-based settings to use the new
`SwitchField` component, introduced in
https://github.com/zed-industries/zed/pull/34713.

Release Notes:

- agent: Added the ability to change the `use_modifier_to_send` setting
from the agent panel settings UI.
This commit is contained in:
Danilo Leal 2025-07-22 09:42:34 -03:00 • committed by GitHub
parent c7158f0bd7
commit a3850b3d38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 69 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

162
crates/agent_ui/src/agent_configuration.rs
View file

@ -28,7 +28,7 @@ use proto::Plan;
use settings::{Settings, update_settings_file}; use settings::{Settings, update_settings_file};
use ui::{ use ui::{
Chip, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, PopoverMenu, Chip, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, PopoverMenu,
Scrollbar, ScrollbarState, Switch, SwitchColor, Tooltip, prelude::*, Scrollbar, ScrollbarState, Switch, SwitchColor, SwitchField, Tooltip, prelude::*,
}; };
use util::ResultExt as _; use util::ResultExt as _;
use workspace::Workspace; use workspace::Workspace;
@ -330,119 +330,74 @@ impl AgentConfiguration {
fn render_command_permission(&mut self, cx: &mut Context<Self>) -> impl IntoElement { fn render_command_permission(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
let always_allow_tool_actions = AgentSettings::get_global(cx).always_allow_tool_actions; let always_allow_tool_actions = AgentSettings::get_global(cx).always_allow_tool_actions;
let fs = self.fs.clone();
h_flex() SwitchField::new(
.gap_4() "single-file-review",
.justify_between() "Enable single-file agent reviews",
.flex_wrap() "Agent edits are also displayed in single-file editors for review.",
.child( always_allow_tool_actions,
v_flex() move |state, _window, cx| {
.gap_0p5() let allow = state == &ToggleState::Selected;
.max_w_5_6() update_settings_file::<AgentSettings>(fs.clone(), cx, move |settings, _| {
.child(Label::new("Allow running editing tools without asking for confirmation")) settings.set_always_allow_tool_actions(allow);
.child( });
Label::new( },
"The agent can perform potentially destructive actions without asking for your confirmation.", )
)
.color(Color::Muted),
),
)
.child(
Switch::new(
"always-allow-tool-actions-switch",
always_allow_tool_actions.into(),
)
.color(SwitchColor::Accent)
.on_click({
let fs = self.fs.clone();
move |state, _window, cx| {
let allow = state == &ToggleState::Selected;
update_settings_file::<AgentSettings>(
fs.clone(),
cx,
move |settings, _| {
settings.set_always_allow_tool_actions(allow);
},
);
}
}),
)
} }
fn render_single_file_review(&mut self, cx: &mut Context<Self>) -> impl IntoElement { fn render_single_file_review(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
let single_file_review = AgentSettings::get_global(cx).single_file_review; let single_file_review = AgentSettings::get_global(cx).single_file_review;
let fs = self.fs.clone();
h_flex() SwitchField::new(
.gap_4() "single-file-review",
.justify_between() "Enable single-file agent reviews",
.flex_wrap() "Agent edits are also displayed in single-file editors for review.",
.child( single_file_review,
v_flex() move |state, _window, cx| {
.gap_0p5() let allow = state == &ToggleState::Selected;
.max_w_5_6() update_settings_file::<AgentSettings>(fs.clone(), cx, move |settings, _| {
.child(Label::new("Enable single-file agent reviews")) settings.set_single_file_review(allow);
.child( });
Label::new( },
"Agent edits are also displayed in single-file editors for review.", )
)
.color(Color::Muted),
),
)
.child(
Switch::new("single-file-review-switch", single_file_review.into())
.color(SwitchColor::Accent)
.on_click({
let fs = self.fs.clone();
move |state, _window, cx| {
let allow = state == &ToggleState::Selected;
update_settings_file::<AgentSettings>(
fs.clone(),
cx,
move |settings, _| {
settings.set_single_file_review(allow);
},
);
}
}),
)
} }
fn render_sound_notification(&mut self, cx: &mut Context<Self>) -> impl IntoElement { fn render_sound_notification(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
let play_sound_when_agent_done = AgentSettings::get_global(cx).play_sound_when_agent_done; let play_sound_when_agent_done = AgentSettings::get_global(cx).play_sound_when_agent_done;
let fs = self.fs.clone();
h_flex() SwitchField::new(
.gap_4() "sound-notification",
.justify_between() "Play sound when finished generating",
.flex_wrap() "Hear a notification sound when the agent is done generating changes or needs your input.",
.child( play_sound_when_agent_done,
v_flex() move |state, _window, cx| {
.gap_0p5() let allow = state == &ToggleState::Selected;
.max_w_5_6() update_settings_file::<AgentSettings>(fs.clone(), cx, move |settings, _| {
.child(Label::new("Play sound when finished generating")) settings.set_play_sound_when_agent_done(allow);
.child( });
Label::new( },
"Hear a notification sound when the agent is done generating changes or needs your input.", )
) }
.color(Color::Muted),
), fn render_modifier_to_send(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
) let use_modifier_to_send = AgentSettings::get_global(cx).use_modifier_to_send;
.child( let fs = self.fs.clone();
Switch::new("play-sound-notification-switch", play_sound_when_agent_done.into())
.color(SwitchColor::Accent) SwitchField::new(
.on_click({ "modifier-send",
let fs = self.fs.clone(); "Use modifier to submit a message",
move |state, _window, cx| { "Make a modifier (cmd-enter on macOS, ctrl-enter on Linux) required to send messages.",
let allow = state == &ToggleState::Selected; use_modifier_to_send,
update_settings_file::<AgentSettings>( move |state, _window, cx| {
fs.clone(), let allow = state == &ToggleState::Selected;
cx, update_settings_file::<AgentSettings>(fs.clone(), cx, move |settings, _| {
move |settings, _| { settings.set_use_modifier_to_send(allow);
settings.set_play_sound_when_agent_done(allow); });
}, },
); )
}
}),
)
} }
fn render_general_settings_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement { fn render_general_settings_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
@ -456,6 +411,7 @@ impl AgentConfiguration {
.child(self.render_command_permission(cx)) .child(self.render_command_permission(cx))
.child(self.render_single_file_review(cx)) .child(self.render_single_file_review(cx))
.child(self.render_sound_notification(cx)) .child(self.render_sound_notification(cx))
.child(self.render_modifier_to_send(cx))
} }
fn render_zed_plan_info(&self, plan: Option<Plan>, cx: &mut Context<Self>) -> impl IntoElement { fn render_zed_plan_info(&self, plan: Option<Plan>, cx: &mut Context<Self>) -> impl IntoElement {

11
crates/ui/src/components/toggle.rs
View file

@ -588,7 +588,7 @@ impl SwitchField {
toggle_state: toggle_state.into(), toggle_state: toggle_state.into(),
on_click: Arc::new(on_click), on_click: Arc::new(on_click),
disabled: false, disabled: false,
color: SwitchColor::default(), color: SwitchColor::Accent,
} }
} }
@ -634,6 +634,15 @@ impl RenderOnce for SwitchField {
} }
}), }),
) )
.when(!self.disabled, |this| {
this.on_click({
let on_click = self.on_click.clone();
let toggle_state = self.toggle_state;
move |_click, window, cx| {
(on_click)(&toggle_state.inverse(), window, cx);
}
})
})
} }
} }