Merge branch 'main' into provider-extensions

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>

.github/workflows/autofix_pr.yml

@@ -54,10 +54,6 @@ jobs:
     - name: autofix_pr::run_autofix::run_cargo_fmt
       run: cargo fmt --all
       shell: bash -euxo pipefail {0}
-    - name: autofix_pr::run_autofix::run_cargo_fix
-      if: ${{ inputs.run_clippy }}
-      run: cargo fix --workspace --release --all-targets --all-features --allow-dirty --allow-staged
-      shell: bash -euxo pipefail {0}
     - name: autofix_pr::run_autofix::run_clippy_fix
       if: ${{ inputs.run_clippy }}
       run: cargo clippy --workspace --release --all-targets --all-features --fix --allow-dirty --allow-staged

.github/workflows/docs_automation.yml

@@ -1,11 +1,11 @@
 name: Documentation Automation
 
 on:
-  # push:
-  #   branches: [main]
-  #   paths:
-  #     - 'crates/**'
-  #     - 'extensions/**'
+  push:
+    branches: [main]
+    paths:
+      - 'crates/**'
+      - 'extensions/**'
   workflow_dispatch:
     inputs:
       pr_number:
@@ -29,7 +29,7 @@ jobs:
   docs-automation:
     runs-on: ubuntu-latest
     timeout-minutes: 30
-
+    
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -77,7 +77,7 @@ jobs:
             echo "ref=$SHA" >> "$GITHUB_OUTPUT"
             git diff --name-only "${SHA}^" "$SHA" > /tmp/changed_files.txt || git diff --name-only HEAD~1 HEAD > /tmp/changed_files.txt
           fi
-
+          
           echo "Changed files:"
           cat /tmp/changed_files.txt
         env:
@@ -102,24 +102,24 @@ jobs:
         run: |
           CHANGED_FILES=$(tr '\n' ' ' < /tmp/changed_files.txt)
           echo "Analyzing changes in: $CHANGED_FILES"
-
+          
           # Build prompt with context
           cat > /tmp/phase3-prompt.md << 'EOF'
           $(cat .factory/prompts/docs-automation/phase3-analyze.md)
-
+          
           ## Context
-
+          
           ### Changed Files
           $CHANGED_FILES
-
+          
           ### Phase 2 Output
           $(cat /tmp/phase2-output.txt)
           EOF
-
+          
           "$DROID_BIN" exec \
             -m "$DROID_MODEL" \
             "$(cat .factory/prompts/docs-automation/phase3-analyze.md)
-
+            
             Changed files: $CHANGED_FILES" \
             > /tmp/phase3-output.md 2>&1 || true
           echo "Change analysis complete"
@@ -135,7 +135,7 @@ jobs:
             > /tmp/phase4-plan.md 2>&1 || true
           echo "Documentation plan complete"
           cat /tmp/phase4-plan.md
-
+          
           # Check if updates are required
           if grep -q "NO_UPDATES_REQUIRED" /tmp/phase4-plan.md; then
             echo "updates_required=false" >> "$GITHUB_OUTPUT"
@@ -163,10 +163,10 @@ jobs:
         run: |
           echo "Formatting documentation with Prettier..."
           cd docs && prettier --write src/
-
+          
           echo "Verifying Prettier formatting passes..."
           cd docs && prettier --check src/
-
+          
           echo "Prettier formatting complete"
 
       # Phase 6: Summarize Changes (Read-Only - default)
@@ -176,7 +176,7 @@ jobs:
         run: |
           # Get git diff of docs
           git diff docs/src/ > /tmp/docs-diff.txt || true
-
+          
           "$DROID_BIN" exec \
             -m "$DROID_MODEL" \
             -f .factory/prompts/docs-automation/phase6-summarize.md \
@@ -194,17 +194,17 @@ jobs:
             echo "No documentation changes detected"
             exit 0
           fi
-
+          
           # Configure git
           git config user.name "factory-droid[bot]"
           git config user.email "138933559+factory-droid[bot]@users.noreply.github.com"
-
+          
           # Daily batch branch - one branch per day, multiple commits accumulate
           BRANCH_NAME="docs/auto-update-$(date +%Y-%m-%d)"
-
+          
           # Stash local changes from phase 5
           git stash push -m "docs-automation-changes" -- docs/src/
-
+          
           # Check if branch already exists on remote
           if git ls-remote --exit-code --heads origin "$BRANCH_NAME" > /dev/null 2>&1; then
             echo "Branch $BRANCH_NAME exists, checking out and updating..."
@@ -214,10 +214,10 @@ jobs:
             echo "Creating new branch $BRANCH_NAME..."
             git checkout -b "$BRANCH_NAME"
           fi
-
+          
           # Apply stashed changes
           git stash pop || true
-
+          
           # Stage and commit
           git add docs/src/
           SUMMARY=$(head -50 < /tmp/phase6-summary.md)
@@ -228,13 +228,13 @@ jobs:
           Triggered by: ${{ steps.changed.outputs.source }} ${{ steps.changed.outputs.ref }}
 
           Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>"
-
+          
           # Push
           git push -u origin "$BRANCH_NAME"
-
+          
           # Check if PR already exists for this branch
           EXISTING_PR=$(gh pr list --head "$BRANCH_NAME" --json number --jq '.[0].number' || echo "")
-
+          
           if [ -n "$EXISTING_PR" ]; then
             echo "PR #$EXISTING_PR already exists for branch $BRANCH_NAME, updated with new commit"
           else
@@ -254,7 +254,7 @@ jobs:
         run: |
           echo "## Documentation Automation Summary" >> "$GITHUB_STEP_SUMMARY"
           echo "" >> "$GITHUB_STEP_SUMMARY"
-
+          
           if [ "${{ steps.phase4.outputs.updates_required }}" == "false" ]; then
             echo "No documentation updates required for this change." >> "$GITHUB_STEP_SUMMARY"
           elif [ -f /tmp/phase6-summary.md ]; then

Cargo.lock

@@ -405,7 +405,6 @@ dependencies = [
  "theme",
  "time",
  "time_format",
- "tracing",
  "tree-sitter-md",
  "ui",
  "ui_input",
@@ -416,7 +415,6 @@ dependencies = [
  "watch",
  "workspace",
  "zed_actions",
- "ztracing",
 ]
 
 [[package]]
@@ -3527,33 +3525,6 @@ dependencies = [
  "theme",
 ]
 
-[[package]]
-name = "component_preview"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "collections",
- "component",
- "db",
- "fs",
- "gpui",
- "language",
- "log",
- "node_runtime",
- "notifications",
- "project",
- "release_channel",
- "reqwest_client",
- "session",
- "settings",
- "theme",
- "ui",
- "ui_input",
- "uuid",
- "workspace",
-]
-
 [[package]]
 name = "compression-codecs"
 version = "0.4.31"
@@ -5953,9 +5924,11 @@ dependencies = [
  "async-trait",
  "client",
  "collections",
+ "credentials_provider",
  "criterion",
  "ctor",
  "dap",
+ "dirs 4.0.0",
  "extension",
  "fs",
  "futures 0.3.31",
@@ -5964,8 +5937,11 @@ dependencies = [
  "http_client",
  "language",
  "language_extension",
+ "language_model",
  "log",
  "lsp",
+ "markdown",
+ "menu",
  "moka",
  "node_runtime",
  "parking_lot",
@@ -5980,17 +5956,21 @@ dependencies = [
  "serde_json",
  "serde_json_lenient",
  "settings",
+ "smol",
  "task",
  "telemetry",
  "tempfile",
  "theme",
  "theme_extension",
  "toml 0.8.23",
+ "ui",
+ "ui_input",
  "url",
  "util",
  "wasmparser 0.221.3",
  "wasmtime",
  "wasmtime-wasi",
+ "workspace",
  "zlog",
 ]
 
@@ -9703,10 +9683,8 @@ dependencies = [
  "settings",
  "sum_tree",
  "theme",
- "tracing",
  "ui",
  "util",
- "ztracing",
 ]
 
 [[package]]
@@ -14904,6 +14882,7 @@ dependencies = [
  "copilot",
  "edit_prediction",
  "editor",
+ "extension_host",
  "feature_flags",
  "fs",
  "futures 0.3.31",
@@ -14911,6 +14890,7 @@ dependencies = [
  "gpui",
  "heck 0.5.0",
  "language",
+ "language_model",
  "language_models",
  "log",
  "menu",
@@ -20674,7 +20654,6 @@ dependencies = [
  "collections",
  "command_palette",
  "component",
- "component_preview",
  "copilot",
  "crashes",
  "dap",
@@ -20780,6 +20759,7 @@ dependencies = [
  "tree-sitter-md",
  "tree-sitter-rust",
  "ui",
+ "ui_input",
  "ui_prompt",
  "url",
  "urlencoding",
@@ -20790,7 +20770,6 @@ dependencies = [
  "watch",
  "web_search",
  "web_search_providers",
- "which 6.0.3",
  "which_key",
  "windows 0.61.3",
  "winresource",

Cargo.toml

@@ -39,7 +39,6 @@ members = [
     "crates/command_palette",
     "crates/command_palette_hooks",
     "crates/component",
-    "crates/component_preview",
     "crates/context_server",
     "crates/copilot",
     "crates/crashes",
@@ -276,7 +275,6 @@ collections = { path = "crates/collections", version = "0.1.0" }
 command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 component = { path = "crates/component" }
-component_preview  = { path = "crates/component_preview" }
 context_server = { path = "crates/context_server" }
 copilot = { path = "crates/copilot" }
 crashes = { path = "crates/crashes" }

crates/acp_thread/src/acp_thread.rs

@@ -11,7 +11,6 @@ use language::language_settings::FormatOnSave;
 pub use mention::*;
 use project::lsp_store::{FormatTrigger, LspFormatTarget};
 use serde::{Deserialize, Serialize};
-use serde_json::to_string_pretty;
 use settings::Settings as _;
 use task::{Shell, ShellBuilder};
 pub use terminal::*;
@@ -1993,42 +1992,37 @@ impl AcpThread {
     fn update_last_checkpoint(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
         let git_store = self.project.read(cx).git_store().clone();
 
-        let Some((_, message)) = self.last_user_message() else {
+        let old_checkpoint = if let Some((_, message)) = self.last_user_message() {
+            if let Some(checkpoint) = message.checkpoint.as_ref() {
+                checkpoint.git_checkpoint.clone()
+            } else {
+                return Task::ready(Ok(()));
+            }
+        } else {
             return Task::ready(Ok(()));
         };
-        let Some(user_message_id) = message.id.clone() else {
-            return Task::ready(Ok(()));
-        };
-        let Some(checkpoint) = message.checkpoint.as_ref() else {
-            return Task::ready(Ok(()));
-        };
-        let old_checkpoint = checkpoint.git_checkpoint.clone();
 
         let new_checkpoint = git_store.update(cx, |git, cx| git.checkpoint(cx));
         cx.spawn(async move |this, cx| {
-            let Some(new_checkpoint) = new_checkpoint
+            let new_checkpoint = new_checkpoint
                 .await
                 .context("failed to get new checkpoint")
-                .log_err()
-            else {
-                return Ok(());
-            };
-
-            let equal = git_store
-                .update(cx, |git, cx| {
-                    git.compare_checkpoints(old_checkpoint.clone(), new_checkpoint, cx)
-                })?
-                .await
-                .unwrap_or(true);
-
-            this.update(cx, |this, cx| {
-                if let Some((ix, message)) = this.user_message_mut(&user_message_id) {
-                    if let Some(checkpoint) = message.checkpoint.as_mut() {
-                        checkpoint.show = !equal;
-                        cx.emit(AcpThreadEvent::EntryUpdated(ix));
-                    }
-                }
-            })?;
+                .log_err();
+            if let Some(new_checkpoint) = new_checkpoint {
+                let equal = git_store
+                    .update(cx, |git, cx| {
+                        git.compare_checkpoints(old_checkpoint.clone(), new_checkpoint, cx)
+                    })?
+                    .await
+                    .unwrap_or(true);
+                this.update(cx, |this, cx| {
+                    let (ix, message) = this.last_user_message().context("no user message")?;
+                    let checkpoint = message.checkpoint.as_mut().context("no checkpoint")?;
+                    checkpoint.show = !equal;
+                    cx.emit(AcpThreadEvent::EntryUpdated(ix));
+                    anyhow::Ok(())
+                })??;
+            }
 
             Ok(())
         })
@@ -2428,10 +2422,8 @@ fn markdown_for_raw_output(
             )
         })),
         value => Some(cx.new(|cx| {
-            let pretty_json = to_string_pretty(value).unwrap_or_else(|_| value.to_string());
-
             Markdown::new(
-                format!("```json\n{}\n```", pretty_json).into(),
+                format!("```json\n{}\n```", value).into(),
                 Some(language_registry.clone()),
                 None,
                 cx,
@@ -4074,67 +4066,4 @@ mod tests {
             "Should have exactly 2 terminals (the completed ones from before checkpoint)"
         );
     }
-
-    /// Tests that update_last_checkpoint correctly updates the original message's checkpoint
-    /// even when a new user message is added while the async checkpoint comparison is in progress.
-    ///
-    /// This is a regression test for a bug where update_last_checkpoint would fail with
-    /// "no checkpoint" if a new user message (without a checkpoint) was added between when
-    /// update_last_checkpoint started and when its async closure ran.
-    #[gpui::test]
-    async fn test_update_last_checkpoint_with_new_message_added(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/test"), json!({".git": {}, "file.txt": "content"}))
-            .await;
-        let project = Project::test(fs.clone(), [Path::new(path!("/test"))], cx).await;
-
-        let handler_done = Arc::new(AtomicBool::new(false));
-        let handler_done_clone = handler_done.clone();
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message(
-            move |_, _thread, _cx| {
-                handler_done_clone.store(true, SeqCst);
-                async move { Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)) }.boxed_local()
-            },
-        ));
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        let send_future = thread.update(cx, |thread, cx| thread.send_raw("First message", cx));
-        let send_task = cx.background_executor.spawn(send_future);
-
-        // Tick until handler completes, then a few more to let update_last_checkpoint start
-        while !handler_done.load(SeqCst) {
-            cx.executor().tick();
-        }
-        for _ in 0..5 {
-            cx.executor().tick();
-        }
-
-        thread.update(cx, |thread, cx| {
-            thread.push_entry(
-                AgentThreadEntry::UserMessage(UserMessage {
-                    id: Some(UserMessageId::new()),
-                    content: ContentBlock::Empty,
-                    chunks: vec!["Injected message (no checkpoint)".into()],
-                    checkpoint: None,
-                    indented: false,
-                }),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-        let result = send_task.await;
-
-        assert!(
-            result.is_ok(),
-            "send should succeed even when new message added during update_last_checkpoint: {:?}",
-            result.err()
-        );
-    }
 }

crates/acp_thread/src/connection.rs

@@ -3,11 +3,11 @@ use agent_client_protocol::{self as acp};
 use anyhow::Result;
 use collections::IndexMap;
 use gpui::{Entity, SharedString, Task};
-use language_model::LanguageModelProviderId;
+use language_model::{IconOrSvg, LanguageModelProviderId};
 use project::Project;
 use serde::{Deserialize, Serialize};
 use std::{any::Any, error::Error, fmt, path::Path, rc::Rc, sync::Arc};
-use ui::{App, IconName};
+use ui::App;
 use uuid::Uuid;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
@@ -210,21 +210,12 @@ pub trait AgentModelSelector: 'static {
     }
 }
 
-/// Icon for a model in the model selector.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum AgentModelIcon {
-    /// A built-in icon from Zed's icon set.
-    Named(IconName),
-    /// Path to a custom SVG icon file.
-    Path(SharedString),
-}
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct AgentModelInfo {
     pub id: acp::ModelId,
     pub name: SharedString,
     pub description: Option<SharedString>,
-    pub icon: Option<AgentModelIcon>,
+    pub icon: Option<IconOrSvg>,
 }
 
 impl From<acp::ModelInfo> for AgentModelInfo {

crates/action_log/src/action_log.rs

@@ -6,7 +6,7 @@ use futures::{FutureExt, StreamExt, channel::mpsc};
 use gpui::{
     App, AppContext, AsyncApp, Context, Entity, SharedString, Subscription, Task, WeakEntity,
 };
-use language::{Anchor, Buffer, BufferEvent, Point, ToPoint};
+use language::{Anchor, Buffer, BufferEvent, DiskState, Point, ToPoint};
 use project::{Project, ProjectItem, lsp_store::OpenLspBufferHandle};
 use std::{cmp, ops::Range, sync::Arc};
 use text::{Edit, Patch, Rope};
@@ -150,7 +150,7 @@ impl ActionLog {
                 if buffer
                     .read(cx)
                     .file()
-                    .is_some_and(|file| file.disk_state().is_deleted())
+                    .is_some_and(|file| file.disk_state() == DiskState::Deleted)
                 {
                     // If the buffer had been edited by a tool, but it got
                     // deleted externally, we want to stop tracking it.
@@ -162,7 +162,7 @@ impl ActionLog {
                 if buffer
                     .read(cx)
                     .file()
-                    .is_some_and(|file| !file.disk_state().is_deleted())
+                    .is_some_and(|file| file.disk_state() != DiskState::Deleted)
                 {
                     // If the buffer had been deleted by a tool, but it got
                     // resurrected externally, we want to clear the edits we
@@ -769,7 +769,7 @@ impl ActionLog {
                 tracked.version != buffer.version
                     && buffer
                         .file()
-                        .is_some_and(|file| !file.disk_state().is_deleted())
+                        .is_some_and(|file| file.disk_state() != DiskState::Deleted)
             })
             .map(|(buffer, _)| buffer)
     }

crates/activity_indicator/src/activity_indicator.rs

@@ -739,7 +739,7 @@ impl ActivityIndicator {
                         extension_store.outstanding_operations().iter().next()
                 {
                     let (message, icon, rotate) = match operation {
-                        ExtensionOperation::Install => (
+                        ExtensionOperation::Install | ExtensionOperation::AutoInstall => (
                             format!("Installing {extension_id} extension…"),
                             IconName::LoadCircle,
                             true,

crates/agent/src/agent.rs

@@ -30,7 +30,7 @@ use futures::{StreamExt, future};
 use gpui::{
     App, AppContext, AsyncApp, Context, Entity, SharedString, Subscription, Task, WeakEntity,
 };
-use language_model::{IconOrSvg, LanguageModel, LanguageModelProvider, LanguageModelRegistry};
+use language_model::{LanguageModel, LanguageModelProvider, LanguageModelRegistry};
 use project::{Project, ProjectItem, ProjectPath, Worktree};
 use prompt_store::{
     ProjectContext, PromptStore, RULES_FILE_NAMES, RulesFileContext, UserRulesContext,
@@ -153,10 +153,7 @@ impl LanguageModels {
             id: Self::model_id(model),
             name: model.name().0,
             description: None,
-            icon: Some(match provider.icon() {
-                IconOrSvg::Svg(path) => acp_thread::AgentModelIcon::Path(path),
-                IconOrSvg::Icon(name) => acp_thread::AgentModelIcon::Named(name),
-            }),
+            icon: Some(provider.icon()),
         }
     }
 
@@ -1633,9 +1630,7 @@ mod internal_tests {
                     id: acp::ModelId::new("fake/fake"),
                     name: "Fake".into(),
                     description: None,
-                    icon: Some(acp_thread::AgentModelIcon::Named(
-                        ui::IconName::ZedAssistant
-                    )),
+                    icon: Some(language_model::IconOrSvg::Icon(ui::IconName::ZedAssistant)),
                 }]
             )])
         );

crates/agent_servers/src/gemini.rs

@@ -5,7 +5,7 @@ use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
 use acp_thread::AgentConnection;
 use anyhow::{Context as _, Result};
 use gpui::{App, SharedString, Task};
-use language_models::provider::google::GoogleLanguageModelProvider;
+use language_models::api_key_for_gemini_cli;
 use project::agent_server_store::GEMINI_NAME;
 
 #[derive(Clone)]
@@ -37,11 +37,7 @@ impl AgentServer for Gemini {
         cx.spawn(async move |cx| {
             extra_env.insert("SURFACE".to_owned(), "zed".to_owned());
 
-            if let Some(api_key) = cx
-                .update(GoogleLanguageModelProvider::api_key_for_gemini_cli)?
-                .await
-                .ok()
-            {
+            if let Some(api_key) = cx.update(api_key_for_gemini_cli)?.await.ok() {
                 extra_env.insert("GEMINI_API_KEY".into(), api_key);
             }
             let (command, root_dir, login) = store

crates/agent_ui/Cargo.toml

@@ -103,8 +103,6 @@ zed_actions.workspace = true
 image.workspace = true
 async-fs.workspace = true
 reqwest_client = { workspace = true, optional = true }
-ztracing.workspace = true
-tracing.workspace = true
 
 [dev-dependencies]
 acp_thread = { workspace = true, features = ["test-support"] }
@@ -126,6 +124,3 @@ semver.workspace = true
 reqwest_client.workspace = true
 tree-sitter-md.workspace = true
 unindent.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["tracing"]

crates/agent_ui/src/acp/message_editor.rs

@@ -965,7 +965,6 @@ impl Focusable for MessageEditor {
 }
 
 impl Render for MessageEditor {
-    #[ztracing::instrument(skip_all)]
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         div()
             .key_context("MessageEditor")

crates/agent_ui/src/acp/model_selector.rs

@@ -1,6 +1,6 @@
 use std::{cmp::Reverse, rc::Rc, sync::Arc};
 
-use acp_thread::{AgentModelIcon, AgentModelInfo, AgentModelList, AgentModelSelector};
+use acp_thread::{AgentModelInfo, AgentModelList, AgentModelSelector};
 use agent_client_protocol::ModelId;
 use agent_servers::AgentServer;
 use agent_settings::AgentSettings;
@@ -13,6 +13,7 @@ use gpui::{
     Action, AsyncWindowContext, BackgroundExecutor, DismissEvent, FocusHandle, Task, WeakEntity,
 };
 use itertools::Itertools;
+use language_model::IconOrSvg;
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
 use settings::Settings;
@@ -351,8 +352,8 @@ impl PickerDelegate for AcpModelPickerDelegate {
                         .child(
                             ModelSelectorListItem::new(ix, model_info.name.clone())
                                 .map(|this| match &model_info.icon {
-                                    Some(AgentModelIcon::Path(path)) => this.icon_path(path.clone()),
-                                    Some(AgentModelIcon::Named(icon)) => this.icon(*icon),
+                                    Some(IconOrSvg::Svg(path)) => this.icon_path(path.clone()),
+                                    Some(IconOrSvg::Icon(icon)) => this.icon(*icon),
                                     None => this,
                                 })
                                 .is_selected(is_selected)

crates/agent_ui/src/acp/model_selector_popover.rs

@@ -1,11 +1,12 @@
 use std::rc::Rc;
 use std::sync::Arc;
 
-use acp_thread::{AgentModelIcon, AgentModelInfo, AgentModelSelector};
+use acp_thread::{AgentModelInfo, AgentModelSelector};
 use agent_servers::AgentServer;
 use agent_settings::AgentSettings;
 use fs::Fs;
 use gpui::{Entity, FocusHandle};
+use language_model::IconOrSvg;
 use picker::popover_menu::PickerPopoverMenu;
 use settings::Settings as _;
 use ui::{ButtonLike, KeyBinding, PopoverMenuHandle, TintColor, Tooltip, prelude::*};
@@ -127,8 +128,8 @@ impl Render for AcpModelSelectorPopover {
                 .when_some(model_icon, |this, icon| {
                     this.child(
                         match icon {
-                            AgentModelIcon::Path(path) => Icon::from_external_svg(path),
-                            AgentModelIcon::Named(icon_name) => Icon::new(icon_name),
+                            IconOrSvg::Svg(path) => Icon::from_external_svg(path),
+                            IconOrSvg::Icon(icon_name) => Icon::new(icon_name),
                         }
                         .color(color)
                         .size(IconSize::XSmall),

crates/agent_ui/src/acp/thread_view.rs

@@ -1925,7 +1925,6 @@ impl AcpThreadView {
             .detach_and_log_err(cx);
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_entry(
         &self,
         entry_ix: usize,
@@ -2303,7 +2302,6 @@ impl AcpThreadView {
         rems_from_px(13.)
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_thinking_block(
         &self,
         entry_ix: usize,
@@ -2405,7 +2403,6 @@ impl AcpThreadView {
             .into_any_element()
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_tool_call(
         &self,
         entry_ix: usize,
@@ -2492,11 +2489,9 @@ impl AcpThreadView {
                                     .border_color(self.tool_card_border_color(cx))
                                     .child(input_output_header("Raw Input:".into()))
                                     .children(tool_call.raw_input_markdown.clone().map(|input| {
-                                        div().id(("tool-call-raw-input-markdown", entry_ix)).child(
-                                            self.render_markdown(
-                                                input,
-                                                default_markdown_style(false, false, window, cx),
-                                            ),
+                                        self.render_markdown(
+                                            input,
+                                            default_markdown_style(false, false, window, cx),
                                         )
                                     }))
                                     .child(input_output_header("Output:".into())),
@@ -2504,17 +2499,15 @@ impl AcpThreadView {
                         })
                         .children(tool_call.content.iter().enumerate().map(
                             |(content_ix, content)| {
-                                div().id(("tool-call-output", entry_ix)).child(
-                                    self.render_tool_call_content(
-                                        entry_ix,
-                                        content,
-                                        content_ix,
-                                        tool_call,
-                                        use_card_layout,
-                                        window,
-                                        cx,
-                                    ),
-                                )
+                                div().child(self.render_tool_call_content(
+                                    entry_ix,
+                                    content,
+                                    content_ix,
+                                    tool_call,
+                                    use_card_layout,
+                                    window,
+                                    cx,
+                                ))
                             },
                         ))
                         .into_any(),
@@ -2634,7 +2627,6 @@ impl AcpThreadView {
             .children(tool_output_display)
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_tool_call_label(
         &self,
         entry_ix: usize,
@@ -2743,7 +2735,6 @@ impl AcpThreadView {
             .when(!is_edit, |this| this.child(gradient_overlay))
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_tool_call_content(
         &self,
         entry_ix: usize,
@@ -2778,7 +2769,6 @@ impl AcpThreadView {
         }
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_markdown_output(
         &self,
         markdown: Entity<Markdown>,
@@ -3043,7 +3033,6 @@ impl AcpThreadView {
             .into_any()
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_terminal_tool_call(
         &self,
         entry_ix: usize,
@@ -3731,7 +3720,6 @@ impl AcpThreadView {
         editor_bg_color.blend(active_color.opacity(0.3))
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_activity_bar(
         &self,
         thread_entity: &Entity<AcpThread>,
@@ -3799,7 +3787,6 @@ impl AcpThreadView {
             .into()
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_plan_summary(
         &self,
         plan: &Plan,
@@ -3895,7 +3882,6 @@ impl AcpThreadView {
             }))
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_plan_entries(
         &self,
         plan: &Plan,
@@ -3956,7 +3942,6 @@ impl AcpThreadView {
             .into_any_element()
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_edits_summary(
         &self,
         changed_buffers: &BTreeMap<Entity<Buffer>, Entity<BufferDiff>>,
@@ -4085,7 +4070,6 @@ impl AcpThreadView {
             )
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_edited_files(
         &self,
         action_log: &Entity<ActionLog>,
@@ -4723,7 +4707,6 @@ impl AcpThreadView {
             }))
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_markdown(&self, markdown: Entity<Markdown>, style: MarkdownStyle) -> MarkdownElement {
         let workspace = self.workspace.clone();
         MarkdownElement::new(markdown, style).on_url_click(move |text, window, cx| {
@@ -6005,7 +5988,6 @@ impl Focusable for AcpThreadView {
 }
 
 impl Render for AcpThreadView {
-    #[ztracing::instrument(skip_all)]
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let has_messages = self.list_state.item_count() > 0;
         let line_height = TextSize::Small.rems(cx).to_pixels(window.rem_size()) * 1.5;

crates/agent_ui/src/agent_diff.rs

@@ -17,7 +17,7 @@ use gpui::{
     Global, SharedString, Subscription, Task, WeakEntity, Window, prelude::*,
 };
 
-use language::{Buffer, Capability, OffsetRangeExt, Point};
+use language::{Buffer, Capability, DiskState, OffsetRangeExt, Point};
 use multi_buffer::PathKey;
 use project::{Project, ProjectItem, ProjectPath};
 use settings::{Settings, SettingsStore};
@@ -192,7 +192,7 @@ impl AgentDiffPane {
                     && buffer
                         .read(cx)
                         .file()
-                        .is_some_and(|file| file.disk_state().is_deleted())
+                        .is_some_and(|file| file.disk_state() == DiskState::Deleted)
                 {
                     editor.fold_buffer(snapshot.text.remote_id(), cx)
                 }

crates/agent_ui/src/agent_panel.rs

@@ -1757,7 +1757,6 @@ impl AgentPanel {
         });
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_panel_options_menu(
         &self,
         window: &mut Window,
@@ -2564,7 +2563,6 @@ impl AgentPanel {
         }
     }
 
-    #[ztracing::instrument(skip_all)]
     fn render_text_thread(
         &self,
         text_thread_editor: &Entity<TextThreadEditor>,
@@ -2739,7 +2737,6 @@ impl AgentPanel {
 }
 
 impl Render for AgentPanel {
-    #[ztracing::instrument(skip_all)]
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         // WARNING: Changes to this element hierarchy can have
         // non-obvious implications to the layout of children.

crates/agent_ui/src/agent_ui.rs

@@ -368,26 +368,49 @@ fn update_active_language_model_from_settings(cx: &mut App) {
         }
     }
 
-    let default = settings.default_model.as_ref().map(to_selected_model);
+    // Filter out models from providers that are not authenticated
+    fn is_provider_authenticated(
+        selection: &LanguageModelSelection,
+        registry: &LanguageModelRegistry,
+        cx: &App,
+    ) -> bool {
+        let provider_id = LanguageModelProviderId::from(selection.provider.0.clone());
+        registry
+            .provider(&provider_id)
+            .map_or(false, |provider| provider.is_authenticated(cx))
+    }
+
+    let registry = LanguageModelRegistry::global(cx);
+    let registry_ref = registry.read(cx);
+
+    let default = settings
+        .default_model
+        .as_ref()
+        .filter(|s| is_provider_authenticated(s, registry_ref, cx))
+        .map(to_selected_model);
     let inline_assistant = settings
         .inline_assistant_model
         .as_ref()
+        .filter(|s| is_provider_authenticated(s, registry_ref, cx))
         .map(to_selected_model);
     let commit_message = settings
         .commit_message_model
         .as_ref()
+        .filter(|s| is_provider_authenticated(s, registry_ref, cx))
         .map(to_selected_model);
     let thread_summary = settings
         .thread_summary_model
         .as_ref()
+        .filter(|s| is_provider_authenticated(s, registry_ref, cx))
         .map(to_selected_model);
     let inline_alternatives = settings
         .inline_alternatives
         .iter()
+        .filter(|s| is_provider_authenticated(s, registry_ref, cx))
         .map(to_selected_model)
         .collect::<Vec<_>>();
 
-    LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+    registry.update(cx, |registry, cx| {
         registry.select_default_model(default.as_ref(), cx);
         registry.select_inline_assistant_model(inline_assistant.as_ref(), cx);
         registry.select_commit_message_model(commit_message.as_ref(), cx);

crates/agent_ui/src/language_model_selector.rs

@@ -2,10 +2,9 @@ use std::{cmp::Reverse, sync::Arc};
 
 use agent_settings::AgentSettings;
 use collections::{HashMap, HashSet, IndexMap};
+use futures::{StreamExt, channel::mpsc};
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    Action, AnyElement, App, BackgroundExecutor, DismissEvent, FocusHandle, Subscription, Task,
-};
+use gpui::{Action, AnyElement, App, BackgroundExecutor, DismissEvent, FocusHandle, Task};
 use language_model::{
     AuthenticateError, ConfiguredModel, IconOrSvg, LanguageModel, LanguageModelId,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry,
@@ -76,7 +75,7 @@ fn all_models(cx: &App) -> GroupedModels {
         })
         .collect();
 
-    let all = providers
+    let all: Vec<ModelInfo> = providers
         .iter()
         .flat_map(|provider| {
             provider
@@ -124,7 +123,7 @@ pub struct LanguageModelPickerDelegate {
     filtered_entries: Vec<LanguageModelPickerEntry>,
     selected_index: usize,
     _authenticate_all_providers_task: Task<()>,
-    _subscriptions: Vec<Subscription>,
+    _refresh_models_task: Task<()>,
     popover_styles: bool,
     focus_handle: FocusHandle,
 }
@@ -151,24 +150,42 @@ impl LanguageModelPickerDelegate {
             get_active_model: Arc::new(get_active_model),
             on_toggle_favorite: Arc::new(on_toggle_favorite),
             _authenticate_all_providers_task: Self::authenticate_all_providers(cx),
-            _subscriptions: vec![cx.subscribe_in(
-                &LanguageModelRegistry::global(cx),
-                window,
-                |picker, _, event, window, cx| {
-                    match event {
-                        language_model::Event::ProviderStateChanged(_)
-                        | language_model::Event::AddedProvider(_)
-                        | language_model::Event::RemovedProvider(_) => {
-                            let query = picker.query(cx);
-                            picker.delegate.all_models = Arc::new(all_models(cx));
-                            // Update matches will automatically drop the previous task
-                            // if we get a provider event again
-                            picker.update_matches(query, window, cx)
-                        }
-                        _ => {}
+            _refresh_models_task: {
+                // Create a channel to signal when models need refreshing
+                let (refresh_tx, mut refresh_rx) = mpsc::unbounded::<()>();
+
+                // Subscribe to registry events and send refresh signals through the channel
+                let registry = LanguageModelRegistry::global(cx);
+                cx.subscribe(&registry, move |_picker, _, event, _cx| match event {
+                    language_model::Event::ProviderStateChanged(_)
+                    | language_model::Event::AddedProvider(_)
+                    | language_model::Event::RemovedProvider(_)
+                    | language_model::Event::ProvidersChanged => {
+                        refresh_tx.unbounded_send(()).ok();
                     }
-                },
-            )],
+                    language_model::Event::DefaultModelChanged
+                    | language_model::Event::InlineAssistantModelChanged
+                    | language_model::Event::CommitMessageModelChanged
+                    | language_model::Event::ThreadSummaryModelChanged => {}
+                })
+                .detach();
+
+                // Spawn a task that listens for refresh signals and updates the picker
+                cx.spawn_in(window, async move |this, cx| {
+                    while let Some(()) = refresh_rx.next().await {
+                        if this
+                            .update_in(cx, |picker, window, cx| {
+                                picker.delegate.all_models = Arc::new(all_models(cx));
+                                picker.refresh(window, cx);
+                            })
+                            .is_err()
+                        {
+                            // Picker was dropped, exit the loop
+                            break;
+                        }
+                    }
+                })
+            },
             popover_styles,
             focus_handle,
         }

crates/agent_ui/src/text_thread_editor.rs

@@ -2651,7 +2651,6 @@ impl EventEmitter<EditorEvent> for TextThreadEditor {}
 impl EventEmitter<SearchEvent> for TextThreadEditor {}
 
 impl Render for TextThreadEditor {
-    #[ztracing::instrument(skip_all)]
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let language_model_selector = self.language_model_selector_menu_handle.clone();
 

crates/agent_ui/src/ui/hold_for_default.rs

@@ -27,7 +27,7 @@ impl RenderOnce for HoldForDefault {
                 PlatformStyle::platform(),
                 None,
                 Some(TextSize::Default.rems(cx).into()),
-                false,
+                true,
             )))
             .child(div().map(|this| {
                 if self.is_default {

crates/agent_ui/src/ui/model_selector_components.rs

@@ -1,11 +1,6 @@
 use gpui::{Action, FocusHandle, prelude::*};
 use ui::{ElevationIndex, KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*};
 
-enum ModelIcon {
-    Name(IconName),
-    Path(SharedString),
-}
-
 #[derive(IntoElement)]
 pub struct ModelSelectorHeader {
     title: SharedString,
@@ -40,6 +35,11 @@ impl RenderOnce for ModelSelectorHeader {
     }
 }
 
+enum ModelIcon {
+    Name(IconName),
+    Path(SharedString),
+}
+
 #[derive(IntoElement)]
 pub struct ModelSelectorListItem {
     index: usize,

crates/anthropic/src/anthropic.rs

@@ -8,7 +8,7 @@ use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::B
 use http_client::http::{self, HeaderMap, HeaderValue};
 use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest, StatusCode};
 use serde::{Deserialize, Serialize};
-pub use settings::{AnthropicAvailableModel as AvailableModel, ModelMode};
+pub use settings::ModelMode;
 use strum::{EnumIter, EnumString};
 use thiserror::Error;
 

crates/component_preview/Cargo.toml

@@ -1,45 +0,0 @@
-[package]
-name = "component_preview"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/component_preview.rs"
-
-[features]
-default = []
-preview = []
-test-support = ["db/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-collections.workspace = true
-component.workspace = true
-db.workspace = true
-fs.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-node_runtime.workspace = true
-notifications.workspace = true
-project.workspace = true
-release_channel.workspace = true
-reqwest_client.workspace = true
-session.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-ui_input.workspace = true
-uuid.workspace = true
-workspace.workspace = true
-
-[[example]]
-name = "component_preview"
-path = "examples/component_preview.rs"
-required-features = ["preview"]

crates/component_preview/LICENSE-GPL

@@ -1 +0,0 @@
-LICENSE-GPL

crates/component_preview/examples/component_preview.rs

@@ -1,18 +0,0 @@
-//! Component Preview Example
-//!
-//! Run with: `cargo run -p component_preview --example component_preview --features="preview"`
-//!
-//! To use this in other projects, add the following to your `Cargo.toml`:
-//!
-//! ```toml
-//! [dependencies]
-//! component_preview = { path = "../component_preview", features = ["preview"] }
-//!
-//! [[example]]
-//! name = "component_preview"
-//! path = "examples/component_preview.rs"
-//! ```
-
-fn main() {
-    component_preview::run_component_preview();
-}

crates/component_preview/src/component_preview_example.rs

@@ -1,145 +0,0 @@
-/// Run the component preview application.
-///
-/// This initializes the application with minimal required infrastructure
-/// and opens a workspace with the ComponentPreview item.
-#[cfg(feature = "preview")]
-pub fn run_component_preview() {
-    use fs::RealFs;
-    use gpui::{
-        AppContext as _, Application, Bounds, KeyBinding, WindowBounds, WindowOptions, actions,
-        size,
-    };
-
-    use client::{Client, UserStore};
-    use language::LanguageRegistry;
-    use node_runtime::NodeRuntime;
-    use project::Project;
-    use reqwest_client::ReqwestClient;
-    use session::{AppSession, Session};
-    use std::sync::Arc;
-    use ui::{App, px};
-    use workspace::{AppState, Workspace, WorkspaceStore};
-
-    use crate::{ComponentPreview, init};
-
-    actions!(zed, [Quit]);
-
-    fn quit(_: &Quit, cx: &mut App) {
-        cx.quit();
-    }
-
-    Application::new().run(|cx| {
-        component::init();
-
-        cx.on_action(quit);
-        cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
-        let version = release_channel::AppVersion::load(env!("CARGO_PKG_VERSION"), None, None);
-        release_channel::init(version, cx);
-
-        let http_client =
-            ReqwestClient::user_agent("component_preview").expect("Failed to create HTTP client");
-        cx.set_http_client(Arc::new(http_client));
-
-        let fs = Arc::new(RealFs::new(None, cx.background_executor().clone()));
-        <dyn fs::Fs>::set_global(fs.clone(), cx);
-
-        settings::init(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-
-        let languages = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
-        let client = Client::production(cx);
-        client::init(&client, cx);
-
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let workspace_store = cx.new(|cx| WorkspaceStore::new(client.clone(), cx));
-        let session_id = uuid::Uuid::new_v4().to_string();
-        let session = cx.background_executor().block(Session::new(session_id));
-        let session = cx.new(|cx| AppSession::new(session, cx));
-        let node_runtime = NodeRuntime::unavailable();
-
-        let app_state = Arc::new(AppState {
-            languages,
-            client,
-            user_store,
-            workspace_store,
-            fs,
-            build_window_options: |_, _| Default::default(),
-            node_runtime,
-            session,
-        });
-        AppState::set_global(Arc::downgrade(&app_state), cx);
-
-        workspace::init(app_state.clone(), cx);
-        init(app_state.clone(), cx);
-
-        let size = size(px(1200.), px(800.));
-        let bounds = Bounds::centered(None, size, cx);
-
-        cx.open_window(
-            WindowOptions {
-                window_bounds: Some(WindowBounds::Windowed(bounds)),
-                ..Default::default()
-            },
-            {
-                move |window, cx| {
-                    let app_state = app_state;
-                    theme::setup_ui_font(window, cx);
-
-                    let project = Project::local(
-                        app_state.client.clone(),
-                        app_state.node_runtime.clone(),
-                        app_state.user_store.clone(),
-                        app_state.languages.clone(),
-                        app_state.fs.clone(),
-                        None,
-                        false,
-                        cx,
-                    );
-
-                    let workspace = cx.new(|cx| {
-                        Workspace::new(
-                            Default::default(),
-                            project.clone(),
-                            app_state.clone(),
-                            window,
-                            cx,
-                        )
-                    });
-
-                    workspace.update(cx, |workspace, cx| {
-                        let weak_workspace = cx.entity().downgrade();
-                        let language_registry = app_state.languages.clone();
-                        let user_store = app_state.user_store.clone();
-
-                        let component_preview = cx.new(|cx| {
-                            ComponentPreview::new(
-                                weak_workspace,
-                                project,
-                                language_registry,
-                                user_store,
-                                None,
-                                None,
-                                window,
-                                cx,
-                            )
-                            .expect("Failed to create component preview")
-                        });
-
-                        workspace.add_item_to_active_pane(
-                            Box::new(component_preview),
-                            None,
-                            true,
-                            window,
-                            cx,
-                        );
-                    });
-
-                    workspace
-                }
-            },
-        )
-        .expect("Failed to open component preview window");
-
-        cx.activate(true);
-    });
-}

crates/editor/src/element.rs

@@ -46,9 +46,9 @@ use gpui::{
     KeybindingKeystroke, Length, Modifiers, ModifiersChangedEvent, MouseButton, MouseClickEvent,
     MouseDownEvent, MouseMoveEvent, MousePressureEvent, MouseUpEvent, PaintQuad, ParentElement,
     Pixels, PressureStage, ScrollDelta, ScrollHandle, ScrollWheelEvent, ShapedLine, SharedString,
-    Size, StatefulInteractiveElement, Style, Styled, TextAlign, TextRun, TextStyleRefinement,
-    WeakEntity, Window, anchored, deferred, div, fill, linear_color_stop, linear_gradient, outline,
-    point, px, quad, relative, size, solid_background, transparent_black,
+    Size, StatefulInteractiveElement, Style, Styled, TextRun, TextStyleRefinement, WeakEntity,
+    Window, anchored, deferred, div, fill, linear_color_stop, linear_gradient, outline, point, px,
+    quad, relative, size, solid_background, transparent_black,
 };
 use itertools::Itertools;
 use language::{IndentGuideSettings, language_settings::ShowWhitespaceSetting};
@@ -1695,13 +1695,9 @@ impl EditorElement {
                         [cursor_position.row().minus(visible_display_row_range.start) as usize];
                     let cursor_column = cursor_position.column() as usize;
 
-                    let cursor_character_x = cursor_row_layout.x_for_index(cursor_column)
-                        + cursor_row_layout
-                            .alignment_offset(self.style.text.text_align, text_hitbox.size.width);
-                    let cursor_next_x = cursor_row_layout.x_for_index(cursor_column + 1)
-                        + cursor_row_layout
-                            .alignment_offset(self.style.text.text_align, text_hitbox.size.width);
-                    let mut block_width = cursor_next_x - cursor_character_x;
+                    let cursor_character_x = cursor_row_layout.x_for_index(cursor_column);
+                    let mut block_width =
+                        cursor_row_layout.x_for_index(cursor_column + 1) - cursor_character_x;
                     if block_width == Pixels::ZERO {
                         block_width = em_advance;
                     }
@@ -6164,25 +6160,10 @@ impl EditorElement {
                     let color = cx.theme().colors().editor_hover_line_number;
 
                     let line = self.shape_line_number(shaped_line.text.clone(), color, window);
-                    line.paint(
-                        hitbox.origin,
-                        line_height,
-                        TextAlign::Left,
-                        None,
-                        window,
-                        cx,
-                    )
-                    .log_err()
+                    line.paint(hitbox.origin, line_height, window, cx).log_err()
                 } else {
                     shaped_line
-                        .paint(
-                            hitbox.origin,
-                            line_height,
-                            TextAlign::Left,
-                            None,
-                            window,
-                            cx,
-                        )
+                        .paint(hitbox.origin, line_height, window, cx)
                         .log_err()
                 }) else {
                     continue;
@@ -7271,27 +7252,23 @@ impl EditorElement {
                     .map(|row| {
                         let line_layout =
                             &layout.position_map.line_layouts[row.minus(start_row) as usize];
-                        let alignment_offset =
-                            line_layout.alignment_offset(layout.text_align, layout.content_width);
                         HighlightedRangeLine {
                             start_x: if row == range.start.row() {
                                 layout.content_origin.x
                                     + Pixels::from(
                                         ScrollPixelOffset::from(
-                                            line_layout.x_for_index(range.start.column() as usize)
-                                                + alignment_offset,
+                                            line_layout.x_for_index(range.start.column() as usize),
                                         ) - layout.position_map.scroll_pixel_position.x,
                                     )
                             } else {
-                                layout.content_origin.x + alignment_offset
+                                layout.content_origin.x
                                     - Pixels::from(layout.position_map.scroll_pixel_position.x)
                             },
                             end_x: if row == range.end.row() {
                                 layout.content_origin.x
                                     + Pixels::from(
                                         ScrollPixelOffset::from(
-                                            line_layout.x_for_index(range.end.column() as usize)
-                                                + alignment_offset,
+                                            line_layout.x_for_index(range.end.column() as usize),
                                         ) - layout.position_map.scroll_pixel_position.x,
                                     )
                             } else {
@@ -7299,7 +7276,6 @@ impl EditorElement {
                                     ScrollPixelOffset::from(
                                         layout.content_origin.x
                                             + line_layout.width
-                                            + alignment_offset
                                             + line_end_overshoot,
                                     ) - layout.position_map.scroll_pixel_position.x,
                                 )
@@ -8540,15 +8516,8 @@ impl LineWithInvisibles {
         for fragment in &self.fragments {
             match fragment {
                 LineFragment::Text(line) => {
-                    line.paint(
-                        fragment_origin,
-                        line_height,
-                        layout.text_align,
-                        Some(layout.content_width),
-                        window,
-                        cx,
-                    )
-                    .log_err();
+                    line.paint(fragment_origin, line_height, window, cx)
+                        .log_err();
                     fragment_origin.x += line.width;
                 }
                 LineFragment::Element { size, .. } => {
@@ -8590,15 +8559,8 @@ impl LineWithInvisibles {
         for fragment in &self.fragments {
             match fragment {
                 LineFragment::Text(line) => {
-                    line.paint_background(
-                        fragment_origin,
-                        line_height,
-                        layout.text_align,
-                        Some(layout.content_width),
-                        window,
-                        cx,
-                    )
-                    .log_err();
+                    line.paint_background(fragment_origin, line_height, window, cx)
+                        .log_err();
                     fragment_origin.x += line.width;
                 }
                 LineFragment::Element { size, .. } => {
@@ -8647,7 +8609,7 @@ impl LineWithInvisibles {
                 [token_offset, token_end_offset],
                 Box::new(move |window: &mut Window, cx: &mut App| {
                     invisible_symbol
-                        .paint(origin, line_height, TextAlign::Left, None, window, cx)
+                        .paint(origin, line_height, window, cx)
                         .log_err();
                 }),
             )
@@ -8808,15 +8770,6 @@ impl LineWithInvisibles {
 
         None
     }
-
-    pub fn alignment_offset(&self, text_align: TextAlign, content_width: Pixels) -> Pixels {
-        let line_width = self.width;
-        match text_align {
-            TextAlign::Left => px(0.0),
-            TextAlign::Center => (content_width - line_width) / 2.0,
-            TextAlign::Right => content_width - line_width,
-        }
-    }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -10219,8 +10172,6 @@ impl Element for EditorElement {
                         em_width,
                         em_advance,
                         snapshot,
-                        text_align: self.style.text.text_align,
-                        content_width: text_hitbox.size.width,
                         gutter_hitbox: gutter_hitbox.clone(),
                         text_hitbox: text_hitbox.clone(),
                         inline_blame_bounds: inline_blame_layout
@@ -10274,8 +10225,6 @@ impl Element for EditorElement {
                         sticky_buffer_header,
                         sticky_headers,
                         expand_toggles,
-                        text_align: self.style.text.text_align,
-                        content_width: text_hitbox.size.width,
                     }
                 })
             })
@@ -10456,8 +10405,6 @@ pub struct EditorLayout {
     sticky_buffer_header: Option<AnyElement>,
     sticky_headers: Option<StickyHeaders>,
     document_colors: Option<(DocumentColorsRenderMode, Vec<(Range<DisplayPoint>, Hsla)>)>,
-    text_align: TextAlign,
-    content_width: Pixels,
 }
 
 struct StickyHeaders {
@@ -10625,9 +10572,7 @@ impl StickyHeaderLine {
                 gutter_origin.x + gutter_width - gutter_right_padding - line_number.width,
                 gutter_origin.y,
             );
-            line_number
-                .paint(origin, line_height, TextAlign::Left, None, window, cx)
-                .log_err();
+            line_number.paint(origin, line_height, window, cx).log_err();
         }
     }
 }
@@ -11066,8 +11011,6 @@ pub(crate) struct PositionMap {
     pub visible_row_range: Range<DisplayRow>,
     pub line_layouts: Vec<LineWithInvisibles>,
     pub snapshot: EditorSnapshot,
-    pub text_align: TextAlign,
-    pub content_width: Pixels,
     pub text_hitbox: Hitbox,
     pub gutter_hitbox: Hitbox,
     pub inline_blame_bounds: Option<(Bounds<Pixels>, BufferId, BlameEntry)>,
@@ -11133,12 +11076,10 @@ impl PositionMap {
             .line_layouts
             .get(row as usize - scroll_position.y as usize)
         {
-            let alignment_offset = line.alignment_offset(self.text_align, self.content_width);
-            let x_relative_to_text = x - alignment_offset;
-            if let Some(ix) = line.index_for_x(x_relative_to_text) {
+            if let Some(ix) = line.index_for_x(x) {
                 (ix as u32, px(0.))
             } else {
-                (line.len as u32, px(0.).max(x_relative_to_text - line.width))
+                (line.len as u32, px(0.).max(x - line.width))
             }
         } else {
             (0, x)
@@ -11327,14 +11268,7 @@ impl CursorLayout {
 
         if let Some(block_text) = &self.block_text {
             block_text
-                .paint(
-                    self.origin + origin,
-                    self.line_height,
-                    TextAlign::Left,
-                    None,
-                    window,
-                    cx,
-                )
+                .paint(self.origin + origin, self.line_height, window, cx)
                 .log_err();
         }
     }

crates/editor/src/items.rs

@@ -17,8 +17,8 @@ use gpui::{
     ParentElement, Pixels, SharedString, Styled, Task, WeakEntity, Window, point,
 };
 use language::{
-    Bias, Buffer, BufferRow, CharKind, CharScopeContext, LocalFile, Point, SelectionGoal,
-    proto::serialize_anchor as serialize_text_anchor,
+    Bias, Buffer, BufferRow, CharKind, CharScopeContext, DiskState, LocalFile, Point,
+    SelectionGoal, proto::serialize_anchor as serialize_text_anchor,
 };
 use lsp::DiagnosticSeverity;
 use multi_buffer::MultiBufferOffset;
@@ -722,7 +722,7 @@ impl Item for Editor {
             .read(cx)
             .as_singleton()
             .and_then(|buffer| buffer.read(cx).file())
-            .is_some_and(|file| file.disk_state().is_deleted());
+            .is_some_and(|file| file.disk_state() == DiskState::Deleted);
 
         h_flex()
             .gap_2()

crates/extension/src/extension_host_proxy.rs

@@ -389,6 +389,49 @@ pub trait ExtensionContextServerProxy: Send + Sync + 'static {
     fn unregister_context_server(&self, server_id: Arc<str>, cx: &mut App);
 }
 
+/// A function that registers a language model provider with the registry.
+/// This allows extension_host to create the provider (which requires WasmExtension)
+/// and pass a registration closure to the language_models crate.
+pub type LanguageModelProviderRegistration = Box<dyn FnOnce(&mut App) + Send + Sync + 'static>;
+
+pub trait ExtensionLanguageModelProviderProxy: Send + Sync + 'static {
+    /// Register an LLM provider from an extension.
+    /// The `register_fn` closure will be called with the App context and should
+    /// register the provider with the LanguageModelRegistry.
+    fn register_language_model_provider(
+        &self,
+        provider_id: Arc<str>,
+        register_fn: LanguageModelProviderRegistration,
+        cx: &mut App,
+    );
+
+    /// Unregister an LLM provider when an extension is unloaded.
+    fn unregister_language_model_provider(&self, provider_id: Arc<str>, cx: &mut App);
+}
+
+impl ExtensionLanguageModelProviderProxy for ExtensionHostProxy {
+    fn register_language_model_provider(
+        &self,
+        provider_id: Arc<str>,
+        register_fn: LanguageModelProviderRegistration,
+        cx: &mut App,
+    ) {
+        let Some(proxy) = self.language_model_provider_proxy.read().clone() else {
+            return;
+        };
+
+        proxy.register_language_model_provider(provider_id, register_fn, cx)
+    }
+
+    fn unregister_language_model_provider(&self, provider_id: Arc<str>, cx: &mut App) {
+        let Some(proxy) = self.language_model_provider_proxy.read().clone() else {
+            return;
+        };
+
+        proxy.unregister_language_model_provider(provider_id, cx)
+    }
+}
+
 impl ExtensionContextServerProxy for ExtensionHostProxy {
     fn register_context_server(
         &self,

crates/extension/src/extension_manifest.rs

@@ -298,6 +298,58 @@ pub struct LanguageModelProviderManifestEntry {
     /// Path to an SVG icon file relative to the extension root (e.g., "icons/provider.svg").
     #[serde(default)]
     pub icon: Option<String>,
+    /// Hardcoded models to always show (as opposed to a model list loaded over the network).
+    #[serde(default)]
+    pub models: Vec<LanguageModelManifestEntry>,
+    /// Authentication configuration.
+    #[serde(default)]
+    pub auth: Option<LanguageModelAuthConfig>,
+}
+
+/// Manifest entry for a language model.
+#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+pub struct LanguageModelManifestEntry {
+    /// Unique identifier for the model.
+    pub id: String,
+    /// Display name for the model.
+    pub name: String,
+    /// Maximum input token count.
+    pub max_token_count: u64,
+    /// Maximum output tokens (optional).
+    pub max_output_tokens: Option<u64>,
+    /// Whether the model supports image inputs.
+    pub supports_images: bool,
+    /// Whether the model supports tool/function calling.
+    pub supports_tools: bool,
+    /// Whether the model supports extended thinking/reasoning.
+    pub supports_thinking: bool,
+}
+
+/// Authentication configuration for a language model provider.
+#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+pub struct LanguageModelAuthConfig {
+    /// Human-readable name for the credential shown in the UI input field (e.g. "API Key", "Access Token").
+    pub credential_label: Option<String>,
+    /// Environment variable names for the API key (if env var auth supported).
+    /// Multiple env vars can be specified; they will be checked in order.
+    #[serde(default)]
+    pub env_vars: Option<Vec<String>>,
+    /// OAuth configuration for web-based authentication flows.
+    #[serde(default)]
+    pub oauth: Option<OAuthConfig>,
+}
+
+/// OAuth configuration for web-based authentication.
+#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+pub struct OAuthConfig {
+    /// The text to display on the sign-in button (e.g. "Sign in with GitHub").
+    pub sign_in_button_label: Option<String>,
+    /// The Zed icon path to display on the sign-in button (e.g. "github").
+    #[serde(default)]
+    pub sign_in_button_icon: Option<String>,
+    /// The description text shown next to the sign-in button in edit prediction settings.
+    #[serde(default)]
+    pub sign_in_description: Option<String>,
 }
 
 impl ExtensionManifest {

crates/extension_api/src/extension_api.rs

@@ -29,6 +29,26 @@ pub use wit::{
         GithubRelease, GithubReleaseAsset, GithubReleaseOptions, github_release_by_tag_name,
         latest_github_release,
     },
+    zed::extension::llm_provider::{
+        CacheConfiguration as LlmCacheConfiguration, CompletionEvent as LlmCompletionEvent,
+        CompletionRequest as LlmCompletionRequest, CustomModelConfig as LlmCustomModelConfig,
+        DeviceFlowPromptInfo as LlmDeviceFlowPromptInfo, ImageData as LlmImageData,
+        MessageContent as LlmMessageContent, MessageRole as LlmMessageRole,
+        ModelCapabilities as LlmModelCapabilities, ModelInfo as LlmModelInfo,
+        OauthWebAuthConfig as LlmOauthWebAuthConfig, OauthWebAuthResult as LlmOauthWebAuthResult,
+        ProviderInfo as LlmProviderInfo, ProviderSettings as LlmProviderSettings,
+        RequestMessage as LlmRequestMessage, StopReason as LlmStopReason,
+        ThinkingContent as LlmThinkingContent, TokenUsage as LlmTokenUsage,
+        ToolChoice as LlmToolChoice, ToolDefinition as LlmToolDefinition,
+        ToolInputFormat as LlmToolInputFormat, ToolResult as LlmToolResult,
+        ToolResultContent as LlmToolResultContent, ToolUse as LlmToolUse,
+        ToolUseJsonParseError as LlmToolUseJsonParseError,
+        delete_credential as llm_delete_credential, get_credential as llm_get_credential,
+        get_env_var as llm_get_env_var, get_provider_settings as llm_get_provider_settings,
+        oauth_open_browser as llm_oauth_open_browser,
+        oauth_send_http_request as llm_oauth_send_http_request,
+        oauth_start_web_auth as llm_oauth_start_web_auth, store_credential as llm_store_credential,
+    },
     zed::extension::nodejs::{
         node_binary_path, npm_install_package, npm_package_installed_version,
         npm_package_latest_version,
@@ -259,6 +279,93 @@ pub trait Extension: Send + Sync {
     ) -> Result<DebugRequest, String> {
         Err("`run_dap_locator` not implemented".to_string())
     }
+
+    /// Returns information about language model providers offered by this extension.
+    fn llm_providers(&self) -> Vec<LlmProviderInfo> {
+        Vec::new()
+    }
+
+    /// Returns the models available for a provider.
+    fn llm_provider_models(&self, _provider_id: &str) -> Result<Vec<LlmModelInfo>, String> {
+        Ok(Vec::new())
+    }
+
+    /// Returns markdown content to display in the provider's settings UI.
+    /// This can include setup instructions, links to documentation, etc.
+    fn llm_provider_settings_markdown(&self, _provider_id: &str) -> Option<String> {
+        None
+    }
+
+    /// Check if the provider is authenticated.
+    fn llm_provider_is_authenticated(&self, _provider_id: &str) -> bool {
+        false
+    }
+
+    /// Start an OAuth device flow sign-in.
+    /// This is called when the user explicitly clicks "Sign in with GitHub" or similar.
+    /// Returns information needed to display the device flow prompt modal to the user.
+    fn llm_provider_start_device_flow_sign_in(
+        &mut self,
+        _provider_id: &str,
+    ) -> Result<LlmDeviceFlowPromptInfo, String> {
+        Err("`llm_provider_start_device_flow_sign_in` not implemented".to_string())
+    }
+
+    /// Poll for device flow sign-in completion.
+    /// This is called after llm_provider_start_device_flow_sign_in returns the user code.
+    /// The extension should poll the OAuth provider until the user authorizes or the flow times out.
+    fn llm_provider_poll_device_flow_sign_in(&mut self, _provider_id: &str) -> Result<(), String> {
+        Err("`llm_provider_poll_device_flow_sign_in` not implemented".to_string())
+    }
+
+    /// Reset credentials for the provider.
+    fn llm_provider_reset_credentials(&mut self, _provider_id: &str) -> Result<(), String> {
+        Err("`llm_provider_reset_credentials` not implemented".to_string())
+    }
+
+    /// Count tokens for a request.
+    fn llm_count_tokens(
+        &self,
+        _provider_id: &str,
+        _model_id: &str,
+        _request: &LlmCompletionRequest,
+    ) -> Result<u64, String> {
+        Err("`llm_count_tokens` not implemented".to_string())
+    }
+
+    /// Start streaming a completion from the model.
+    /// Returns a stream ID that can be used with `llm_stream_completion_next` and `llm_stream_completion_close`.
+    fn llm_stream_completion_start(
+        &mut self,
+        _provider_id: &str,
+        _model_id: &str,
+        _request: &LlmCompletionRequest,
+    ) -> Result<String, String> {
+        Err("`llm_stream_completion_start` not implemented".to_string())
+    }
+
+    /// Get the next event from a completion stream.
+    /// Returns `Ok(None)` when the stream is complete.
+    fn llm_stream_completion_next(
+        &mut self,
+        _stream_id: &str,
+    ) -> Result<Option<LlmCompletionEvent>, String> {
+        Err("`llm_stream_completion_next` not implemented".to_string())
+    }
+
+    /// Close a completion stream and release its resources.
+    fn llm_stream_completion_close(&mut self, _stream_id: &str) {
+        // Default implementation does nothing
+    }
+
+    /// Get cache configuration for a model (if prompt caching is supported).
+    fn llm_cache_configuration(
+        &self,
+        _provider_id: &str,
+        _model_id: &str,
+    ) -> Option<LlmCacheConfiguration> {
+        None
+    }
 }
 
 /// Registers the provided type as a Zed extension.
@@ -517,6 +624,67 @@ impl wit::Guest for Component {
     ) -> Result<DebugRequest, String> {
         extension().run_dap_locator(locator_name, build_task)
     }
+
+    fn llm_providers() -> Vec<LlmProviderInfo> {
+        extension().llm_providers()
+    }
+
+    fn llm_provider_models(provider_id: String) -> Result<Vec<LlmModelInfo>, String> {
+        extension().llm_provider_models(&provider_id)
+    }
+
+    fn llm_provider_settings_markdown(provider_id: String) -> Option<String> {
+        extension().llm_provider_settings_markdown(&provider_id)
+    }
+
+    fn llm_provider_is_authenticated(provider_id: String) -> bool {
+        extension().llm_provider_is_authenticated(&provider_id)
+    }
+
+    fn llm_provider_start_device_flow_sign_in(
+        provider_id: String,
+    ) -> Result<LlmDeviceFlowPromptInfo, String> {
+        extension().llm_provider_start_device_flow_sign_in(&provider_id)
+    }
+
+    fn llm_provider_poll_device_flow_sign_in(provider_id: String) -> Result<(), String> {
+        extension().llm_provider_poll_device_flow_sign_in(&provider_id)
+    }
+
+    fn llm_provider_reset_credentials(provider_id: String) -> Result<(), String> {
+        extension().llm_provider_reset_credentials(&provider_id)
+    }
+
+    fn llm_count_tokens(
+        provider_id: String,
+        model_id: String,
+        request: LlmCompletionRequest,
+    ) -> Result<u64, String> {
+        extension().llm_count_tokens(&provider_id, &model_id, &request)
+    }
+
+    fn llm_stream_completion_start(
+        provider_id: String,
+        model_id: String,
+        request: LlmCompletionRequest,
+    ) -> Result<String, String> {
+        extension().llm_stream_completion_start(&provider_id, &model_id, &request)
+    }
+
+    fn llm_stream_completion_next(stream_id: String) -> Result<Option<LlmCompletionEvent>, String> {
+        extension().llm_stream_completion_next(&stream_id)
+    }
+
+    fn llm_stream_completion_close(stream_id: String) {
+        extension().llm_stream_completion_close(&stream_id)
+    }
+
+    fn llm_cache_configuration(
+        provider_id: String,
+        model_id: String,
+    ) -> Option<LlmCacheConfiguration> {
+        extension().llm_cache_configuration(&provider_id, &model_id)
+    }
 }
 
 /// The ID of a language server.

crates/extension_api/src/http_client.rs

@@ -1,7 +1,8 @@
 //! An HTTP client.
 
 pub use crate::wit::zed::extension::http_client::{
-    HttpMethod, HttpRequest, HttpResponse, HttpResponseStream, RedirectPolicy, fetch, fetch_stream,
+    HttpMethod, HttpRequest, HttpResponse, HttpResponseStream, HttpResponseWithStatus,
+    RedirectPolicy, fetch, fetch_fallible, fetch_stream,
 };
 
 impl HttpRequest {
@@ -15,6 +16,11 @@ impl HttpRequest {
         fetch(self)
     }
 
+    /// Like [`fetch`], except it doesn't treat any status codes as errors.
+    pub fn fetch_fallible(&self) -> Result<HttpResponseWithStatus, String> {
+        fetch_fallible(self)
+    }
+
     /// Executes the [`HttpRequest`] with [`fetch_stream`].
     pub fn fetch_stream(&self) -> Result<HttpResponseStream, String> {
         fetch_stream(self)

crates/extension_api/wit/since_v0.8.0/extension.wit

@@ -8,6 +8,7 @@ world extension {
     import platform;
     import process;
     import nodejs;
+    import llm-provider;
 
     use common.{env-vars, range};
     use context-server.{context-server-configuration};
@@ -15,6 +16,11 @@ world extension {
     use lsp.{completion, symbol};
     use process.{command};
     use slash-command.{slash-command, slash-command-argument-completion, slash-command-output};
+    use llm-provider.{
+        provider-info, model-info, completion-request,
+        cache-configuration, completion-event, token-usage,
+        device-flow-prompt-info
+    };
 
     /// Initializes the extension.
     export init-extension: func();
@@ -164,4 +170,73 @@ world extension {
     export dap-config-to-scenario: func(config: debug-config) -> result<debug-scenario, string>;
     export dap-locator-create-scenario: func(locator-name: string, build-config-template: build-task-template, resolved-label: string, debug-adapter-name: string) -> option<debug-scenario>;
     export run-dap-locator: func(locator-name: string, config: resolved-task) -> result<debug-request, string>;
+
+    /// Returns information about language model providers offered by this extension.
+    export llm-providers: func() -> list<provider-info>;
+
+    /// Returns the models available for a provider.
+    export llm-provider-models: func(provider-id: string) -> result<list<model-info>, string>;
+
+    /// Returns markdown content to display in the provider's settings UI.
+    /// This can include setup instructions, links to documentation, etc.
+    export llm-provider-settings-markdown: func(provider-id: string) -> option<string>;
+
+    /// Check if the provider is authenticated.
+    export llm-provider-is-authenticated: func(provider-id: string) -> bool;
+
+    /// Start an OAuth device flow sign-in.
+    /// This is called when the user explicitly clicks "Sign in with GitHub" or similar.
+    ///
+    /// The device flow works as follows:
+    /// 1. Extension requests a device code from the OAuth provider
+    /// 2. Extension returns prompt info including user code and verification URL
+    /// 3. Host displays a modal with the prompt info
+    /// 4. Host calls llm-provider-poll-device-flow-sign-in
+    /// 5. Extension polls for the access token while user authorizes in browser
+    /// 6. Once authorized, extension stores the credential and returns success
+    ///
+    /// Returns information needed to display the device flow prompt modal.
+    export llm-provider-start-device-flow-sign-in: func(provider-id: string) -> result<device-flow-prompt-info, string>;
+
+    /// Poll for device flow sign-in completion.
+    /// This is called after llm-provider-start-device-flow-sign-in returns the user code.
+    /// The extension should poll the OAuth provider until the user authorizes or the flow times out.
+    /// Returns Ok(()) on successful authentication, or an error message on failure.
+    export llm-provider-poll-device-flow-sign-in: func(provider-id: string) -> result<_, string>;
+
+    /// Reset credentials for the provider.
+    export llm-provider-reset-credentials: func(provider-id: string) -> result<_, string>;
+
+    /// Count tokens for a request.
+    export llm-count-tokens: func(
+        provider-id: string,
+        model-id: string,
+        request: completion-request
+    ) -> result<u64, string>;
+
+    /// Start streaming a completion from the model.
+    /// Returns a stream ID that can be used with llm-stream-next and llm-stream-close.
+    export llm-stream-completion-start: func(
+        provider-id: string,
+        model-id: string,
+        request: completion-request
+    ) -> result<string, string>;
+
+    /// Get the next event from a completion stream.
+    /// Returns None when the stream is complete.
+    export llm-stream-completion-next: func(
+        stream-id: string
+    ) -> result<option<completion-event>, string>;
+
+    /// Close a completion stream and release its resources.
+    export llm-stream-completion-close: func(
+        stream-id: string
+    );
+
+    /// Get cache configuration for a model (if prompt caching is supported).
+    export llm-cache-configuration: func(
+        provider-id: string,
+        model-id: string
+    ) -> option<cache-configuration>;
+
 }

crates/extension_api/wit/since_v0.8.0/http-client.wit

@@ -51,9 +51,26 @@ interface http-client {
         body: list<u8>,
     }
 
+    /// An HTTP response that includes the status code.
+    ///
+    /// Used by `fetch-fallible` which returns responses for all status codes
+    /// rather than treating some status codes as errors.
+    record http-response-with-status {
+        /// The HTTP status code.
+        status: u16,
+        /// The response headers.
+        headers: list<tuple<string, string>>,
+        /// The response body.
+        body: list<u8>,
+    }
+
     /// Performs an HTTP request and returns the response.
+    /// Returns an error if the response status is 4xx or 5xx.
     fetch: func(req: http-request) -> result<http-response, string>;
 
+    /// Performs an HTTP request and returns the response regardless of its status code.
+    fetch-fallible: func(req: http-request) -> result<http-response-with-status, string>;
+
     /// An HTTP response stream.
     resource http-response-stream {
         /// Retrieves the next chunk of data from the response stream.

crates/extension_api/wit/since_v0.8.0/llm-provider.wit

@@ -0,0 +1,362 @@
+interface llm-provider {
+    use http-client.{http-request, http-response-with-status};
+
+    /// Information about a language model provider.
+    record provider-info {
+        /// Unique identifier for the provider (e.g. "my-extension.my-provider").
+        id: string,
+        /// Display name for the provider.
+        name: string,
+        /// Path to an SVG icon file relative to the extension root (e.g. "icons/provider.svg").
+        icon: option<string>,
+    }
+
+    /// Capabilities of a language model.
+    record model-capabilities {
+        /// Whether the model supports image inputs.
+        supports-images: bool,
+        /// Whether the model supports tool/function calling.
+        supports-tools: bool,
+        /// Whether the model supports the "auto" tool choice.
+        supports-tool-choice-auto: bool,
+        /// Whether the model supports the "any" tool choice.
+        supports-tool-choice-any: bool,
+        /// Whether the model supports the "none" tool choice.
+        supports-tool-choice-none: bool,
+        /// Whether the model supports extended thinking/reasoning.
+        supports-thinking: bool,
+        /// The format for tool input schemas.
+        tool-input-format: tool-input-format,
+    }
+
+    /// Format for tool input schemas.
+    enum tool-input-format {
+        /// Standard JSON Schema format.
+        json-schema,
+        /// A subset of JSON Schema supported by Google AI.
+        /// See https://ai.google.dev/api/caching#Schema
+        json-schema-subset,
+        /// Simplified schema format for certain providers.
+        simplified,
+    }
+
+    /// Information about a specific model.
+    record model-info {
+        /// Unique identifier for the model.
+        id: string,
+        /// Display name for the model.
+        name: string,
+        /// Maximum input token count.
+        max-token-count: u64,
+        /// Maximum output tokens (optional).
+        max-output-tokens: option<u64>,
+        /// Model capabilities.
+        capabilities: model-capabilities,
+        /// Whether this is the default model for the provider.
+        is-default: bool,
+        /// Whether this is the default fast model.
+        is-default-fast: bool,
+    }
+
+    /// The role of a message participant.
+    enum message-role {
+        /// User message.
+        user,
+        /// Assistant message.
+        assistant,
+        /// System message.
+        system,
+    }
+
+    /// A message in a completion request.
+    record request-message {
+        /// The role of the message sender.
+        role: message-role,
+        /// The content of the message.
+        content: list<message-content>,
+        /// Whether to cache this message for prompt caching.
+        cache: bool,
+    }
+
+    /// Content within a message.
+    variant message-content {
+        /// Plain text content.
+        text(string),
+        /// Image content.
+        image(image-data),
+        /// A tool use request from the assistant.
+        tool-use(tool-use),
+        /// A tool result from the user.
+        tool-result(tool-result),
+        /// Thinking/reasoning content.
+        thinking(thinking-content),
+        /// Redacted/encrypted thinking content.
+        redacted-thinking(string),
+    }
+
+    /// Image data for vision models.
+    record image-data {
+        /// Base64-encoded image data.
+        source: string,
+        /// Image width in pixels (optional).
+        width: option<u32>,
+        /// Image height in pixels (optional).
+        height: option<u32>,
+    }
+
+    /// A tool use request from the model.
+    record tool-use {
+        /// Unique identifier for this tool use.
+        id: string,
+        /// The name of the tool being used.
+        name: string,
+        /// JSON string of the tool input arguments.
+        input: string,
+        /// Whether the input JSON is complete (false while streaming, true when done).
+        is-input-complete: bool,
+        /// Thought signature for providers that support it (e.g., Anthropic).
+        thought-signature: option<string>,
+    }
+
+    /// A tool result to send back to the model.
+    record tool-result {
+        /// The ID of the tool use this is a result for.
+        tool-use-id: string,
+        /// The name of the tool.
+        tool-name: string,
+        /// Whether this result represents an error.
+        is-error: bool,
+        /// The content of the result.
+        content: tool-result-content,
+    }
+
+    /// Content of a tool result.
+    variant tool-result-content {
+        /// Text result.
+        text(string),
+        /// Image result.
+        image(image-data),
+    }
+
+    /// Thinking/reasoning content from models that support extended thinking.
+    record thinking-content {
+        /// The thinking text.
+        text: string,
+        /// Signature for the thinking block (provider-specific).
+        signature: option<string>,
+    }
+
+    /// A tool definition for function calling.
+    record tool-definition {
+        /// The name of the tool.
+        name: string,
+        /// Description of what the tool does.
+        description: string,
+        /// JSON Schema for input parameters.
+        input-schema: string,
+    }
+
+    /// Tool choice preference for the model.
+    enum tool-choice {
+        /// Let the model decide whether to use tools.
+        auto,
+        /// Force the model to use at least one tool.
+        any,
+        /// Prevent the model from using tools.
+        none,
+    }
+
+    /// A completion request to send to the model.
+    record completion-request {
+        /// The messages in the conversation.
+        messages: list<request-message>,
+        /// Available tools for the model to use.
+        tools: list<tool-definition>,
+        /// Tool choice preference.
+        tool-choice: option<tool-choice>,
+        /// Stop sequences to end generation.
+        stop-sequences: list<string>,
+        /// Temperature for sampling (0.0-1.0).
+        temperature: option<f32>,
+        /// Whether thinking/reasoning is allowed.
+        thinking-allowed: bool,
+        /// Maximum tokens to generate.
+        max-tokens: option<u64>,
+    }
+
+    /// Events emitted during completion streaming.
+    variant completion-event {
+        /// Completion has started.
+        started,
+        /// Text content chunk.
+        text(string),
+        /// Thinking/reasoning content chunk.
+        thinking(thinking-content),
+        /// Redacted thinking (encrypted) chunk.
+        redacted-thinking(string),
+        /// Tool use request from the model.
+        tool-use(tool-use),
+        /// JSON parse error when parsing tool input.
+        tool-use-json-parse-error(tool-use-json-parse-error),
+        /// Completion stopped.
+        stop(stop-reason),
+        /// Token usage update.
+        usage(token-usage),
+        /// Reasoning details (provider-specific JSON).
+        reasoning-details(string),
+    }
+
+    /// Error information when tool use JSON parsing fails.
+    record tool-use-json-parse-error {
+        /// The tool use ID.
+        id: string,
+        /// The tool name.
+        tool-name: string,
+        /// The raw input that failed to parse.
+        raw-input: string,
+        /// The parse error message.
+        error: string,
+    }
+
+    /// Reason the completion stopped.
+    enum stop-reason {
+        /// The model finished generating.
+        end-turn,
+        /// Maximum tokens reached.
+        max-tokens,
+        /// The model wants to use a tool.
+        tool-use,
+        /// The model refused to respond.
+        refusal,
+    }
+
+    /// Token usage statistics.
+    record token-usage {
+        /// Number of input tokens used.
+        input-tokens: u64,
+        /// Number of output tokens generated.
+        output-tokens: u64,
+        /// Tokens used for cache creation (if supported).
+        cache-creation-input-tokens: option<u64>,
+        /// Tokens read from cache (if supported).
+        cache-read-input-tokens: option<u64>,
+    }
+
+    /// Cache configuration for prompt caching.
+    record cache-configuration {
+        /// Maximum number of cache anchors.
+        max-cache-anchors: u32,
+        /// Whether caching should be applied to tool definitions.
+        should-cache-tool-definitions: bool,
+        /// Minimum token count for a message to be cached.
+        min-total-token-count: u64,
+    }
+
+    /// Configuration for starting an OAuth web authentication flow.
+    record oauth-web-auth-config {
+        /// The URL to open in the user's browser to start authentication.
+        /// This should include client_id, redirect_uri, scope, state, etc.
+        /// Use `{port}` as a placeholder in the URL - it will be replaced with
+        /// the actual localhost port before opening the browser.
+        /// Example: "https://example.com/oauth?redirect_uri=http://127.0.0.1:{port}/callback"
+        auth-url: string,
+        /// The path to listen on for the OAuth callback (e.g., "/callback").
+        /// A localhost server will be started to receive the redirect.
+        callback-path: string,
+        /// Timeout in seconds to wait for the callback (default: 300 = 5 minutes).
+        timeout-secs: option<u32>,
+    }
+
+    /// Result of an OAuth web authentication flow.
+    record oauth-web-auth-result {
+        /// The full callback URL that was received, including query parameters.
+        /// The extension is responsible for parsing the code, state, etc.
+        callback-url: string,
+        /// The port that was used for the localhost callback server.
+        port: u32,
+    }
+
+    /// Get a stored credential for this provider.
+    get-credential: func(provider-id: string) -> option<string>;
+
+    /// Store a credential for this provider.
+    store-credential: func(provider-id: string, value: string) -> result<_, string>;
+
+    /// Delete a stored credential for this provider.
+    delete-credential: func(provider-id: string) -> result<_, string>;
+
+    /// Read an environment variable.
+    get-env-var: func(name: string) -> option<string>;
+
+    /// Start an OAuth web authentication flow.
+    ///
+    /// This will:
+    /// 1. Start a localhost server to receive the OAuth callback
+    /// 2. Open the auth URL in the user's default browser
+    /// 3. Wait for the callback (up to the timeout)
+    /// 4. Return the callback URL with query parameters
+    ///
+    /// The extension is responsible for:
+    /// - Constructing the auth URL with client_id, redirect_uri, scope, state, etc.
+    /// - Parsing the callback URL to extract the authorization code
+    /// - Exchanging the code for tokens using fetch-fallible from http-client
+    oauth-start-web-auth: func(config: oauth-web-auth-config) -> result<oauth-web-auth-result, string>;
+
+    /// Make an HTTP request for OAuth token exchange.
+    ///
+    /// This is a convenience wrapper around http-client's fetch-fallible for OAuth flows.
+    /// Unlike the standard fetch, this does not treat non-2xx responses as errors,
+    /// allowing proper handling of OAuth error responses.
+    oauth-send-http-request: func(request: http-request) -> result<http-response-with-status, string>;
+
+    /// Open a URL in the user's default browser.
+    ///
+    /// Useful for OAuth flows that need to open a browser but handle the
+    /// callback differently (e.g., polling-based flows).
+    oauth-open-browser: func(url: string) -> result<_, string>;
+
+    /// Provider settings from user configuration.
+    /// Extensions can use this to allow custom API URLs, custom models, etc.
+    record provider-settings {
+        /// Custom API URL override (if configured by the user).
+        api-url: option<string>,
+        /// Custom models configured by the user.
+        available-models: list<custom-model-config>,
+    }
+
+    /// Configuration for a custom model defined by the user.
+    record custom-model-config {
+        /// The model's API identifier.
+        name: string,
+        /// Display name for the UI.
+        display-name: option<string>,
+        /// Maximum input token count.
+        max-tokens: u64,
+        /// Maximum output tokens (optional).
+        max-output-tokens: option<u64>,
+        /// Thinking budget for models that support extended thinking (None = auto).
+        thinking-budget: option<u32>,
+    }
+
+    /// Get provider-specific settings configured by the user.
+    /// Returns settings like custom API URLs and custom model configurations.
+    get-provider-settings: func(provider-id: string) -> option<provider-settings>;
+
+    /// Information needed to display the device flow prompt modal to the user.
+    record device-flow-prompt-info {
+        /// The user code to display (e.g., "ABC-123").
+        user-code: string,
+        /// The URL the user needs to visit to authorize (for the "Connect" button).
+        verification-url: string,
+        /// The headline text for the modal (e.g., "Use GitHub Copilot in Zed.").
+        headline: string,
+        /// A description to show below the headline (e.g., "Using Copilot requires an active subscription on GitHub.").
+        description: string,
+        /// Label for the connect button (e.g., "Connect to GitHub").
+        connect-button-label: string,
+        /// Success headline shown when authorization completes.
+        success-headline: string,
+        /// Success message shown when authorization completes.
+        success-message: string,
+    }
+}

crates/extension_cli/src/main.rs

@@ -255,6 +255,21 @@ async fn copy_extension_resources(
         }
     }
 
+    for (_, provider_entry) in &manifest.language_model_providers {
+        if let Some(icon_path) = &provider_entry.icon {
+            let source_icon = extension_path.join(icon_path);
+            let dest_icon = output_dir.join(icon_path);
+
+            // Create parent directory if needed
+            if let Some(parent) = dest_icon.parent() {
+                fs::create_dir_all(parent)?;
+            }
+
+            fs::copy(&source_icon, &dest_icon)
+                .with_context(|| format!("failed to copy LLM provider icon '{}'", icon_path))?;
+        }
+    }
+
     if !manifest.languages.is_empty() {
         let output_languages_dir = output_dir.join("languages");
         fs::create_dir_all(&output_languages_dir)?;

crates/extension_host/Cargo.toml

@@ -22,7 +22,9 @@ async-tar.workspace = true
 async-trait.workspace = true
 client.workspace = true
 collections.workspace = true
+credentials_provider.workspace = true
 dap.workspace = true
+dirs.workspace = true
 extension.workspace = true
 fs.workspace = true
 futures.workspace = true
@@ -30,8 +32,11 @@ gpui.workspace = true
 gpui_tokio.workspace = true
 http_client.workspace = true
 language.workspace = true
+language_model.workspace = true
 log.workspace = true
+markdown.workspace = true
 lsp.workspace = true
+menu.workspace = true
 moka.workspace = true
 node_runtime.workspace = true
 paths.workspace = true
@@ -43,11 +48,16 @@ serde.workspace = true
 serde_json.workspace = true
 serde_json_lenient.workspace = true
 settings.workspace = true
+smol.workspace = true
 task.workspace = true
 telemetry.workspace = true
 tempfile.workspace = true
+theme.workspace = true
 toml.workspace = true
+ui.workspace = true
+ui_input.workspace = true
 url.workspace = true
+workspace.workspace = true
 util.workspace = true
 wasmparser.workspace = true
 wasmtime-wasi.workspace = true

crates/extension_host/src/anthropic_migration.rs

@@ -0,0 +1,124 @@
+use credentials_provider::CredentialsProvider;
+use gpui::App;
+
+const ANTHROPIC_EXTENSION_ID: &str = "anthropic";
+const ANTHROPIC_PROVIDER_ID: &str = "anthropic";
+const ANTHROPIC_DEFAULT_API_URL: &str = "https://api.anthropic.com";
+
+/// Migrates Anthropic API credentials from the old built-in provider location
+/// to the new extension-based location.
+///
+/// This should only be called during auto-install of the extension.
+pub fn migrate_anthropic_credentials_if_needed(extension_id: &str, cx: &mut App) {
+    if extension_id != ANTHROPIC_EXTENSION_ID {
+        return;
+    }
+
+    let extension_credential_key = format!(
+        "extension-llm-{}:{}",
+        ANTHROPIC_EXTENSION_ID, ANTHROPIC_PROVIDER_ID
+    );
+
+    let credentials_provider = <dyn CredentialsProvider>::global(cx);
+
+    cx.spawn(async move |cx| {
+        // Read from old location
+        let old_credential = credentials_provider
+            .read_credentials(ANTHROPIC_DEFAULT_API_URL, &cx)
+            .await
+            .ok()
+            .flatten();
+
+        let api_key = match old_credential {
+            Some((_, key_bytes)) => match String::from_utf8(key_bytes) {
+                Ok(key) if !key.is_empty() => key,
+                Ok(_) => {
+                    log::debug!("Existing Anthropic API key is empty, nothing to migrate");
+                    return;
+                }
+                Err(_) => {
+                    log::error!("Failed to decode Anthropic API key as UTF-8");
+                    return;
+                }
+            },
+            None => {
+                log::debug!("No existing Anthropic API key found to migrate");
+                return;
+            }
+        };
+
+        log::info!("Migrating existing Anthropic API key to Anthropic extension");
+
+        match credentials_provider
+            .write_credentials(&extension_credential_key, "Bearer", api_key.as_bytes(), &cx)
+            .await
+        {
+            Ok(()) => {
+                log::info!("Successfully migrated Anthropic API key to extension");
+            }
+            Err(err) => {
+                log::error!("Failed to migrate Anthropic API key: {}", err);
+            }
+        }
+    })
+    .detach();
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+
+    #[gpui::test]
+    async fn test_migrates_credentials_from_old_location(cx: &mut TestAppContext) {
+        let api_key = "sk-ant-test-key-12345";
+
+        cx.write_credentials(ANTHROPIC_DEFAULT_API_URL, "Bearer", api_key.as_bytes());
+
+        cx.update(|cx| {
+            migrate_anthropic_credentials_if_needed(ANTHROPIC_EXTENSION_ID, cx);
+        });
+
+        cx.run_until_parked();
+
+        let migrated = cx.read_credentials("extension-llm-anthropic:anthropic");
+        assert!(migrated.is_some(), "Credentials should have been migrated");
+        let (username, password) = migrated.unwrap();
+        assert_eq!(username, "Bearer");
+        assert_eq!(String::from_utf8(password).unwrap(), api_key);
+    }
+
+    #[gpui::test]
+    async fn test_no_migration_if_no_old_credentials(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            migrate_anthropic_credentials_if_needed(ANTHROPIC_EXTENSION_ID, cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-anthropic:anthropic");
+        assert!(
+            credentials.is_none(),
+            "Should not create credentials if none existed"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_skips_migration_for_other_extensions(cx: &mut TestAppContext) {
+        let api_key = "sk-ant-test-key";
+
+        cx.write_credentials(ANTHROPIC_DEFAULT_API_URL, "Bearer", api_key.as_bytes());
+
+        cx.update(|cx| {
+            migrate_anthropic_credentials_if_needed("some-other-extension", cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-anthropic:anthropic");
+        assert!(
+            credentials.is_none(),
+            "Should not migrate for other extensions"
+        );
+    }
+}

crates/extension_host/src/copilot_migration.rs

@@ -0,0 +1,216 @@
+use credentials_provider::CredentialsProvider;
+use gpui::App;
+use std::path::PathBuf;
+
+const COPILOT_CHAT_EXTENSION_ID: &str = "copilot-chat";
+const COPILOT_CHAT_PROVIDER_ID: &str = "copilot-chat";
+
+/// Migrates Copilot OAuth credentials from the GitHub Copilot config files
+/// to the new extension-based credential location.
+///
+/// This should only be called during auto-install of the extension.
+pub fn migrate_copilot_credentials_if_needed(extension_id: &str, cx: &mut App) {
+    if extension_id != COPILOT_CHAT_EXTENSION_ID {
+        return;
+    }
+
+    let credential_key = format!(
+        "extension-llm-{}:{}",
+        COPILOT_CHAT_EXTENSION_ID, COPILOT_CHAT_PROVIDER_ID
+    );
+
+    let credentials_provider = <dyn CredentialsProvider>::global(cx);
+
+    cx.spawn(async move |_cx| {
+        // Read from copilot config files
+        let oauth_token = match read_copilot_oauth_token().await {
+            Some(token) if !token.is_empty() => token,
+            _ => {
+                log::debug!("No existing Copilot OAuth token found to migrate");
+                return;
+            }
+        };
+
+        log::info!("Migrating existing Copilot OAuth token to Copilot Chat extension");
+
+        match credentials_provider
+            .write_credentials(&credential_key, "api_key", oauth_token.as_bytes(), &_cx)
+            .await
+        {
+            Ok(()) => {
+                log::info!("Successfully migrated Copilot OAuth token to Copilot Chat extension");
+            }
+            Err(err) => {
+                log::error!("Failed to migrate Copilot OAuth token: {}", err);
+            }
+        }
+    })
+    .detach();
+}
+
+async fn read_copilot_oauth_token() -> Option<String> {
+    let config_paths = copilot_config_paths();
+
+    for path in config_paths {
+        if let Some(token) = read_oauth_token_from_file(&path).await {
+            return Some(token);
+        }
+    }
+
+    None
+}
+
+fn copilot_config_paths() -> Vec<PathBuf> {
+    let config_dir = if cfg!(target_os = "windows") {
+        dirs::data_local_dir()
+    } else {
+        std::env::var("XDG_CONFIG_HOME")
+            .map(PathBuf::from)
+            .ok()
+            .or_else(|| dirs::home_dir().map(|h| h.join(".config")))
+    };
+
+    let Some(config_dir) = config_dir else {
+        return Vec::new();
+    };
+
+    let copilot_dir = config_dir.join("github-copilot");
+
+    vec![
+        copilot_dir.join("hosts.json"),
+        copilot_dir.join("apps.json"),
+    ]
+}
+
+async fn read_oauth_token_from_file(path: &PathBuf) -> Option<String> {
+    let contents = match smol::fs::read_to_string(path).await {
+        Ok(contents) => contents,
+        Err(_) => return None,
+    };
+
+    extract_oauth_token(&contents, "github.com")
+}
+
+fn extract_oauth_token(contents: &str, domain: &str) -> Option<String> {
+    let value: serde_json::Value = serde_json::from_str(contents).ok()?;
+    let obj = value.as_object()?;
+
+    for (key, value) in obj.iter() {
+        if key.starts_with(domain) {
+            if let Some(token) = value.get("oauth_token").and_then(|v| v.as_str()) {
+                return Some(token.to_string());
+            }
+        }
+    }
+
+    None
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+
+    #[test]
+    fn test_extract_oauth_token_from_hosts_json() {
+        let contents = r#"{
+            "github.com": {
+                "oauth_token": "ghu_test_token_12345"
+            }
+        }"#;
+
+        let token = extract_oauth_token(contents, "github.com");
+        assert_eq!(token, Some("ghu_test_token_12345".to_string()));
+    }
+
+    #[test]
+    fn test_extract_oauth_token_with_user_suffix() {
+        let contents = r#"{
+            "github.com:user": {
+                "oauth_token": "ghu_another_token"
+            }
+        }"#;
+
+        let token = extract_oauth_token(contents, "github.com");
+        assert_eq!(token, Some("ghu_another_token".to_string()));
+    }
+
+    #[test]
+    fn test_extract_oauth_token_wrong_domain() {
+        let contents = r#"{
+            "gitlab.com": {
+                "oauth_token": "some_token"
+            }
+        }"#;
+
+        let token = extract_oauth_token(contents, "github.com");
+        assert_eq!(token, None);
+    }
+
+    #[test]
+    fn test_extract_oauth_token_invalid_json() {
+        let contents = "not valid json";
+        let token = extract_oauth_token(contents, "github.com");
+        assert_eq!(token, None);
+    }
+
+    #[test]
+    fn test_extract_oauth_token_missing_oauth_token_field() {
+        let contents = r#"{
+            "github.com": {
+                "user": "testuser"
+            }
+        }"#;
+
+        let token = extract_oauth_token(contents, "github.com");
+        assert_eq!(token, None);
+    }
+
+    #[test]
+    fn test_extract_oauth_token_multiple_entries_picks_first_match() {
+        let contents = r#"{
+            "gitlab.com": {
+                "oauth_token": "gitlab_token"
+            },
+            "github.com": {
+                "oauth_token": "github_token"
+            }
+        }"#;
+
+        let token = extract_oauth_token(contents, "github.com");
+        assert_eq!(token, Some("github_token".to_string()));
+    }
+
+    #[gpui::test]
+    async fn test_skips_migration_for_other_extensions(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            migrate_copilot_credentials_if_needed("some-other-extension", cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-copilot-chat:copilot-chat");
+        assert!(
+            credentials.is_none(),
+            "Should not create credentials for other extensions"
+        );
+    }
+
+    // Note: Unlike the other migrations, copilot migration reads from the filesystem
+    // (copilot config files), not from the credentials provider. In tests, these files
+    // don't exist, so no migration occurs.
+    #[gpui::test]
+    async fn test_no_credentials_when_no_copilot_config_exists(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            migrate_copilot_credentials_if_needed(COPILOT_CHAT_EXTENSION_ID, cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-copilot-chat:copilot-chat");
+        assert!(
+            credentials.is_none(),
+            "No credentials should be written when copilot config doesn't exist"
+        );
+    }
+}

crates/extension_host/src/extension_host.rs

@@ -1,6 +1,11 @@
+mod anthropic_migration;
 mod capability_granter;
+mod copilot_migration;
 pub mod extension_settings;
+mod google_ai_migration;
 pub mod headless_host;
+mod open_router_migration;
+mod openai_migration;
 pub mod wasm_host;
 
 #[cfg(test)]
@@ -12,13 +17,14 @@ use async_tar::Archive;
 use client::ExtensionProvides;
 use client::{Client, ExtensionMetadata, GetExtensionsResponse, proto, telemetry::Telemetry};
 use collections::{BTreeMap, BTreeSet, HashSet, btree_map};
+
 pub use extension::ExtensionManifest;
 use extension::extension_builder::{CompileExtensionOptions, ExtensionBuilder};
 use extension::{
     ExtensionContextServerProxy, ExtensionDebugAdapterProviderProxy, ExtensionEvents,
-    ExtensionGrammarProxy, ExtensionHostProxy, ExtensionLanguageProxy,
-    ExtensionLanguageServerProxy, ExtensionSlashCommandProxy, ExtensionSnippetProxy,
-    ExtensionThemeProxy,
+    ExtensionGrammarProxy, ExtensionHostProxy, ExtensionLanguageModelProviderProxy,
+    ExtensionLanguageProxy, ExtensionLanguageServerProxy, ExtensionSlashCommandProxy,
+    ExtensionSnippetProxy, ExtensionThemeProxy,
 };
 use fs::{Fs, RemoveOptions};
 use futures::future::join_all;
@@ -32,8 +38,8 @@ use futures::{
     select_biased,
 };
 use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Global, Task, WeakEntity,
-    actions,
+    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Global, SharedString, Task,
+    WeakEntity, actions,
 };
 use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};
 use language::{
@@ -53,15 +59,28 @@ use std::{
     cmp::Ordering,
     path::{self, Path, PathBuf},
     sync::Arc,
-    time::{Duration, Instant},
+    time::Duration,
 };
 use url::Url;
 use util::{ResultExt, paths::RemotePathBuf};
+use wasm_host::llm_provider::ExtensionLanguageModelProvider;
 use wasm_host::{
     WasmExtension, WasmHost,
-    wit::{is_supported_wasm_api_version, wasm_api_version_range},
+    wit::{
+        LlmCacheConfiguration, LlmModelInfo, LlmProviderInfo, is_supported_wasm_api_version,
+        wasm_api_version_range,
+    },
 };
 
+struct LlmProviderWithModels {
+    provider_info: LlmProviderInfo,
+    models: Vec<LlmModelInfo>,
+    cache_configs: collections::HashMap<String, LlmCacheConfiguration>,
+    is_authenticated: bool,
+    icon_path: Option<SharedString>,
+    auth_config: Option<extension::LanguageModelAuthConfig>,
+}
+
 pub use extension::{
     ExtensionLibraryKind, GrammarManifestEntry, OldExtensionManifest, SchemaVersion,
 };
@@ -70,6 +89,82 @@ pub use extension_settings::ExtensionSettings;
 pub const RELOAD_DEBOUNCE_DURATION: Duration = Duration::from_millis(200);
 const FS_WATCH_LATENCY: Duration = Duration::from_millis(100);
 
+/// Extension IDs that are being migrated from hardcoded LLM providers.
+/// For backwards compatibility, if the user has the corresponding env var set,
+/// we automatically enable env var reading for these extensions on first install.
+pub const LEGACY_LLM_EXTENSION_IDS: &[&str] = &[
+    "anthropic",
+    "copilot-chat",
+    "google-ai",
+    "openrouter",
+    "openai",
+];
+
+/// Migrates legacy LLM provider extensions by auto-enabling env var reading
+/// if the env var is currently present in the environment.
+///
+/// This is idempotent: if the env var is already in `allowed_env_vars`,
+/// we skip. This means if a user explicitly removes it, it will be re-added on
+/// next launch if the env var is still set - but that's predictable behavior.
+fn migrate_legacy_llm_provider_env_var(manifest: &ExtensionManifest, cx: &mut App) {
+    // Only apply migration to known legacy LLM extensions
+    if !LEGACY_LLM_EXTENSION_IDS.contains(&manifest.id.as_ref()) {
+        return;
+    }
+
+    // Check each provider in the manifest
+    for (provider_id, provider_entry) in &manifest.language_model_providers {
+        let Some(auth_config) = &provider_entry.auth else {
+            continue;
+        };
+        let Some(env_vars) = &auth_config.env_vars else {
+            continue;
+        };
+
+        let full_provider_id = format!("{}:{}", manifest.id, provider_id);
+
+        // For each env var, check if it's set and enable it if so
+        for env_var_name in env_vars {
+            let env_var_is_set = std::env::var(env_var_name)
+                .map(|v| !v.is_empty())
+                .unwrap_or(false);
+
+            if !env_var_is_set {
+                continue;
+            }
+
+            let settings_key: Arc<str> = format!("{}:{}", full_provider_id, env_var_name).into();
+
+            // Check if already enabled in settings
+            let already_enabled = ExtensionSettings::get_global(cx)
+                .allowed_env_var_providers
+                .contains(settings_key.as_ref());
+
+            if already_enabled {
+                continue;
+            }
+
+            // Enable env var reading since the env var is set
+            settings::update_settings_file(<dyn fs::Fs>::global(cx), cx, {
+                let settings_key = settings_key.clone();
+                move |settings, _| {
+                    let allowed = settings
+                        .extension
+                        .allowed_env_var_providers
+                        .get_or_insert_with(Vec::new);
+
+                    if !allowed
+                        .iter()
+                        .any(|id| id.as_ref() == settings_key.as_ref())
+                    {
+                        allowed.push(settings_key);
+                    }
+                }
+            });
+        }
+    }
+}
+
 /// The current extension [`SchemaVersion`] supported by Zed.
 const CURRENT_SCHEMA_VERSION: SchemaVersion = SchemaVersion(1);
 
@@ -131,6 +226,8 @@ pub struct ExtensionStore {
 pub enum ExtensionOperation {
     Upgrade,
     Install,
+    /// Auto-install from settings - triggers legacy LLM provider migrations
+    AutoInstall,
     Remove,
 }
 
@@ -613,8 +710,60 @@ impl ExtensionStore {
 
         cx.spawn(async move |this, cx| {
             for extension_id in extensions_to_install {
+                // When enabled, this checks if an extension exists locally in the repo's extensions/
+                // directory and installs it as a dev extension instead of fetching from the registry.
+                // This is useful for testing auto-installed extensions before they've been published.
+                // Set to `true` only during local development/testing of new auto-install extensions.
+                #[cfg(debug_assertions)]
+                const DEBUG_ALLOW_UNPUBLISHED_AUTO_EXTENSIONS: bool = false;
+
+                #[cfg(debug_assertions)]
+                if DEBUG_ALLOW_UNPUBLISHED_AUTO_EXTENSIONS {
+                    let local_extension_path = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+                        .parent()
+                        .unwrap()
+                        .parent()
+                        .unwrap()
+                        .join("extensions")
+                        .join(extension_id.as_ref());
+
+                    if local_extension_path.exists() {
+                        // Force-remove existing extension directory if it exists and isn't a symlink
+                        // This handles the case where the extension was previously installed from the registry
+                        if let Some(installed_dir) = this
+                            .update(cx, |this, _cx| this.installed_dir.clone())
+                            .ok()
+                        {
+                            let existing_path = installed_dir.join(extension_id.as_ref());
+                            if existing_path.exists() {
+                                let metadata = std::fs::symlink_metadata(&existing_path);
+                                let is_symlink = metadata.map(|m| m.is_symlink()).unwrap_or(false);
+                                if !is_symlink {
+                                    if let Err(e) = std::fs::remove_dir_all(&existing_path) {
+                                        log::error!(
+                                            "Failed to remove existing extension directory {:?}: {}",
+                                            existing_path,
+                                            e
+                                        );
+                                    }
+                                }
+                            }
+                        }
+
+                        if let Some(task) = this
+                            .update(cx, |this, cx| {
+                                this.install_dev_extension(local_extension_path, cx)
+                            })
+                            .ok()
+                        {
+                            task.await.log_err();
+                        }
+                        continue;
+                    }
+                }
+
                 this.update(cx, |this, cx| {
-                    this.install_latest_extension(extension_id.clone(), cx);
+                    this.auto_install_latest_extension(extension_id.clone(), cx);
                 })
                 .ok();
             }
@@ -769,7 +918,10 @@ impl ExtensionStore {
             this.update(cx, |this, cx| this.reload(Some(extension_id.clone()), cx))?
                 .await;
 
-            if let ExtensionOperation::Install = operation {
+            if matches!(
+                operation,
+                ExtensionOperation::Install | ExtensionOperation::AutoInstall
+            ) {
                 this.update(cx, |this, cx| {
                     cx.emit(Event::ExtensionInstalled(extension_id.clone()));
                     if let Some(events) = ExtensionEvents::try_global(cx)
@@ -779,6 +931,27 @@ impl ExtensionStore {
                             this.emit(extension::Event::ExtensionInstalled(manifest.clone()), cx)
                         });
                     }
+
+                    // Run legacy LLM provider migrations only for auto-installed extensions
+                    if matches!(operation, ExtensionOperation::AutoInstall) {
+                        if let Some(manifest) = this.extension_manifest_for_id(&extension_id) {
+                            migrate_legacy_llm_provider_env_var(&manifest, cx);
+                        }
+                        copilot_migration::migrate_copilot_credentials_if_needed(&extension_id, cx);
+                        anthropic_migration::migrate_anthropic_credentials_if_needed(
+                            &extension_id,
+                            cx,
+                        );
+                        google_ai_migration::migrate_google_ai_credentials_if_needed(
+                            &extension_id,
+                            cx,
+                        );
+                        openai_migration::migrate_openai_credentials_if_needed(&extension_id, cx);
+                        open_router_migration::migrate_open_router_credentials_if_needed(
+                            &extension_id,
+                            cx,
+                        );
+                    }
                 })
                 .ok();
             }
@@ -788,8 +961,24 @@ impl ExtensionStore {
     }
 
     pub fn install_latest_extension(&mut self, extension_id: Arc<str>, cx: &mut Context<Self>) {
-        log::info!("installing extension {extension_id} latest version");
+        self.install_latest_extension_with_operation(extension_id, ExtensionOperation::Install, cx);
+    }
 
+    /// Auto-install an extension, triggering legacy LLM provider migrations.
+    fn auto_install_latest_extension(&mut self, extension_id: Arc<str>, cx: &mut Context<Self>) {
+        self.install_latest_extension_with_operation(
+            extension_id,
+            ExtensionOperation::AutoInstall,
+            cx,
+        );
+    }
+
+    fn install_latest_extension_with_operation(
+        &mut self,
+        extension_id: Arc<str>,
+        operation: ExtensionOperation,
+        cx: &mut Context<Self>,
+    ) {
         let schema_versions = schema_version_range();
         let wasm_api_versions = wasm_api_version_range(ReleaseChannel::global(cx));
 
@@ -812,13 +1001,8 @@ impl ExtensionStore {
             return;
         };
 
-        self.install_or_upgrade_extension_at_endpoint(
-            extension_id,
-            url,
-            ExtensionOperation::Install,
-            cx,
-        )
-        .detach_and_log_err(cx);
+        self.install_or_upgrade_extension_at_endpoint(extension_id, url, operation, cx)
+            .detach_and_log_err(cx);
     }
 
     pub fn upgrade_extension(
@@ -837,7 +1021,6 @@ impl ExtensionStore {
         operation: ExtensionOperation,
         cx: &mut Context<Self>,
     ) -> Task<Result<()>> {
-        log::info!("installing extension {extension_id} {version}");
         let Some(url) = self
             .http_client
             .build_zed_api_url(
@@ -1013,9 +1196,37 @@ impl ExtensionStore {
                 }
             }
 
-            fs.create_symlink(output_path, extension_source_path)
+            fs.create_symlink(output_path, extension_source_path.clone())
                 .await?;
 
+            // Re-load manifest and run migrations before reload so settings are updated before providers are registered
+            let manifest_for_migration =
+                ExtensionManifest::load(fs.clone(), &extension_source_path).await?;
+            this.update(cx, |_this, cx| {
+                migrate_legacy_llm_provider_env_var(&manifest_for_migration, cx);
+                // Also run credential migrations for dev extensions
+                copilot_migration::migrate_copilot_credentials_if_needed(
+                    manifest_for_migration.id.as_ref(),
+                    cx,
+                );
+                anthropic_migration::migrate_anthropic_credentials_if_needed(
+                    manifest_for_migration.id.as_ref(),
+                    cx,
+                );
+                google_ai_migration::migrate_google_ai_credentials_if_needed(
+                    manifest_for_migration.id.as_ref(),
+                    cx,
+                );
+                openai_migration::migrate_openai_credentials_if_needed(
+                    manifest_for_migration.id.as_ref(),
+                    cx,
+                );
+                open_router_migration::migrate_open_router_credentials_if_needed(
+                    manifest_for_migration.id.as_ref(),
+                    cx,
+                );
+            })?;
+
             this.update(cx, |this, cx| this.reload(None, cx))?.await;
             this.update(cx, |this, cx| {
                 cx.emit(Event::ExtensionInstalled(extension_id.clone()));
@@ -1134,18 +1345,6 @@ impl ExtensionStore {
             return Task::ready(());
         }
 
-        let reload_count = extensions_to_unload
-            .iter()
-            .filter(|id| extensions_to_load.contains(id))
-            .count();
-
-        log::info!(
-            "extensions updated. loading {}, reloading {}, unloading {}",
-            extensions_to_load.len() - reload_count,
-            reload_count,
-            extensions_to_unload.len() - reload_count
-        );
-
         let extension_ids = extensions_to_load
             .iter()
             .filter_map(|id| {
@@ -1220,6 +1419,11 @@ impl ExtensionStore {
             for command_name in extension.manifest.slash_commands.keys() {
                 self.proxy.unregister_slash_command(command_name.clone());
             }
+            for provider_id in extension.manifest.language_model_providers.keys() {
+                let full_provider_id: Arc<str> = format!("{}:{}", extension_id, provider_id).into();
+                self.proxy
+                    .unregister_language_model_provider(full_provider_id, cx);
+            }
         }
 
         self.wasm_extensions
@@ -1358,7 +1562,11 @@ impl ExtensionStore {
             })
             .await;
 
-            let mut wasm_extensions = Vec::new();
+            let mut wasm_extensions: Vec<(
+                Arc<ExtensionManifest>,
+                WasmExtension,
+                Vec<LlmProviderWithModels>,
+            )> = Vec::new();
             for extension in extension_entries {
                 if extension.manifest.lib.kind.is_none() {
                     continue;
@@ -1376,7 +1584,149 @@ impl ExtensionStore {
 
                 match wasm_extension {
                     Ok(wasm_extension) => {
-                        wasm_extensions.push((extension.manifest.clone(), wasm_extension))
+                        // Query for LLM providers if the manifest declares any
+                        let mut llm_providers_with_models = Vec::new();
+                        if !extension.manifest.language_model_providers.is_empty() {
+                            let providers_result = wasm_extension
+                                .call(|ext, store| {
+                                    async move { ext.call_llm_providers(store).await }.boxed()
+                                })
+                                .await;
+
+                            if let Ok(Ok(providers)) = providers_result {
+                                for provider_info in providers {
+                                    let models_result = wasm_extension
+                                        .call({
+                                            let provider_id = provider_info.id.clone();
+                                            |ext, store| {
+                                                async move {
+                                                    ext.call_llm_provider_models(store, &provider_id)
+                                                        .await
+                                                }
+                                                .boxed()
+                                            }
+                                        })
+                                        .await;
+
+                                    let models: Vec<LlmModelInfo> = match models_result {
+                                        Ok(Ok(Ok(models))) => models,
+                                        Ok(Ok(Err(e))) => {
+                                            log::error!(
+                                                "Failed to get models for LLM provider {} in extension {}: {}",
+                                                provider_info.id,
+                                                extension.manifest.id,
+                                                e
+                                            );
+                                            Vec::new()
+                                        }
+                                        Ok(Err(e)) => {
+                                            log::error!(
+                                                "Wasm error calling llm_provider_models for {} in extension {}: {:?}",
+                                                provider_info.id,
+                                                extension.manifest.id,
+                                                e
+                                            );
+                                            Vec::new()
+                                        }
+                                        Err(e) => {
+                                            log::error!(
+                                                "Extension call failed for llm_provider_models {} in extension {}: {:?}",
+                                                provider_info.id,
+                                                extension.manifest.id,
+                                                e
+                                            );
+                                            Vec::new()
+                                        }
+                                    };
+
+                                    // Query cache configurations for each model
+                                    let mut cache_configs = collections::HashMap::default();
+                                    for model in &models {
+                                        let cache_config_result = wasm_extension
+                                            .call({
+                                                let provider_id = provider_info.id.clone();
+                                                let model_id = model.id.clone();
+                                                |ext, store| {
+                                                    async move {
+                                                        ext.call_llm_cache_configuration(
+                                                            store,
+                                                            &provider_id,
+                                                            &model_id,
+                                                        )
+                                                        .await
+                                                    }
+                                                    .boxed()
+                                                }
+                                            })
+                                            .await;
+
+                                        if let Ok(Ok(Some(config))) = cache_config_result {
+                                            cache_configs.insert(model.id.clone(), config);
+                                        }
+                                    }
+
+                                    // Query initial authentication state
+                                    let is_authenticated = wasm_extension
+                                        .call({
+                                            let provider_id = provider_info.id.clone();
+                                            |ext, store| {
+                                                async move {
+                                                    ext.call_llm_provider_is_authenticated(
+                                                        store,
+                                                        &provider_id,
+                                                    )
+                                                    .await
+                                                }
+                                                .boxed()
+                                            }
+                                        })
+                                        .await
+                                        .unwrap_or(Ok(false))
+                                        .unwrap_or(false);
+
+                                    // Resolve icon path if provided
+                                    let icon_path = provider_info.icon.as_ref().map(|icon| {
+                                        let icon_file_path = extension_path.join(icon);
+                                        // Canonicalize to resolve symlinks (dev extensions are symlinked)
+                                        let absolute_icon_path = icon_file_path
+                                            .canonicalize()
+                                            .unwrap_or(icon_file_path)
+                                            .to_string_lossy()
+                                            .to_string();
+                                        SharedString::from(absolute_icon_path)
+                                    });
+
+                                    let provider_id_arc: Arc<str> =
+                                        provider_info.id.as_str().into();
+                                    let auth_config = extension
+                                        .manifest
+                                        .language_model_providers
+                                        .get(&provider_id_arc)
+                                        .and_then(|entry| entry.auth.clone());
+
+                                    llm_providers_with_models.push(LlmProviderWithModels {
+                                        provider_info,
+                                        models,
+                                        cache_configs,
+                                        is_authenticated,
+                                        icon_path,
+                                        auth_config,
+                                    });
+                                }
+                            } else {
+                                log::error!(
+                                    "Failed to get LLM providers from extension {}: {:?}",
+                                    extension.manifest.id,
+                                    providers_result
+                                );
+                            }
+                        }
+
+                        wasm_extensions.push((
+                            extension.manifest.clone(),
+                            wasm_extension,
+                            llm_providers_with_models,
+                        ))
                     }
                     Err(e) => {
                         log::error!(
@@ -1395,7 +1745,7 @@ impl ExtensionStore {
             this.update(cx, |this, cx| {
                 this.reload_complete_senders.clear();
 
-                for (manifest, wasm_extension) in &wasm_extensions {
+                for (manifest, wasm_extension, llm_providers_with_models) in &wasm_extensions {
                     let extension = Arc::new(wasm_extension.clone());
 
                     for (language_server_id, language_server_config) in &manifest.language_servers {
@@ -1449,9 +1799,42 @@ impl ExtensionStore {
                         this.proxy
                             .register_debug_locator(extension.clone(), debug_adapter.clone());
                     }
+
+                    // Register LLM providers
+                    for llm_provider in llm_providers_with_models {
+                        let provider_id: Arc<str> =
+                            format!("{}:{}", manifest.id, llm_provider.provider_info.id).into();
+                        let wasm_ext = extension.as_ref().clone();
+                        let pinfo = llm_provider.provider_info.clone();
+                        let mods = llm_provider.models.clone();
+                        let cache_cfgs = llm_provider.cache_configs.clone();
+                        let auth = llm_provider.is_authenticated;
+                        let icon = llm_provider.icon_path.clone();
+                        let auth_config = llm_provider.auth_config.clone();
+
+                        this.proxy.register_language_model_provider(
+                            provider_id.clone(),
+                            Box::new(move |cx: &mut App| {
+                                let provider = Arc::new(ExtensionLanguageModelProvider::new(
+                                    wasm_ext, pinfo, mods, cache_cfgs, auth, icon, auth_config, cx,
+                                ));
+                                language_model::LanguageModelRegistry::global(cx).update(
+                                    cx,
+                                    |registry, cx| {
+                                        registry.register_provider(provider, cx);
+                                    },
+                                );
+                            }),
+                            cx,
+                        );
+                    }
                 }
 
-                this.wasm_extensions.extend(wasm_extensions);
+                let wasm_extensions_without_llm: Vec<_> = wasm_extensions
+                    .into_iter()
+                    .map(|(manifest, ext, _)| (manifest, ext))
+                    .collect();
+                this.wasm_extensions.extend(wasm_extensions_without_llm);
                 this.proxy.set_extensions_loaded();
                 this.proxy.reload_current_theme(cx);
                 this.proxy.reload_current_icon_theme(cx);
@@ -1473,7 +1856,6 @@ impl ExtensionStore {
         let index_path = self.index_path.clone();
         let proxy = self.proxy.clone();
         cx.background_spawn(async move {
-            let start_time = Instant::now();
             let mut index = ExtensionIndex::default();
 
             fs.create_dir(&work_dir).await.log_err();
@@ -1511,7 +1893,6 @@ impl ExtensionStore {
                     .log_err();
             }
 
-            log::info!("rebuilt extension index in {:?}", start_time.elapsed());
             index
         })
     }
@@ -1785,11 +2166,6 @@ impl ExtensionStore {
                     })?,
                 path_style,
             );
-            log::info!(
-                "Uploading extension {} to {:?}",
-                missing_extension.clone().id,
-                dest_dir
-            );
 
             client
                 .update(cx, |client, cx| {
@@ -1797,11 +2173,6 @@ impl ExtensionStore {
                 })?
                 .await?;
 
-            log::info!(
-                "Finished uploading extension {}",
-                missing_extension.clone().id
-            );
-
             let result = client
                 .update(cx, |client, _cx| {
                     client.proto_client().request(proto::InstallExtension {

crates/extension_host/src/extension_settings.rs

@@ -1,4 +1,4 @@
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use extension::{
     DownloadFileCapability, ExtensionCapability, NpmInstallPackageCapability, ProcessExecCapability,
 };
@@ -16,6 +16,10 @@ pub struct ExtensionSettings {
     pub auto_install_extensions: HashMap<Arc<str>, bool>,
     pub auto_update_extensions: HashMap<Arc<str>, bool>,
     pub granted_capabilities: Vec<ExtensionCapability>,
+    /// The extension language model providers that are allowed to read API keys
+    /// from environment variables. Each entry is in the format
+    /// "extension_id:provider_id:ENV_VAR_NAME".
+    pub allowed_env_var_providers: HashSet<Arc<str>>,
 }
 
 impl ExtensionSettings {
@@ -60,6 +64,13 @@ impl Settings for ExtensionSettings {
                     }
                 })
                 .collect(),
+            allowed_env_var_providers: content
+                .extension
+                .allowed_env_var_providers
+                .clone()
+                .unwrap_or_default()
+                .into_iter()
+                .collect(),
         }
     }
 }

crates/extension_host/src/google_ai_migration.rs

@@ -0,0 +1,124 @@
+use credentials_provider::CredentialsProvider;
+use gpui::App;
+
+const GOOGLE_AI_EXTENSION_ID: &str = "google-ai";
+const GOOGLE_AI_PROVIDER_ID: &str = "google-ai";
+const GOOGLE_AI_DEFAULT_API_URL: &str = "https://generativelanguage.googleapis.com";
+
+/// Migrates Google AI API credentials from the old built-in provider location
+/// to the new extension-based location.
+///
+/// This should only be called during auto-install of the extension.
+pub fn migrate_google_ai_credentials_if_needed(extension_id: &str, cx: &mut App) {
+    if extension_id != GOOGLE_AI_EXTENSION_ID {
+        return;
+    }
+
+    let extension_credential_key = format!(
+        "extension-llm-{}:{}",
+        GOOGLE_AI_EXTENSION_ID, GOOGLE_AI_PROVIDER_ID
+    );
+
+    let credentials_provider = <dyn CredentialsProvider>::global(cx);
+
+    cx.spawn(async move |cx| {
+        // Read from old location
+        let old_credential = credentials_provider
+            .read_credentials(GOOGLE_AI_DEFAULT_API_URL, &cx)
+            .await
+            .ok()
+            .flatten();
+
+        let api_key = match old_credential {
+            Some((_, key_bytes)) => match String::from_utf8(key_bytes) {
+                Ok(key) if !key.is_empty() => key,
+                Ok(_) => {
+                    log::debug!("Existing Google AI API key is empty, nothing to migrate");
+                    return;
+                }
+                Err(_) => {
+                    log::error!("Failed to decode Google AI API key as UTF-8");
+                    return;
+                }
+            },
+            None => {
+                log::debug!("No existing Google AI API key found to migrate");
+                return;
+            }
+        };
+
+        log::info!("Migrating existing Google AI API key to Google AI extension");
+
+        match credentials_provider
+            .write_credentials(&extension_credential_key, "Bearer", api_key.as_bytes(), &cx)
+            .await
+        {
+            Ok(()) => {
+                log::info!("Successfully migrated Google AI API key to extension");
+            }
+            Err(err) => {
+                log::error!("Failed to migrate Google AI API key: {}", err);
+            }
+        }
+    })
+    .detach();
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+
+    #[gpui::test]
+    async fn test_migrates_credentials_from_old_location(cx: &mut TestAppContext) {
+        let api_key = "AIzaSy-test-key-12345";
+
+        cx.write_credentials(GOOGLE_AI_DEFAULT_API_URL, "Bearer", api_key.as_bytes());
+
+        cx.update(|cx| {
+            migrate_google_ai_credentials_if_needed(GOOGLE_AI_EXTENSION_ID, cx);
+        });
+
+        cx.run_until_parked();
+
+        let migrated = cx.read_credentials("extension-llm-google-ai:google-ai");
+        assert!(migrated.is_some(), "Credentials should have been migrated");
+        let (username, password) = migrated.unwrap();
+        assert_eq!(username, "Bearer");
+        assert_eq!(String::from_utf8(password).unwrap(), api_key);
+    }
+
+    #[gpui::test]
+    async fn test_no_migration_if_no_old_credentials(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            migrate_google_ai_credentials_if_needed(GOOGLE_AI_EXTENSION_ID, cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-google-ai:google-ai");
+        assert!(
+            credentials.is_none(),
+            "Should not create credentials if none existed"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_skips_migration_for_other_extensions(cx: &mut TestAppContext) {
+        let api_key = "AIzaSy-test-key";
+
+        cx.write_credentials(GOOGLE_AI_DEFAULT_API_URL, "Bearer", api_key.as_bytes());
+
+        cx.update(|cx| {
+            migrate_google_ai_credentials_if_needed("some-other-extension", cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-google-ai:google-ai");
+        assert!(
+            credentials.is_none(),
+            "Should not migrate for other extensions"
+        );
+    }
+}

crates/extension_host/src/open_router_migration.rs

@@ -0,0 +1,124 @@
+use credentials_provider::CredentialsProvider;
+use gpui::App;
+
+const OPEN_ROUTER_EXTENSION_ID: &str = "openrouter";
+const OPEN_ROUTER_PROVIDER_ID: &str = "openrouter";
+const OPEN_ROUTER_DEFAULT_API_URL: &str = "https://openrouter.ai/api/v1";
+
+/// Migrates OpenRouter API credentials from the old built-in provider location
+/// to the new extension-based location.
+///
+/// This should only be called during auto-install of the extension.
+pub fn migrate_open_router_credentials_if_needed(extension_id: &str, cx: &mut App) {
+    if extension_id != OPEN_ROUTER_EXTENSION_ID {
+        return;
+    }
+
+    let extension_credential_key = format!(
+        "extension-llm-{}:{}",
+        OPEN_ROUTER_EXTENSION_ID, OPEN_ROUTER_PROVIDER_ID
+    );
+
+    let credentials_provider = <dyn CredentialsProvider>::global(cx);
+
+    cx.spawn(async move |cx| {
+        // Read from old location
+        let old_credential = credentials_provider
+            .read_credentials(OPEN_ROUTER_DEFAULT_API_URL, &cx)
+            .await
+            .ok()
+            .flatten();
+
+        let api_key = match old_credential {
+            Some((_, key_bytes)) => match String::from_utf8(key_bytes) {
+                Ok(key) if !key.is_empty() => key,
+                Ok(_) => {
+                    log::debug!("Existing OpenRouter API key is empty, nothing to migrate");
+                    return;
+                }
+                Err(_) => {
+                    log::error!("Failed to decode OpenRouter API key as UTF-8");
+                    return;
+                }
+            },
+            None => {
+                log::debug!("No existing OpenRouter API key found to migrate");
+                return;
+            }
+        };
+
+        log::info!("Migrating existing OpenRouter API key to OpenRouter extension");
+
+        match credentials_provider
+            .write_credentials(&extension_credential_key, "Bearer", api_key.as_bytes(), &cx)
+            .await
+        {
+            Ok(()) => {
+                log::info!("Successfully migrated OpenRouter API key to extension");
+            }
+            Err(err) => {
+                log::error!("Failed to migrate OpenRouter API key: {}", err);
+            }
+        }
+    })
+    .detach();
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+
+    #[gpui::test]
+    async fn test_migrates_credentials_from_old_location(cx: &mut TestAppContext) {
+        let api_key = "sk-or-test-key-12345";
+
+        cx.write_credentials(OPEN_ROUTER_DEFAULT_API_URL, "Bearer", api_key.as_bytes());
+
+        cx.update(|cx| {
+            migrate_open_router_credentials_if_needed(OPEN_ROUTER_EXTENSION_ID, cx);
+        });
+
+        cx.run_until_parked();
+
+        let migrated = cx.read_credentials("extension-llm-openrouter:openrouter");
+        assert!(migrated.is_some(), "Credentials should have been migrated");
+        let (username, password) = migrated.unwrap();
+        assert_eq!(username, "Bearer");
+        assert_eq!(String::from_utf8(password).unwrap(), api_key);
+    }
+
+    #[gpui::test]
+    async fn test_no_migration_if_no_old_credentials(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            migrate_open_router_credentials_if_needed(OPEN_ROUTER_EXTENSION_ID, cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-openrouter:openrouter");
+        assert!(
+            credentials.is_none(),
+            "Should not create credentials if none existed"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_skips_migration_for_other_extensions(cx: &mut TestAppContext) {
+        let api_key = "sk-or-test-key";
+
+        cx.write_credentials(OPEN_ROUTER_DEFAULT_API_URL, "Bearer", api_key.as_bytes());
+
+        cx.update(|cx| {
+            migrate_open_router_credentials_if_needed("some-other-extension", cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-openrouter:openrouter");
+        assert!(
+            credentials.is_none(),
+            "Should not migrate for other extensions"
+        );
+    }
+}

crates/extension_host/src/openai_migration.rs

@@ -0,0 +1,124 @@
+use credentials_provider::CredentialsProvider;
+use gpui::App;
+
+const OPENAI_EXTENSION_ID: &str = "openai";
+const OPENAI_PROVIDER_ID: &str = "openai";
+const OPENAI_DEFAULT_API_URL: &str = "https://api.openai.com/v1";
+
+/// Migrates OpenAI API credentials from the old built-in provider location
+/// to the new extension-based location.
+///
+/// This should only be called during auto-install of the extension.
+pub fn migrate_openai_credentials_if_needed(extension_id: &str, cx: &mut App) {
+    if extension_id != OPENAI_EXTENSION_ID {
+        return;
+    }
+
+    let extension_credential_key = format!(
+        "extension-llm-{}:{}",
+        OPENAI_EXTENSION_ID, OPENAI_PROVIDER_ID
+    );
+
+    let credentials_provider = <dyn CredentialsProvider>::global(cx);
+
+    cx.spawn(async move |cx| {
+        // Read from old location
+        let old_credential = credentials_provider
+            .read_credentials(OPENAI_DEFAULT_API_URL, &cx)
+            .await
+            .ok()
+            .flatten();
+
+        let api_key = match old_credential {
+            Some((_, key_bytes)) => match String::from_utf8(key_bytes) {
+                Ok(key) if !key.is_empty() => key,
+                Ok(_) => {
+                    log::debug!("Existing OpenAI API key is empty, nothing to migrate");
+                    return;
+                }
+                Err(_) => {
+                    log::error!("Failed to decode OpenAI API key as UTF-8");
+                    return;
+                }
+            },
+            None => {
+                log::debug!("No existing OpenAI API key found to migrate");
+                return;
+            }
+        };
+
+        log::info!("Migrating existing OpenAI API key to OpenAI extension");
+
+        match credentials_provider
+            .write_credentials(&extension_credential_key, "Bearer", api_key.as_bytes(), &cx)
+            .await
+        {
+            Ok(()) => {
+                log::info!("Successfully migrated OpenAI API key to extension");
+            }
+            Err(err) => {
+                log::error!("Failed to migrate OpenAI API key: {}", err);
+            }
+        }
+    })
+    .detach();
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+
+    #[gpui::test]
+    async fn test_migrates_credentials_from_old_location(cx: &mut TestAppContext) {
+        let api_key = "sk-test-key-12345";
+
+        cx.write_credentials(OPENAI_DEFAULT_API_URL, "Bearer", api_key.as_bytes());
+
+        cx.update(|cx| {
+            migrate_openai_credentials_if_needed(OPENAI_EXTENSION_ID, cx);
+        });
+
+        cx.run_until_parked();
+
+        let migrated = cx.read_credentials("extension-llm-openai:openai");
+        assert!(migrated.is_some(), "Credentials should have been migrated");
+        let (username, password) = migrated.unwrap();
+        assert_eq!(username, "Bearer");
+        assert_eq!(String::from_utf8(password).unwrap(), api_key);
+    }
+
+    #[gpui::test]
+    async fn test_no_migration_if_no_old_credentials(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            migrate_openai_credentials_if_needed(OPENAI_EXTENSION_ID, cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-openai:openai");
+        assert!(
+            credentials.is_none(),
+            "Should not create credentials if none existed"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_skips_migration_for_other_extensions(cx: &mut TestAppContext) {
+        let api_key = "sk-test-key";
+
+        cx.write_credentials(OPENAI_DEFAULT_API_URL, "Bearer", api_key.as_bytes());
+
+        cx.update(|cx| {
+            migrate_openai_credentials_if_needed("some-other-extension", cx);
+        });
+
+        cx.run_until_parked();
+
+        let credentials = cx.read_credentials("extension-llm-openai:openai");
+        assert!(
+            credentials.is_none(),
+            "Should not migrate for other extensions"
+        );
+    }
+}

crates/extension_host/src/wasm_host.rs

@@ -1,9 +1,11 @@
+pub mod llm_provider;
 pub mod wit;
 
 use crate::capability_granter::CapabilityGranter;
 use crate::{ExtensionManifest, ExtensionSettings};
 use anyhow::{Context as _, Result, anyhow, bail};
 use async_trait::async_trait;
+
 use dap::{DebugRequest, StartDebuggingRequestArgumentsRequest};
 use extension::{
     CodeLabel, Command, Completion, ContextServerConfiguration, DebugAdapterBinary,
@@ -64,7 +66,7 @@ pub struct WasmHost {
 
 #[derive(Clone, Debug)]
 pub struct WasmExtension {
-    tx: UnboundedSender<ExtensionCall>,
+    tx: Arc<UnboundedSender<ExtensionCall>>,
     pub manifest: Arc<ExtensionManifest>,
     pub work_dir: Arc<Path>,
     #[allow(unused)]
@@ -74,7 +76,10 @@ pub struct WasmExtension {
 
 impl Drop for WasmExtension {
     fn drop(&mut self) {
-        self.tx.close_channel();
+        // Only close the channel when this is the last clone holding the sender
+        if Arc::strong_count(&self.tx) == 1 {
+            self.tx.close_channel();
+        }
     }
 }
 
@@ -671,7 +676,7 @@ impl WasmHost {
             Ok(WasmExtension {
                 manifest,
                 work_dir,
-                tx,
+                tx: Arc::new(tx),
                 zed_api_version,
                 _task: task,
             })

crates/extension_host/src/wasm_host/oauth_callback_response.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Authentication Complete</title>
+</head>
+<body style="font-family: system-ui, sans-serif; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0;">
+    <div style="text-align: center;">
+        <h1>Authentication Complete</h1>
+        <p>You can close this window and return to Zed.</p>
+    </div>
+</body>
+</html>

crates/extension_host/src/wasm_host/wit.rs

@@ -16,7 +16,7 @@ use lsp::LanguageServerName;
 use release_channel::ReleaseChannel;
 use task::{DebugScenario, SpawnInTerminal, TaskTemplate, ZedDebugConfig};
 
-use crate::wasm_host::wit::since_v0_6_0::dap::StartDebuggingRequestArgumentsRequest;
+use crate::wasm_host::wit::since_v0_8_0::dap::StartDebuggingRequestArgumentsRequest;
 
 use super::{WasmState, wasm_engine};
 use anyhow::{Context as _, Result, anyhow};
@@ -33,6 +33,19 @@ pub use latest::CodeLabelSpanLiteral;
 pub use latest::{
     CodeLabel, CodeLabelSpan, Command, DebugAdapterBinary, ExtensionProject, Range, SlashCommand,
     zed::extension::context_server::ContextServerConfiguration,
+    zed::extension::llm_provider::{
+        CacheConfiguration as LlmCacheConfiguration, CompletionEvent as LlmCompletionEvent,
+        CompletionRequest as LlmCompletionRequest, DeviceFlowPromptInfo as LlmDeviceFlowPromptInfo,
+        ImageData as LlmImageData, MessageContent as LlmMessageContent,
+        MessageRole as LlmMessageRole, ModelCapabilities as LlmModelCapabilities,
+        ModelInfo as LlmModelInfo, ProviderInfo as LlmProviderInfo,
+        RequestMessage as LlmRequestMessage, StopReason as LlmStopReason,
+        ThinkingContent as LlmThinkingContent, TokenUsage as LlmTokenUsage,
+        ToolChoice as LlmToolChoice, ToolDefinition as LlmToolDefinition,
+        ToolInputFormat as LlmToolInputFormat, ToolResult as LlmToolResult,
+        ToolResultContent as LlmToolResultContent, ToolUse as LlmToolUse,
+        ToolUseJsonParseError as LlmToolUseJsonParseError,
+    },
     zed::extension::lsp::{
         Completion, CompletionKind, CompletionLabelDetails, InsertTextFormat, Symbol, SymbolKind,
     },
@@ -1007,6 +1020,20 @@ impl Extension {
         resource: Resource<Arc<dyn WorktreeDelegate>>,
     ) -> Result<Result<DebugAdapterBinary, String>> {
         match self {
+            Extension::V0_8_0(ext) => {
+                let dap_binary = ext
+                    .call_get_dap_binary(
+                        store,
+                        &adapter_name,
+                        &task.try_into()?,
+                        user_installed_path.as_ref().and_then(|p| p.to_str()),
+                        resource,
+                    )
+                    .await?
+                    .map_err(|e| anyhow!("{e:?}"))?;
+
+                Ok(Ok(dap_binary))
+            }
             Extension::V0_6_0(ext) => {
                 let dap_binary = ext
                     .call_get_dap_binary(
@@ -1032,6 +1059,16 @@ impl Extension {
         config: serde_json::Value,
     ) -> Result<Result<StartDebuggingRequestArgumentsRequest, String>> {
         match self {
+            Extension::V0_8_0(ext) => {
+                let config =
+                    serde_json::to_string(&config).context("Adapter config is not a valid JSON")?;
+                let result = ext
+                    .call_dap_request_kind(store, &adapter_name, &config)
+                    .await?
+                    .map_err(|e| anyhow!("{e:?}"))?;
+
+                Ok(Ok(result))
+            }
             Extension::V0_6_0(ext) => {
                 let config =
                     serde_json::to_string(&config).context("Adapter config is not a valid JSON")?;
@@ -1052,6 +1089,15 @@ impl Extension {
         config: ZedDebugConfig,
     ) -> Result<Result<DebugScenario, String>> {
         match self {
+            Extension::V0_8_0(ext) => {
+                let config = config.into();
+                let result = ext
+                    .call_dap_config_to_scenario(store, &config)
+                    .await?
+                    .map_err(|e| anyhow!("{e:?}"))?;
+
+                Ok(Ok(result.try_into()?))
+            }
             Extension::V0_6_0(ext) => {
                 let config = config.into();
                 let dap_binary = ext
@@ -1074,6 +1120,20 @@ impl Extension {
         debug_adapter_name: String,
     ) -> Result<Option<DebugScenario>> {
         match self {
+            Extension::V0_8_0(ext) => {
+                let build_config_template = build_config_template.into();
+                let result = ext
+                    .call_dap_locator_create_scenario(
+                        store,
+                        &locator_name,
+                        &build_config_template,
+                        &resolved_label,
+                        &debug_adapter_name,
+                    )
+                    .await?;
+
+                Ok(result.map(TryInto::try_into).transpose()?)
+            }
             Extension::V0_6_0(ext) => {
                 let build_config_template = build_config_template.into();
                 let dap_binary = ext
@@ -1099,6 +1159,15 @@ impl Extension {
         resolved_build_task: SpawnInTerminal,
     ) -> Result<Result<DebugRequest, String>> {
         match self {
+            Extension::V0_8_0(ext) => {
+                let build_config_template = resolved_build_task.try_into()?;
+                let dap_request = ext
+                    .call_run_dap_locator(store, &locator_name, &build_config_template)
+                    .await?
+                    .map_err(|e| anyhow!("{e:?}"))?;
+
+                Ok(Ok(dap_request.into()))
+            }
             Extension::V0_6_0(ext) => {
                 let build_config_template = resolved_build_task.try_into()?;
                 let dap_request = ext
@@ -1111,6 +1180,174 @@ impl Extension {
             _ => anyhow::bail!("`dap_locator_create_scenario` not available prior to v0.6.0"),
         }
     }
+
+    pub async fn call_llm_providers(
+        &self,
+        store: &mut Store<WasmState>,
+    ) -> Result<Vec<latest::llm_provider::ProviderInfo>> {
+        match self {
+            Extension::V0_8_0(ext) => ext.call_llm_providers(store).await,
+            _ => Ok(Vec::new()),
+        }
+    }
+
+    pub async fn call_llm_provider_models(
+        &self,
+        store: &mut Store<WasmState>,
+        provider_id: &str,
+    ) -> Result<Result<Vec<latest::llm_provider::ModelInfo>, String>> {
+        match self {
+            Extension::V0_8_0(ext) => ext.call_llm_provider_models(store, provider_id).await,
+            _ => anyhow::bail!("`llm_provider_models` not available prior to v0.8.0"),
+        }
+    }
+
+    pub async fn call_llm_provider_settings_markdown(
+        &self,
+        store: &mut Store<WasmState>,
+        provider_id: &str,
+    ) -> Result<Option<String>> {
+        match self {
+            Extension::V0_8_0(ext) => {
+                ext.call_llm_provider_settings_markdown(store, provider_id)
+                    .await
+            }
+            _ => Ok(None),
+        }
+    }
+
+    pub async fn call_llm_provider_is_authenticated(
+        &self,
+        store: &mut Store<WasmState>,
+        provider_id: &str,
+    ) -> Result<bool> {
+        match self {
+            Extension::V0_8_0(ext) => {
+                ext.call_llm_provider_is_authenticated(store, provider_id)
+                    .await
+            }
+            _ => Ok(false),
+        }
+    }
+
+    pub async fn call_llm_provider_start_device_flow_sign_in(
+        &self,
+        store: &mut Store<WasmState>,
+        provider_id: &str,
+    ) -> Result<Result<LlmDeviceFlowPromptInfo, String>> {
+        match self {
+            Extension::V0_8_0(ext) => {
+                ext.call_llm_provider_start_device_flow_sign_in(store, provider_id)
+                    .await
+            }
+            _ => {
+                anyhow::bail!(
+                    "`llm_provider_start_device_flow_sign_in` not available prior to v0.8.0"
+                )
+            }
+        }
+    }
+
+    pub async fn call_llm_provider_poll_device_flow_sign_in(
+        &self,
+        store: &mut Store<WasmState>,
+        provider_id: &str,
+    ) -> Result<Result<(), String>> {
+        match self {
+            Extension::V0_8_0(ext) => {
+                ext.call_llm_provider_poll_device_flow_sign_in(store, provider_id)
+                    .await
+            }
+            _ => {
+                anyhow::bail!(
+                    "`llm_provider_poll_device_flow_sign_in` not available prior to v0.8.0"
+                )
+            }
+        }
+    }
+
+    pub async fn call_llm_provider_reset_credentials(
+        &self,
+        store: &mut Store<WasmState>,
+        provider_id: &str,
+    ) -> Result<Result<(), String>> {
+        match self {
+            Extension::V0_8_0(ext) => {
+                ext.call_llm_provider_reset_credentials(store, provider_id)
+                    .await
+            }
+            _ => anyhow::bail!("`llm_provider_reset_credentials` not available prior to v0.8.0"),
+        }
+    }
+
+    pub async fn call_llm_count_tokens(
+        &self,
+        store: &mut Store<WasmState>,
+        provider_id: &str,
+        model_id: &str,
+        request: &latest::llm_provider::CompletionRequest,
+    ) -> Result<Result<u64, String>> {
+        match self {
+            Extension::V0_8_0(ext) => {
+                ext.call_llm_count_tokens(store, provider_id, model_id, request)
+                    .await
+            }
+            _ => anyhow::bail!("`llm_count_tokens` not available prior to v0.8.0"),
+        }
+    }
+
+    pub async fn call_llm_stream_completion_start(
+        &self,
+        store: &mut Store<WasmState>,
+        provider_id: &str,
+        model_id: &str,
+        request: &latest::llm_provider::CompletionRequest,
+    ) -> Result<Result<String, String>> {
+        match self {
+            Extension::V0_8_0(ext) => {
+                ext.call_llm_stream_completion_start(store, provider_id, model_id, request)
+                    .await
+            }
+            _ => anyhow::bail!("`llm_stream_completion_start` not available prior to v0.8.0"),
+        }
+    }
+
+    pub async fn call_llm_stream_completion_next(
+        &self,
+        store: &mut Store<WasmState>,
+        stream_id: &str,
+    ) -> Result<Result<Option<latest::llm_provider::CompletionEvent>, String>> {
+        match self {
+            Extension::V0_8_0(ext) => ext.call_llm_stream_completion_next(store, stream_id).await,
+            _ => anyhow::bail!("`llm_stream_completion_next` not available prior to v0.8.0"),
+        }
+    }
+
+    pub async fn call_llm_stream_completion_close(
+        &self,
+        store: &mut Store<WasmState>,
+        stream_id: &str,
+    ) -> Result<()> {
+        match self {
+            Extension::V0_8_0(ext) => ext.call_llm_stream_completion_close(store, stream_id).await,
+            _ => anyhow::bail!("`llm_stream_completion_close` not available prior to v0.8.0"),
+        }
+    }
+
+    pub async fn call_llm_cache_configuration(
+        &self,
+        store: &mut Store<WasmState>,
+        provider_id: &str,
+        model_id: &str,
+    ) -> Result<Option<latest::llm_provider::CacheConfiguration>> {
+        match self {
+            Extension::V0_8_0(ext) => {
+                ext.call_llm_cache_configuration(store, provider_id, model_id)
+                    .await
+            }
+            _ => Ok(None),
+        }
+    }
 }
 
 trait ToWasmtimeResult<T> {

crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs

@@ -32,8 +32,6 @@ wasmtime::component::bindgen!({
     },
 });
 
-pub use self::zed::extension::*;
-
 mod settings {
     #![allow(dead_code)]
     include!(concat!(env!("OUT_DIR"), "/since_v0.6.0/settings.rs"));

crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs

@@ -1,18 +1,19 @@
-use crate::wasm_host::wit::since_v0_6_0::{
+use crate::wasm_host::wit::since_v0_8_0::{
     dap::{
         BuildTaskDefinition, BuildTaskDefinitionTemplatePayload, StartDebuggingRequestArguments,
         TcpArguments, TcpArgumentsTemplate,
     },
+    lsp::{CompletionKind, CompletionLabelDetails, InsertTextFormat, SymbolKind},
     slash_command::SlashCommandOutputSection,
 };
-use crate::wasm_host::wit::{CompletionKind, CompletionLabelDetails, InsertTextFormat, SymbolKind};
 use crate::wasm_host::{WasmState, wit::ToWasmtimeResult};
 use ::http_client::{AsyncBody, HttpRequestExt};
-use ::settings::{Settings, WorktreeId};
+use ::settings::{ModelMode, Settings, SettingsStore, WorktreeId};
 use anyhow::{Context as _, Result, bail};
 use async_compression::futures::bufread::GzipDecoder;
 use async_tar::Archive;
 use async_trait::async_trait;
+use credentials_provider::CredentialsProvider;
 use extension::{
     ExtensionLanguageServerProxy, KeyValueStoreDelegate, ProjectDelegate, WorktreeDelegate,
 };
@@ -22,12 +23,14 @@ use gpui::{BackgroundExecutor, SharedString};
 use language::{BinaryStatus, LanguageName, language_settings::AllLanguageSettings};
 use project::project_settings::ProjectSettings;
 use semver::Version;
+use smol::net::TcpListener;
 use std::{
     env,
     net::Ipv4Addr,
     path::{Path, PathBuf},
     str::FromStr,
     sync::{Arc, OnceLock},
+    time::Duration,
 };
 use task::{SpawnInTerminal, ZedDebugConfig};
 use url::Url;
@@ -615,6 +618,19 @@ impl http_client::Host for WasmState {
         .to_wasmtime_result()
     }
 
+    async fn fetch_fallible(
+        &mut self,
+        request: http_client::HttpRequest,
+    ) -> wasmtime::Result<Result<http_client::HttpResponseWithStatus, String>> {
+        maybe!(async {
+            let request = convert_request(&request)?;
+            let mut response = self.host.http_client.send(request).await?;
+            convert_response_with_status(&mut response).await
+        })
+        .await
+        .to_wasmtime_result()
+    }
+
     async fn fetch_stream(
         &mut self,
         request: http_client::HttpRequest,
@@ -718,6 +734,26 @@ async fn convert_response(
     Ok(extension_response)
 }
 
+async fn convert_response_with_status(
+    response: &mut ::http_client::Response<AsyncBody>,
+) -> anyhow::Result<http_client::HttpResponseWithStatus> {
+    let status = response.status().as_u16();
+    let headers: Vec<(String, String)> = response
+        .headers()
+        .iter()
+        .map(|(k, v)| (k.to_string(), v.to_str().unwrap_or("").to_string()))
+        .collect();
+
+    let mut body = Vec::new();
+    response.body_mut().read_to_end(&mut body).await?;
+
+    Ok(http_client::HttpResponseWithStatus {
+        status,
+        headers,
+        body,
+    })
+}
+
 impl nodejs::Host for WasmState {
     async fn node_binary_path(&mut self) -> wasmtime::Result<Result<String, String>> {
         self.host
@@ -1109,3 +1145,369 @@ impl ExtensionImports for WasmState {
             .to_wasmtime_result()
     }
 }
+
+impl llm_provider::Host for WasmState {
+    async fn get_credential(&mut self, provider_id: String) -> wasmtime::Result<Option<String>> {
+        let extension_id = self.manifest.id.clone();
+        let is_legacy_extension = crate::LEGACY_LLM_EXTENSION_IDS.contains(&extension_id.as_ref());
+
+        // Check if this provider has env vars configured and if the user has allowed any of them
+        let env_vars = self
+            .manifest
+            .language_model_providers
+            .get(&Arc::<str>::from(provider_id.as_str()))
+            .and_then(|entry| entry.auth.as_ref())
+            .and_then(|auth| auth.env_vars.clone());
+
+        if let Some(env_vars) = env_vars {
+            let full_provider_id = format!("{}:{}", extension_id, provider_id);
+
+            // Check each env var to see if it's allowed and set
+            for env_var_name in &env_vars {
+                let settings_key: Arc<str> =
+                    format!("{}:{}", full_provider_id, env_var_name).into();
+
+                // For legacy extensions, auto-allow if env var is set
+                let env_var_is_set = env::var(env_var_name)
+                    .map(|v| !v.is_empty())
+                    .unwrap_or(false);
+
+                let is_allowed = self
+                    .on_main_thread({
+                        let settings_key = settings_key.clone();
+                        move |cx| {
+                            async move {
+                                cx.update(|cx| {
+                                    crate::extension_settings::ExtensionSettings::get_global(cx)
+                                        .allowed_env_var_providers
+                                        .contains(&settings_key)
+                                })
+                            }
+                            .boxed_local()
+                        }
+                    })
+                    .await
+                    .unwrap_or(false);
+
+                if is_allowed || (is_legacy_extension && env_var_is_set) {
+                    if let Ok(value) = env::var(env_var_name) {
+                        if !value.is_empty() {
+                            return Ok(Some(value));
+                        }
+                    }
+                }
+            }
+        }
+
+        // Fall back to credential store
+        let credential_key = format!("extension-llm-{}:{}", extension_id, provider_id);
+
+        self.on_main_thread(move |cx| {
+            async move {
+                let credentials_provider = cx.update(|cx| <dyn CredentialsProvider>::global(cx))?;
+                let result = credentials_provider
+                    .read_credentials(&credential_key, cx)
+                    .await
+                    .ok()
+                    .flatten();
+                Ok(result.map(|(_, password)| String::from_utf8_lossy(&password).to_string()))
+            }
+            .boxed_local()
+        })
+        .await
+    }
+
+    async fn store_credential(
+        &mut self,
+        provider_id: String,
+        value: String,
+    ) -> wasmtime::Result<Result<(), String>> {
+        let extension_id = self.manifest.id.clone();
+        let credential_key = format!("extension-llm-{}:{}", extension_id, provider_id);
+
+        self.on_main_thread(move |cx| {
+            async move {
+                let credentials_provider = cx.update(|cx| <dyn CredentialsProvider>::global(cx))?;
+                credentials_provider
+                    .write_credentials(&credential_key, "api_key", value.as_bytes(), cx)
+                    .await
+                    .map_err(|e| anyhow::anyhow!("{}", e))
+            }
+            .boxed_local()
+        })
+        .await
+        .to_wasmtime_result()
+    }
+
+    async fn delete_credential(
+        &mut self,
+        provider_id: String,
+    ) -> wasmtime::Result<Result<(), String>> {
+        let extension_id = self.manifest.id.clone();
+        let credential_key = format!("extension-llm-{}:{}", extension_id, provider_id);
+
+        self.on_main_thread(move |cx| {
+            async move {
+                let credentials_provider = cx.update(|cx| <dyn CredentialsProvider>::global(cx))?;
+                credentials_provider
+                    .delete_credentials(&credential_key, cx)
+                    .await
+                    .map_err(|e| anyhow::anyhow!("{}", e))
+            }
+            .boxed_local()
+        })
+        .await
+        .to_wasmtime_result()
+    }
+
+    async fn get_env_var(&mut self, name: String) -> wasmtime::Result<Option<String>> {
+        let extension_id = self.manifest.id.clone();
+
+        // Find which provider (if any) declares this env var in its auth config
+        let mut allowed_provider_id: Option<Arc<str>> = None;
+        for (provider_id, provider_entry) in &self.manifest.language_model_providers {
+            if let Some(auth_config) = &provider_entry.auth {
+                if let Some(env_vars) = &auth_config.env_vars {
+                    if env_vars.iter().any(|v| v == &name) {
+                        allowed_provider_id = Some(provider_id.clone());
+                        break;
+                    }
+                }
+            }
+        }
+
+        // If no provider declares this env var, deny access
+        let Some(provider_id) = allowed_provider_id else {
+            log::warn!(
+                "Extension {} attempted to read env var {} which is not declared in any provider auth config",
+                extension_id,
+                name
+            );
+            return Ok(None);
+        };
+
+        // Check if the user has allowed this specific env var
+        let settings_key: Arc<str> = format!("{}:{}:{}", extension_id, provider_id, name).into();
+        let is_legacy_extension = crate::LEGACY_LLM_EXTENSION_IDS.contains(&extension_id.as_ref());
+
+        // For legacy extensions, auto-allow if env var is set
+        let env_var_is_set = env::var(&name).map(|v| !v.is_empty()).unwrap_or(false);
+
+        let is_allowed = self
+            .on_main_thread({
+                let settings_key = settings_key.clone();
+                move |cx| {
+                    async move {
+                        cx.update(|cx| {
+                            crate::extension_settings::ExtensionSettings::get_global(cx)
+                                .allowed_env_var_providers
+                                .contains(&settings_key)
+                        })
+                    }
+                    .boxed_local()
+                }
+            })
+            .await
+            .unwrap_or(false);
+
+        if !is_allowed && !(is_legacy_extension && env_var_is_set) {
+            log::debug!(
+                "Extension {} provider {} is not allowed to read env var {}",
+                extension_id,
+                provider_id,
+                name
+            );
+            return Ok(None);
+        }
+
+        Ok(env::var(&name).ok())
+    }
+
+    async fn oauth_start_web_auth(
+        &mut self,
+        config: llm_provider::OauthWebAuthConfig,
+    ) -> wasmtime::Result<Result<llm_provider::OauthWebAuthResult, String>> {
+        let auth_url = config.auth_url;
+        let callback_path = config.callback_path;
+        let timeout_secs = config.timeout_secs.unwrap_or(300);
+
+        self.on_main_thread(move |cx| {
+            async move {
+                // Bind to port 0 to let the OS assign an available port, then substitute
+                // it into the auth URL's {port} placeholder for the OAuth callback.
+                let listener = TcpListener::bind("127.0.0.1:0")
+                    .await
+                    .map_err(|e| anyhow::anyhow!("Failed to bind localhost server: {}", e))?;
+                let port = listener
+                    .local_addr()
+                    .map_err(|e| anyhow::anyhow!("Failed to get local address: {}", e))?
+                    .port();
+
+                let auth_url_with_port = auth_url.replace("{port}", &port.to_string());
+                cx.update(|cx| {
+                    cx.open_url(&auth_url_with_port);
+                })?;
+
+                let accept_future = async {
+                    let (mut stream, _) = listener
+                        .accept()
+                        .await
+                        .map_err(|e| anyhow::anyhow!("Failed to accept connection: {}", e))?;
+
+                    let mut request_line = String::new();
+                    {
+                        let mut reader = smol::io::BufReader::new(&mut stream);
+                        smol::io::AsyncBufReadExt::read_line(&mut reader, &mut request_line)
+                            .await
+                            .map_err(|e| anyhow::anyhow!("Failed to read request: {}", e))?;
+                    }
+
+                    let path = request_line
+                        .split_whitespace()
+                        .nth(1)
+                        .ok_or_else(|| anyhow::anyhow!("Malformed HTTP request"))?;
+
+                    let callback_url = if path.starts_with(&callback_path)
+                        || path.starts_with(&format!("/{}", callback_path.trim_start_matches('/')))
+                    {
+                        format!("http://localhost:{}{}", port, path)
+                    } else {
+                        return Err(anyhow::anyhow!("Unexpected callback path: {}", path));
+                    };
+
+                    let response = format!(
+                        "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n{}",
+                        include_str!("../oauth_callback_response.html")
+                    );
+
+                    smol::io::AsyncWriteExt::write_all(&mut stream, response.as_bytes())
+                        .await
+                        .ok();
+                    smol::io::AsyncWriteExt::flush(&mut stream).await.ok();
+
+                    Ok(callback_url)
+                };
+
+                let timeout_duration = Duration::from_secs(timeout_secs as u64);
+                let callback_url = smol::future::or(accept_future, async {
+                    smol::Timer::after(timeout_duration).await;
+                    Err(anyhow::anyhow!(
+                        "OAuth callback timed out after {} seconds",
+                        timeout_secs
+                    ))
+                })
+                .await?;
+
+                Ok(llm_provider::OauthWebAuthResult {
+                    callback_url,
+                    port: port as u32,
+                })
+            }
+            .boxed_local()
+        })
+        .await
+        .to_wasmtime_result()
+    }
+
+    async fn oauth_send_http_request(
+        &mut self,
+        request: http_client::HttpRequest,
+    ) -> wasmtime::Result<Result<http_client::HttpResponseWithStatus, String>> {
+        maybe!(async {
+            let request = convert_request(&request)?;
+            let mut response = self.host.http_client.send(request).await?;
+            convert_response_with_status(&mut response).await
+        })
+        .await
+        .to_wasmtime_result()
+    }
+
+    async fn oauth_open_browser(&mut self, url: String) -> wasmtime::Result<Result<(), String>> {
+        self.on_main_thread(move |cx| {
+            async move {
+                cx.update(|cx| {
+                    cx.open_url(&url);
+                })?;
+                Ok(())
+            }
+            .boxed_local()
+        })
+        .await
+        .to_wasmtime_result()
+    }
+
+    async fn get_provider_settings(
+        &mut self,
+        provider_id: String,
+    ) -> wasmtime::Result<Option<llm_provider::ProviderSettings>> {
+        let extension_id = self.manifest.id.clone();
+
+        let result = self
+            .on_main_thread(move |cx| {
+                async move {
+                    cx.update(|cx| {
+                        let settings_store = cx.global::<SettingsStore>();
+                        let user_settings = settings_store.raw_user_settings();
+                        let language_models =
+                            user_settings.and_then(|s| s.content.language_models.as_ref());
+
+                        // Map provider IDs to their settings
+                        // The provider_id from the extension is just the provider part (e.g., "google-ai")
+                        // We need to match this to the appropriate settings
+                        match provider_id.as_str() {
+                            "google-ai" => {
+                                let google = language_models.and_then(|lm| lm.google.as_ref());
+                                let google = google?;
+
+                                let api_url = google.api_url.clone().filter(|s| !s.is_empty());
+
+                                let available_models = google
+                                    .available_models
+                                    .as_ref()
+                                    .map(|models| {
+                                        models
+                                            .iter()
+                                            .map(|m| {
+                                                let thinking_budget = match &m.mode {
+                                                    Some(ModelMode::Thinking { budget_tokens }) => {
+                                                        *budget_tokens
+                                                    }
+                                                    _ => None,
+                                                };
+                                                llm_provider::CustomModelConfig {
+                                                    name: m.name.clone(),
+                                                    display_name: m.display_name.clone(),
+                                                    max_tokens: m.max_tokens,
+                                                    max_output_tokens: None,
+                                                    thinking_budget,
+                                                }
+                                            })
+                                            .collect()
+                                    })
+                                    .unwrap_or_default();
+
+                                Some(llm_provider::ProviderSettings {
+                                    api_url,
+                                    available_models,
+                                })
+                            }
+                            _ => {
+                                log::debug!(
+                                    "Extension {} requested settings for unknown provider: {}",
+                                    extension_id,
+                                    provider_id
+                                );
+                                None
+                            }
+                        }
+                    })
+                    .ok()
+                    .flatten()
+                }
+                .boxed_local()
+            })
+            .await;
+
+        Ok(result)
+    }
+}

crates/extensions_ui/src/extensions_ui.rs

@@ -442,7 +442,9 @@ impl ExtensionsPage {
         let extension_store = ExtensionStore::global(cx).read(cx);
 
         match extension_store.outstanding_operations().get(extension_id) {
-            Some(ExtensionOperation::Install) => ExtensionStatus::Installing,
+            Some(ExtensionOperation::Install) | Some(ExtensionOperation::AutoInstall) => {
+                ExtensionStatus::Installing
+            }
             Some(ExtensionOperation::Remove) => ExtensionStatus::Removing,
             Some(ExtensionOperation::Upgrade) => ExtensionStatus::Upgrading,
             None => match extension_store.installed_extensions().get(extension_id) {

crates/git_ui/src/commit_view.rs

@@ -69,7 +69,7 @@ struct GitBlob {
     path: RepoPath,
     worktree_id: WorktreeId,
     is_deleted: bool,
-    display_name: String,
+    display_name: Arc<str>,
 }
 
 const COMMIT_MESSAGE_SORT_PREFIX: u64 = 0;
@@ -243,8 +243,9 @@ impl CommitView {
                     .path
                     .file_name()
                     .map(|name| name.to_string())
-                    .unwrap_or_else(|| file.path.display(PathStyle::local()).to_string());
-                let display_name = format!("{short_sha} - {file_name}");
+                    .unwrap_or_else(|| file.path.display(PathStyle::Posix).to_string());
+                let display_name: Arc<str> =
+                    Arc::from(format!("{short_sha} - {file_name}").into_boxed_str());
 
                 let file = Arc::new(GitBlob {
                     path: file.path.clone(),
@@ -660,13 +661,15 @@ impl language::File for GitBlob {
     }
 
     fn disk_state(&self) -> DiskState {
-        DiskState::Historic {
-            was_deleted: self.is_deleted,
+        if self.is_deleted {
+            DiskState::Deleted
+        } else {
+            DiskState::New
         }
     }
 
     fn path_style(&self, _: &App) -> PathStyle {
-        PathStyle::local()
+        PathStyle::Posix
     }
 
     fn path(&self) -> &Arc<RelPath> {
@@ -694,6 +697,45 @@ impl language::File for GitBlob {
     }
 }
 
+// No longer needed since metadata buffer is not created
+// impl language::File for CommitMetadataFile {
+//     fn as_local(&self) -> Option<&dyn language::LocalFile> {
+//         None
+//     }
+//
+//     fn disk_state(&self) -> DiskState {
+//         DiskState::New
+//     }
+//
+//     fn path_style(&self, _: &App) -> PathStyle {
+//         PathStyle::Posix
+//     }
+//
+//     fn path(&self) -> &Arc<RelPath> {
+//         &self.title
+//     }
+//
+//     fn full_path(&self, _: &App) -> PathBuf {
+//         self.title.as_std_path().to_path_buf()
+//     }
+//
+//     fn file_name<'a>(&'a self, _: &'a App) -> &'a str {
+//         self.title.file_name().unwrap_or("commit")
+//     }
+//
+//     fn worktree_id(&self, _: &App) -> WorktreeId {
+//         self.worktree_id
+//     }
+//
+//     fn to_proto(&self, _cx: &App) -> language::proto::File {
+//         unimplemented!()
+//     }
+//
+//     fn is_private(&self) -> bool {
+//         false
+//     }
+// }
+
 async fn build_buffer(
     mut text: String,
     blob: Arc<dyn File>,

crates/gpui/examples/input.rs

@@ -546,15 +546,8 @@ impl Element for TextElement {
             window.paint_quad(selection)
         }
         let line = prepaint.line.take().unwrap();
-        line.paint(
-            bounds.origin,
-            window.line_height(),
-            gpui::TextAlign::Left,
-            None,
-            window,
-            cx,
-        )
-        .unwrap();
+        line.paint(bounds.origin, window.line_height(), window, cx)
+            .unwrap();
 
         if focus_handle.is_focused(window)
             && let Some(cursor) = prepaint.cursor.take()

crates/gpui/examples/popover.rs

@@ -1,174 +0,0 @@
-use gpui::{
-    App, Application, Context, Corner, Div, Hsla, Stateful, Window, WindowOptions, anchored,
-    deferred, div, prelude::*, px,
-};
-
-/// An example show use deferred to create a floating layers.
-struct HelloWorld {
-    open: bool,
-    secondary_open: bool,
-}
-
-fn button(id: &'static str) -> Stateful<Div> {
-    div()
-        .id(id)
-        .bg(gpui::black())
-        .text_color(gpui::white())
-        .px_3()
-        .py_1()
-}
-
-fn popover() -> Div {
-    div()
-        .flex()
-        .flex_col()
-        .items_center()
-        .justify_center()
-        .shadow_lg()
-        .p_3()
-        .rounded_md()
-        .bg(gpui::white())
-        .text_color(gpui::black())
-        .border_1()
-        .text_sm()
-        .border_color(gpui::black().opacity(0.1))
-}
-
-fn line(color: Hsla) -> Div {
-    div().w(px(480.)).h_2().bg(color.opacity(0.25))
-}
-
-impl HelloWorld {
-    fn render_secondary_popover(
-        &mut self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        button("secondary-btn")
-            .mt_2()
-            .child("Child Popover")
-            .on_click(cx.listener(|this, _, _, cx| {
-                this.secondary_open = true;
-                cx.notify();
-            }))
-            .when(self.secondary_open, |this| {
-                this.child(
-                    // GPUI can't support deferred here yet,
-                    // it was inside another deferred element.
-                    anchored()
-                        .anchor(Corner::TopLeft)
-                        .snap_to_window_with_margin(px(8.))
-                        .child(
-                            popover()
-                                .child("This is second level Popover")
-                                .bg(gpui::white())
-                                .border_color(gpui::blue())
-                                .on_mouse_down_out(cx.listener(|this, _, _, cx| {
-                                    this.secondary_open = false;
-                                    cx.notify();
-                                })),
-                        ),
-                )
-            })
-    }
-}
-
-impl Render for HelloWorld {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .flex()
-            .flex_col()
-            .gap_3()
-            .size_full()
-            .bg(gpui::white())
-            .text_color(gpui::black())
-            .justify_center()
-            .items_center()
-            .child(
-                div()
-                    .flex()
-                    .flex_row()
-                    .gap_4()
-                    .child(
-                        button("popover0").child("Opened Popover").child(
-                            deferred(
-                                anchored()
-                                    .anchor(Corner::TopLeft)
-                                    .snap_to_window_with_margin(px(8.))
-                                    .child(popover().w_96().gap_3().child(
-                                        "This is a default opened Popover, \
-                                        we can use deferred to render it \
-                                        in a floating layer.",
-                                    )),
-                            )
-                            .priority(0),
-                        ),
-                    )
-                    .child(
-                        button("popover1")
-                            .child("Open Popover")
-                            .on_click(cx.listener(|this, _, _, cx| {
-                                this.open = true;
-                                cx.notify();
-                            }))
-                            .when(self.open, |this| {
-                                this.child(
-                                    deferred(
-                                        anchored()
-                                            .anchor(Corner::TopLeft)
-                                            .snap_to_window_with_margin(px(8.))
-                                            .child(
-                                                popover()
-                                                    .w_96()
-                                                    .gap_3()
-                                                    .child(
-                                                        "This is first level Popover, \
-                                                   we can use deferred to render it \
-                                                   in a floating layer.\n\
-                                                   Click outside to close.",
-                                                    )
-                                                    .when(!self.secondary_open, |this| {
-                                                        this.on_mouse_down_out(cx.listener(
-                                                            |this, _, _, cx| {
-                                                                this.open = false;
-                                                                cx.notify();
-                                                            },
-                                                        ))
-                                                    })
-                                                    // Here we need render popover after the content
-                                                    // to ensure it will be on top layer.
-                                                    .child(
-                                                        self.render_secondary_popover(window, cx),
-                                                    ),
-                                            ),
-                                    )
-                                    .priority(1),
-                                )
-                            }),
-                    ),
-            )
-            .child(
-                "Here is an example text rendered, \
-                to ensure the Popover will float above this contents.",
-            )
-            .children([
-                line(gpui::red()),
-                line(gpui::yellow()),
-                line(gpui::blue()),
-                line(gpui::green()),
-            ])
-    }
-}
-
-fn main() {
-    Application::new().run(|cx: &mut App| {
-        cx.open_window(WindowOptions::default(), |_, cx| {
-            cx.new(|_| HelloWorld {
-                open: false,
-                secondary_open: false,
-            })
-        })
-        .unwrap();
-        cx.activate(true);
-    });
-}

crates/gpui/examples/tab_stop.rs

@@ -130,50 +130,6 @@ impl Render for Example {
                             })),
                     ),
             )
-            .child(
-                div()
-                    .id("group-1")
-                    .tab_index(6)
-                    .tab_group()
-                    .tab_stop(false)
-                    .child(
-                        button("group-1-button-1")
-                            .tab_index(1)
-                            .child("Tab index [6, 1]"),
-                    )
-                    .child(
-                        button("group-1-button-2")
-                            .tab_index(2)
-                            .child("Tab index [6, 2]"),
-                    )
-                    .child(
-                        button("group-1-button-3")
-                            .tab_index(3)
-                            .child("Tab index [6, 3]"),
-                    ),
-            )
-            .child(
-                div()
-                    .id("group-2")
-                    .tab_index(7)
-                    .tab_group()
-                    .tab_stop(false)
-                    .child(
-                        button("group-2-button-1")
-                            .tab_index(1)
-                            .child("Tab index [7, 1]"),
-                    )
-                    .child(
-                        button("group-2-button-2")
-                            .tab_index(2)
-                            .child("Tab index [7, 2]"),
-                    )
-                    .child(
-                        button("group-2-button-3")
-                            .tab_index(3)
-                            .child("Tab index [7, 3]"),
-                    ),
-            )
     }
 }
 

crates/gpui/src/app/test_context.rs

@@ -296,6 +296,20 @@ impl TestAppContext {
         &self.text_system
     }
 
+    /// Simulates writing credentials to the platform keychain.
+    pub fn write_credentials(&self, url: &str, username: &str, password: &[u8]) {
+        let _ = self
+            .test_platform
+            .write_credentials(url, username, password);
+    }
+
+    /// Simulates reading credentials from the platform keychain.
+    pub fn read_credentials(&self, url: &str) -> Option<(String, Vec<u8>)> {
+        smol::block_on(self.test_platform.read_credentials(url))
+            .ok()
+            .flatten()
+    }
+
     /// Simulates writing to the platform clipboard
     pub fn write_to_clipboard(&self, item: ClipboardItem) {
         self.test_platform.write_to_clipboard(item)

crates/gpui/src/elements/div.rs

@@ -1730,11 +1730,6 @@ impl Interactivity {
                         let clicked_state = clicked_state.borrow();
                         self.active = Some(clicked_state.element);
                     }
-                    if self.hover_style.is_some() || self.group_hover_style.is_some() {
-                        element_state
-                            .hover_state
-                            .get_or_insert_with(Default::default);
-                    }
                     if let Some(active_tooltip) = element_state.active_tooltip.as_ref() {
                         if self.tooltip_builder.is_some() {
                             self.tooltip_id = set_tooltip_on_window(active_tooltip, window);
@@ -2155,46 +2150,14 @@ impl Interactivity {
         {
             let hitbox = hitbox.clone();
             let was_hovered = hitbox.is_hovered(window);
-            let hover_state = self.hover_style.as_ref().and_then(|_| {
-                element_state
-                    .as_ref()
-                    .and_then(|state| state.hover_state.as_ref())
-                    .cloned()
-            });
             let current_view = window.current_view();
             window.on_mouse_event(move |_: &MouseMoveEvent, phase, window, cx| {
                 let hovered = hitbox.is_hovered(window);
                 if phase == DispatchPhase::Capture && hovered != was_hovered {
-                    if let Some(hover_state) = &hover_state {
-                        hover_state.borrow_mut().element = hovered;
-                    }
                     cx.notify(current_view);
                 }
             });
         }
-
-        if let Some(group_hover) = self.group_hover_style.as_ref() {
-            if let Some(group_hitbox_id) = GroupHitboxes::get(&group_hover.group, cx) {
-                let hover_state = element_state
-                    .as_ref()
-                    .and_then(|element| element.hover_state.as_ref())
-                    .cloned();
-
-                let was_group_hovered = group_hitbox_id.is_hovered(window);
-                let current_view = window.current_view();
-
-                window.on_mouse_event(move |_: &MouseMoveEvent, phase, window, cx| {
-                    let group_hovered = group_hitbox_id.is_hovered(window);
-                    if phase == DispatchPhase::Capture && group_hovered != was_group_hovered {
-                        if let Some(hover_state) = &hover_state {
-                            hover_state.borrow_mut().group = group_hovered;
-                        }
-                        cx.notify(current_view);
-                    }
-                });
-            }
-        }
-
         let drag_cursor_style = self.base_style.as_ref().mouse_cursor;
 
         let mut drag_listener = mem::take(&mut self.drag_listener);
@@ -2383,8 +2346,8 @@ impl Interactivity {
                         && hitbox.is_hovered(window);
                     let mut was_hovered = was_hovered.borrow_mut();
 
-                    if is_hovered != was_hovered.element {
-                        was_hovered.element = is_hovered;
+                    if is_hovered != *was_hovered {
+                        *was_hovered = is_hovered;
                         drop(was_hovered);
 
                         hover_listener(&is_hovered, window, cx);
@@ -2617,46 +2580,22 @@ impl Interactivity {
             }
         }
 
-        if !cx.has_active_drag() {
-            if let Some(group_hover) = self.group_hover_style.as_ref() {
-                let is_group_hovered =
-                    if let Some(group_hitbox_id) = GroupHitboxes::get(&group_hover.group, cx) {
-                        group_hitbox_id.is_hovered(window)
-                    } else if let Some(element_state) = element_state.as_ref() {
-                        element_state
-                            .hover_state
-                            .as_ref()
-                            .map(|state| state.borrow().group)
-                            .unwrap_or(false)
-                    } else {
-                        false
-                    };
-
-                if is_group_hovered {
+        if let Some(hitbox) = hitbox {
+            if !cx.has_active_drag() {
+                if let Some(group_hover) = self.group_hover_style.as_ref()
+                    && let Some(group_hitbox_id) = GroupHitboxes::get(&group_hover.group, cx)
+                    && group_hitbox_id.is_hovered(window)
+                {
                     style.refine(&group_hover.style);
                 }
-            }
 
-            if let Some(hover_style) = self.hover_style.as_ref() {
-                let is_hovered = if let Some(hitbox) = hitbox {
-                    hitbox.is_hovered(window)
-                } else if let Some(element_state) = element_state.as_ref() {
-                    element_state
-                        .hover_state
-                        .as_ref()
-                        .map(|state| state.borrow().element)
-                        .unwrap_or(false)
-                } else {
-                    false
-                };
-
-                if is_hovered {
+                if let Some(hover_style) = self.hover_style.as_ref()
+                    && hitbox.is_hovered(window)
+                {
                     style.refine(hover_style);
                 }
             }
-        }
 
-        if let Some(hitbox) = hitbox {
             if let Some(drag) = cx.active_drag.take() {
                 let mut can_drop = true;
                 if let Some(can_drop_predicate) = &self.can_drop_predicate {
@@ -2715,7 +2654,7 @@ impl Interactivity {
 pub struct InteractiveElementState {
     pub(crate) focus_handle: Option<FocusHandle>,
     pub(crate) clicked_state: Option<Rc<RefCell<ElementClickedState>>>,
-    pub(crate) hover_state: Option<Rc<RefCell<ElementHoverState>>>,
+    pub(crate) hover_state: Option<Rc<RefCell<bool>>>,
     pub(crate) pending_mouse_down: Option<Rc<RefCell<Option<MouseDownEvent>>>>,
     pub(crate) scroll_offset: Option<Rc<RefCell<Point<Pixels>>>>,
     pub(crate) active_tooltip: Option<Rc<RefCell<Option<ActiveTooltip>>>>,
@@ -2737,16 +2676,6 @@ impl ElementClickedState {
     }
 }
 
-/// Whether or not the element or a group that contains it is hovered.
-#[derive(Copy, Clone, Default, Eq, PartialEq)]
-pub struct ElementHoverState {
-    /// True if this element's group is hovered, false otherwise
-    pub group: bool,
-
-    /// True if this element is hovered, false otherwise
-    pub element: bool,
-}
-
 pub(crate) enum ActiveTooltip {
     /// Currently delaying before showing the tooltip.
     WaitingForShow { _task: Task<()> },

crates/gpui/src/platform/linux/x11/client.rs

@@ -944,8 +944,6 @@ impl X11Client {
                 let window = self.get_window(event.event)?;
                 window.set_active(false);
                 let mut state = self.0.borrow_mut();
-                // Set last scroll values to `None` so that a large delta isn't created if scrolling is done outside the window (the valuator is global)
-                reset_all_pointer_device_scroll_positions(&mut state.pointer_device_states);
                 state.keyboard_focused_window = None;
                 if let Some(compose_state) = state.compose_state.as_mut() {
                     compose_state.reset();

crates/gpui/src/platform/linux/x11/window.rs

@@ -431,7 +431,6 @@ impl X11WindowState {
             // https://stackoverflow.com/questions/43218127/x11-xlib-xcb-creating-a-window-requires-border-pixel-if-specifying-colormap-wh
             .border_pixel(visual_set.black_pixel)
             .colormap(colormap)
-            .override_redirect((params.kind == WindowKind::PopUp) as u32)
             .event_mask(
                 xproto::EventMask::EXPOSURE
                     | xproto::EventMask::STRUCTURE_NOTIFY

crates/gpui/src/platform/mac/metal_renderer.rs

@@ -46,9 +46,9 @@ pub unsafe fn new_renderer(
     _native_window: *mut c_void,
     _native_view: *mut c_void,
     _bounds: crate::Size<f32>,
-    _transparent: bool,
+    transparent: bool,
 ) -> Renderer {
-    MetalRenderer::new(context)
+    MetalRenderer::new(context, transparent)
 }
 
 pub(crate) struct InstanceBufferPool {
@@ -128,7 +128,7 @@ pub struct PathRasterizationVertex {
 }
 
 impl MetalRenderer {
-    pub fn new(instance_buffer_pool: Arc<Mutex<InstanceBufferPool>>) -> Self {
+    pub fn new(instance_buffer_pool: Arc<Mutex<InstanceBufferPool>>, transparent: bool) -> Self {
         // Prefer low‐power integrated GPUs on Intel Mac. On Apple
         // Silicon, there is only ever one GPU, so this is equivalent to
         // `metal::Device::system_default()`.
@@ -152,8 +152,13 @@ impl MetalRenderer {
         let layer = metal::MetalLayer::new();
         layer.set_device(&device);
         layer.set_pixel_format(MTLPixelFormat::BGRA8Unorm);
-        layer.set_opaque(false);
+        // Support direct-to-display rendering if the window is not transparent
+        // https://developer.apple.com/documentation/metal/managing-your-game-window-for-metal-in-macos
+        layer.set_opaque(!transparent);
         layer.set_maximum_drawable_count(3);
+        // We already present at display sync with the display link
+        // This allows to use direct-to-display even in window mode
+        layer.set_display_sync_enabled(false);
         unsafe {
             let _: () = msg_send![&*layer, setAllowsNextDrawableTimeout: NO];
             let _: () = msg_send![&*layer, setNeedsDisplayOnBoundsChange: YES];
@@ -352,8 +357,8 @@ impl MetalRenderer {
         }
     }
 
-    pub fn update_transparency(&self, _transparent: bool) {
-        // todo(mac)?
+    pub fn update_transparency(&self, transparent: bool) {
+        self.layer.set_opaque(!transparent);
     }
 
     pub fn destroy(&self) {

crates/gpui/src/platform/test/platform.rs

@@ -6,7 +6,7 @@ use crate::{
     TestDisplay, TestWindow, WindowAppearance, WindowParams, size,
 };
 use anyhow::Result;
-use collections::VecDeque;
+use collections::{HashMap, VecDeque};
 use futures::channel::oneshot;
 use parking_lot::Mutex;
 use std::{
@@ -32,6 +32,7 @@ pub(crate) struct TestPlatform {
     current_clipboard_item: Mutex<Option<ClipboardItem>>,
     #[cfg(any(target_os = "linux", target_os = "freebsd"))]
     current_primary_item: Mutex<Option<ClipboardItem>>,
+    credentials: Mutex<HashMap<String, (String, Vec<u8>)>>,
     #[cfg(target_os = "macos")]
     current_find_pasteboard_item: Mutex<Option<ClipboardItem>>,
     pub(crate) prompts: RefCell<TestPrompts>,
@@ -119,6 +120,7 @@ impl TestPlatform {
             current_clipboard_item: Mutex::new(None),
             #[cfg(any(target_os = "linux", target_os = "freebsd"))]
             current_primary_item: Mutex::new(None),
+            credentials: Mutex::new(HashMap::default()),
             #[cfg(target_os = "macos")]
             current_find_pasteboard_item: Mutex::new(None),
             weak: weak.clone(),
@@ -430,15 +432,20 @@ impl Platform for TestPlatform {
         *self.current_find_pasteboard_item.lock() = Some(item);
     }
 
-    fn write_credentials(&self, _url: &str, _username: &str, _password: &[u8]) -> Task<Result<()>> {
+    fn write_credentials(&self, url: &str, username: &str, password: &[u8]) -> Task<Result<()>> {
+        self.credentials
+            .lock()
+            .insert(url.to_string(), (username.to_string(), password.to_vec()));
         Task::ready(Ok(()))
     }
 
-    fn read_credentials(&self, _url: &str) -> Task<Result<Option<(String, Vec<u8>)>>> {
-        Task::ready(Ok(None))
+    fn read_credentials(&self, url: &str) -> Task<Result<Option<(String, Vec<u8>)>>> {
+        let result = self.credentials.lock().get(url).cloned();
+        Task::ready(Ok(result))
     }
 
-    fn delete_credentials(&self, _url: &str) -> Task<Result<()>> {
+    fn delete_credentials(&self, url: &str) -> Task<Result<()>> {
+        self.credentials.lock().remove(url);
         Task::ready(Ok(()))
     }
 

crates/gpui/src/text_system/line.rs

@@ -64,8 +64,6 @@ impl ShapedLine {
         &self,
         origin: Point<Pixels>,
         line_height: Pixels,
-        align: TextAlign,
-        align_width: Option<Pixels>,
         window: &mut Window,
         cx: &mut App,
     ) -> Result<()> {
@@ -73,8 +71,8 @@ impl ShapedLine {
             origin,
             &self.layout,
             line_height,
-            align,
-            align_width,
+            TextAlign::default(),
+            None,
             &self.decoration_runs,
             &[],
             window,
@@ -89,8 +87,6 @@ impl ShapedLine {
         &self,
         origin: Point<Pixels>,
         line_height: Pixels,
-        align: TextAlign,
-        align_width: Option<Pixels>,
         window: &mut Window,
         cx: &mut App,
     ) -> Result<()> {
@@ -98,8 +94,8 @@ impl ShapedLine {
             origin,
             &self.layout,
             line_height,
-            align,
-            align_width,
+            TextAlign::default(),
+            None,
             &self.decoration_runs,
             &[],
             window,

crates/image_viewer/src/image_viewer.rs

@@ -11,7 +11,7 @@ use gpui::{
     InteractiveElement, IntoElement, ObjectFit, ParentElement, Render, Styled, Task, WeakEntity,
     Window, canvas, div, fill, img, opaque_grey, point, size,
 };
-use language::File as _;
+use language::{DiskState, File as _};
 use persistence::IMAGE_VIEWER;
 use project::{ImageItem, Project, ProjectPath, image_store::ImageItemEvent};
 use settings::Settings;
@@ -195,7 +195,7 @@ impl Item for ImageView {
     }
 
     fn has_deleted_file(&self, cx: &App) -> bool {
-        self.image_item.read(cx).file.disk_state().is_deleted()
+        self.image_item.read(cx).file.disk_state() == DiskState::Deleted
     }
     fn buffer_kind(&self, _: &App) -> workspace::item::ItemBufferKind {
         workspace::item::ItemBufferKind::Singleton

crates/language/src/buffer.rs

@@ -427,9 +427,6 @@ pub enum DiskState {
     Present { mtime: MTime },
     /// Deleted file that was previously present.
     Deleted,
-    /// An old version of a file that was previously present
-    /// usually from a version control system. e.g. A git blob
-    Historic { was_deleted: bool },
 }
 
 impl DiskState {
@@ -439,7 +436,6 @@ impl DiskState {
             DiskState::New => None,
             DiskState::Present { mtime } => Some(mtime),
             DiskState::Deleted => None,
-            DiskState::Historic { .. } => None,
         }
     }
 
@@ -448,16 +444,6 @@ impl DiskState {
             DiskState::New => false,
             DiskState::Present { .. } => true,
             DiskState::Deleted => false,
-            DiskState::Historic { .. } => false,
-        }
-    }
-
-    /// Returns true if this state represents a deleted file.
-    pub fn is_deleted(&self) -> bool {
-        match self {
-            DiskState::Deleted => true,
-            DiskState::Historic { was_deleted } => *was_deleted,
-            _ => false,
         }
     }
 }
@@ -2288,7 +2274,6 @@ impl Buffer {
                 None => true,
             },
             DiskState::Deleted => false,
-            DiskState::Historic { .. } => false,
         }
     }
 

crates/language_model/src/api_key.rs

@@ -228,10 +228,6 @@ impl ApiKeyState {
 }
 
 impl ApiKey {
-    pub fn key(&self) -> &str {
-        &self.key
-    }
-
     pub fn from_env(env_var_name: SharedString, key: &str) -> Self {
         Self {
             source: ApiKeySource::EnvVar(env_var_name),
@@ -239,16 +235,6 @@ impl ApiKey {
         }
     }
 
-    pub async fn load_from_system_keychain(
-        url: &str,
-        credentials_provider: &dyn CredentialsProvider,
-        cx: &AsyncApp,
-    ) -> Result<Self, AuthenticateError> {
-        Self::load_from_system_keychain_impl(url, credentials_provider, cx)
-            .await
-            .into_authenticate_result()
-    }
-
     async fn load_from_system_keychain_impl(
         url: &str,
         credentials_provider: &dyn CredentialsProvider,

crates/language_model/src/language_model.rs

@@ -818,6 +818,11 @@ pub trait LanguageModelProvider: 'static {
     fn icon(&self) -> IconOrSvg {
         IconOrSvg::default()
     }
+    /// Returns the path to an external SVG icon for this provider, if any.
+    /// When present, this takes precedence over `icon()`.
+    fn icon_path(&self) -> Option<SharedString> {
+        None
+    }
     fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>>;
     fn default_fast_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>>;
     fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>>;
@@ -839,6 +844,7 @@ pub trait LanguageModelProvider: 'static {
 pub enum ConfigurationViewTargetAgent {
     #[default]
     ZedAgent,
+    EditPrediction,
     Other(SharedString),
 }
 

crates/language_model/src/registry.rs

@@ -492,6 +492,7 @@ mod tests {
         registry.update(cx, |registry, cx| {
             registry.register_provider(provider.clone(), cx);
 
+            // Set up a hiding function that hides the fake provider when "fake-extension" is installed
             registry.set_builtin_provider_hiding_fn(Box::new(|id| {
                 if id == "fake" {
                     Some("fake-extension")
@@ -501,17 +502,21 @@ mod tests {
             }));
         });
 
+        // Provider should be visible initially
         let visible = registry.read(cx).visible_providers();
         assert_eq!(visible.len(), 1);
         assert_eq!(visible[0].id(), provider_id);
 
+        // Install the extension
         registry.update(cx, |registry, cx| {
             registry.extension_installed("fake-extension".into(), cx);
         });
 
+        // Provider should now be hidden
         let visible = registry.read(cx).visible_providers();
         assert!(visible.is_empty());
 
+        // But still in providers()
         let all = registry.read(cx).providers();
         assert_eq!(all.len(), 1);
     }
@@ -526,6 +531,7 @@ mod tests {
         registry.update(cx, |registry, cx| {
             registry.register_provider(provider.clone(), cx);
 
+            // Set up hiding function
             registry.set_builtin_provider_hiding_fn(Box::new(|id| {
                 if id == "fake" {
                     Some("fake-extension")
@@ -534,16 +540,20 @@ mod tests {
                 }
             }));
 
+            // Start with extension installed
             registry.extension_installed("fake-extension".into(), cx);
         });
 
+        // Provider should be hidden
         let visible = registry.read(cx).visible_providers();
         assert!(visible.is_empty());
 
+        // Uninstall the extension
         registry.update(cx, |registry, cx| {
             registry.extension_uninstalled("fake-extension", cx);
         });
 
+        // Provider should now be visible again
         let visible = registry.read(cx).visible_providers();
         assert_eq!(visible.len(), 1);
         assert_eq!(visible[0].id(), provider_id);
@@ -554,6 +564,7 @@ mod tests {
         let registry = cx.new(|_| LanguageModelRegistry::default());
 
         registry.update(cx, |registry, cx| {
+            // Set up hiding function
             registry.set_builtin_provider_hiding_fn(Box::new(|id| {
                 if id == "anthropic" {
                     Some("anthropic")
@@ -564,15 +575,19 @@ mod tests {
                 }
             }));
 
+            // Install only anthropic extension
             registry.extension_installed("anthropic".into(), cx);
         });
 
         let registry_read = registry.read(cx);
 
+        // Anthropic should be hidden
         assert!(registry_read.should_hide_provider(&LanguageModelProviderId("anthropic".into())));
 
+        // OpenAI should not be hidden (extension not installed)
         assert!(!registry_read.should_hide_provider(&LanguageModelProviderId("openai".into())));
 
+        // Unknown provider should not be hidden
         assert!(!registry_read.should_hide_provider(&LanguageModelProviderId("unknown".into())));
     }
 
@@ -594,6 +609,7 @@ mod tests {
             }));
         });
 
+        // Sync with a set containing the extension
         let mut extension_ids = HashSet::default();
         extension_ids.insert(Arc::from("fake-extension"));
 
@@ -601,12 +617,15 @@ mod tests {
             registry.sync_installed_llm_extensions(extension_ids, cx);
         });
 
+        // Provider should be hidden
         assert!(registry.read(cx).visible_providers().is_empty());
 
+        // Sync with empty set
         registry.update(cx, |registry, cx| {
             registry.sync_installed_llm_extensions(HashSet::default(), cx);
         });
 
+        // Provider should be visible again
         assert_eq!(registry.read(cx).visible_providers().len(), 1);
     }
 }

crates/language_models/src/extension.rs

@@ -1,7 +1,7 @@
-use collections::HashMap;
-use extension::{
+use ::extension::{
     ExtensionHostProxy, ExtensionLanguageModelProviderProxy, LanguageModelProviderRegistration,
 };
+use collections::HashMap;
 use gpui::{App, Entity};
 use language_model::{LanguageModelProviderId, LanguageModelRegistry};
 use std::sync::{Arc, LazyLock};
@@ -59,6 +59,7 @@ pub fn init_proxy(cx: &mut App) {
     let proxy = ExtensionHostProxy::default_global(cx);
     let registry = LanguageModelRegistry::global(cx);
 
+    // Set the function that determines which built-in providers should be hidden
     registry.update(cx, |registry, _cx| {
         registry.set_builtin_provider_hiding_fn(Box::new(extension_for_builtin_provider));
     });

crates/language_models/src/google_ai_api_key.rs

@@ -0,0 +1,43 @@
+use anyhow::Result;
+use credentials_provider::CredentialsProvider;
+use gpui::{App, Task};
+
+const GEMINI_API_KEY_VAR_NAME: &str = "GEMINI_API_KEY";
+const GOOGLE_AI_API_KEY_VAR_NAME: &str = "GOOGLE_AI_API_KEY";
+const GOOGLE_AI_EXTENSION_CREDENTIAL_KEY: &str = "extension-llm-google-ai:google-ai";
+
+/// Returns the Google AI API key for use by the Gemini CLI.
+///
+/// This function checks the following sources in order:
+/// 1. `GEMINI_API_KEY` environment variable
+/// 2. `GOOGLE_AI_API_KEY` environment variable
+/// 3. Extension credential store (`extension-llm-google-ai:google-ai`)
+pub fn api_key_for_gemini_cli(cx: &mut App) -> Task<Result<String>> {
+    if let Ok(key) = std::env::var(GEMINI_API_KEY_VAR_NAME) {
+        if !key.is_empty() {
+            return Task::ready(Ok(key));
+        }
+    }
+
+    if let Ok(key) = std::env::var(GOOGLE_AI_API_KEY_VAR_NAME) {
+        if !key.is_empty() {
+            return Task::ready(Ok(key));
+        }
+    }
+
+    let credentials_provider = <dyn CredentialsProvider>::global(cx);
+
+    cx.spawn(async move |cx| {
+        let credential = credentials_provider
+            .read_credentials(GOOGLE_AI_EXTENSION_CREDENTIAL_KEY, &cx)
+            .await?;
+
+        match credential {
+            Some((_, key_bytes)) => {
+                let key = String::from_utf8(key_bytes)?;
+                Ok(key)
+            }
+            None => Err(anyhow::anyhow!("No Google AI API key found")),
+        }
+    })
+}

crates/language_models/src/language_models.rs

@@ -8,11 +8,12 @@ use language_model::{LanguageModelProviderId, LanguageModelRegistry};
 use provider::deepseek::DeepSeekLanguageModelProvider;
 
 pub mod extension;
+mod google_ai_api_key;
 pub mod provider;
 mod settings;
 
 pub use crate::extension::init_proxy as init_extension_proxy;
-
+pub use crate::google_ai_api_key::api_key_for_gemini_cli;
 use crate::provider::anthropic::AnthropicLanguageModelProvider;
 use crate::provider::bedrock::BedrockLanguageModelProvider;
 use crate::provider::cloud::CloudLanguageModelProvider;
@@ -38,36 +39,41 @@ pub fn init(user_store: Entity<UserStore>, client: Arc<Client>, cx: &mut App) {
     if let Some(extension_store) = extension_host::ExtensionStore::try_global(cx) {
         cx.subscribe(&extension_store, {
             let registry = registry.clone();
-            move |extension_store, event, cx| match event {
-                extension_host::Event::ExtensionInstalled(extension_id) => {
-                    if let Some(manifest) = extension_store
-                        .read(cx)
-                        .extension_manifest_for_id(extension_id)
-                    {
-                        if !manifest.language_model_providers.is_empty() {
-                            registry.update(cx, |registry, cx| {
-                                registry.extension_installed(extension_id.clone(), cx);
-                            });
+            move |extension_store, event, cx| {
+                match event {
+                    extension_host::Event::ExtensionInstalled(extension_id) => {
+                        // Check if this extension has language_model_providers
+                        if let Some(manifest) = extension_store
+                            .read(cx)
+                            .extension_manifest_for_id(extension_id)
+                        {
+                            if !manifest.language_model_providers.is_empty() {
+                                registry.update(cx, |registry, cx| {
+                                    registry.extension_installed(extension_id.clone(), cx);
+                                });
+                            }
                         }
                     }
-                }
-                extension_host::Event::ExtensionUninstalled(extension_id) => {
-                    registry.update(cx, |registry, cx| {
-                        registry.extension_uninstalled(extension_id, cx);
-                    });
-                }
-                extension_host::Event::ExtensionsUpdated => {
-                    let mut new_ids = HashSet::default();
-                    for (extension_id, entry) in extension_store.read(cx).installed_extensions() {
-                        if !entry.manifest.language_model_providers.is_empty() {
-                            new_ids.insert(extension_id.clone());
-                        }
+                    extension_host::Event::ExtensionUninstalled(extension_id) => {
+                        registry.update(cx, |registry, cx| {
+                            registry.extension_uninstalled(extension_id, cx);
+                        });
                     }
-                    registry.update(cx, |registry, cx| {
-                        registry.sync_installed_llm_extensions(new_ids, cx);
-                    });
+                    extension_host::Event::ExtensionsUpdated => {
+                        // Re-sync installed extensions on bulk updates
+                        let mut new_ids = HashSet::default();
+                        for (extension_id, entry) in extension_store.read(cx).installed_extensions()
+                        {
+                            if !entry.manifest.language_model_providers.is_empty() {
+                                new_ids.insert(extension_id.clone());
+                            }
+                        }
+                        registry.update(cx, |registry, cx| {
+                            registry.sync_installed_llm_extensions(new_ids, cx);
+                        });
+                    }
+                    _ => {}
                 }
-                _ => {}
             }
         })
         .detach();

crates/language_models/src/provider/anthropic.rs

@@ -1104,6 +1104,7 @@ impl Render for ConfigurationView {
                 .on_action(cx.listener(Self::save_api_key))
                 .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match &self.target_agent {
                     ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Anthropic".into(),
+                    ConfigurationViewTargetAgent::EditPrediction => "Anthropic for edit predictions".into(),
                     ConfigurationViewTargetAgent::Other(agent) => agent.clone(),
                 })))
                 .child(

crates/language_models/src/provider/google.rs

@@ -1,6 +1,5 @@
 use anyhow::{Context as _, Result, anyhow};
 use collections::BTreeMap;
-use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, Stream, StreamExt, future, future::BoxFuture};
 use google_ai::{
     FunctionDeclaration, GenerateContentResponse, GoogleModelMode, Part, SystemInstruction,
@@ -32,7 +31,7 @@ use ui::{ButtonLink, ConfiguredApiCard, List, ListBulletItem, prelude::*};
 use ui_input::InputField;
 use util::ResultExt;
 
-use language_model::{ApiKey, ApiKeyState};
+use language_model::ApiKeyState;
 
 const PROVIDER_ID: LanguageModelProviderId = language_model::GOOGLE_PROVIDER_ID;
 const PROVIDER_NAME: LanguageModelProviderName = language_model::GOOGLE_PROVIDER_NAME;
@@ -117,22 +116,6 @@ impl GoogleLanguageModelProvider {
         })
     }
 
-    pub fn api_key_for_gemini_cli(cx: &mut App) -> Task<Result<String>> {
-        if let Some(key) = API_KEY_ENV_VAR.value.clone() {
-            return Task::ready(Ok(key));
-        }
-        let credentials_provider = <dyn CredentialsProvider>::global(cx);
-        let api_url = Self::api_url(cx).to_string();
-        cx.spawn(async move |cx| {
-            Ok(
-                ApiKey::load_from_system_keychain(&api_url, credentials_provider.as_ref(), cx)
-                    .await?
-                    .key()
-                    .to_string(),
-            )
-        })
-    }
-
     fn settings(cx: &App) -> &GoogleSettings {
         &crate::AllLanguageModelSettings::get_global(cx).google
     }
@@ -707,7 +690,7 @@ pub fn count_google_tokens(
             })
             .collect::<Vec<_>>();
 
-        // Tiktoken doesn't yet support these models, so we manually use the
+        // Tiktoken doesn't support these models, so we manually use the
         // same tokenizer as GPT-4.
         tiktoken_rs::num_tokens_from_messages("gpt-4", &messages).map(|tokens| tokens as u64)
     })
@@ -858,6 +841,7 @@ impl Render for ConfigurationView {
                 .on_action(cx.listener(Self::save_api_key))
                 .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match &self.target_agent {
                     ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Google AI".into(),
+                    ConfigurationViewTargetAgent::EditPrediction => "Google AI for edit predictions".into(),
                     ConfigurationViewTargetAgent::Other(agent) => agent.clone(),
                 })))
                 .child(

crates/language_models/src/provider/open_router.rs

@@ -370,8 +370,8 @@ impl LanguageModel for OpenRouterLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let openrouter_request = into_open_router(request, &self.model, self.max_output_tokens());
-        let request = self.stream_completion(openrouter_request, cx);
+        let request = into_open_router(request, &self.model, self.max_output_tokens());
+        let request = self.stream_completion(request, cx);
         let future = self.request_limiter.stream(async move {
             let response = request.await?;
             Ok(OpenRouterEventMapper::new().map_stream(response))
@@ -385,31 +385,15 @@ pub fn into_open_router(
     model: &Model,
     max_output_tokens: Option<u64>,
 ) -> open_router::Request {
-    // Anthropic models via OpenRouter don't accept reasoning_details being echoed back
-    // in requests - it's an output-only field for them. However, Gemini models require
-    // the thought signatures to be echoed back for proper reasoning chain continuity.
-    // Note: OpenRouter's model API provides an `architecture.tokenizer` field (e.g. "Claude",
-    // "Gemini") which could replace this ID prefix check, but since this is the only place
-    // we need this distinction, we're just using this less invasive check instead.
-    // If we ever have a more formal distionction between the models in the future,
-    // we should revise this to use that instead.
-    let is_anthropic_model = model.id().starts_with("anthropic/");
-
     let mut messages = Vec::new();
     for message in request.messages {
-        let reasoning_details_for_message = if is_anthropic_model {
-            None
-        } else {
-            message.reasoning_details.clone()
-        };
-
+        let reasoning_details = message.reasoning_details.clone();
         for content in message.content {
             match content {
                 MessageContent::Text(text) => add_message_content_part(
                     open_router::MessagePart::Text { text },
                     message.role,
                     &mut messages,
-                    reasoning_details_for_message.clone(),
                 ),
                 MessageContent::Thinking { .. } => {}
                 MessageContent::RedactedThinking(_) => {}
@@ -420,7 +404,6 @@ pub fn into_open_router(
                         },
                         message.role,
                         &mut messages,
-                        reasoning_details_for_message.clone(),
                     );
                 }
                 MessageContent::ToolUse(tool_use) => {
@@ -436,15 +419,21 @@ pub fn into_open_router(
                         },
                     };
 
-                    if let Some(open_router::RequestMessage::Assistant { tool_calls, .. }) =
-                        messages.last_mut()
+                    if let Some(open_router::RequestMessage::Assistant {
+                        tool_calls,
+                        reasoning_details: existing_reasoning,
+                        ..
+                    }) = messages.last_mut()
                     {
                         tool_calls.push(tool_call);
+                        if existing_reasoning.is_none() && reasoning_details.is_some() {
+                            *existing_reasoning = reasoning_details.clone();
+                        }
                     } else {
                         messages.push(open_router::RequestMessage::Assistant {
                             content: None,
                             tool_calls: vec![tool_call],
-                            reasoning_details: reasoning_details_for_message.clone(),
+                            reasoning_details: reasoning_details.clone(),
                         });
                     }
                 }
@@ -520,7 +509,6 @@ fn add_message_content_part(
     new_part: open_router::MessagePart,
     role: Role,
     messages: &mut Vec<open_router::RequestMessage>,
-    reasoning_details: Option<serde_json::Value>,
 ) {
     match (role, messages.last_mut()) {
         (Role::User, Some(open_router::RequestMessage::User { content }))
@@ -544,7 +532,7 @@ fn add_message_content_part(
                 Role::Assistant => open_router::RequestMessage::Assistant {
                     content: Some(open_router::MessageContent::from(vec![new_part])),
                     tool_calls: Vec::new(),
-                    reasoning_details,
+                    reasoning_details: None,
                 },
                 Role::System => open_router::RequestMessage::System {
                     content: open_router::MessageContent::from(vec![new_part]),

crates/languages/src/c/textobjects.scm

@@ -23,9 +23,3 @@
         "{"
         [(_) ","?]* @class.inside
         "}")) @class.around
-
-(union_specifier
-    body: (_
-        "{"
-        (_)* @class.inside
-        "}")) @class.around

crates/languages/src/cpp/textobjects.scm

@@ -24,12 +24,6 @@
         [(_) ","?]* @class.inside
         "}")) @class.around
 
-(union_specifier
-    body: (_
-        "{"
-        (_)* @class.inside
-        "}")) @class.around
-
 (class_specifier
   body: (_
       "{"

crates/markdown/Cargo.toml

@@ -29,10 +29,8 @@ log.workspace = true
 pulldown-cmark.workspace = true
 sum_tree.workspace = true
 theme.workspace = true
-tracing.workspace = true
 ui.workspace = true
 util.workspace = true
-ztracing.workspace = true
 
 [dev-dependencies]
 assets.workspace = true
@@ -43,6 +41,3 @@ languages = { workspace = true, features = ["load-grammars"] }
 node_runtime.workspace = true
 settings = { workspace = true, features = ["test-support"] }
 util = { workspace = true, features = ["test-support"] }
-
-[package.metadata.cargo-machete]
-ignored = ["tracing"]

crates/markdown/src/markdown.rs

@@ -831,7 +831,6 @@ impl Element for MarkdownElement {
         None
     }
 
-    #[ztracing::instrument(skip_all)]
     fn request_layout(
         &mut self,
         _id: Option<&GlobalElementId>,
@@ -1325,7 +1324,6 @@ impl Element for MarkdownElement {
         (layout_id, rendered_markdown)
     }
 
-    #[ztracing::instrument(skip_all)]
     fn prepaint(
         &mut self,
         _id: Option<&GlobalElementId>,
@@ -1345,7 +1343,6 @@ impl Element for MarkdownElement {
         hitbox
     }
 
-    #[ztracing::instrument(skip_all)]
     fn paint(
         &mut self,
         _id: Option<&GlobalElementId>,

crates/multi_buffer/src/multi_buffer.rs

@@ -19,9 +19,9 @@ use gpui::{App, Context, Entity, EntityId, EventEmitter};
 use itertools::Itertools;
 use language::{
     AutoindentMode, BracketMatch, Buffer, BufferChunks, BufferRow, BufferSnapshot, Capability,
-    CharClassifier, CharKind, CharScopeContext, Chunk, CursorShape, DiagnosticEntryRef, File,
-    IndentGuideSettings, IndentSize, Language, LanguageScope, OffsetRangeExt, OffsetUtf16, Outline,
-    OutlineItem, Point, PointUtf16, Selection, TextDimension, TextObject, ToOffset as _,
+    CharClassifier, CharKind, CharScopeContext, Chunk, CursorShape, DiagnosticEntryRef, DiskState,
+    File, IndentGuideSettings, IndentSize, Language, LanguageScope, OffsetRangeExt, OffsetUtf16,
+    Outline, OutlineItem, Point, PointUtf16, Selection, TextDimension, TextObject, ToOffset as _,
     ToPoint as _, TransactionId, TreeSitterOptions, Unclipped,
     language_settings::{LanguageSettings, language_settings},
 };
@@ -2980,7 +2980,7 @@ impl MultiBuffer {
             *is_dirty |= buffer.is_dirty();
             *has_deleted_file |= buffer
                 .file()
-                .is_some_and(|file| file.disk_state().is_deleted());
+                .is_some_and(|file| file.disk_state() == DiskState::Deleted);
             *has_conflict |= buffer.has_conflict();
         }
         if edited {

crates/project/src/debugger/breakpoint_store.rs

@@ -23,7 +23,7 @@ use super::session::ThreadId;
 
 mod breakpoints_in_file {
     use collections::HashMap;
-    use language::BufferEvent;
+    use language::{BufferEvent, DiskState};
 
     use super::*;
 
@@ -82,7 +82,7 @@ mod breakpoints_in_file {
                     BufferEvent::FileHandleChanged => {
                         let entity_id = buffer.entity_id();
 
-                        if buffer.read(cx).file().is_none_or(|f| f.disk_state().is_deleted()) {
+                        if buffer.read(cx).file().is_none_or(|f| f.disk_state() == DiskState::Deleted) {
                             breakpoint_store.breakpoints.retain(|_, breakpoints_in_file| {
                                 breakpoints_in_file.buffer.entity_id() != entity_id
                             });

crates/project/src/project.rs

@@ -83,7 +83,7 @@ use gpui::{
     Task, WeakEntity, Window,
 };
 use language::{
-    Buffer, BufferEvent, Capability, CodeLabel, CursorShape, DiskState, Language, LanguageName,
+    Buffer, BufferEvent, Capability, CodeLabel, CursorShape, Language, LanguageName,
     LanguageRegistry, PointUtf16, ToOffset, ToPointUtf16, Toolchain, ToolchainMetadata,
     ToolchainScope, Transaction, Unclipped, language_settings::InlayHintKind,
     proto::split_operations,
@@ -5671,9 +5671,7 @@ impl ProjectItem for Buffer {
     }
 
     fn project_path(&self, cx: &App) -> Option<ProjectPath> {
-        let file = self.file()?;
-
-        (!matches!(file.disk_state(), DiskState::Historic { .. })).then(|| ProjectPath {
+        self.file().map(|file| ProjectPath {
             worktree_id: file.worktree_id(cx),
             path: file.path().clone(),
         })

crates/proto/proto/worktree.proto

@@ -2,162 +2,161 @@ syntax = "proto3";
 package zed.messages;
 
 message Timestamp {
-  uint64 seconds = 1;
-  uint32 nanos = 2;
+    uint64 seconds = 1;
+    uint32 nanos = 2;
 }
 
 message File {
-  uint64 worktree_id = 1;
-  optional uint64 entry_id = 2;
-  string path = 3;
-  Timestamp mtime = 4;
-  bool is_deleted = 5;
-  bool is_historic = 6;
+    uint64 worktree_id = 1;
+    optional uint64 entry_id = 2;
+    string path = 3;
+    Timestamp mtime = 4;
+    bool is_deleted = 5;
 }
 
 message Entry {
-  uint64 id = 1;
-  bool is_dir = 2;
-  string path = 3;
-  uint64 inode = 4;
-  Timestamp mtime = 5;
-  bool is_ignored = 7;
-  bool is_external = 8;
-  reserved 6;
-  reserved 9;
-  bool is_fifo = 10;
-  optional uint64 size = 11;
-  optional string canonical_path = 12;
-  bool is_hidden = 13;
+    uint64 id = 1;
+    bool is_dir = 2;
+    string path = 3;
+    uint64 inode = 4;
+    Timestamp mtime = 5;
+    bool is_ignored = 7;
+    bool is_external = 8;
+    reserved 6;
+    reserved 9;
+    bool is_fifo = 10;
+    optional uint64 size = 11;
+    optional string canonical_path = 12;
+    bool is_hidden = 13;
 }
 
 message AddWorktree {
-  string path = 1;
-  uint64 project_id = 2;
-  bool visible = 3;
+    string path = 1;
+    uint64 project_id = 2;
+    bool visible = 3;
 }
 
 message AddWorktreeResponse {
-  uint64 worktree_id = 1;
-  string canonicalized_path = 2;
+    uint64 worktree_id = 1;
+    string canonicalized_path = 2;
 }
 
 message RemoveWorktree {
-  uint64 worktree_id = 1;
+    uint64 worktree_id = 1;
 }
 
 message GetPathMetadata {
-  uint64 project_id = 1;
-  string path = 2;
+    uint64 project_id = 1;
+    string path = 2;
 }
 
 message GetPathMetadataResponse {
-  bool exists = 1;
-  string path = 2;
-  bool is_dir = 3;
+    bool exists = 1;
+    string path = 2;
+    bool is_dir = 3;
 }
 
 message WorktreeMetadata {
-  uint64 id = 1;
-  string root_name = 2;
-  bool visible = 3;
-  string abs_path = 4;
+    uint64 id = 1;
+    string root_name = 2;
+    bool visible = 3;
+    string abs_path = 4;
 }
 
 message ProjectPath {
-  uint64 worktree_id = 1;
-  string path = 2;
+    uint64 worktree_id = 1;
+    string path = 2;
 }
 
 message ListRemoteDirectoryConfig {
-  bool is_dir = 1;
+    bool is_dir = 1;
 }
 
 message ListRemoteDirectory {
-  uint64 dev_server_id = 1;
-  string path = 2;
-  ListRemoteDirectoryConfig config = 3;
+    uint64 dev_server_id = 1;
+    string path = 2;
+    ListRemoteDirectoryConfig config = 3;
 }
 
 message EntryInfo {
-  bool is_dir = 1;
+    bool is_dir = 1;
 }
 
 message ListRemoteDirectoryResponse {
-  repeated string entries = 1;
-  repeated EntryInfo entry_info = 2;
+    repeated string entries = 1;
+    repeated EntryInfo entry_info = 2;
 }
 
 message CreateProjectEntry {
-  uint64 project_id = 1;
-  uint64 worktree_id = 2;
-  string path = 3;
-  bool is_directory = 4;
-  optional bytes content = 5;
+    uint64 project_id = 1;
+    uint64 worktree_id = 2;
+    string path = 3;
+    bool is_directory = 4;
+    optional bytes content = 5;
 }
 
 message RenameProjectEntry {
-  uint64 project_id = 1;
-  uint64 entry_id = 2;
-  string new_path = 3;
-  uint64 new_worktree_id = 4;
+    uint64 project_id = 1;
+    uint64 entry_id = 2;
+    string new_path = 3;
+    uint64 new_worktree_id = 4;
 }
 
 message CopyProjectEntry {
-  uint64 project_id = 1;
-  uint64 entry_id = 2;
-  string new_path = 3;
-  uint64 new_worktree_id = 5;
-  reserved 4;
+    uint64 project_id = 1;
+    uint64 entry_id = 2;
+    string new_path = 3;
+    uint64 new_worktree_id = 5;
+    reserved 4;
 }
 
 message DeleteProjectEntry {
-  uint64 project_id = 1;
-  uint64 entry_id = 2;
-  bool use_trash = 3;
+    uint64 project_id = 1;
+    uint64 entry_id = 2;
+    bool use_trash = 3;
 }
 
 message ExpandProjectEntry {
-  uint64 project_id = 1;
-  uint64 entry_id = 2;
+    uint64 project_id = 1;
+    uint64 entry_id = 2;
 }
 
 message ExpandProjectEntryResponse {
-  uint64 worktree_scan_id = 1;
+    uint64 worktree_scan_id = 1;
 }
 
 message ExpandAllForProjectEntry {
-  uint64 project_id = 1;
-  uint64 entry_id = 2;
+    uint64 project_id = 1;
+    uint64 entry_id = 2;
 }
 
 message ExpandAllForProjectEntryResponse {
-  uint64 worktree_scan_id = 1;
+    uint64 worktree_scan_id = 1;
 }
 
 message ProjectEntryResponse {
-  optional Entry entry = 1;
-  uint64 worktree_scan_id = 2;
+    optional Entry entry = 1;
+    uint64 worktree_scan_id = 2;
 }
 
 message UpdateWorktreeSettings {
-  uint64 project_id = 1;
-  uint64 worktree_id = 2;
-  string path = 3;
-  optional string content = 4;
-  optional LocalSettingsKind kind = 5;
+    uint64 project_id = 1;
+    uint64 worktree_id = 2;
+    string path = 3;
+    optional string content = 4;
+    optional LocalSettingsKind kind = 5;
 }
 
 enum LocalSettingsKind {
-  Settings = 0;
-  Tasks = 1;
-  Editorconfig = 2;
-  Debug = 3;
+    Settings = 0;
+    Tasks = 1;
+    Editorconfig = 2;
+    Debug = 3;
 }
 
 message UpdateUserSettings {
-  uint64 project_id = 1;
-  string contents = 2;
+    uint64 project_id = 1;
+    string contents = 2;
 }
 
 message TrustWorktrees {

crates/settings/src/settings_content/agent.rs

@@ -281,7 +281,6 @@ impl JsonSchema for LanguageModelProviderSetting {
                     "type": "string",
                     "enum": [
                         "amazon-bedrock",
-                        "anthropic",
                         "copilot_chat",
                         "deepseek",
                         "google",

crates/settings/src/settings_content/extension.rs

@@ -20,6 +20,12 @@ pub struct ExtensionSettingsContent {
     pub auto_update_extensions: HashMap<Arc<str>, bool>,
     /// The capabilities granted to extensions.
     pub granted_extension_capabilities: Option<Vec<ExtensionCapabilityContent>>,
+    /// Extension language model providers that are allowed to read API keys from
+    /// environment variables. Each entry is in the format
+    /// "extension_id:provider_id:ENV_VAR_NAME" (e.g., "google-ai:google-ai:GEMINI_API_KEY").
+    ///
+    /// Default: []
+    pub allowed_env_var_providers: Option<Vec<Arc<str>>>,
 }
 
 /// A capability for an extension.

crates/settings_ui/Cargo.toml

@@ -20,6 +20,8 @@ anyhow.workspace = true
 bm25 = "2.3.2"
 copilot.workspace = true
 edit_prediction.workspace = true
+extension_host.workspace = true
+language_model.workspace = true
 language_models.workspace = true
 editor.workspace = true
 feature_flags.workspace = true

crates/settings_ui/src/page_data.rs

@@ -7659,8 +7659,8 @@ fn edit_prediction_language_settings_section() -> Vec<SettingsPageItem> {
             files: USER,
             render: Arc::new(|_, window, cx| {
                 let settings_window = cx.entity();
-                let page = window.use_state(cx, |_, _| {
-                    crate::pages::EditPredictionSetupPage::new(settings_window)
+                let page = window.use_state(cx, |window, cx| {
+                    crate::pages::EditPredictionSetupPage::new(settings_window, window, cx)
                 });
                 page.into_any_element()
             }),

crates/settings_ui/src/pages/edit_prediction_provider_setup.rs

@@ -3,10 +3,15 @@ use edit_prediction::{
     mercury::{MERCURY_CREDENTIALS_URL, mercury_api_token},
     sweep_ai::{SWEEP_CREDENTIALS_URL, sweep_api_token},
 };
+use extension_host::ExtensionStore;
 use feature_flags::FeatureFlagAppExt as _;
-use gpui::{Entity, ScrollHandle, prelude::*};
+use gpui::{AnyView, Entity, ScrollHandle, Subscription, prelude::*};
+use language_model::{
+    ConfigurationViewTargetAgent, LanguageModelProviderId, LanguageModelRegistry,
+};
 use language_models::provider::mistral::{CODESTRAL_API_URL, codestral_api_key};
-use ui::{ButtonLink, ConfiguredApiCard, WithScrollbar, prelude::*};
+use std::collections::HashMap;
+use ui::{ButtonLink, ConfiguredApiCard, Icon, WithScrollbar, prelude::*};
 
 use crate::{
     SettingField, SettingItem, SettingsFieldMetadata, SettingsPageItem, SettingsWindow, USER,
@@ -16,24 +21,133 @@ use crate::{
 pub struct EditPredictionSetupPage {
     settings_window: Entity<SettingsWindow>,
     scroll_handle: ScrollHandle,
+    extension_oauth_views: HashMap<LanguageModelProviderId, ExtensionOAuthProviderView>,
+    _registry_subscription: Subscription,
+}
+
+struct ExtensionOAuthProviderView {
+    provider_name: SharedString,
+    provider_icon: IconName,
+    provider_icon_path: Option<SharedString>,
+    configuration_view: AnyView,
 }
 
 impl EditPredictionSetupPage {
-    pub fn new(settings_window: Entity<SettingsWindow>) -> Self {
-        Self {
+    pub fn new(
+        settings_window: Entity<SettingsWindow>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let registry_subscription = cx.subscribe_in(
+            &LanguageModelRegistry::global(cx),
+            window,
+            |this, _, event: &language_model::Event, window, cx| match event {
+                language_model::Event::AddedProvider(provider_id) => {
+                    this.maybe_add_extension_oauth_view(provider_id, window, cx);
+                }
+                language_model::Event::RemovedProvider(provider_id) => {
+                    this.extension_oauth_views.remove(provider_id);
+                }
+                _ => {}
+            },
+        );
+
+        let mut this = Self {
             settings_window,
             scroll_handle: ScrollHandle::new(),
+            extension_oauth_views: HashMap::default(),
+            _registry_subscription: registry_subscription,
+        };
+        this.build_extension_oauth_views(window, cx);
+        this
+    }
+
+    fn build_extension_oauth_views(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let oauth_provider_ids = get_extension_oauth_provider_ids(cx);
+        for provider_id in oauth_provider_ids {
+            self.maybe_add_extension_oauth_view(&provider_id, window, cx);
         }
     }
+
+    fn maybe_add_extension_oauth_view(
+        &mut self,
+        provider_id: &LanguageModelProviderId,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        // Check if this provider has OAuth configured in the extension manifest
+        if !is_extension_oauth_provider(provider_id, cx) {
+            return;
+        }
+
+        let registry = LanguageModelRegistry::global(cx).read(cx);
+        let Some(provider) = registry.provider(provider_id) else {
+            return;
+        };
+
+        let provider_name = provider.name().0;
+        let provider_icon = provider.icon();
+        let provider_icon_path = provider.icon_path();
+        let configuration_view =
+            provider.configuration_view(ConfigurationViewTargetAgent::EditPrediction, window, cx);
+
+        self.extension_oauth_views.insert(
+            provider_id.clone(),
+            ExtensionOAuthProviderView {
+                provider_name,
+                provider_icon,
+                provider_icon_path,
+                configuration_view,
+            },
+        );
+    }
 }
 
 impl Render for EditPredictionSetupPage {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let settings_window = self.settings_window.clone();
 
-        let providers = [
-            Some(render_github_copilot_provider(window, cx).into_any_element()),
-            cx.has_flag::<Zeta2FeatureFlag>().then(|| {
+        let copilot_extension_installed = ExtensionStore::global(cx)
+            .read(cx)
+            .installed_extensions()
+            .contains_key("copilot-chat");
+
+        let mut providers: Vec<AnyElement> = Vec::new();
+
+        // Built-in Copilot (hidden if copilot-chat extension is installed)
+        if !copilot_extension_installed {
+            providers.push(render_github_copilot_provider(window, cx).into_any_element());
+        }
+
+        // Extension providers with OAuth support
+        for (provider_id, view) in &self.extension_oauth_views {
+            let icon_element: AnyElement = if let Some(icon_path) = &view.provider_icon_path {
+                Icon::from_external_svg(icon_path.clone())
+                    .size(ui::IconSize::Medium)
+                    .into_any_element()
+            } else {
+                Icon::new(view.provider_icon)
+                    .size(ui::IconSize::Medium)
+                    .into_any_element()
+            };
+
+            providers.push(
+                v_flex()
+                    .id(SharedString::from(provider_id.0.to_string()))
+                    .min_w_0()
+                    .gap_1p5()
+                    .child(
+                        h_flex().gap_2().items_center().child(icon_element).child(
+                            Headline::new(view.provider_name.clone()).size(HeadlineSize::Small),
+                        ),
+                    )
+                    .child(view.configuration_view.clone())
+                    .into_any_element(),
+            );
+        }
+
+        if cx.has_flag::<Zeta2FeatureFlag>() {
+            providers.push(
                 render_api_key_provider(
                     IconName::Inception,
                     "Mercury",
@@ -44,9 +158,12 @@ impl Render for EditPredictionSetupPage {
                     window,
                     cx,
                 )
-                .into_any_element()
-            }),
-            cx.has_flag::<Zeta2FeatureFlag>().then(|| {
+                .into_any_element(),
+            );
+        }
+
+        if cx.has_flag::<Zeta2FeatureFlag>() {
+            providers.push(
                 render_api_key_provider(
                     IconName::SweepAi,
                     "Sweep",
@@ -57,32 +174,33 @@ impl Render for EditPredictionSetupPage {
                     window,
                     cx,
                 )
-                .into_any_element()
-            }),
-            Some(
-                render_api_key_provider(
-                    IconName::AiMistral,
-                    "Codestral",
-                    "https://console.mistral.ai/codestral".into(),
-                    codestral_api_key(cx),
-                    |cx| language_models::MistralLanguageModelProvider::api_url(cx),
-                    Some(settings_window.update(cx, |settings_window, cx| {
-                        let codestral_settings = codestral_settings();
-                        settings_window
-                            .render_sub_page_items_section(
-                                codestral_settings.iter().enumerate(),
-                                None,
-                                window,
-                                cx,
-                            )
-                            .into_any_element()
-                    })),
-                    window,
-                    cx,
-                )
                 .into_any_element(),
-            ),
-        ];
+            );
+        }
+
+        providers.push(
+            render_api_key_provider(
+                IconName::AiMistral,
+                "Codestral",
+                "https://console.mistral.ai/codestral".into(),
+                codestral_api_key(cx),
+                |cx| language_models::MistralLanguageModelProvider::api_url(cx),
+                Some(settings_window.update(cx, |settings_window, cx| {
+                    let codestral_settings = codestral_settings();
+                    settings_window
+                        .render_sub_page_items_section(
+                            codestral_settings.iter().enumerate(),
+                            None,
+                            window,
+                            cx,
+                        )
+                        .into_any_element()
+                })),
+                window,
+                cx,
+            )
+            .into_any_element(),
+        );
 
         div()
             .size_full()
@@ -96,11 +214,60 @@ impl Render for EditPredictionSetupPage {
                     .pb_16()
                     .overflow_y_scroll()
                     .track_scroll(&self.scroll_handle)
-                    .children(providers.into_iter().flatten()),
+                    .children(providers),
             )
     }
 }
 
+/// Get extension provider IDs that have OAuth configured.
+fn get_extension_oauth_provider_ids(cx: &App) -> Vec<LanguageModelProviderId> {
+    let extension_store = ExtensionStore::global(cx).read(cx);
+
+    extension_store
+        .installed_extensions()
+        .iter()
+        .flat_map(|(extension_id, entry)| {
+            entry.manifest.language_model_providers.iter().filter_map(
+                move |(provider_id, provider_entry)| {
+                    // Check if this provider has OAuth configured
+                    let has_oauth = provider_entry
+                        .auth
+                        .as_ref()
+                        .is_some_and(|auth| auth.oauth.is_some());
+
+                    if has_oauth {
+                        Some(LanguageModelProviderId(
+                            format!("{}:{}", extension_id, provider_id).into(),
+                        ))
+                    } else {
+                        None
+                    }
+                },
+            )
+        })
+        .collect()
+}
+
+/// Check if a provider ID corresponds to an extension with OAuth configured.
+fn is_extension_oauth_provider(provider_id: &LanguageModelProviderId, cx: &App) -> bool {
+    // Extension provider IDs are in the format "extension_id:provider_id"
+    let Some((extension_id, local_provider_id)) = provider_id.0.split_once(':') else {
+        return false;
+    };
+
+    let extension_store = ExtensionStore::global(cx).read(cx);
+    let Some(entry) = extension_store.installed_extensions().get(extension_id) else {
+        return false;
+    };
+
+    entry
+        .manifest
+        .language_model_providers
+        .get(local_provider_id)
+        .and_then(|p| p.auth.as_ref())
+        .is_some_and(|auth| auth.oauth.is_some())
+}
+
 fn render_api_key_provider(
     icon: IconName,
     title: &'static str,

crates/settings_ui/src/settings_ui.rs

@@ -602,7 +602,7 @@ pub fn open_settings_editor(
                 focus: true,
                 show: true,
                 is_movable: true,
-                kind: gpui::WindowKind::Normal,
+                kind: gpui::WindowKind::Floating,
                 window_background: cx.theme().window_background_appearance(),
                 app_id: Some(app_id.to_owned()),
                 window_decorations: Some(window_decorations),

crates/terminal_view/src/terminal_element.rs

@@ -151,14 +151,7 @@ impl BatchedTextRun {
                 std::slice::from_ref(&self.style),
                 Some(dimensions.cell_width),
             )
-            .paint(
-                pos,
-                dimensions.line_height,
-                gpui::TextAlign::Left,
-                None,
-                window,
-                cx,
-            );
+            .paint(pos, dimensions.line_height, window, cx);
     }
 }
 
@@ -1333,14 +1326,8 @@ impl Element for TerminalElement {
                                     }],
                                     None
                                 );
-                                shaped_line.paint(
-                                    ime_position,
-                                    layout.dimensions.line_height,
-                                    gpui::TextAlign::Left,
-                                    None,
-                                    window,
-                                    cx,
-                                )
+                                shaped_line
+                                    .paint(ime_position, layout.dimensions.line_height, window, cx)
                                     .log_err();
                             }
 

crates/ui/src/components/toggle.rs

@@ -344,6 +344,7 @@ pub struct Switch {
     label: Option<SharedString>,
     label_position: Option<SwitchLabelPosition>,
     label_size: LabelSize,
+    label_color: Color,
     full_width: bool,
     key_binding: Option<KeyBinding>,
     color: SwitchColor,
@@ -361,6 +362,7 @@ impl Switch {
             label: None,
             label_position: None,
             label_size: LabelSize::Small,
+            label_color: Color::Default,
             full_width: false,
             key_binding: None,
             color: SwitchColor::default(),
@@ -408,6 +410,11 @@ impl Switch {
         self
     }
 
+    pub fn label_color(mut self, color: Color) -> Self {
+        self.label_color = color;
+        self
+    }
+
     pub fn full_width(mut self, full_width: bool) -> Self {
         self.full_width = full_width;
         self
@@ -507,7 +514,11 @@ impl RenderOnce for Switch {
                 self.label_position == Some(SwitchLabelPosition::Start),
                 |this| {
                     this.when_some(label.clone(), |this, label| {
-                        this.child(Label::new(label).size(self.label_size))
+                        this.child(
+                            Label::new(label)
+                                .color(self.label_color)
+                                .size(self.label_size),
+                        )
                     })
                 },
             )
@@ -516,7 +527,11 @@ impl RenderOnce for Switch {
                 self.label_position == Some(SwitchLabelPosition::End),
                 |this| {
                     this.when_some(label, |this, label| {
-                        this.child(Label::new(label).size(self.label_size))
+                        this.child(
+                            Label::new(label)
+                                .color(self.label_color)
+                                .size(self.label_size),
+                        )
                     })
                 },
             )

crates/ui_input/src/number_field.rs

@@ -5,11 +5,8 @@ use std::{
     str::FromStr,
 };
 
-use editor::{Editor, actions::MoveDown, actions::MoveUp};
-use gpui::{
-    ClickEvent, Entity, FocusHandle, Focusable, FontWeight, Modifiers, TextAlign,
-    TextStyleRefinement, WeakEntity,
-};
+use editor::{Editor, EditorStyle};
+use gpui::{ClickEvent, Entity, FocusHandle, Focusable, FontWeight, Modifiers};
 
 use settings::{CenteredPaddingSettings, CodeFade, DelayMs, InactiveOpacity, MinimumContrast};
 use ui::prelude::*;
@@ -238,14 +235,12 @@ impl_numeric_stepper_nonzero_int!(NonZeroU32, u32);
 impl_numeric_stepper_nonzero_int!(NonZeroU64, u64);
 impl_numeric_stepper_nonzero_int!(NonZero<usize>, usize);
 
-#[derive(IntoElement, RegisterComponent)]
-pub struct NumberField<T: NumberFieldType = usize> {
+#[derive(RegisterComponent)]
+pub struct NumberField<T = usize> {
     id: ElementId,
     value: T,
     focus_handle: FocusHandle,
     mode: Entity<NumberFieldMode>,
-    /// Stores a weak reference to the editor when in edit mode, so buttons can update its text
-    edit_editor: Entity<Option<WeakEntity<Editor>>>,
     format: Box<dyn FnOnce(&T) -> String>,
     large_step: T,
     small_step: T,
@@ -261,17 +256,15 @@ impl<T: NumberFieldType> NumberField<T> {
     pub fn new(id: impl Into<ElementId>, value: T, window: &mut Window, cx: &mut App) -> Self {
         let id = id.into();
 
-        let (mode, focus_handle, edit_editor) = window.with_id(id.clone(), |window| {
+        let (mode, focus_handle) = window.with_id(id.clone(), |window| {
             let mode = window.use_state(cx, |_, _| NumberFieldMode::default());
             let focus_handle = window.use_state(cx, |_, cx| cx.focus_handle());
-            let edit_editor = window.use_state(cx, |_, _| None);
-            (mode, focus_handle, edit_editor)
+            (mode, focus_handle)
         });
 
         Self {
             id,
             mode,
-            edit_editor,
             value,
             focus_handle: focus_handle.read(cx).clone(),
             format: Box::new(T::default_format),
@@ -316,11 +309,6 @@ impl<T: NumberFieldType> NumberField<T> {
         self
     }
 
-    pub fn mode(self, mode: NumberFieldMode, cx: &mut App) -> Self {
-        self.mode.write(cx, mode);
-        self
-    }
-
     pub fn on_reset(
         mut self,
         on_reset: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
@@ -340,16 +328,17 @@ impl<T: NumberFieldType> NumberField<T> {
     }
 }
 
-#[derive(Clone, Copy)]
-enum ValueChangeDirection {
-    Increment,
-    Decrement,
+impl<T: NumberFieldType> IntoElement for NumberField<T> {
+    type Element = gpui::Component<Self>;
+
+    fn into_element(self) -> Self::Element {
+        gpui::Component::new(self)
+    }
 }
 
 impl<T: NumberFieldType> RenderOnce for NumberField<T> {
     fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
         let mut tab_index = self.tab_index;
-        let is_edit_mode = matches!(*self.mode.read(cx), NumberFieldMode::Edit);
 
         let get_step = {
             let large_step = self.large_step;
@@ -366,67 +355,6 @@ impl<T: NumberFieldType> RenderOnce for NumberField<T> {
             }
         };
 
-        let clamp_value = {
-            let min = self.min_value;
-            let max = self.max_value;
-            move |value: T| -> T {
-                if value < min {
-                    min
-                } else if value > max {
-                    max
-                } else {
-                    value
-                }
-            }
-        };
-
-        let change_value = {
-            move |current: T, step: T, direction: ValueChangeDirection| -> T {
-                let new_value = match direction {
-                    ValueChangeDirection::Increment => current.saturating_add(step),
-                    ValueChangeDirection::Decrement => current.saturating_sub(step),
-                };
-                clamp_value(new_value)
-            }
-        };
-
-        let get_current_value = {
-            let value = self.value;
-            let edit_editor = self.edit_editor.clone();
-
-            Rc::new(move |cx: &App| -> T {
-                if !is_edit_mode {
-                    return value;
-                }
-                edit_editor
-                    .read(cx)
-                    .as_ref()
-                    .and_then(|weak| weak.upgrade())
-                    .and_then(|editor| editor.read(cx).text(cx).parse::<T>().ok())
-                    .unwrap_or(value)
-            })
-        };
-
-        let update_editor_text = {
-            let edit_editor = self.edit_editor.clone();
-
-            Rc::new(move |new_value: T, window: &mut Window, cx: &mut App| {
-                if !is_edit_mode {
-                    return;
-                }
-                let Some(editor) = edit_editor
-                    .read(cx)
-                    .as_ref()
-                    .and_then(|weak| weak.upgrade())
-                else {
-                    return;
-                };
-                editor.update(cx, |editor, cx| {
-                    editor.set_text(format!("{}", new_value), window, cx);
-                });
-            })
-        };
-
         let bg_color = cx.theme().colors().surface_background;
         let hover_bg_color = cx.theme().colors().element_hover;
 
@@ -467,20 +395,13 @@ impl<T: NumberFieldType> RenderOnce for NumberField<T> {
                 h_flex()
                     .map(|decrement| {
                         let decrement_handler = {
+                            let value = self.value;
                             let on_change = self.on_change.clone();
-                            let get_current_value = get_current_value.clone();
-                            let update_editor_text = update_editor_text.clone();
-
+                            let min = self.min_value;
                             move |click: &ClickEvent, window: &mut Window, cx: &mut App| {
-                                let current_value = get_current_value(cx);
                                 let step = get_step(click.modifiers());
-                                let new_value = change_value(
-                                    current_value,
-                                    step,
-                                    ValueChangeDirection::Decrement,
-                                );
-
-                                update_editor_text(new_value, window, cx);
+                                let new_value = value.saturating_sub(step);
+                                let new_value = if new_value < min { min } else { new_value };
                                 on_change(&new_value, window, cx);
                             }
                         };
@@ -517,97 +438,46 @@ impl<T: NumberFieldType> RenderOnce for NumberField<T> {
                                     .justify_center()
                                     .child(Label::new((self.format)(&self.value)))
                                     .into_any_element(),
+                                // Edit mode is disabled until we implement center text alignment for editor
+                                // mode.write(cx, NumberFieldMode::Edit);
+                                //
+                                // When we get to making Edit mode work, we shouldn't even focus the decrement/increment buttons.
+                                // Focus should go instead straight to the editor, avoiding any double-step focus.
+                                // In this world, the buttons become a mouse-only interaction, given users should be able
+                                // to do everything they'd do with the buttons straight in the editor anyway.
                                 NumberFieldMode::Edit => h_flex()
                                     .flex_1()
                                     .child(window.use_state(cx, {
                                         |window, cx| {
+                                            let previous_focus_handle = window.focused(cx);
                                             let mut editor = Editor::single_line(window, cx);
-
-                                            editor.set_text_style_refinement(TextStyleRefinement {
-                                                text_align: Some(TextAlign::Center),
-                                                ..Default::default()
-                                            });
+                                            let mut style = EditorStyle::default();
+                                            style.text.text_align = gpui::TextAlign::Right;
+                                            editor.set_style(style, window, cx);
 
                                             editor.set_text(format!("{}", self.value), window, cx);
-
-                                            let editor_weak = cx.entity().downgrade();
-
-                                            self.edit_editor.update(cx, |state, _| {
-                                                *state = Some(editor_weak);
-                                            });
-
-                                            editor
-                                                .register_action::<MoveUp>({
-                                                    let on_change = self.on_change.clone();
-                                                    let editor_handle = cx.entity().downgrade();
-                                                    move |_, window, cx| {
-                                                        let Some(editor) = editor_handle.upgrade()
-                                                        else {
-                                                            return;
-                                                        };
-                                                        editor.update(cx, |editor, cx| {
-                                                            if let Ok(current_value) =
-                                                                editor.text(cx).parse::<T>()
-                                                            {
-                                                                let step =
-                                                                    get_step(window.modifiers());
-                                                                let new_value = change_value(
-                                                                    current_value,
-                                                                    step,
-                                                                    ValueChangeDirection::Increment,
-                                                                );
-                                                                editor.set_text(
-                                                                    format!("{}", new_value),
-                                                                    window,
-                                                                    cx,
-                                                                );
-                                                                on_change(&new_value, window, cx);
-                                                            }
-                                                        });
-                                                    }
-                                                })
-                                                .detach();
-
-                                            editor
-                                                .register_action::<MoveDown>({
-                                                    let on_change = self.on_change.clone();
-                                                    let editor_handle = cx.entity().downgrade();
-                                                    move |_, window, cx| {
-                                                        let Some(editor) = editor_handle.upgrade()
-                                                        else {
-                                                            return;
-                                                        };
-                                                        editor.update(cx, |editor, cx| {
-                                                            if let Ok(current_value) =
-                                                                editor.text(cx).parse::<T>()
-                                                            {
-                                                                let step =
-                                                                    get_step(window.modifiers());
-                                                                let new_value = change_value(
-                                                                    current_value,
-                                                                    step,
-                                                                    ValueChangeDirection::Decrement,
-                                                                );
-                                                                editor.set_text(
-                                                                    format!("{}", new_value),
-                                                                    window,
-                                                                    cx,
-                                                                );
-                                                                on_change(&new_value, window, cx);
-                                                            }
-                                                        });
-                                                    }
-                                                })
-                                                .detach();
-
                                             cx.on_focus_out(&editor.focus_handle(cx), window, {
                                                 let mode = self.mode.clone();
+                                                let min = self.min_value;
+                                                let max = self.max_value;
                                                 let on_change = self.on_change.clone();
                                                 move |this, _, window, cx| {
-                                                    if let Ok(parsed_value) =
+                                                    if let Ok(new_value) =
                                                         this.text(cx).parse::<T>()
                                                     {
-                                                        let new_value = clamp_value(parsed_value);
+                                                        let new_value = if new_value < min {
+                                                            min
+                                                        } else if new_value > max {
+                                                            max
+                                                        } else {
+                                                            new_value
+                                                        };
+
+                                                        if let Some(previous) =
+                                                            previous_focus_handle.as_ref()
+                                                        {
+                                                            window.focus(previous, cx);
+                                                        }
                                                         on_change(&new_value, window, cx);
                                                     };
                                                     mode.write(cx, NumberFieldMode::Read);
@@ -630,20 +500,13 @@ impl<T: NumberFieldType> RenderOnce for NumberField<T> {
                     )
                     .map(|increment| {
                         let increment_handler = {
+                            let value = self.value;
                             let on_change = self.on_change.clone();
-                            let get_current_value = get_current_value.clone();
-                            let update_editor_text = update_editor_text.clone();
-
+                            let max = self.max_value;
                             move |click: &ClickEvent, window: &mut Window, cx: &mut App| {
-                                let current_value = get_current_value(cx);
                                 let step = get_step(click.modifiers());
-                                let new_value = change_value(
-                                    current_value,
-                                    step,
-                                    ValueChangeDirection::Increment,
-                                );
-
-                                update_editor_text(new_value, window, cx);
+                                let new_value = value.saturating_add(step);
+                                let new_value = if new_value > max { max } else { new_value };
                                 on_change(&new_value, window, cx);
                             }
                         };
@@ -678,42 +541,36 @@ impl Component for NumberField<usize> {
         "Number Field"
     }
 
+    fn sort_name() -> &'static str {
+        Self::name()
+    }
+
     fn description() -> Option<&'static str> {
         Some("A numeric input element with increment and decrement buttons.")
     }
 
     fn preview(window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let default_ex = window.use_state(cx, |_, _| 100.0);
-        let edit_ex = window.use_state(cx, |_, _| 500.0);
+        let stepper_example = window.use_state(cx, |_, _| 100.0);
 
         Some(
             v_flex()
                 .gap_6()
-                .children(vec![
-                    single_example(
-                        "Button-Only Number Field",
-                        NumberField::new("number-field", *default_ex.read(cx), window, cx)
-                            .on_change({
-                                let default_ex = default_ex.clone();
-                                move |value, _, cx| default_ex.write(cx, *value)
-                            })
-                            .min(1.0)
-                            .max(100.0)
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "Editable Number Field",
-                        NumberField::new("editable-number-field", *edit_ex.read(cx), window, cx)
-                            .on_change({
-                                let edit_ex = edit_ex.clone();
-                                move |value, _, cx| edit_ex.write(cx, *value)
-                            })
-                            .min(100.0)
-                            .max(500.0)
-                            .mode(NumberFieldMode::Edit, cx)
-                            .into_any_element(),
-                    ),
-                ])
+                .children(vec![single_example(
+                    "Default Numeric Stepper",
+                    NumberField::new(
+                        "numeric-stepper-component-preview",
+                        *stepper_example.read(cx),
+                        window,
+                        cx,
+                    )
+                    .on_change({
+                        let stepper_example = stepper_example.clone();
+                        move |value, _, cx| stepper_example.write(cx, *value)
+                    })
+                    .min(1.0)
+                    .max(100.0)
+                    .into_any_element(),
+                )])
                 .into_any_element(),
         )
     }

crates/workspace/src/oauth_device_flow_modal.rs

@@ -0,0 +1,294 @@
+use gpui::{
+    Animation, AnimationExt, App, ClipboardItem, Context, DismissEvent, Element, Entity,
+    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, MouseDownEvent,
+    ParentElement, Render, SharedString, Styled, Subscription, Transformation, Window, div,
+    percentage, rems, svg,
+};
+use menu;
+use std::time::Duration;
+use ui::{Button, Icon, IconName, Label, Vector, VectorName, prelude::*};
+
+use crate::ModalView;
+
+/// Configuration for the OAuth device flow modal.
+/// This allows extensions to specify the text and appearance of the modal.
+#[derive(Clone)]
+pub struct OAuthDeviceFlowModalConfig {
+    /// The user code to display (e.g., "ABC-123").
+    pub user_code: String,
+    /// The URL the user needs to visit to authorize (for the "Connect" button).
+    pub verification_url: String,
+    /// The headline text for the modal (e.g., "Use GitHub Copilot in Zed.").
+    pub headline: String,
+    /// A description to show below the headline.
+    pub description: String,
+    /// Label for the connect button (e.g., "Connect to GitHub").
+    pub connect_button_label: String,
+    /// Success headline shown when authorization completes.
+    pub success_headline: String,
+    /// Success message shown when authorization completes.
+    pub success_message: String,
+    /// Optional path to an SVG icon file (absolute path on disk).
+    pub icon_path: Option<SharedString>,
+}
+
+/// The current status of the OAuth device flow.
+#[derive(Clone, Debug)]
+pub enum OAuthDeviceFlowStatus {
+    /// Waiting for user to click connect and authorize.
+    Prompting,
+    /// User clicked connect, waiting for authorization.
+    WaitingForAuthorization,
+    /// Successfully authorized.
+    Authorized,
+    /// Authorization failed with an error message.
+    Failed(String),
+}
+
+/// Shared state for the OAuth device flow that can be observed by the modal.
+pub struct OAuthDeviceFlowState {
+    pub config: OAuthDeviceFlowModalConfig,
+    pub status: OAuthDeviceFlowStatus,
+}
+
+impl EventEmitter<()> for OAuthDeviceFlowState {}
+
+impl OAuthDeviceFlowState {
+    pub fn new(config: OAuthDeviceFlowModalConfig) -> Self {
+        Self {
+            config,
+            status: OAuthDeviceFlowStatus::Prompting,
+        }
+    }
+
+    /// Update the status of the OAuth flow.
+    pub fn set_status(&mut self, status: OAuthDeviceFlowStatus, cx: &mut Context<Self>) {
+        self.status = status;
+        cx.emit(());
+        cx.notify();
+    }
+}
+
+/// A generic OAuth device flow modal that can be used by extensions.
+pub struct OAuthDeviceFlowModal {
+    state: Entity<OAuthDeviceFlowState>,
+    connect_clicked: bool,
+    focus_handle: FocusHandle,
+    _subscription: Subscription,
+}
+
+impl Focusable for OAuthDeviceFlowModal {
+    fn focus_handle(&self, _: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl EventEmitter<DismissEvent> for OAuthDeviceFlowModal {}
+
+impl ModalView for OAuthDeviceFlowModal {}
+
+impl OAuthDeviceFlowModal {
+    pub fn new(state: Entity<OAuthDeviceFlowState>, cx: &mut Context<Self>) -> Self {
+        let subscription = cx.observe(&state, |_, _, cx| {
+            cx.notify();
+        });
+
+        Self {
+            state,
+            connect_clicked: false,
+            focus_handle: cx.focus_handle(),
+            _subscription: subscription,
+        }
+    }
+
+    fn render_icon(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let state = self.state.read(cx);
+        let icon_color = Color::Custom(cx.theme().colors().icon);
+        // Match ZedXCopilot visual appearance
+        let icon_size = rems(2.5);
+        let plus_size = rems(0.875);
+        // The "+" in ZedXCopilot SVG has fill-opacity="0.5"
+        let plus_color = cx.theme().colors().icon.opacity(0.5);
+
+        if let Some(icon_path) = &state.config.icon_path {
+            // Show "[Provider Icon] + [Zed Logo]" format to match built-in Copilot modal
+            h_flex()
+                .gap_2()
+                .items_center()
+                .child(
+                    Icon::from_external_svg(icon_path.clone())
+                        .size(ui::IconSize::Custom(icon_size))
+                        .color(icon_color),
+                )
+                .child(
+                    svg()
+                        .size(plus_size)
+                        .path("icons/plus.svg")
+                        .text_color(plus_color),
+                )
+                .child(Vector::new(VectorName::ZedLogo, icon_size, icon_size).color(icon_color))
+                .into_any_element()
+        } else {
+            // Fallback to just Zed logo if no provider icon
+            Vector::new(VectorName::ZedLogo, icon_size, icon_size)
+                .color(icon_color)
+                .into_any_element()
+        }
+    }
+
+    fn render_device_code(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let state = self.state.read(cx);
+        let user_code = state.config.user_code.clone();
+        let copied = cx
+            .read_from_clipboard()
+            .map(|item| item.text().as_ref() == Some(&user_code))
+            .unwrap_or(false);
+        let user_code_for_click = user_code.clone();
+
+        h_flex()
+            .w_full()
+            .p_1()
+            .border_1()
+            .border_muted(cx)
+            .rounded_sm()
+            .cursor_pointer()
+            .justify_between()
+            .on_mouse_down(gpui::MouseButton::Left, move |_, window, cx| {
+                cx.write_to_clipboard(ClipboardItem::new_string(user_code_for_click.clone()));
+                window.refresh();
+            })
+            .child(div().flex_1().child(Label::new(user_code)))
+            .child(div().flex_none().px_1().child(Label::new(if copied {
+                "Copied!"
+            } else {
+                "Copy"
+            })))
+    }
+
+    fn render_prompting_modal(&self, cx: &mut Context<Self>) -> impl Element {
+        let (connect_button_label, verification_url, headline, description) = {
+            let state = self.state.read(cx);
+            let label = if self.connect_clicked {
+                "Waiting for connection...".to_string()
+            } else {
+                state.config.connect_button_label.clone()
+            };
+            (
+                label,
+                state.config.verification_url.clone(),
+                state.config.headline.clone(),
+                state.config.description.clone(),
+            )
+        };
+
+        v_flex()
+            .flex_1()
+            .gap_2()
+            .items_center()
+            .child(Headline::new(headline).size(HeadlineSize::Large))
+            .child(Label::new(description).color(Color::Muted))
+            .child(self.render_device_code(cx))
+            .child(
+                Label::new("Paste this code into GitHub after clicking the button below.")
+                    .size(ui::LabelSize::Small),
+            )
+            .child(
+                Button::new("connect-button", connect_button_label)
+                    .on_click(cx.listener(move |this, _, _window, cx| {
+                        cx.open_url(&verification_url);
+                        this.connect_clicked = true;
+                    }))
+                    .full_width()
+                    .style(ButtonStyle::Filled),
+            )
+            .child(
+                Button::new("cancel-button", "Cancel")
+                    .full_width()
+                    .on_click(cx.listener(|_, _, _, cx| {
+                        cx.emit(DismissEvent);
+                    })),
+            )
+    }
+
+    fn render_authorized_modal(&self, cx: &mut Context<Self>) -> impl Element {
+        let state = self.state.read(cx);
+        let success_headline = state.config.success_headline.clone();
+        let success_message = state.config.success_message.clone();
+
+        v_flex()
+            .gap_2()
+            .child(Headline::new(success_headline).size(HeadlineSize::Large))
+            .child(Label::new(success_message))
+            .child(
+                Button::new("done-button", "Done")
+                    .full_width()
+                    .on_click(cx.listener(|_, _, _, cx| cx.emit(DismissEvent))),
+            )
+    }
+
+    fn render_failed_modal(&self, error: &str, cx: &mut Context<Self>) -> impl Element {
+        v_flex()
+            .gap_2()
+            .child(Headline::new("Authorization Failed").size(HeadlineSize::Large))
+            .child(Label::new(error.to_string()).color(Color::Error))
+            .child(
+                Button::new("close-button", "Close")
+                    .full_width()
+                    .on_click(cx.listener(|_, _, _, cx| cx.emit(DismissEvent))),
+            )
+    }
+
+    fn render_loading(window: &mut Window, _cx: &mut Context<Self>) -> impl Element {
+        let loading_icon = svg()
+            .size_8()
+            .path(IconName::ArrowCircle.path())
+            .text_color(window.text_style().color)
+            .with_animation(
+                "icon_circle_arrow",
+                Animation::new(Duration::from_secs(2)).repeat(),
+                |svg, delta| svg.with_transformation(Transformation::rotate(percentage(delta))),
+            );
+
+        h_flex().justify_center().child(loading_icon)
+    }
+}
+
+impl Render for OAuthDeviceFlowModal {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let status = self.state.read(cx).status.clone();
+
+        let prompt = match &status {
+            OAuthDeviceFlowStatus::Prompting => self.render_prompting_modal(cx).into_any_element(),
+            OAuthDeviceFlowStatus::WaitingForAuthorization => {
+                if self.connect_clicked {
+                    self.render_prompting_modal(cx).into_any_element()
+                } else {
+                    Self::render_loading(window, cx).into_any_element()
+                }
+            }
+            OAuthDeviceFlowStatus::Authorized => {
+                self.render_authorized_modal(cx).into_any_element()
+            }
+            OAuthDeviceFlowStatus::Failed(error) => {
+                self.render_failed_modal(error, cx).into_any_element()
+            }
+        };
+
+        v_flex()
+            .id("oauth-device-flow-modal")
+            .track_focus(&self.focus_handle(cx))
+            .elevation_3(cx)
+            .w_96()
+            .items_center()
+            .p_4()
+            .gap_2()
+            .on_action(cx.listener(|_, _: &menu::Cancel, _, cx| {
+                cx.emit(DismissEvent);
+            }))
+            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, cx| {
+                window.focus(&this.focus_handle, cx);
+            }))
+            .child(self.render_icon(cx))
+            .child(prompt)
+    }
+}

crates/workspace/src/workspace.rs

@@ -4,6 +4,7 @@ pub mod invalid_item_view;
 pub mod item;
 mod modal_layer;
 pub mod notifications;
+pub mod oauth_device_flow_modal;
 pub mod pane;
 pub mod pane_group;
 mod path_list;

crates/worktree/src/worktree.rs

@@ -3235,8 +3235,7 @@ impl language::File for File {
             entry_id: self.entry_id.map(|id| id.to_proto()),
             path: self.path.as_ref().to_proto(),
             mtime: self.disk_state.mtime().map(|time| time.into()),
-            is_deleted: self.disk_state.is_deleted(),
-            is_historic: matches!(self.disk_state, DiskState::Historic { .. }),
+            is_deleted: self.disk_state == DiskState::Deleted,
         }
     }
 
@@ -3297,11 +3296,7 @@ impl File {
             "worktree id does not match file"
         );
 
-        let disk_state = if proto.is_historic {
-            DiskState::Historic {
-                was_deleted: proto.is_deleted,
-            }
-        } else if proto.is_deleted {
+        let disk_state = if proto.is_deleted {
             DiskState::Deleted
         } else if let Some(mtime) = proto.mtime.map(&Into::into) {
             DiskState::Present { mtime }

crates/zed/Cargo.toml

@@ -41,7 +41,6 @@ collab_ui.workspace = true
 collections.workspace = true
 command_palette.workspace = true
 component.workspace = true
-component_preview.workspace = true
 copilot.workspace = true
 crashes.workspace = true
 dap_adapters.workspace = true
@@ -149,6 +148,7 @@ ztracing.workspace = true
 tracing.workspace = true
 toolchain_selector.workspace = true
 ui.workspace = true
+ui_input.workspace = true
 ui_prompt.workspace = true
 url.workspace = true
 urlencoding.workspace = true
@@ -159,7 +159,6 @@ vim_mode_setting.workspace = true
 watch.workspace = true
 web_search.workspace = true
 web_search_providers.workspace = true
-which.workspace = true
 which_key.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true

crates/zed/src/main.rs

@@ -571,6 +571,11 @@ fn main() {
         dap_adapters::init(cx);
         auto_update_ui::init(cx);
         reliability::init(client.clone(), cx);
+        // Initialize the language model registry first, then set up the extension proxy
+        // BEFORE extension_host::init so that extensions can register their LLM providers
+        // when they load.
+        language_model::init(app_state.client.clone(), cx);
+        language_models::init_extension_proxy(cx);
         extension_host::init(
             extension_host_proxy.clone(),
             app_state.fs.clone(),
@@ -596,7 +601,6 @@ fn main() {
             cx,
         );
         supermaven::init(app_state.client.clone(), cx);
-        language_model::init(app_state.client.clone(), cx);
         language_models::init(app_state.user_store.clone(), app_state.client.clone(), cx);
         acp_tools::init(cx);
         edit_prediction_ui::init(cx);
@@ -774,7 +778,7 @@ fn main() {
 
         let app_state = app_state.clone();
 
-        component_preview::init(app_state.clone(), cx);
+        crate::zed::component_preview::init(app_state.clone(), cx);
 
         cx.spawn(async move |cx| {
             while let Some(urls) = open_rx.next().await {

crates/zed/src/zed.rs

@@ -1,4 +1,5 @@
 mod app_menus;
+pub mod component_preview;
 pub mod edit_prediction_registry;
 #[cfg(target_os = "macos")]
 pub(crate) mod mac_only_instance;
@@ -139,10 +140,6 @@ actions!(
         /// audio system (including yourself) on the current call in a tar file
         /// in the current working directory.
         CaptureRecentAudio,
-        /// Starts Tracy profiling by launching tracy-profiler if available.
-        /// Tracy will connect to this Zed instance and begin capturing performance data.
-        /// Requires Zed to be built with tracy support (ZTRACING=1).
-        StartTracing,
     ]
 );
 
@@ -1152,9 +1149,6 @@ fn register_actions(
         })
         .register_action(|workspace, _: &CaptureRecentAudio, window, cx| {
             capture_recent_audio(workspace, window, cx);
-        })
-        .register_action(|workspace, _: &StartTracing, window, cx| {
-            start_tracing(workspace, window, cx);
         });
 
     #[cfg(not(target_os = "windows"))]
@@ -2218,117 +2212,6 @@ fn capture_recent_audio(workspace: &mut Workspace, _: &mut Window, cx: &mut Cont
     );
 }
 
-fn start_tracing(workspace: &mut Workspace, _window: &mut Window, cx: &mut Context<Workspace>) {
-    struct StartTracingNotification {
-        focus_handle: gpui::FocusHandle,
-        status: TracingStatus,
-        _spawn_task: Option<Task<()>>,
-    }
-
-    enum TracingStatus {
-        Starting,
-        TracyLaunched,
-        TracyNotFound,
-        TracyLaunchFailed(String),
-        ZtracingNotEnabled,
-    }
-
-    impl gpui::EventEmitter<DismissEvent> for StartTracingNotification {}
-    impl gpui::EventEmitter<SuppressEvent> for StartTracingNotification {}
-    impl gpui::Focusable for StartTracingNotification {
-        fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
-            self.focus_handle.clone()
-        }
-    }
-    impl workspace::notifications::Notification for StartTracingNotification {}
-
-    impl Render for StartTracingNotification {
-        fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-            let (title, message) = match &self.status {
-                TracingStatus::Starting => (
-                    "Starting Tracy",
-                    "Launching tracy-profiler...".to_string(),
-                ),
-                TracingStatus::TracyLaunched => (
-                    "Tracy Profiler Ready",
-                    "Tracy profiler has been launched. It should automatically connect to this Zed instance and begin capturing performance data.".to_string(),
-                ),
-                TracingStatus::TracyNotFound => (
-                    "Tracy Not Found",
-                    "Could not find `tracy-profiler` on your PATH. Please install Tracy profiler and ensure it's available in your PATH.\n\nOn macOS: brew install tracy\nOn Linux: Install from your package manager or build from source".to_string(),
-                ),
-                TracingStatus::TracyLaunchFailed(error) => (
-                    "Tracy Launch Failed",
-                    format!("Failed to launch tracy-profiler: {}", error),
-                ),
-                TracingStatus::ZtracingNotEnabled => (
-                    "Tracy Support Not Enabled",
-                    "This build of Zed was not compiled with Tracy support. To enable tracing, rebuild Zed with `cargo build --features tracy`.".to_string(),
-                ),
-            };
-
-            let show_debug_warning =
-                cfg!(debug_assertions) && matches!(self.status, TracingStatus::TracyLaunched);
-
-            NotificationFrame::new()
-                .with_title(Some(title))
-                .show_suppress_button(false)
-                .on_close(cx.listener(|_, _, _, cx| {
-                    cx.emit(DismissEvent);
-                }))
-                .with_content(message)
-        }
-    }
-
-    impl StartTracingNotification {
-        fn new(cx: &mut Context<Self>) -> Self {
-            if !ztracing::is_enabled() {
-                return Self {
-                    focus_handle: cx.focus_handle(),
-                    status: TracingStatus::ZtracingNotEnabled,
-                    _spawn_task: None,
-                };
-            }
-
-            let spawn_task = cx.spawn(async move |this, cx| {
-                let tracy_path = cx
-                    .background_spawn(async { which::which("tracy-profiler").ok() })
-                    .await;
-
-                let status = match tracy_path {
-                    Some(path) => {
-                        let spawn_result = smol::process::Command::new(&path).spawn();
-
-                        match spawn_result {
-                            Ok(_child) => TracingStatus::TracyLaunched,
-                            Err(error) => TracingStatus::TracyLaunchFailed(error.to_string()),
-                        }
-                    }
-                    None => TracingStatus::TracyNotFound,
-                };
-
-                this.update(cx, |this, cx| {
-                    this.status = status;
-                    cx.notify();
-                })
-                .ok();
-            });
-
-            Self {
-                focus_handle: cx.focus_handle(),
-                status: TracingStatus::Starting,
-                _spawn_task: Some(spawn_task),
-            }
-        }
-    }
-
-    workspace.show_notification(
-        NotificationId::unique::<StartTracingNotification>(),
-        cx,
-        |cx| cx.new(StartTracingNotification::new),
-    );
-}
-
 /// Eagerly loads the active theme and icon theme based on the selections in the
 /// theme settings.
 ///

crates/zed/src/zed/component_preview.rs

@@ -1,4 +1,7 @@
-mod component_preview_example;
+//! # Component Preview
+//!
+//! A view for exploring Zed components.
+
 mod persistence;
 
 use client::UserStore;
@@ -8,21 +11,18 @@ use gpui::{
     App, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity, Window, list, prelude::*,
 };
 use gpui::{ListState, ScrollHandle, ScrollStrategy, UniformListScrollHandle};
-use language::LanguageRegistry;
+use languages::LanguageRegistry;
 use notifications::status_toast::{StatusToast, ToastIcon};
 use persistence::COMPONENT_PREVIEW_DB;
 use project::Project;
 use std::{iter::Iterator, ops::Range, sync::Arc};
 use ui::{ButtonLike, Divider, HighlightedLabel, ListItem, ListSubHeader, Tooltip, prelude::*};
 use ui_input::InputField;
-use workspace::AppState;
 use workspace::{
-    Item, ItemId, SerializableItem, Workspace, WorkspaceId, delete_unloaded_items, item::ItemEvent,
+    AppState, Item, ItemId, SerializableItem, Workspace, WorkspaceId, delete_unloaded_items,
+    item::ItemEvent,
 };
 
-#[allow(unused_imports)]
-pub use component_preview_example::*;
-
 pub fn init(app_state: Arc<AppState>, cx: &mut App) {
     workspace::register_serializable_item::<ComponentPreview>(cx);
 

crates/ztracing/build.rs

@@ -1,3 +1,9 @@
+use std::env;
+
 fn main() {
+    if env::var_os("ZTRACING").is_some() {
+        println!(r"cargo::rustc-cfg=ztracing");
+    }
     println!("cargo::rerun-if-changed=build.rs");
+    println!("cargo::rerun-if-env-changed=ZTRACING");
 }