diff --git a/Cargo.lock b/Cargo.lock index 7d7c932bc5d..b5f5dcf5f63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5548,7 +5548,6 @@ dependencies = [ "codestral", "command_palette_hooks", "copilot", - "copilot_chat", "copilot_ui", "edit_prediction", "edit_prediction_types", @@ -9785,7 +9784,6 @@ dependencies = [ "gpui", "gpui_tokio", "http_client", - "language", "language_model", "language_models_cloud", "llama_cpp", diff --git a/assets/settings/default.json b/assets/settings/default.json index 98844cbd33d..669ed34aee3 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -1932,7 +1932,6 @@ "mode": "eager", // Copilot-specific settings // "copilot": { - // "enterprise_uri": "", // "proxy": "", // "proxy_no_verify": false, // "enable_next_edit_suggestions": true, @@ -1941,7 +1940,6 @@ // "prediction_debounce": 75 // }, "copilot": { - "enterprise_uri": null, "proxy": null, "proxy_no_verify": null, "enable_next_edit_suggestions": true, @@ -2640,6 +2638,10 @@ "language_servers": ["zls", "..."], }, }, + // Settings shared by Copilot Chat and edit predictions. + "copilot": { + "enterprise_uri": null, + }, // Different settings for specific language models. "language_models": { "anthropic": { diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs index bd28e4f0470..62664980de1 100644 --- a/crates/copilot/src/copilot.rs +++ b/crates/copilot/src/copilot.rs @@ -15,7 +15,7 @@ use gpui::{ App, AppContext as _, AsyncApp, Context, Entity, EntityId, EventEmitter, Global, Subscription, Task, WeakEntity, actions, }; -use language::language_settings::{AllLanguageSettings, CopilotSettings}; +use language::language_settings::{AllLanguageSettings, CopilotEditPredictionSettings}; use language::{ Anchor, Bias, Buffer, BufferSnapshot, Language, PointUtf16, ToPointUtf16, language_settings::{EditPredictionProvider, all_language_settings}, @@ -479,7 +479,10 @@ impl Copilot { cx.notify(); } - fn build_env(&self, copilot_settings: &CopilotSettings) -> Option> { + fn build_env( + &self, + copilot_settings: &CopilotEditPredictionSettings, + ) -> Option> { let proxy_url = copilot_settings.proxy.clone()?; let no_verify = copilot_settings.proxy_no_verify; let http_or_https_proxy = if proxy_url.starts_with("http:") { @@ -1311,24 +1314,13 @@ fn notify_did_change_config_to_server( .copilot .clone(); - if let Some(copilot_chat) = copilot_chat::CopilotChat::global(cx) { - copilot_chat.update(cx, |chat, cx| { - chat.set_configuration( - copilot_chat::CopilotChatConfiguration { - enterprise_uri: copilot_settings.enterprise_uri.clone(), - }, - cx, - ); - }); - } - let settings = json!({ "http": { "proxy": copilot_settings.proxy, "proxyStrictSSL": !copilot_settings.proxy_no_verify.unwrap_or(false) }, "github-enterprise": { - "uri": copilot_settings.enterprise_uri + "uri": settings::CopilotSettings::get_global(cx).enterprise_uri } }); diff --git a/crates/edit_prediction_ui/Cargo.toml b/crates/edit_prediction_ui/Cargo.toml index d0e892024c1..b2ff528f329 100644 --- a/crates/edit_prediction_ui/Cargo.toml +++ b/crates/edit_prediction_ui/Cargo.toml @@ -20,7 +20,6 @@ cloud_llm_client.workspace = true codestral.workspace = true command_palette_hooks.workspace = true copilot.workspace = true -copilot_chat.workspace = true copilot_ui.workspace = true edit_prediction_types.workspace = true edit_prediction.workspace = true diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs index 6a5cc13b8c6..4a06ff04b41 100644 --- a/crates/edit_prediction_ui/src/edit_prediction_button.rs +++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs @@ -1036,14 +1036,11 @@ impl EditPredictionButton { .copilot .enable_next_edit_suggestions .unwrap_or(true); - let copilot_config = copilot_chat::CopilotChatConfiguration { - enterprise_uri: all_language_settings - .edit_predictions - .copilot + let settings_url = copilot_settings_url( + settings::CopilotSettings::get_global(cx) .enterprise_uri - .clone(), - }; - let settings_url = copilot_settings_url(copilot_config.enterprise_uri.as_deref()); + .as_deref(), + ); ContextMenu::build(window, cx, |menu, window, cx| { let menu = self.build_language_settings_menu(menu, window, cx); @@ -1809,18 +1806,15 @@ mod tests { cx.update_global(|settings_store: &mut SettingsStore, cx| { settings_store .set_user_settings( - r#"{"edit_predictions":{"copilot":{"enterprise_uri":"https://my-company.ghe.com"}}}"#, + r#"{"copilot":{"enterprise_uri":"https://my-company.ghe.com"}}"#, cx, ) .unwrap(); }); let url = cx.update(|cx| { - let all_language_settings = all_language_settings(None, cx); copilot_settings_url( - all_language_settings - .edit_predictions - .copilot + settings::CopilotSettings::get_global(cx) .enterprise_uri .as_deref(), ) @@ -1839,18 +1833,15 @@ mod tests { cx.update_global(|settings_store: &mut SettingsStore, cx| { settings_store .set_user_settings( - r#"{"edit_predictions":{"copilot":{"enterprise_uri":"https://my-company.ghe.com/"}}}"#, + r#"{"copilot":{"enterprise_uri":"https://my-company.ghe.com/"}}"#, cx, ) .unwrap(); }); let url = cx.update(|cx| { - let all_language_settings = all_language_settings(None, cx); copilot_settings_url( - all_language_settings - .edit_predictions - .copilot + settings::CopilotSettings::get_global(cx) .enterprise_uri .as_deref(), ) @@ -1867,11 +1858,8 @@ mod tests { }); let url = cx.update(|cx| { - let all_language_settings = all_language_settings(None, cx); copilot_settings_url( - all_language_settings - .edit_predictions - .copilot + settings::CopilotSettings::get_global(cx) .enterprise_uri .as_deref(), ) diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs index da69ac707b8..08db052239d 100644 --- a/crates/language/src/language_settings.rs +++ b/crates/language/src/language_settings.rs @@ -525,7 +525,7 @@ pub struct EditPredictionSettings { /// Configures how edit predictions are displayed in the buffer. pub mode: settings::EditPredictionsMode, /// Settings specific to GitHub Copilot. - pub copilot: CopilotSettings, + pub copilot: CopilotEditPredictionSettings, /// Settings specific to Codestral. pub codestral: CodestralSettings, /// Settings specific to Ollama. @@ -598,13 +598,11 @@ pub struct DisabledGlob { } #[derive(Clone, Debug, Default)] -pub struct CopilotSettings { +pub struct CopilotEditPredictionSettings { /// HTTP/HTTPS proxy to use for Copilot. pub proxy: Option, /// Disable certificate verification for proxy (not recommended). pub proxy_no_verify: Option, - /// Enterprise URI for Copilot. - pub enterprise_uri: Option, /// Whether the Copilot Next Edit Suggestions feature is enabled. pub enable_next_edit_suggestions: Option, /// Automatic prediction debounce delay. @@ -955,10 +953,9 @@ impl settings::Settings for AllLanguageSettings { .collect(); let copilot = edit_predictions.copilot.unwrap(); - let copilot_settings = CopilotSettings { + let copilot_settings = CopilotEditPredictionSettings { proxy: copilot.proxy, proxy_no_verify: copilot.proxy_no_verify, - enterprise_uri: copilot.enterprise_uri, enable_next_edit_suggestions: copilot.enable_next_edit_suggestions, prediction_debounce: copilot.prediction_debounce.unwrap(), }; diff --git a/crates/language_models/Cargo.toml b/crates/language_models/Cargo.toml index b4ccec6d853..de0d53de4b3 100644 --- a/crates/language_models/Cargo.toml +++ b/crates/language_models/Cargo.toml @@ -43,7 +43,6 @@ google_ai = { workspace = true, features = ["schemars"] } gpui.workspace = true gpui_tokio.workspace = true http_client.workspace = true -language.workspace = true language_model.workspace = true language_models_cloud.workspace = true llama_cpp = { workspace = true, features = ["schemars"] } diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs index b641a6acedd..f6a786cda24 100644 --- a/crates/language_models/src/provider/copilot_chat.rs +++ b/crates/language_models/src/provider/copilot_chat.rs @@ -6,14 +6,13 @@ use copilot_chat::{ }; use futures::{FutureExt as _, future::BoxFuture}; use gpui::{App, AsyncApp, Entity, Subscription, Task}; -use language::language_settings::all_language_settings; use language_model::{ AuthenticateError, IconOrSvg, LanguageModel, LanguageModelClient, LanguageModelCompletionError, LanguageModelCompletionStream, LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest, ModelRateLimiters, ProviderSettingsView, unavailable_error, }; -use settings::SettingsStore; +use settings::{CopilotSettings, Settings, SettingsStore}; use ui::prelude::*; pub struct CopilotChatLanguageModelProvider { @@ -43,13 +42,8 @@ impl CopilotChatLanguageModelProvider { _copilot_chat_subscription: copilot_chat_subscription, _settings_subscription: cx.observe_global::(|_, cx| { if let Some(copilot_chat) = CopilotChat::global(cx) { - let language_settings = all_language_settings(None, cx); let configuration = CopilotChatConfiguration { - enterprise_uri: language_settings - .edit_predictions - .copilot - .enterprise_uri - .clone(), + enterprise_uri: CopilotSettings::get_global(cx).enterprise_uri.clone(), }; copilot_chat.update(cx, |chat, cx| { chat.set_configuration(configuration, cx); diff --git a/crates/migrator/src/migrations.rs b/crates/migrator/src/migrations.rs index 516b9dfc45c..bc8c4b380f6 100644 --- a/crates/migrator/src/migrations.rs +++ b/crates/migrator/src/migrations.rs @@ -382,3 +382,9 @@ pub(crate) mod m_2026_09_16 { pub(crate) use settings::nest_agent_threads_sidebar_settings; } + +pub(crate) mod m_2026_09_29 { + mod settings; + + pub(crate) use settings::move_copilot_enterprise_uri; +} diff --git a/crates/migrator/src/migrations/m_2026_09_29/settings.rs b/crates/migrator/src/migrations/m_2026_09_29/settings.rs new file mode 100644 index 00000000000..cdce096d466 --- /dev/null +++ b/crates/migrator/src/migrations/m_2026_09_29/settings.rs @@ -0,0 +1,104 @@ +use anyhow::Result; +use serde_json::{Map, Value}; + +use crate::migrations::migrate_settings; + +pub fn move_copilot_enterprise_uri(value: &mut Value) -> Result<()> { + migrate_settings(value, &mut migrate_one) +} + +fn migrate_one(settings: &mut Map) -> Result<()> { + if settings + .get("copilot") + .is_some_and(|value| !value.is_object()) + { + return Ok(()); + } + + let Some(edit_predictions) = settings + .get_mut("edit_predictions") + .and_then(Value::as_object_mut) + else { + return Ok(()); + }; + let Some(prediction_copilot) = edit_predictions + .get_mut("copilot") + .and_then(Value::as_object_mut) + else { + return Ok(()); + }; + let Some(enterprise_uri) = prediction_copilot.remove("enterprise_uri") else { + return Ok(()); + }; + if prediction_copilot.is_empty() { + edit_predictions.remove("copilot"); + } + if edit_predictions.is_empty() { + settings.remove("edit_predictions"); + } + + let copilot = settings + .entry("copilot") + .or_insert_with(|| Value::Object(Map::new())); + if let Value::Object(copilot) = copilot { + copilot.entry("enterprise_uri").or_insert(enterprise_uri); + } + + Ok(()) +} + +#[cfg(test)] +mod tests { + use serde_json::json; + + use super::*; + + #[test] + fn moves_enterprise_uri_in_all_settings_scopes_without_overwriting_existing_values() { + let legacy = json!({ + "edit_predictions": { + "copilot": { "enterprise_uri": "https://legacy.example", "other": true }, + "provider": "copilot" + } + }); + let mut value = json!({ + "edit_predictions": legacy["edit_predictions"], + "macos": legacy, + "preview": legacy, + "profiles": { + "direct": legacy, + "wrapped": { "settings": legacy }, + "existing": { + "settings": { + "edit_predictions": { "copilot": { "enterprise_uri": "https://legacy.example" } }, + "copilot": { "enterprise_uri": null, "other": true } + } + } + } + }); + + move_copilot_enterprise_uri(&mut value).expect("migration should succeed"); + for scope in [ + &value, + &value["macos"], + &value["preview"], + &value["profiles"]["direct"], + &value["profiles"]["wrapped"]["settings"], + ] { + assert_eq!(scope["copilot"]["enterprise_uri"], "https://legacy.example"); + assert_eq!( + scope["edit_predictions"], + json!({ + "copilot": { "other": true }, + "provider": "copilot" + }) + ); + } + assert_eq!( + value["profiles"]["existing"]["settings"], + json!({ + "copilot": { "enterprise_uri": null, "other": true } + }) + ); + } +} diff --git a/crates/migrator/src/migrator.rs b/crates/migrator/src/migrator.rs index b184f25adc1..065e2db33a5 100644 --- a/crates/migrator/src/migrator.rs +++ b/crates/migrator/src/migrator.rs @@ -257,6 +257,7 @@ pub fn migrate_settings(text: &str) -> Result> { MigrationType::Json(migrations::m_2026_08_26::rename_folder_icons_to_folder_indicator), MigrationType::Json(migrations::m_2026_08_30::nest_markdown_preview_settings), MigrationType::Json(migrations::m_2026_09_16::nest_agent_threads_sidebar_settings), + MigrationType::Json(migrations::m_2026_09_29::move_copilot_enterprise_uri), ]; run_migrations(text, migrations) } @@ -465,6 +466,37 @@ mod tests { assert_migrate_settings("", None) } + #[test] + fn test_copilot_enterprise_uri_migration_does_not_restore_deleted_destination() { + let input = r#"{ + // Keep this comment. + "edit_predictions": { "copilot": { "enterprise_uri": "https://enterprise.example" } } + }"#; + let migrated = migrate_settings(input) + .expect("migration should succeed") + .expect("settings should change"); + assert!(migrated.contains("// Keep this comment.")); + let value: serde_json_lenient::Value = + parse_json_with_comments(&migrated).expect("migrated settings should parse"); + let value = serde_json::to_value(value).expect("settings should convert to JSON"); + assert_eq!( + value["copilot"]["enterprise_uri"], + "https://enterprise.example" + ); + assert!(value.get("edit_predictions").is_none()); + + let mut value = value; + value + .as_object_mut() + .expect("settings should be an object") + .remove("copilot"); + let without_destination = serde_json::to_string(&value).expect("settings should serialize"); + assert_eq!( + migrate_settings(&without_destination).expect("migration should succeed"), + None + ); + } + #[test] fn test_replace_array_with_single_string() { assert_migrate_keymap( diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs index b0d52372469..ce7731fd835 100644 --- a/crates/settings/src/settings.rs +++ b/crates/settings/src/settings.rs @@ -26,6 +26,7 @@ pub mod private { use gpui::{App, Global}; +use crate as settings; use std::env; use std::{borrow::Cow, fmt, str}; use util::asset_str; @@ -54,6 +55,22 @@ pub use vscode_import::{VsCodeSettings, VsCodeSettingsSource}; pub use keymap_file::ActionSequence; +#[derive(Clone, Debug, Default, RegisterSetting)] +pub struct CopilotSettings { + pub enterprise_uri: Option, +} + +impl Settings for CopilotSettings { + fn from_settings(content: &SettingsContent) -> Self { + Self { + enterprise_uri: content + .copilot + .as_ref() + .and_then(|copilot| copilot.enterprise_uri.clone()), + } + } +} + #[derive(Clone, Debug, PartialEq)] pub struct ActiveSettingsProfileName(pub String); diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs index 7248c1ab19c..9f4f835824d 100644 --- a/crates/settings/src/vscode_import.rs +++ b/crates/settings/src/vscode_import.rs @@ -193,6 +193,7 @@ impl VsCodeSettings { .map(|history| CommandPaletteSettingsContent { use_command_history: Some(history > 0), }), + copilot: None, credentials_url: None, debugger: None, diagnostics: None, diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs index 676a356da46..61975fe1bf4 100644 --- a/crates/settings_content/src/language.rs +++ b/crates/settings_content/src/language.rs @@ -160,7 +160,7 @@ pub struct EditPredictionSettingsContent { /// Provider support required. pub mode: Option, /// Settings specific to GitHub Copilot. - pub copilot: Option, + pub copilot: Option, /// Settings specific to Codestral. pub codestral: Option, /// Settings specific to Ollama. @@ -241,6 +241,15 @@ pub enum EditPredictionPromptFormatContent { #[with_fallible_options] #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)] pub struct CopilotSettingsContent { + /// Enterprise URI shared by Copilot Chat and edit predictions. + /// + /// Default: none + pub enterprise_uri: Option, +} + +#[with_fallible_options] +#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)] +pub struct CopilotEditPredictionSettingsContent { /// HTTP/HTTPS proxy to use for Copilot. /// /// Default: none @@ -249,10 +258,6 @@ pub struct CopilotSettingsContent { /// /// Default: false pub proxy_no_verify: Option, - /// Enterprise URI for Copilot. - /// - /// Default: none - pub enterprise_uri: Option, /// Whether the Copilot Next Edit Suggestions feature is enabled. /// /// Default: true diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs index 5de2a86ad9f..ac639dd15c7 100644 --- a/crates/settings_content/src/settings_content.rs +++ b/crates/settings_content/src/settings_content.rs @@ -270,6 +270,8 @@ pub struct SettingsContent { pub language_models: Option, + pub copilot: Option, + pub outline_panel: Option, pub project_panel: Option, @@ -406,7 +408,7 @@ fallible_options::flattened_deserialize!(SettingsContent { agent_servers, audio, auto_update, base_keymap, collaboration_panel, debugger, diagnostics, git, global_lsp_settings, image_viewer, markdown_preview, repl, helix_mode, hide_mouse, - journal, log, line_indicator_format, language_models, outline_panel, project_panel, + journal, log, line_indicator_format, language_models, copilot, outline_panel, project_panel, node, proxy, reduce_motion, server_url, credentials_url, session, telemetry, terminal, title_bar, vim_mode, calls, which_key, vim, modeline_lines, feature_flags, instrumentation, diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index ec3198047ce..f720fefad6c 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -676,9 +676,7 @@ fn main() { ); command_palette::init(cx); let copilot_chat_configuration = copilot_chat::CopilotChatConfiguration { - enterprise_uri: language::language_settings::all_language_settings(None, cx) - .edit_predictions - .copilot + enterprise_uri: settings::CopilotSettings::get_global(cx) .enterprise_uri .clone(), }; diff --git a/docs/src/ai/edit-prediction.md b/docs/src/ai/edit-prediction.md index b49506ac4bd..afc2fc41274 100644 --- a/docs/src/ai/edit-prediction.md +++ b/docs/src/ai/edit-prediction.md @@ -255,16 +255,15 @@ If your organization uses GitHub Copilot Enterprise, you can configure Zed to us ```json [settings] { - "edit_predictions": { - "copilot": { - "enterprise_uri": "https://your.enterprise.domain" - } + "copilot": { + "enterprise_uri": "https://your.enterprise.domain" } } ``` Replace `"https://your.enterprise.domain"` with the URL provided by your GitHub Enterprise administrator (e.g., `https://foo.ghe.com`). +This setting applies to both Copilot edit predictions and Copilot Chat. Once set, Zed routes Copilot requests through your enterprise endpoint. When you sign in by clicking the Copilot icon in the status bar, you are redirected to your configured enterprise URL to complete authentication. All other Copilot features and usage remain the same. diff --git a/docs/src/ai/use-an-existing-subscription.md b/docs/src/ai/use-an-existing-subscription.md index 4e00f0a0043..94b6ef173eb 100644 --- a/docs/src/ai/use-an-existing-subscription.md +++ b/docs/src/ai/use-an-existing-subscription.md @@ -38,6 +38,22 @@ GitHub Copilot can be used as a Copilot Chat model provider for Zed AI features If you use a Copilot agent or CLI, that setup is owned by Copilot. See [External Agents](./external-agents.md) and [Terminal Threads](./terminal-threads.md). +### GitHub Copilot Enterprise {#copilot-enterprise} + +To use your enterprise instance for Copilot Chat and edit predictions, add this to your settings file ([how to edit](../configuring-zed.md#settings-files)): + +```json [settings] +{ + "copilot": { + "enterprise_uri": "https://your.enterprise.domain" + } +} +``` + +Replace `"https://your.enterprise.domain"` with the URL provided by your GitHub Enterprise administrator (for example, `https://foo.ghe.com`). + +This setting also controls [Copilot edit predictions](./edit-prediction.md#using-github-copilot-enterprise). + ## OpenCode Zen / Go {#opencode} OpenCode is a first-class language model provider in Zed. If you think of Zen or Go as your OpenCode subscription, the Zed setup path is still [Use API Access](./use-api-access.md#opencode): enter an OpenCode API key, then choose which OpenCode models to show. Zed does not sign in to OpenCode with OAuth or detect your subscription directly.