Skip to content

Commit ff0cebb

Browse files
bennetboFrGoIs
authored andcommitted
acp: Enable feature flag for everyone (zed-industries#36928)
Release Notes: - N/A
1 parent e418a6e commit ff0cebb

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

crates/agent_ui/src/agent_panel.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -591,17 +591,6 @@ impl AgentPanel {
591591
None
592592
};
593593

594-
// Wait for the Gemini/Native feature flag to be available.
595-
let client = workspace.read_with(cx, |workspace, _| workspace.client().clone())?;
596-
if !client.status().borrow().is_signed_out() {
597-
cx.update(|_, cx| {
598-
cx.wait_for_flag_or_timeout::<feature_flags::GeminiAndNativeFeatureFlag>(
599-
Duration::from_secs(2),
600-
)
601-
})?
602-
.await;
603-
}
604-
605594
let panel = workspace.update_in(cx, |workspace, window, cx| {
606595
let panel = cx.new(|cx| {
607596
Self::new(

crates/feature_flags/src/feature_flags.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ impl FeatureFlag for GeminiAndNativeFeatureFlag {
9898
// integration too, and we'd like to turn Gemini/Native on in new builds
9999
// without enabling Claude Code in old builds.
100100
const NAME: &'static str = "gemini-and-native";
101+
102+
fn enabled_for_all() -> bool {
103+
true
104+
}
101105
}
102106

103107
pub struct ClaudeCodeFeatureFlag;
@@ -201,7 +205,7 @@ impl FeatureFlagAppExt for App {
201205
fn has_flag<T: FeatureFlag>(&self) -> bool {
202206
self.try_global::<FeatureFlags>()
203207
.map(|flags| flags.has_flag::<T>())
204-
.unwrap_or(false)
208+
.unwrap_or(T::enabled_for_all())
205209
}
206210

207211
fn is_staff(&self) -> bool {

0 commit comments

Comments
 (0)