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

Rename acp flag (#36541)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Agus Zubiaga 2025-08-19 23:11:17 -03:00 • committed by GitHub
parent 3996587c0b
commit b12d862236
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/agent_ui/src/agent_panel.rs
View file

@ -45,7 +45,7 @@ use assistant_tool::ToolWorkingSet;
use client::{UserStore, zed_urls}; use client::{UserStore, zed_urls};
use cloud_llm_client::{CompletionIntent, Plan, UsageLimit}; use cloud_llm_client::{CompletionIntent, Plan, UsageLimit};
use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer}; use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
use feature_flags::{self, AcpFeatureFlag, ClaudeCodeFeatureFlag, FeatureFlagAppExt}; use feature_flags::{self, ClaudeCodeFeatureFlag, FeatureFlagAppExt, GeminiAndNativeFeatureFlag};
use fs::Fs; use fs::Fs;
use gpui::{ use gpui::{
Action, Animation, AnimationExt as _, AnyElement, App, AsyncWindowContext, ClipboardItem, Action, Animation, AnimationExt as _, AnyElement, App, AsyncWindowContext, ClipboardItem,
@ -725,7 +725,7 @@ impl AgentPanel {
let assistant_navigation_menu = let assistant_navigation_menu =
ContextMenu::build_persistent(window, cx, move |mut menu, _window, cx| { ContextMenu::build_persistent(window, cx, move |mut menu, _window, cx| {
if let Some(panel) = panel.upgrade() { if let Some(panel) = panel.upgrade() {
if cx.has_flag::<AcpFeatureFlag>() { if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
menu = Self::populate_recently_opened_menu_section_new(menu, panel, cx); menu = Self::populate_recently_opened_menu_section_new(menu, panel, cx);
} else { } else {
menu = Self::populate_recently_opened_menu_section_old(menu, panel, cx); menu = Self::populate_recently_opened_menu_section_old(menu, panel, cx);
@ -881,7 +881,7 @@ impl AgentPanel {
} }
fn new_thread(&mut self, action: &NewThread, window: &mut Window, cx: &mut Context<Self>) { fn new_thread(&mut self, action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
if cx.has_flag::<AcpFeatureFlag>() { if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
return self.new_agent_thread(AgentType::NativeAgent, window, cx); return self.new_agent_thread(AgentType::NativeAgent, window, cx);
} }
// Preserve chat box text when using creating new thread // Preserve chat box text when using creating new thread
@ -1058,7 +1058,7 @@ impl AgentPanel {
this.update_in(cx, |this, window, cx| { this.update_in(cx, |this, window, cx| {
match ext_agent { match ext_agent {
crate::ExternalAgent::Gemini | crate::ExternalAgent::NativeAgent => { crate::ExternalAgent::Gemini | crate::ExternalAgent::NativeAgent => {
if !cx.has_flag::<AcpFeatureFlag>() { if !cx.has_flag::<GeminiAndNativeFeatureFlag>() {
return; return;
} }
} }
@ -1825,7 +1825,7 @@ impl Focusable for AgentPanel {
ActiveView::Thread { message_editor, .. } => message_editor.focus_handle(cx), ActiveView::Thread { message_editor, .. } => message_editor.focus_handle(cx),
ActiveView::ExternalAgentThread { thread_view, .. } => thread_view.focus_handle(cx), ActiveView::ExternalAgentThread { thread_view, .. } => thread_view.focus_handle(cx),
ActiveView::History => { ActiveView::History => {
if cx.has_flag::<feature_flags::AcpFeatureFlag>() { if cx.has_flag::<feature_flags::GeminiAndNativeFeatureFlag>() {
self.acp_history.focus_handle(cx) self.acp_history.focus_handle(cx)
} else { } else {
self.history.focus_handle(cx) self.history.focus_handle(cx)
@ -2441,7 +2441,7 @@ impl AgentPanel {
) )
.separator() .separator()
.header("External Agents") .header("External Agents")
.when(cx.has_flag::<AcpFeatureFlag>(), |menu| { .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |menu| {
menu.item( menu.item(
ContextMenuEntry::new("New Gemini Thread") ContextMenuEntry::new("New Gemini Thread")
.icon(IconName::AiGemini) .icon(IconName::AiGemini)
@ -2564,7 +2564,7 @@ impl AgentPanel {
} }
fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement { fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
if cx.has_flag::<feature_flags::AcpFeatureFlag>() if cx.has_flag::<feature_flags::GeminiAndNativeFeatureFlag>()
|| cx.has_flag::<feature_flags::ClaudeCodeFeatureFlag>() || cx.has_flag::<feature_flags::ClaudeCodeFeatureFlag>()
{ {
self.render_toolbar_new(window, cx).into_any_element() self.render_toolbar_new(window, cx).into_any_element()
@ -2749,7 +2749,7 @@ impl AgentPanel {
false false
} }
_ => { _ => {
let history_is_empty = if cx.has_flag::<AcpFeatureFlag>() { let history_is_empty = if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
self.acp_history_store.read(cx).is_empty(cx) self.acp_history_store.read(cx).is_empty(cx)
} else { } else {
self.history_store self.history_store
@ -3641,7 +3641,7 @@ impl Render for AgentPanel {
.child(thread_view.clone()) .child(thread_view.clone())
.child(self.render_drag_target(cx)), .child(self.render_drag_target(cx)),
ActiveView::History => { ActiveView::History => {
if cx.has_flag::<feature_flags::AcpFeatureFlag>() { if cx.has_flag::<feature_flags::GeminiAndNativeFeatureFlag>() {
parent.child(self.acp_history.clone()) parent.child(self.acp_history.clone())
} else { } else {
parent.child(self.history.clone()) parent.child(self.history.clone())

11
crates/feature_flags/src/feature_flags.rs
View file

@ -89,10 +89,15 @@ impl FeatureFlag for JjUiFeatureFlag {
const NAME: &'static str = "jj-ui"; const NAME: &'static str = "jj-ui";
} }
pub struct AcpFeatureFlag; pub struct GeminiAndNativeFeatureFlag;
impl FeatureFlag for AcpFeatureFlag { impl FeatureFlag for GeminiAndNativeFeatureFlag {
const NAME: &'static str = "acp"; // This was previously called "acp".
//
// We renamed it because existing builds used it to enable the Claude Code
// integration too, and we'd like to turn Gemini/Native on in new builds
// without enabling Claude Code in old builds.
const NAME: &'static str = "gemini-and-native";
} }
pub struct ClaudeCodeFeatureFlag; pub struct ClaudeCodeFeatureFlag;