Skip to content

Make mercury and sweep non experimental #48227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
probably-neb merged 2 commits into from
Feb 3, 2026
Merged

Make mercury and sweep non experimental #48227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1f2a96
move mercury and sweep out of experimental
probably-neb Feb 2, 2026
9f33a77
add migration
probably-neb Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions crates/agent_ui/src/agent_ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,8 @@ fn update_command_palette_filter(cx: &mut App) {
}
EditPredictionProvider::Zed
| EditPredictionProvider::Codestral
| EditPredictionProvider::Sweep
| EditPredictionProvider::Mercury
| EditPredictionProvider::Experimental(_) => {
filter.show_namespace("edit_prediction");
filter.hide_namespace("copilot");
Expand Down
26 changes: 9 additions & 17 deletions crates/edit_prediction_ui/src/edit_prediction_button.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ use language::{
use project::{DisableAiSettings, Project};
use regex::Regex;
use settings::{
EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME, Settings, SettingsStore,
update_settings_file,
EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME, Settings, SettingsStore, update_settings_file,
};
use std::{
sync::{Arc, LazyLock},
Expand Down Expand Up @@ -306,7 +303,10 @@ impl Render for EditPredictionButton {
.with_handle(self.popover_menu_handle.clone()),
)
}
provider @ (EditPredictionProvider::Experimental(_) | EditPredictionProvider::Zed) => {
provider @ (EditPredictionProvider::Experimental(_)
| EditPredictionProvider::Zed
| EditPredictionProvider::Sweep
| EditPredictionProvider::Mercury) => {
let enabled = self.editor_enabled.unwrap_or(true);
let icons = self
.edit_prediction_provider
Expand All @@ -321,9 +321,7 @@ impl Render for EditPredictionButton {
let mut missing_token = false;

match provider {
EditPredictionProvider::Experimental(
EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
) => {
EditPredictionProvider::Sweep => {
missing_token = edit_prediction::EditPredictionStore::try_global(cx)
.is_some_and(|ep_store| !ep_store.read(cx).has_sweep_api_token(cx));
ep_icon = if enabled { icons.base } else { icons.disabled };
Expand All @@ -333,9 +331,7 @@ impl Render for EditPredictionButton {
"Powered by Sweep"
};
}
EditPredictionProvider::Experimental(
EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
) => {
EditPredictionProvider::Mercury => {
ep_icon = if enabled { icons.base } else { icons.disabled };
missing_token = edit_prediction::EditPredictionStore::try_global(cx)
.is_some_and(|ep_store| !ep_store.read(cx).has_mercury_api_token(cx));
Expand Down Expand Up @@ -1327,19 +1323,15 @@ pub fn get_available_providers(cx: &mut App) -> Vec<EditPredictionProvider> {
.read(cx)
.has_key()
{
providers.push(EditPredictionProvider::Experimental(
EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
));
providers.push(EditPredictionProvider::Sweep);
}

if cx.has_flag::<MercuryFeatureFlag>()
&& edit_prediction::mercury::mercury_api_token(cx)
.read(cx)
.has_key()
{
providers.push(EditPredictionProvider::Experimental(
EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
));
providers.push(EditPredictionProvider::Mercury);
}

providers
Expand Down
6 changes: 6 additions & 0 deletions crates/migrator/src/migrations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,9 @@ pub(crate) mod m_2026_02_02 {

pub(crate) use settings::move_edit_prediction_provider_to_edit_predictions;
}

pub(crate) mod m_2026_02_03 {
mod settings;

pub(crate) use settings::migrate_experimental_sweep_mercury;
}
44 changes: 44 additions & 0 deletions crates/migrator/src/migrations/m_2026_02_03/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
use anyhow::Result;
use serde_json::Value;

pub fn migrate_experimental_sweep_mercury(value: &mut Value) -> Result<()> {
let Some(obj) = value.as_object_mut() else {
return Ok(());
};

if let Some(edit_predictions) = obj.get_mut("edit_predictions") {
if let Some(edit_predictions_obj) = edit_predictions.as_object_mut() {
migrate_provider_field(edit_predictions_obj, "provider");
}
}

if let Some(features) = obj.get_mut("features") {
if let Some(features_obj) = features.as_object_mut() {
migrate_provider_field(features_obj, "edit_prediction_provider");
}
}

Ok(())
}

fn migrate_provider_field(obj: &mut serde_json::Map<String, Value>, field_name: &str) {
let Some(provider) = obj.get(field_name) else {
return;
};

let Some(provider_obj) = provider.as_object() else {
return;
};

let Some(experimental_name) = provider_obj.get("experimental") else {
return;
};

let Some(name) = experimental_name.as_str() else {
return;
};

if name == "sweep" || name == "mercury" {
obj.insert(field_name.to_string(), Value::String(name.to_string()));
}
}
122 changes: 122 additions & 0 deletions crates/migrator/src/migrator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ pub fn migrate_settings(text: &str) -> Result<Option<String>> {
MigrationType::Json(
migrations::m_2026_02_02::move_edit_prediction_provider_to_edit_predictions,
),
MigrationType::Json(migrations::m_2026_02_03::migrate_experimental_sweep_mercury),
];
run_migrations(text, migrations)
}
Expand Down Expand Up @@ -2470,4 +2471,125 @@ mod tests {
None,
);
}

#[test]
fn test_migrate_experimental_sweep_mercury() {
assert_migrate_settings_with_migrations(
&[MigrationType::Json(
migrations::m_2026_02_03::migrate_experimental_sweep_mercury,
)],
&r#"{ }"#.unindent(),
None,
);

assert_migrate_settings_with_migrations(
&[MigrationType::Json(
migrations::m_2026_02_03::migrate_experimental_sweep_mercury,
)],
&r#"
{
"edit_predictions": {
"provider": {
"experimental": "sweep"
}
}
}
"#
.unindent(),
Some(
&r#"
{
"edit_predictions": {
"provider": "sweep"
}
}
"#
.unindent(),
),
);

assert_migrate_settings_with_migrations(
&[MigrationType::Json(
migrations::m_2026_02_03::migrate_experimental_sweep_mercury,
)],
&r#"
{
"edit_predictions": {
"provider": {
"experimental": "mercury"
}
}
}
"#
.unindent(),
Some(
&r#"
{
"edit_predictions": {
"provider": "mercury"
}
}
"#
.unindent(),
),
);

assert_migrate_settings_with_migrations(
&[MigrationType::Json(
migrations::m_2026_02_03::migrate_experimental_sweep_mercury,
)],
&r#"
{
"features": {
"edit_prediction_provider": {
"experimental": "sweep"
}
}
}
"#
.unindent(),
Some(
&r#"
{
"features": {
"edit_prediction_provider": "sweep"
}
}
"#
.unindent(),
),
);

assert_migrate_settings_with_migrations(
&[MigrationType::Json(
migrations::m_2026_02_03::migrate_experimental_sweep_mercury,
)],
&r#"
{
"edit_predictions": {
"provider": "zed"
}
}
"#
.unindent(),
None,
);

assert_migrate_settings_with_migrations(
&[MigrationType::Json(
migrations::m_2026_02_03::migrate_experimental_sweep_mercury,
)],
&r#"
{
"edit_predictions": {
"provider": {
"experimental": "zeta2"
}
}
}
"#
.unindent(),
None,
);
}
}
32 changes: 10 additions & 22 deletions crates/settings_content/src/language.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ pub enum EditPredictionProvider {
Supermaven,
Zed,
Codestral,
Sweep,
Mercury,
Experimental(&'static str),
}

pub const EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME: &str = "sweep";
pub const EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME: &str = "zeta2";
pub const EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME: &str = "mercury";

impl<'de> Deserialize<'de> for EditPredictionProvider {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
Expand All @@ -104,6 +104,8 @@ impl<'de> Deserialize<'de> for EditPredictionProvider {
Supermaven,
Zed,
Codestral,
Sweep,
Mercury,
Experimental(String),
}

Expand All @@ -113,20 +115,8 @@ impl<'de> Deserialize<'de> for EditPredictionProvider {
Content::Supermaven => EditPredictionProvider::Supermaven,
Content::Zed => EditPredictionProvider::Zed,
Content::Codestral => EditPredictionProvider::Codestral,
Content::Experimental(name)
if name == EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME =>
{
EditPredictionProvider::Experimental(
EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
)
}
Content::Experimental(name)
if name == EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME =>
{
EditPredictionProvider::Experimental(
EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
)
}
Content::Sweep => EditPredictionProvider::Sweep,
Content::Mercury => EditPredictionProvider::Mercury,
Content::Experimental(name)
if name == EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME =>
{
Expand All @@ -152,6 +142,8 @@ impl EditPredictionProvider {
| EditPredictionProvider::Copilot
| EditPredictionProvider::Supermaven
| EditPredictionProvider::Codestral
| EditPredictionProvider::Sweep
| EditPredictionProvider::Mercury
| EditPredictionProvider::Experimental(_) => false,
}
}
Expand All @@ -162,12 +154,8 @@ impl EditPredictionProvider {
EditPredictionProvider::Copilot => Some("GitHub Copilot"),
EditPredictionProvider::Supermaven => Some("Supermaven"),
EditPredictionProvider::Codestral => Some("Codestral"),
EditPredictionProvider::Experimental(
EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
) => Some("Sweep"),
EditPredictionProvider::Experimental(
EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
) => Some("Mercury"),
EditPredictionProvider::Sweep => Some("Sweep"),
EditPredictionProvider::Mercury => Some("Mercury"),
EditPredictionProvider::Experimental(
EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME,
) => Some("Zeta2"),
Expand Down
Loading
Loading