feat(layout): Restore Current Layout and Save Changes in Current Layout

Restore Current Layout applies the active saved tool window layout again,
or the default layout when none is active; Shift+F12 in the IntelliJ keymaps
now runs it. Save Changes in Current Layout stores the current windows into
the active layout. Both are in Window > Tool Window Layouts.

Cargo.lock

@@ -4146,6 +4146,7 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 name = "ide-agent"
 version = "0.1.45"
 dependencies = [
+ "blake3",
  "dunce",
  "encoding_rs",
  "ide-core",
@@ -4268,6 +4269,7 @@ dependencies = [
 name = "ide-dap"
 version = "0.1.45"
 dependencies = [
+ "base64 0.22.1",
  "futures",
  "ide-core",
  "ide-heap",
@@ -4286,6 +4288,7 @@ dependencies = [
  "specta",
  "tempfile",
  "tokio",
+ "tokio-tungstenite",
  "tracing",
  "tracing-subscriber",
  "windows-sys 0.61.2",

crates/ide-agent/Cargo.toml

@@ -7,6 +7,7 @@ license.workspace = true
 
 [dependencies]
 encoding_rs.workspace = true
+blake3.workspace = true
 ide-vfs.workspace = true
 ide-core.workspace = true
 ide-mcp.workspace = true
@@ -24,3 +25,6 @@ dunce.workspace = true
 uuid.workspace = true
 tempfile.workspace = true
 which = "8"
+
+[dev-dependencies]
+tokio = { workspace = true, features = ["test-util"] }

crates/ide-agent/src/acp/discover.rs

@@ -3,6 +3,7 @@
 //! `initialize` alone).
 
 use super::{Conn, Dialect};
+use crate::catalogs::Discovered;
 use crate::config;
 use crate::model::AgentConfigOption;
 use crate::provider::ProviderSpec;
@@ -15,7 +16,7 @@ use std::time::Duration;
 const DISCOVER_TIMEOUT: Duration = if cfg!(test) { Duration::from_secs(3) } else { Duration::from_secs(120) };
 
 /// Opens `session/new`, reads `configOptions`, and records per-model `thought_level` choices.
-pub(crate) async fn run(shared: &Arc<Shared>, spec: &ProviderSpec) -> Result<(), String> {
+pub(crate) async fn run(shared: &Arc<Shared>, spec: &ProviderSpec) -> Result<Discovered, String> {
     let root = shared.paths.project_root.clone();
     let launch = spec.clone();
     let launch = tokio::task::spawn_blocking({
@@ -25,12 +26,12 @@ pub(crate) async fn run(shared: &Arc<Shared>, spec: &ProviderSpec) -> Result<(),
     .await
     .map_err(|e| e.to_string())?;
     let cwd = dunce::canonicalize(&root).unwrap_or(root);
-    let stderr: Arc<Mutex<Vec<String>>> = Arc::default();
-    let lines = stderr.clone();
-    let on_stderr: Box<dyn Fn(String) + Send + Sync> = Box::new(move |l| lines.lock().push(l));
-    let client = Dialect::wrap(Arc::new(ide_jsonrpc::NoopHandler));
+    let updates = Arc::new(DiscoveryUpdates { provider: spec.id.clone(), commands: Mutex::new(None) });
+    let client = Dialect::wrap(updates.clone());
+    let on_stderr: Box<dyn Fn(String) + Send + Sync> = Box::new(|_| {});
     let peer = (shared.connector)(&launch, &cwd, client.clone(), on_stderr)
         .map_err(|e| format!("Couldn't start {} (`{}`): {e}", launch.name, launch.command))?;
+    let _stop = crate::catalogs::KillPeer(peer.clone());
     let conn = Conn::new(peer.clone(), client);
     let work = async {
         conn.initialize(&client_info()).await.map_err(|e| e.to_string())?;
@@ -51,34 +52,41 @@ pub(crate) async fn run(shared: &Arc<Shared>, spec: &ProviderSpec) -> Result<(),
             (Some(model), Some(effort)) => model.current.clone().map(|m| vec![(m, effort)]).unwrap_or_default(),
             _ => Vec::new(),
         };
-        let option_ids: Vec<_> = options.iter().map(|o| o.id.as_str()).collect();
-        tracing::info!(
-            "agent {}: settings discovery got {} config option(s) {:?}, {} model effort list(s)",
-            launch.id,
-            options.len(),
-            option_ids,
-            levels.len()
-        );
-        shared.remember_discovered(&launch.id, &options, &[], &levels);
-        Ok::<(), String>(())
+        let commands = updates
+            .commands
+            .lock()
+            .clone()
+            .or_else(|| new.get("availableCommands").map(|_| config::commands_of(&new, &launch.id)));
+        Ok::<_, String>(Discovered { config: options, commands, levels: levels.into_iter().collect() })
     };
     let result = tokio::time::timeout(DISCOVER_TIMEOUT, work).await;
     peer.kill();
     match result {
-        Ok(Ok(())) => Ok(()),
-        Ok(Err(e)) => Err(match stderr.lock().last() {
-            Some(line) => format!("{e}: {line}"),
-            None => e,
-        }),
-        Err(_) => {
-            let tail = stderr.lock().join("\n");
-            if tail.is_empty() {
-                Err("the agent did not answer in time".into())
-            } else {
-                Err(format!("the agent did not answer in time:\n{tail}"))
-            }
+        Ok(result) => result,
+        Err(_) => Err("the agent did not answer in time".into()),
+    }
+}
+
+#[derive(Default)]
+struct DiscoveryUpdates {
+    provider: String,
+    commands: Mutex<Option<Vec<crate::AgentCommand>>>,
+}
+
+impl ide_jsonrpc::Handler for DiscoveryUpdates {
+    fn on_notification(&self, method: &str, params: Value) {
+        if method == "session/update"
+            && let Some(update) = params.get("update")
+            && update["sessionUpdate"] == "available_commands_update"
+        {
+            // Commands are protocol data, not stderr (which may contain credentials).
+            *self.commands.lock() = Some(config::commands_of(update, &self.provider));
         }
     }
+
+    fn on_request(&self, method: &str, _: Value) -> Result<Value, (i64, String)> {
+        Err((ide_jsonrpc::codes::METHOD_NOT_FOUND, format!("unsupported discovery request {method}")))
+    }
 }
 
 fn is_thought_level(o: &AgentConfigOption) -> bool {

crates/ide-agent/src/acp/e2e.rs

@@ -108,6 +108,7 @@ fn manager(dir: &Path, agent: Arc<FakeV2Agent>) -> AgentManager {
             custom_agents_dir: None,
             home_dir: None,
             env_secrets: None,
+            catalogs: Arc::default(),
         },
         tokio::runtime::Handle::current(),
         connector,

crates/ide-agent/src/acp/tests.rs

@@ -155,6 +155,7 @@ async fn discovery_reads_effort_and_fast_from_session_new_then_stops_the_agent()
             custom_agents_dir: None,
             home_dir: None,
             env_secrets: None,
+            catalogs: Arc::default(),
         },
         tokio::runtime::Handle::current(),
         connector,

crates/ide-agent/src/catalogs.rs

@@ -0,0 +1,427 @@
+//! Model availability for new tasks. Sessions own selections; discovery owns catalogs.
+
+use crate::{
+    AgentCommand, AgentConfigOption, AgentEvent, AgentModelCatalog, Known, Shared, acp, config, native, provider,
+};
+use ide_core::{IdeError, IdeResult};
+use parking_lot::Mutex;
+use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, HashMap};
+use std::path::PathBuf;
+use std::sync::{Arc, Weak};
+use std::time::Duration;
+use tokio::sync::watch;
+use tokio::time::Instant;
+
+const FRESH_FOR: Duration = Duration::from_secs(15 * 60);
+const COOLDOWN: Duration = Duration::from_secs(30);
+
+type Store = Arc<Mutex<HashMap<String, Known>>>;
+type Key = (PathBuf, PathBuf, String);
+
+/// Backend-wide single-flight model lookups, scoped to project and effective launch configuration.
+#[derive(Default)]
+pub struct AgentCatalogs {
+    state: Mutex<State>,
+    #[cfg(test)]
+    clock_ms: std::sync::atomic::AtomicU64,
+}
+
+#[derive(Default)]
+struct State {
+    stores: HashMap<PathBuf, Store>,
+    entries: HashMap<Key, Entry>,
+    subscribers: Vec<Weak<Shared>>,
+    generation: u64,
+}
+
+struct Entry {
+    // Launch credentials remain only in memory, never serialized or logged.
+    context: LaunchContext,
+    generation: u64,
+    completed: Option<Instant>,
+    successful: Option<Instant>,
+    retry_at_ms: Option<f64>,
+    error: Option<String>,
+    flight: Option<watch::Receiver<bool>>,
+    abort: Option<tokio::task::AbortHandle>,
+    catalog: Option<CatalogData>,
+}
+
+#[derive(Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct CatalogData {
+    pub config: Vec<AgentConfigOption>,
+    pub thought_levels: BTreeMap<String, Vec<AgentConfigOption>>,
+    pub refreshed_at_ms: Option<f64>,
+}
+
+#[derive(Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct SavedCatalog {
+    /// An opaque cryptographic digest, never raw launch arguments or credentials.
+    fingerprint: String,
+    #[serde(flatten)]
+    catalog: CatalogData,
+}
+
+#[derive(PartialEq)]
+struct LaunchContext {
+    spec: provider::ProviderSpec,
+    executable: PathBuf,
+    modified: Option<std::time::SystemTime>,
+    len: Option<u64>,
+}
+
+impl LaunchContext {
+    fn new(spec: provider::ProviderSpec, root: &std::path::Path) -> Self {
+        let resolved = spec.clone().resolve_for_launch(root);
+        let executable = dunce::canonicalize(&resolved.command).unwrap_or_else(|_| PathBuf::from(&resolved.command));
+        let metadata = std::fs::metadata(&executable).ok();
+        Self {
+            spec,
+            executable,
+            modified: metadata.as_ref().and_then(|m| m.modified().ok()),
+            len: metadata.as_ref().map(std::fs::Metadata::len),
+        }
+    }
+
+    fn fingerprint(&self) -> String {
+        let mut hash = blake3::Hasher::new();
+        fn field(hash: &mut blake3::Hasher, value: &[u8]) {
+            hash.update(&(value.len() as u64).to_le_bytes());
+            hash.update(value);
+        }
+        field(&mut hash, b"openidea-model-catalog-v1");
+        field(
+            &mut hash,
+            match self.spec.driver {
+                provider::Driver::Acp => b"acp",
+                provider::Driver::Codex => b"codex",
+                provider::Driver::Claude => b"claude",
+            },
+        );
+        field(&mut hash, self.spec.command.as_bytes());
+        hash.update(&(self.spec.args.len() as u64).to_le_bytes());
+        for arg in &self.spec.args {
+            field(&mut hash, arg.as_bytes());
+        }
+        hash.update(&(self.spec.env.len() as u64).to_le_bytes());
+        for (name, value) in &self.spec.env {
+            field(&mut hash, name.as_bytes());
+            field(&mut hash, value.as_bytes());
+        }
+        field(&mut hash, self.executable.to_string_lossy().as_bytes());
+        if let Some(modified) = self.modified.and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok()) {
+            hash.update(&modified.as_nanos().to_le_bytes());
+        }
+        if let Some(len) = self.len {
+            hash.update(&len.to_le_bytes());
+        }
+        hash.finalize().to_hex().to_string()
+    }
+}
+
+pub(crate) struct Discovered {
+    pub config: Vec<AgentConfigOption>,
+    pub commands: Option<Vec<AgentCommand>>,
+    pub levels: BTreeMap<String, Vec<AgentConfigOption>>,
+}
+
+pub(crate) struct KillPeer(pub ide_jsonrpc::Peer);
+
+impl Drop for KillPeer {
+    fn drop(&mut self) {
+        self.0.kill();
+    }
+}
+
+impl AgentCatalogs {
+    fn now(&self) -> Instant {
+        let now = Instant::now();
+        #[cfg(test)]
+        let now = now + Duration::from_millis(self.clock_ms.load(std::sync::atomic::Ordering::Relaxed));
+        now
+    }
+
+    fn epoch_ms(&self) -> f64 {
+        let now = crate::now_ms();
+        #[cfg(test)]
+        let now = now + self.clock_ms.load(std::sync::atomic::Ordering::Relaxed) as f64;
+        now
+    }
+
+    pub(crate) fn store(&self, path: &std::path::Path) -> Store {
+        self.state
+            .lock()
+            .stores
+            .entry(path.to_path_buf())
+            .or_insert_with(|| {
+                Arc::new(Mutex::new(
+                    std::fs::read(path).ok().and_then(|b| serde_json::from_slice(&b).ok()).unwrap_or_default(),
+                ))
+            })
+            .clone()
+    }
+
+    pub(crate) fn subscribe(&self, shared: &Arc<Shared>) {
+        let mut state = self.state.lock();
+        state.subscribers.retain(|s| s.strong_count() > 0);
+        state.subscribers.push(Arc::downgrade(shared));
+    }
+
+    fn key(shared: &Shared, provider: &str) -> Key {
+        (shared.paths.models_file.clone(), shared.paths.project_root.clone(), provider.to_owned())
+    }
+
+    fn fallback(shared: &Shared, provider: &str) -> CatalogData {
+        let cache = shared.known.lock();
+        let Some(known) = cache.get(provider) else { return CatalogData::default() };
+        known.catalogs.get(&shared.root_key()).map(|saved| saved.catalog.clone()).unwrap_or_else(|| CatalogData {
+            config: known.config.clone(),
+            thought_levels: known.thought_levels.clone(),
+            refreshed_at_ms: None,
+        })
+    }
+
+    pub(crate) fn cached(&self, shared: &Shared, provider: &str) -> CatalogData {
+        self.state
+            .lock()
+            .entries
+            .get(&Self::key(shared, provider))
+            .and_then(|e| e.catalog.clone())
+            .unwrap_or_else(|| Self::fallback(shared, provider))
+    }
+
+    fn snapshot(&self, shared: &Shared, provider: &str, entry: &Entry) -> AgentModelCatalog {
+        let catalog = entry.catalog.clone().unwrap_or_else(|| Self::fallback(shared, provider));
+        AgentModelCatalog {
+            provider: provider.to_owned(),
+            config: shared.config_for_new_task(catalog.config, provider),
+            thought_levels: catalog.thought_levels,
+            refreshing: entry.flight.is_some(),
+            refreshed_at_ms: catalog.refreshed_at_ms,
+            retry_at_ms: entry
+                .retry_at_ms
+                .filter(|_| entry.completed.is_some_and(|at| self.now().duration_since(at) < COOLDOWN)),
+            error: entry.error.clone(),
+        }
+    }
+
+    /// Start or join a lookup. No queued refresh can outlive the request that asked for it.
+    pub(crate) fn request(
+        self: &Arc<Self>,
+        shared: &Arc<Shared>,
+        spec: provider::ProviderSpec,
+        force: bool,
+    ) -> (AgentModelCatalog, Option<watch::Receiver<bool>>) {
+        let key = Self::key(shared, &spec.id);
+        let context = LaunchContext::new(spec.clone(), &shared.paths.project_root);
+        let now = self.now();
+        let mut state = self.state.lock();
+        let changed = state.entries.get(&key).is_none_or(|e| e.context != context);
+        if changed {
+            if let Some(abort) = state.entries.get_mut(&key).and_then(|entry| entry.abort.take()) {
+                abort.abort();
+            }
+            state.generation += 1;
+            let generation = state.generation;
+            let saved =
+                shared.known.lock().get(&spec.id).and_then(|known| known.catalogs.get(&shared.root_key())).cloned();
+            let matching = saved.as_ref().is_some_and(|saved| saved.fingerprint == context.fingerprint());
+            let age = saved
+                .as_ref()
+                .filter(|_| matching)
+                .and_then(|saved| saved.catalog.refreshed_at_ms)
+                .map(|at| self.epoch_ms() - at)
+                .filter(|age| *age >= 0.0 && *age < FRESH_FOR.as_millis() as f64)
+                .map(|age| Duration::from_secs_f64(age / 1000.0));
+            let successful = age.and_then(|age| now.checked_sub(age));
+            let completed = age.filter(|age| *age < COOLDOWN).and_then(|age| now.checked_sub(age));
+            let retry_at_ms = completed
+                .and_then(|_| saved.as_ref().and_then(|s| s.catalog.refreshed_at_ms))
+                .map(|at| at + COOLDOWN.as_millis() as f64);
+            let catalog = saved.map(|saved| {
+                let mut catalog = saved.catalog;
+                if !matching {
+                    catalog.refreshed_at_ms = None;
+                }
+                catalog
+            });
+            state.entries.insert(
+                key.clone(),
+                Entry {
+                    context,
+                    generation,
+                    completed,
+                    successful,
+                    retry_at_ms,
+                    catalog,
+                    error: None,
+                    flight: None,
+                    abort: None,
+                },
+            );
+        }
+        let entry = state.entries.get_mut(&key).expect("catalog entry");
+        let cooling = entry.completed.is_some_and(|at| now.duration_since(at) < COOLDOWN);
+        let fresh = entry.successful.is_some_and(|at| now.duration_since(at) < FRESH_FOR);
+        let mut start = None;
+        if entry.flight.is_none() && !cooling && (force || !fresh) {
+            let (done, ready) = watch::channel(false);
+            entry.flight = Some(ready);
+            entry.error = None;
+            entry.retry_at_ms = None;
+            start = Some((entry.generation, done));
+        }
+        let snapshot = self.snapshot(shared, &spec.id, entry);
+        let flight = entry.flight.clone();
+        drop(state);
+        if let Some((generation, done)) = start {
+            self.broadcast(shared, &snapshot);
+            let coordinator = self.clone();
+            let shared = shared.clone();
+            let flight_key = key.clone();
+            let task = shared.runtime.clone().spawn(async move {
+                let result = discover(&shared, spec).await;
+                coordinator.complete(&shared, flight_key, generation, result);
+                let _ = done.send(true);
+            });
+            // A subscriber can re-enter and change configuration during the start event.
+            let mut state = self.state.lock();
+            if let Some(entry) = state.entries.get_mut(&key).filter(|entry| entry.generation == generation) {
+                if entry.flight.is_some() {
+                    entry.abort = Some(task.abort_handle());
+                }
+            } else {
+                task.abort();
+            }
+        }
+        (snapshot, flight)
+    }
+
+    fn complete(&self, shared: &Shared, key: Key, generation: u64, result: Result<Discovered, String>) {
+        let current = provider::load(shared.paths.custom_agents_dir.as_deref(), shared.env_secrets())
+            .into_iter()
+            .find(|spec| spec.id == key.2)
+            .map(|spec| LaunchContext::new(spec, &shared.paths.project_root));
+        let mut state = self.state.lock();
+        let Some(entry) = state.entries.get_mut(&key).filter(|e| e.generation == generation) else { return };
+        // Configuration may have changed without another refresh request arriving.
+        if current.as_ref() != Some(&entry.context) {
+            entry.flight = None;
+            entry.abort = None;
+            entry.completed = None;
+            entry.retry_at_ms = None;
+            entry.error = None;
+            let snapshot = self.snapshot(shared, &key.2, entry);
+            state.entries.remove(&key);
+            drop(state);
+            self.broadcast(shared, &snapshot);
+            return;
+        }
+        let now = self.now();
+        entry.completed = Some(now);
+        entry.retry_at_ms = Some(self.epoch_ms() + COOLDOWN.as_millis() as f64);
+        entry.flight = None;
+        entry.abort = None;
+        let success = match result {
+            Ok(found) => {
+                let mut cache = shared.known.lock();
+                let known = cache.entry(key.2.clone()).or_default();
+                let catalog = CatalogData {
+                    config: found.config,
+                    thought_levels: found.levels,
+                    refreshed_at_ms: Some(self.epoch_ms()),
+                };
+                known.config = catalog.config.clone();
+                known.thought_levels = catalog.thought_levels.clone();
+                if let Some(commands) = found.commands {
+                    known.commands.insert(shared.root_key(), commands);
+                }
+                known.authoritative = true;
+                known.refreshed_at_ms = catalog.refreshed_at_ms;
+                known.catalogs.insert(
+                    shared.root_key(),
+                    SavedCatalog { fingerprint: entry.context.fingerprint(), catalog: catalog.clone() },
+                );
+                entry.catalog = Some(catalog);
+                shared.persist_known(&cache);
+                entry.successful = Some(now);
+                entry.error = None;
+                true
+            }
+            Err(error) => {
+                entry.error = Some(error);
+                false
+            }
+        };
+        let snapshot = self.snapshot(shared, &key.2, entry);
+        drop(state);
+        self.broadcast(shared, &snapshot);
+        if success {
+            for subscriber in self.subscribers(shared) {
+                subscriber.emit(AgentEvent::Providers);
+            }
+        }
+    }
+
+    fn subscribers(&self, shared: &Shared) -> Vec<Arc<Shared>> {
+        self.state
+            .lock()
+            .subscribers
+            .iter()
+            .filter_map(Weak::upgrade)
+            .filter(|s| {
+                s.paths.models_file == shared.paths.models_file && s.paths.project_root == shared.paths.project_root
+            })
+            .collect()
+    }
+
+    fn broadcast(&self, shared: &Shared, catalog: &AgentModelCatalog) {
+        for subscriber in self.subscribers(shared) {
+            subscriber.emit(AgentEvent::ModelCatalog { catalog: catalog.clone() });
+        }
+    }
+}
+
+impl crate::AgentManager {
+    /// Return cached choices immediately and schedule discovery when eligible.
+    pub fn refresh_models(&self, provider: &str, force: bool) -> IdeResult<AgentModelCatalog> {
+        // Settings and environment secrets can change while this window is open.
+        *self.shared.providers.write() =
+            provider::load(self.shared.paths.custom_agents_dir.as_deref(), self.shared.env_secrets());
+        let spec = self.shared.spec(provider).ok_or_else(|| IdeError::invalid(format!("unknown agent {provider}")))?;
+        Ok(self.shared.paths.catalogs.request(&self.shared, spec, force).0)
+    }
+}
+
+async fn discover(shared: &Arc<Shared>, spec: provider::ProviderSpec) -> Result<Discovered, String> {
+    match spec.driver {
+        provider::Driver::Acp => acp::discover::run(shared, &spec).await,
+        provider::Driver::Codex => native::codex::discover(spec, shared.paths.project_root.clone()).await,
+        provider::Driver::Claude => {
+            let found = native::claude::discover(spec.clone(), shared.paths.project_root.clone()).await?;
+            Ok(Discovered {
+                commands: Some(config::commands_of(
+                    &serde_json::json!({ "availableCommands": found.commands }),
+                    &spec.id,
+                )),
+                config: config::options_of(&serde_json::json!({ "configOptions": found.options })),
+                levels: found
+                    .efforts
+                    .into_iter()
+                    .map(|(model, option)| {
+                        let levels = option
+                            .map(|o| config::options_of(&serde_json::json!({ "configOptions": [o] })))
+                            .unwrap_or_default();
+                        (model, levels)
+                    })
+                    .collect(),
+            })
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests;

crates/ide-agent/src/catalogs/tests.rs

@@ -0,0 +1,501 @@
+use super::*;
+use crate::{AgentManager, AgentPaths, Connector};
+use ide_jsonrpc::{Framing, Peer};
+use serde_json::{Value, json};
+use std::path::Path;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
+use tokio::sync::{mpsc, oneshot};
+
+const PROVIDER: &str = "catalog-test";
+
+#[derive(Debug)]
+struct Pending {
+    params: Value,
+    reply: oneshot::Sender<Result<Value, String>>,
+}
+
+struct Harness {
+    connector: Connector,
+    pending: mpsc::UnboundedReceiver<Pending>,
+    launches: Arc<AtomicUsize>,
+    live: Arc<AtomicUsize>,
+}
+
+struct Live(Arc<AtomicUsize>);
+impl Drop for Live {
+    fn drop(&mut self) {
+        self.0.fetch_sub(1, Ordering::SeqCst);
+    }
+}
+
+impl Harness {
+    fn new() -> Self {
+        let (pending_tx, pending) = mpsc::unbounded_channel();
+        let launches = Arc::new(AtomicUsize::new(0));
+        let live = Arc::new(AtomicUsize::new(0));
+        let connector: Connector = Arc::new({
+            let launches = launches.clone();
+            let live = live.clone();
+            move |_, _, client, _| {
+                launches.fetch_add(1, Ordering::SeqCst);
+                live.fetch_add(1, Ordering::SeqCst);
+                let guard = Live(live.clone());
+                let pending = pending_tx.clone();
+                let (client_io, server_io) = tokio::io::duplex(1 << 16);
+                let (read, mut write) = tokio::io::split(server_io);
+                tokio::spawn(async move {
+                    let _guard = guard;
+                    let mut lines = BufReader::new(read).lines();
+                    while let Some(line) = lines.next_line().await.unwrap() {
+                        let request: Value = serde_json::from_str(&line).unwrap();
+                        let id = &request["id"];
+                        if id.is_null() {
+                            continue;
+                        }
+                        let response = match request["method"].as_str().unwrap() {
+                            "initialize" => json!({ "id": id, "jsonrpc": "2.0", "result": {
+                                "protocolVersion": 1, "agentCapabilities": {}, "authMethods": [] } }),
+                            "session/new" => {
+                                let (reply, result) = oneshot::channel();
+                                pending.send(Pending { params: request["params"].clone(), reply }).unwrap();
+                                let result = tokio::select! {
+                                    result = result => result.unwrap(),
+                                    _ = lines.next_line() => break,
+                                };
+                                match result {
+                                    Ok(result) => json!({ "id": id, "jsonrpc": "2.0", "result": result }),
+                                    Err(error) => {
+                                        json!({ "id": id, "jsonrpc": "2.0", "error": { "code": -32000, "message": error } })
+                                    }
+                                }
+                            }
+                            method => panic!("discovery must not call {method}"),
+                        };
+                        if write.write_all(format!("{response}\n").as_bytes()).await.is_err() {
+                            break;
+                        }
+                    }
+                });
+                let (read, write) = tokio::io::split(client_io);
+                Ok(Peer::connect_framed(read, write, client, Framing::Lines))
+            }
+        });
+        Self { connector, pending, launches, live }
+    }
+
+    async fn next(&mut self) -> Pending {
+        tokio::time::timeout(Duration::from_secs(5), self.pending.recv()).await.unwrap().unwrap()
+    }
+}
+
+fn configure(root: &Path, version: &str) {
+    std::fs::create_dir_all(root.join("agents")).unwrap();
+    let executable = root.join("catalog-test-bin");
+    if !executable.exists() {
+        std::fs::write(&executable, "first executable").unwrap();
+    }
+    std::fs::write(
+        root.join("agents/catalog-test.toml"),
+        format!(
+            "name = \"Catalog Test\"\ncommand = {}\n[env]\nTOKEN = \"secret-{version}\"\n",
+            serde_json::to_string(&executable.to_string_lossy()).unwrap()
+        ),
+    )
+    .unwrap();
+}
+
+fn make_manager(root: &Path, catalogs: Arc<AgentCatalogs>, harness: &Harness) -> AgentManager {
+    make_manager_at(root, &root.join("models.json"), catalogs, harness)
+}
+
+fn make_manager_at(root: &Path, models_file: &Path, catalogs: Arc<AgentCatalogs>, harness: &Harness) -> AgentManager {
+    AgentManager::with_connector(
+        AgentPaths {
+            project_root: root.to_path_buf(),
+            store_dir: root.join("store"),
+            worktrees_dir: root.join("worktrees"),
+            models_file: models_file.to_path_buf(),
+            catalogs,
+            custom_agents_dir: Some(root.join("agents")),
+            home_dir: Some(root.to_path_buf()),
+            env_secrets: None,
+        },
+        tokio::runtime::Handle::current(),
+        harness.connector.clone(),
+    )
+}
+
+fn events(manager: &AgentManager) -> mpsc::UnboundedReceiver<AgentEvent> {
+    let (tx, rx) = mpsc::unbounded_channel();
+    manager.subscribe(Arc::new(move |event| {
+        let _ = tx.send(event);
+    }));
+    rx
+}
+
+async fn completed(events: &mut mpsc::UnboundedReceiver<AgentEvent>) -> AgentModelCatalog {
+    tokio::time::timeout(Duration::from_secs(5), async {
+        loop {
+            if let AgentEvent::ModelCatalog { catalog } = events.recv().await.unwrap()
+                && !catalog.refreshing
+            {
+                return catalog;
+            }
+        }
+    })
+    .await
+    .unwrap()
+}
+
+fn response(models: &[&str], effort: &[&str]) -> Value {
+    json!({ "sessionId": "discovery-only", "configOptions": [
+        { "id": "model", "type": "select", "category": "model", "currentValue": models.first(),
+          "options": models.iter().map(|m| json!({ "value": m, "name": m })).collect::<Vec<_>>() },
+        { "id": "effort", "type": "select", "category": "thought_level", "currentValue": effort.first(),
+          "options": effort.iter().map(|e| json!({ "value": e })).collect::<Vec<_>>() }
+    ] })
+}
+
+fn model_values(catalog: &AgentModelCatalog) -> Vec<&str> {
+    catalog
+        .config
+        .iter()
+        .filter(|o| o.category.as_deref() == Some("model"))
+        .flat_map(|o| o.values.iter().map(|v| v.value.as_str()))
+        .collect()
+}
+
+async fn stopped(harness: &Harness) {
+    tokio::time::timeout(Duration::from_secs(5), async {
+        while harness.live.load(Ordering::SeqCst) != 0 {
+            tokio::task::yield_now().await;
+        }
+    })
+    .await
+    .unwrap();
+}
+
+fn advance(catalogs: &AgentCatalogs, seconds: u64) {
+    catalogs.clock_ms.fetch_add(seconds * 1000, Ordering::Relaxed);
+}
+
+#[tokio::test]
+async fn successful_refresh_replaces_models_and_efforts_and_old_sessions_cannot_revert_it() {
+    let tmp = tempfile::tempdir().unwrap();
+    configure(tmp.path(), "one");
+    let catalogs = Arc::new(AgentCatalogs::default());
+    let mut harness = Harness::new();
+    let manager = make_manager(tmp.path(), catalogs.clone(), &harness);
+    let mut events = events(&manager);
+    let old = config::options_of(&response(&["old", "retained"], &["low", "high"]));
+    manager.shared.remember(PROVIDER, Some(&old), None, Some("old"));
+    let cached = manager.refresh_models(PROVIDER, false).unwrap();
+    assert!(cached.refreshing);
+    assert_eq!(model_values(&cached), ["old", "retained"]);
+    assert!(cached.refreshed_at_ms.is_none(), "session reports are not fresh discovery");
+    let pending = harness.next().await;
+    assert_eq!(pending.params["mcpServers"], json!([]));
+    pending.reply.send(Ok(response(&["retained", "new"], &["medium"]))).unwrap();
+    let fresh = completed(&mut events).await;
+    assert_eq!(model_values(&fresh), ["retained", "new"]);
+    assert_eq!(fresh.thought_levels.keys().map(String::as_str).collect::<Vec<_>>(), ["new", "retained"]);
+    assert_eq!(fresh.thought_levels["retained"][0].values[0].value, "medium");
+    assert!(fresh.refreshed_at_ms.is_some() && fresh.retry_at_ms.is_some());
+    manager.shared.remember(PROVIDER, Some(&old), None, Some("old"));
+    assert_eq!(manager.refresh_models(PROVIDER, false).unwrap().config, fresh.config);
+    let provider = manager.providers().into_iter().find(|p| p.id == PROVIDER).unwrap();
+    assert_eq!(provider.config, fresh.config);
+    let persisted = std::fs::read_to_string(tmp.path().join("models.json")).unwrap();
+    assert!(!persisted.contains("secret-one") && !persisted.contains("TOKEN"));
+    let restored = make_manager(tmp.path(), Arc::default(), &harness);
+    let restored_snapshot = restored.refresh_models(PROVIDER, false).unwrap();
+    assert!(!restored_snapshot.refreshing, "matching persisted launch context remains fresh");
+    assert_eq!(restored_snapshot.refreshed_at_ms, fresh.refreshed_at_ms);
+    let provider = restored.providers().into_iter().find(|p| p.id == PROVIDER).unwrap();
+    assert_eq!(provider.config, fresh.config);
+    restored.shared.remember(PROVIDER, Some(&old), None, Some("old"));
+    assert_eq!(restored.shared.known_config(PROVIDER), fresh.config);
+    assert_eq!(restored.shared.known.lock()[PROVIDER].refreshed_at_ms, fresh.refreshed_at_ms);
+    assert!(!tmp.path().join("store").exists(), "refresh never creates tasks");
+}
+
+#[tokio::test]
+async fn legacy_cache_loads_without_claiming_authoritative_freshness() {
+    let tmp = tempfile::tempdir().unwrap();
+    configure(tmp.path(), "one");
+    let options = config::options_of(&response(&["legacy"], &["low"]));
+    std::fs::write(
+        tmp.path().join("models.json"),
+        serde_json::to_vec(&json!({
+            (PROVIDER): { "config": options, "thoughtLevels": {}, "projectCommands": {} }
+        }))
+        .unwrap(),
+    )
+    .unwrap();
+    let mut harness = Harness::new();
+    let manager = make_manager(tmp.path(), Arc::default(), &harness);
+    let mut events = events(&manager);
+    let cached = manager.refresh_models(PROVIDER, false).unwrap();
+    assert_eq!(model_values(&cached), ["legacy"]);
+    assert!(cached.refreshing && cached.refreshed_at_ms.is_none());
+    harness.next().await.reply.send(Err("Sign in required".into())).unwrap();
+    let failed = completed(&mut events).await;
+    assert_eq!(failed.config, cached.config);
+    assert!(failed.error.as_deref().unwrap().contains("Sign in required"));
+}
+
+#[tokio::test]
+async fn concurrent_windows_commands_and_manual_requests_share_one_flight_and_cooldown() {
+    let tmp = tempfile::tempdir().unwrap();
+    configure(tmp.path(), "one");
+    let catalogs = Arc::new(AgentCatalogs::default());
+    let mut harness = Harness::new();
+    let first = Arc::new(make_manager(tmp.path(), catalogs.clone(), &harness));
+    let second = make_manager(tmp.path(), catalogs.clone(), &harness);
+    let mut first_events = events(&first);
+    let mut second_events = events(&second);
+    assert!(first.refresh_models(PROVIDER, false).unwrap().refreshing);
+    let pending = harness.next().await;
+    for _ in 0..10 {
+        assert!(second.refresh_models(PROVIDER, true).unwrap().refreshing);
+        assert!(first.refresh_models(PROVIDER, true).unwrap().refreshing);
+    }
+    let commands = tokio::spawn({
+        let first = first.clone();
+        async move { first.commands(PROVIDER, None).await }
+    });
+    tokio::task::yield_now().await;
+    assert_eq!(harness.launches.load(Ordering::SeqCst), 1);
+    pending.reply.send(Ok(response(&["one"], &["low"]))).unwrap();
+    let done = completed(&mut first_events).await;
+    assert_eq!(completed(&mut second_events).await, done);
+    commands.await.unwrap().unwrap();
+    for force in [false, true, false, true] {
+        assert!(!second.refresh_models(PROVIDER, force).unwrap().refreshing);
+    }
+    advance(&catalogs, 29);
+    assert!(!first.refresh_models(PROVIDER, true).unwrap().refreshing);
+    advance(&catalogs, 1);
+    assert!(!first.refresh_models(PROVIDER, false).unwrap().refreshing, "automatic refresh remains fresh");
+    assert!(first.refresh_models(PROVIDER, true).unwrap().refreshing);
+    harness.next().await.reply.send(Ok(response(&["two"], &["high"]))).unwrap();
+    let newer = completed(&mut first_events).await;
+    assert_eq!(model_values(&newer), ["two"]);
+    assert_eq!(completed(&mut second_events).await, newer);
+    advance(&catalogs, 15 * 60 - 1);
+    assert!(!second.refresh_models(PROVIDER, false).unwrap().refreshing);
+    advance(&catalogs, 1);
+    assert!(second.refresh_models(PROVIDER, false).unwrap().refreshing);
+    harness.next().await.reply.send(Ok(response(&["three"], &["low"]))).unwrap();
+    completed(&mut first_events).await;
+    assert_eq!(harness.launches.load(Ordering::SeqCst), 3);
+}
+
+#[tokio::test]
+async fn failure_keeps_successful_choices_and_throttles_manual_and_auto_retries() {
+    let tmp = tempfile::tempdir().unwrap();
+    configure(tmp.path(), "one");
+    let catalogs = Arc::new(AgentCatalogs::default());
+    let mut harness = Harness::new();
+    let manager = make_manager(tmp.path(), catalogs.clone(), &harness);
+    let mut events = events(&manager);
+    manager.refresh_models(PROVIDER, true).unwrap();
+    harness.next().await.reply.send(Ok(response(&["cached"], &["low"]))).unwrap();
+    let success = completed(&mut events).await;
+    let disk = std::fs::read(tmp.path().join("models.json")).unwrap();
+    advance(&catalogs, 15 * 60);
+    manager.refresh_models(PROVIDER, false).unwrap();
+    harness.next().await.reply.send(Err("Authentication expired".into())).unwrap();
+    let failed = completed(&mut events).await;
+    assert_eq!(failed.config, success.config);
+    assert_eq!(failed.thought_levels, success.thought_levels);
+    assert_eq!(failed.refreshed_at_ms, success.refreshed_at_ms);
+    assert!(failed.error.as_deref().unwrap().contains("Authentication expired"));
+    assert_eq!(std::fs::read(tmp.path().join("models.json")).unwrap(), disk);
+    assert!(!manager.refresh_models(PROVIDER, false).unwrap().refreshing);
+    assert!(!manager.refresh_models(PROVIDER, true).unwrap().refreshing);
+    advance(&catalogs, 29);
+    assert!(!manager.refresh_models(PROVIDER, true).unwrap().refreshing);
+    advance(&catalogs, 1);
+    assert!(manager.refresh_models(PROVIDER, false).unwrap().refreshing);
+    harness.next().await.reply.send(Ok(response(&["recovered"], &["high"]))).unwrap();
+    let recovered = completed(&mut events).await;
+    assert_eq!(model_values(&recovered), ["recovered"]);
+    assert!(recovered.error.is_none());
+}
+
+#[tokio::test]
+async fn timeout_cleans_up_and_enters_the_same_failure_cooldown() {
+    let tmp = tempfile::tempdir().unwrap();
+    configure(tmp.path(), "one");
+    let catalogs = Arc::new(AgentCatalogs::default());
+    let mut harness = Harness::new();
+    let manager = make_manager(tmp.path(), catalogs.clone(), &harness);
+    let mut events = events(&manager);
+    manager.refresh_models(PROVIDER, false).unwrap();
+    let pending = harness.next().await;
+    tokio::time::pause();
+    tokio::time::advance(Duration::from_secs(4)).await;
+    let failed = completed(&mut events).await;
+    assert!(failed.error.as_deref().unwrap().contains("time"));
+    assert!(failed.retry_at_ms.is_some());
+    assert!(!manager.refresh_models(PROVIDER, true).unwrap().refreshing);
+    assert!(!manager.refresh_models(PROVIDER, false).unwrap().refreshing);
+    tokio::time::resume();
+    stopped(&harness).await;
+    assert_eq!(harness.live.load(Ordering::SeqCst), 0, "timed-out connection must close");
+    assert!(pending.reply.is_closed());
+    advance(&catalogs, 30);
+    assert!(manager.refresh_models(PROVIDER, false).unwrap().refreshing);
+    harness.next().await.reply.send(Ok(response(&["retry"], &["low"]))).unwrap();
+    completed(&mut events).await;
+}
+
+#[tokio::test]
+async fn changed_effective_config_supersedes_old_completion_without_queueing() {
+    let tmp = tempfile::tempdir().unwrap();
+    configure(tmp.path(), "one");
+    let catalogs = Arc::new(AgentCatalogs::default());
+    let mut harness = Harness::new();
+    let first = make_manager(tmp.path(), catalogs.clone(), &harness);
+    let second = make_manager(tmp.path(), catalogs.clone(), &harness);
+    let mut events = events(&second);
+    first.refresh_models(PROVIDER, false).unwrap();
+    let obsolete = harness.next().await;
+    configure(tmp.path(), "two");
+    assert!(second.refresh_models(PROVIDER, false).unwrap().refreshing);
+    let latest = harness.next().await;
+    latest.reply.send(Ok(response(&["latest"], &["high"]))).unwrap();
+    let fresh = completed(&mut events).await;
+    let _ = obsolete.reply.send(Ok(response(&["obsolete"], &["low"])));
+    stopped(&harness).await;
+    let shown = first.refresh_models(PROVIDER, false).unwrap();
+    assert_eq!(shown.config, fresh.config);
+    assert_eq!(shown.refreshed_at_ms, fresh.refreshed_at_ms);
+    assert!(!shown.refreshing);
+    assert_eq!(harness.launches.load(Ordering::SeqCst), 2);
+    assert!(!std::fs::read_to_string(tmp.path().join("models.json")).unwrap().contains("obsolete"));
+    // A changed configuration also invalidates successful freshness/cooldown.
+    configure(tmp.path(), "three");
+    assert!(first.refresh_models(PROVIDER, false).unwrap().refreshing);
+    harness.next().await.reply.send(Ok(response(&["new-config"], &["medium"]))).unwrap();
+    completed(&mut events).await;
+}
+
+#[tokio::test]
+async fn invalid_provider_is_a_request_error_and_does_not_launch() {
+    let tmp = tempfile::tempdir().unwrap();
+    let harness = Harness::new();
+    let manager = make_manager(tmp.path(), Arc::default(), &harness);
+    assert!(manager.refresh_models("missing-provider", true).is_err());
+    assert_eq!(harness.launches.load(Ordering::SeqCst), 0);
+}
+
+#[tokio::test]
+async fn replacing_the_executable_at_the_same_path_invalidates_freshness_and_obsolete_responses() {
+    let tmp = tempfile::tempdir().unwrap();
+    configure(tmp.path(), "unchanged-environment");
+    let catalogs = Arc::new(AgentCatalogs::default());
+    let mut harness = Harness::new();
+    let manager = make_manager(tmp.path(), catalogs, &harness);
+    let mut events = events(&manager);
+    manager.refresh_models(PROVIDER, false).unwrap();
+    let obsolete = harness.next().await;
+    std::fs::write(tmp.path().join("catalog-test-bin"), "replacement executable with different size").unwrap();
+    manager.refresh_models(PROVIDER, false).unwrap();
+    let latest = harness.next().await;
+    latest.reply.send(Ok(response(&["updated"], &["high"]))).unwrap();
+    let fresh = completed(&mut events).await;
+    let _ = obsolete.reply.send(Ok(response(&["obsolete"], &["low"])));
+    stopped(&harness).await;
+    assert_eq!(manager.refresh_models(PROVIDER, false).unwrap().config, fresh.config);
+    std::fs::write(tmp.path().join("catalog-test-bin"), "another executable").unwrap();
+    assert!(manager.refresh_models(PROVIDER, false).unwrap().refreshing);
+    harness.next().await.reply.send(Ok(response(&["new-install"], &["medium"]))).unwrap();
+    assert_eq!(model_values(&completed(&mut events).await), ["new-install"]);
+    assert_eq!(harness.launches.load(Ordering::SeqCst), 3);
+}
+
+#[tokio::test]
+async fn project_catalogs_and_persisted_freshness_do_not_leak_between_contexts() {
+    let tmp = tempfile::tempdir().unwrap();
+    let a = tmp.path().join("project-a");
+    let b = tmp.path().join("project-b");
+    configure(&a, "account-a");
+    configure(&b, "account-b");
+    let models_file = tmp.path().join("shared-models.json");
+    let catalogs = Arc::new(AgentCatalogs::default());
+    let mut harness = Harness::new();
+    let first = make_manager_at(&a, &models_file, catalogs.clone(), &harness);
+    let second = make_manager_at(&b, &models_file, catalogs, &harness);
+    let mut first_events = events(&first);
+    let mut second_events = events(&second);
+    first.refresh_models(PROVIDER, false).unwrap();
+    harness.next().await.reply.send(Ok(response(&["account-a-model"], &["low"]))).unwrap();
+    let a_catalog = completed(&mut first_events).await;
+    second.refresh_models(PROVIDER, false).unwrap();
+    harness.next().await.reply.send(Ok(response(&["account-b-model"], &["high"]))).unwrap();
+    let b_catalog = completed(&mut second_events).await;
+    assert_eq!(first.refresh_models(PROVIDER, false).unwrap().config, a_catalog.config);
+    assert_eq!(second.refresh_models(PROVIDER, false).unwrap().config, b_catalog.config);
+    assert_eq!(first.providers().into_iter().find(|p| p.id == PROVIDER).unwrap().config, a_catalog.config);
+    for (root, expected) in [(&a, &a_catalog), (&b, &b_catalog)] {
+        let restored = make_manager_at(root, &models_file, Arc::default(), &harness);
+        let cached = restored.refresh_models(PROVIDER, false).unwrap();
+        assert!(!cached.refreshing, "matching persisted context should retain freshness");
+        assert_eq!(cached.config, expected.config);
+        assert_eq!(cached.refreshed_at_ms, expected.refreshed_at_ms);
+    }
+    assert_eq!(harness.launches.load(Ordering::SeqCst), 2);
+    configure(&a, "new-account");
+    let changed = make_manager_at(&a, &models_file, Arc::default(), &harness);
+    let mut events = events(&changed);
+    let stale = changed.refresh_models(PROVIDER, false).unwrap();
+    assert!(stale.refreshing, "a different launch environment cannot reuse persisted freshness");
+    assert!(stale.refreshed_at_ms.is_none());
+    assert_eq!(stale.config, a_catalog.config, "stale cached choices remain selectable");
+    harness.next().await.reply.send(Ok(response(&["new-account-model"], &["medium"]))).unwrap();
+    completed(&mut events).await;
+    let persisted = std::fs::read_to_string(models_file).unwrap();
+    assert!(!persisted.contains("secret-") && !persisted.contains("TOKEN"));
+}
+
+#[tokio::test]
+async fn configuration_changed_without_another_request_also_discards_old_discovery() {
+    let tmp = tempfile::tempdir().unwrap();
+    configure(tmp.path(), "before");
+    let mut harness = Harness::new();
+    let manager = make_manager(tmp.path(), Arc::default(), &harness);
+    let mut events = events(&manager);
+    manager.refresh_models(PROVIDER, false).unwrap();
+    let obsolete = harness.next().await;
+    configure(tmp.path(), "after");
+    obsolete.reply.send(Ok(response(&["obsolete"], &["low"]))).unwrap();
+    let discarded = completed(&mut events).await;
+    assert!(model_values(&discarded).is_empty());
+    assert!(discarded.refreshed_at_ms.is_none());
+    assert!(!tmp.path().join("models.json").exists());
+    manager.refresh_models(PROVIDER, false).unwrap();
+    harness.next().await.reply.send(Ok(response(&["current"], &["high"]))).unwrap();
+    assert_eq!(model_values(&completed(&mut events).await), ["current"]);
+}
+
+#[tokio::test]
+async fn successful_empty_catalog_removes_all_previous_models_and_efforts() {
+    let tmp = tempfile::tempdir().unwrap();
+    configure(tmp.path(), "one");
+    let catalogs = Arc::new(AgentCatalogs::default());
+    let mut harness = Harness::new();
+    let manager = make_manager(tmp.path(), catalogs.clone(), &harness);
+    let mut events = events(&manager);
+    manager.refresh_models(PROVIDER, true).unwrap();
+    harness.next().await.reply.send(Ok(response(&["removed"], &["low"]))).unwrap();
+    completed(&mut events).await;
+    advance(&catalogs, 30);
+    manager.refresh_models(PROVIDER, true).unwrap();
+    harness.next().await.reply.send(Ok(response(&[], &[]))).unwrap();
+    let empty = completed(&mut events).await;
+    assert!(model_values(&empty).is_empty() && empty.thought_levels.is_empty());
+    assert!(empty.refreshed_at_ms.is_some() && empty.error.is_none());
+}

crates/ide-agent/src/lib.rs

@@ -8,6 +8,7 @@
 //! next prompt when the agent supports `session/load`.
 
 mod acp;
+mod catalogs;
 mod config;
 mod conversation;
 mod external;
@@ -21,6 +22,7 @@ mod skills;
 mod timeline;
 mod worktree;
 
+pub use catalogs::AgentCatalogs;
 pub use external::ExternalSession;
 pub use model::*;
 
@@ -88,6 +90,8 @@ pub struct AgentPaths {
     pub worktrees_dir: PathBuf,
     /// Settings each agent offered last time (shared by all projects), and its commands per project.
     pub models_file: PathBuf,
+    /// Shared by every project/window on this backend.
+    pub catalogs: Arc<AgentCatalogs>,
     /// User-defined agents, one `<id>.toml` each (`name`, `command`, `args`, `env`).
     pub custom_agents_dir: Option<PathBuf>,
     /// The user's home: its `.claude` holds their own skills and commands.
@@ -123,12 +127,10 @@ struct Shared {
     sink: RwLock<Option<AgentSink>>,
     security: RwLock<Option<SecurityHook>>,
     new_task_approvals: RwLock<Option<NewTaskApprovalsHook>>,
-    known: Mutex<HashMap<String, Known>>,
+    known: Arc<Mutex<HashMap<String, Known>>>,
     providers: RwLock<Vec<provider::ProviderSpec>>,
     /// Last probe of each provider.
     probes: Mutex<HashMap<String, AgentProbe>>,
-    /// One pre-session lookup of commands and settings per provider, including failed attempts.
-    command_fetches: Mutex<HashMap<String, tokio::sync::watch::Receiver<bool>>>,
     /// [`IDLE_RELEASE`], in milliseconds (shorter in tests).
     idle_release_ms: AtomicU64,
     mcp_servers_hook: RwLock<Option<Arc<McpServersFn>>>,
@@ -145,6 +147,14 @@ struct Known {
     /// By project root: skills and custom commands differ per project.
     #[serde(default, rename = "projectCommands")]
     commands: HashMap<String, Vec<AgentCommand>>,
+    /// Successful discovery, unlike a session report, owns availability.
+    #[serde(default)]
+    authoritative: bool,
+    #[serde(default, rename = "refreshedAtMs")]
+    refreshed_at_ms: Option<f64>,
+    /// Authoritative availability and freshness are scoped to project and launch context.
+    #[serde(default, rename = "projectCatalogs")]
+    catalogs: HashMap<String, catalogs::SavedCatalog>,
 }
 
 impl Shared {
@@ -171,7 +181,11 @@ impl Shared {
     }
 
     fn known_config(&self, provider: &str) -> Vec<AgentConfigOption> {
-        let mut config = self.known.lock().get(provider).map(|k| k.config.clone()).unwrap_or_default();
+        let config = self.paths.catalogs.cached(self, provider).config;
+        self.config_for_new_task(config, provider)
+    }
+
+    fn config_for_new_task(&self, mut config: Vec<AgentConfigOption>, provider: &str) -> Vec<AgentConfigOption> {
         // Model-specific options are offered separately, never as provider-wide defaults.
         config.retain(|o| o.category.as_deref() != Some("thought_level"));
         config::add_client_options(provider, &mut config);
@@ -197,80 +211,6 @@ impl Shared {
         cache.get(provider).and_then(|k| k.commands.get(&self.root_key())).cloned().unwrap_or_default()
     }
 
-    async fn fetch_settings(self: &Arc<Self>, spec: provider::ProviderSpec) {
-        let mut ready = {
-            let mut fetches = self.command_fetches.lock();
-            fetches
-                .entry(spec.id.clone())
-                .or_insert_with(|| {
-                    let (done, ready) = tokio::sync::watch::channel(false);
-                    let shared = self.clone();
-                    // Keep the lookup alive if a composer unmounts while it is waiting.
-                    self.runtime.spawn(async move {
-                        tracing::info!("agent {}: settings discovery started", spec.id);
-                        let discovered = if spec.driver == provider::Driver::Acp {
-                            acp::discover::run(&shared, &spec).await.map(|_| None)
-                        } else if spec.driver == provider::Driver::Claude {
-                            native::claude::discover(spec.clone(), shared.paths.project_root.clone()).await.map(Some)
-                        } else {
-                            return;
-                        };
-                        if let Ok(Some(found)) = discovered {
-                            let commands =
-                                config::commands_of(&json!({ "availableCommands": found.commands }), &spec.id);
-                            let options = config::options_of(&json!({ "configOptions": found.options }));
-                            let levels: Vec<_> = found
-                                .efforts
-                                .into_iter()
-                                .map(|(model, o)| {
-                                    let options = o.map(|o| config::options_of(&json!({ "configOptions": [o] })));
-                                    (model, options.unwrap_or_default())
-                                })
-                                .collect();
-                            let _ = tokio::task::spawn_blocking(move || {
-                                // Notifies subscribers itself when the discovery
-                                // changed the cached config; unchanged results
-                                // stay silent.
-                                shared.remember_discovered(&spec.id, &options, &commands, &levels);
-                            })
-                            .await;
-                        } else if let Err(e) = discovered {
-                            tracing::info!("agent {}: settings discovery failed: {e}", spec.id);
-                        }
-                        let _ = done.send(true);
-                    });
-                    ready
-                })
-                .clone()
-        };
-        while !*ready.borrow_and_update() {
-            if ready.changed().await.is_err() {
-                break;
-            }
-        }
-    }
-
-    fn has_config(&self, provider: &str) -> bool {
-        self.known.lock().get(provider).is_some_and(|k| !k.config.is_empty())
-    }
-
-    /// Whether the thinking levels of every model the agent offers are known (#1686).
-    fn knows_all_levels(&self, provider: &str) -> bool {
-        let cache = self.known.lock();
-        let Some(known) = cache.get(provider) else { return false };
-        let models: Vec<&str> = known
-            .config
-            .iter()
-            .filter(|o| o.category.as_deref() == Some("model"))
-            .flat_map(|o| o.values.iter().map(|v| v.value.as_str()))
-            .collect();
-        // No advertised models yet: nothing to attach effort levels to.
-        if models.is_empty() {
-            return false;
-        }
-        models.iter().all(|id| known.thought_levels.contains_key(*id))
-    }
-
     fn root_key(&self) -> String {
         self.paths.project_root.to_string_lossy().into_owned()
     }
@@ -283,78 +223,48 @@ impl Shared {
         commands: Option<&[AgentCommand]>,
         model: Option<&str>,
     ) {
-        self.remember_inner(provider, config, commands, model, &[], false);
-    }
-
-    /// `levels`: each model's thinking-level options, so a new task offers them for any model
-    /// it picks (#1686). A session's report for a model wins over these.
-    fn remember_discovered(
-        &self,
-        provider: &str,
-        config: &[AgentConfigOption],
-        commands: &[AgentCommand],
-        levels: &[(String, Vec<AgentConfigOption>)],
-    ) {
-        self.remember_inner(provider, Some(config), Some(commands), model_of(config).as_deref(), levels, true);
-    }
-
-    fn remember_inner(
-        &self,
-        provider: &str,
-        config: Option<&[AgentConfigOption]>,
-        commands: Option<&[AgentCommand]>,
-        model: Option<&str>,
-        discovered_levels: &[(String, Vec<AgentConfigOption>)],
-        discovered: bool,
-    ) {
-        // Keep the update and its disk write ordered; a session report wins over discovery.
         let mut cache = self.known.lock();
         let known = cache.entry(provider.to_owned()).or_default();
         let mut changed = false;
-        for (model, levels) in discovered_levels {
-            if !known.thought_levels.contains_key(model) {
-                known.thought_levels.insert(model.clone(), levels.clone());
-                changed = true;
-            }
-        }
-        if let Some(c) = config.filter(|_| !discovered || known.config.is_empty()) {
+        // Running tasks retain their own reported settings. Once discovery has
+        // succeeded, a session's older list/defaults cannot change New Task choices.
+        if !known.authoritative
+            && let Some(config) = config.filter(|c| !c.is_empty())
+        {
             if let Some(model) = model {
                 let levels: Vec<_> =
-                    c.iter().filter(|o| o.category.as_deref() == Some("thought_level")).cloned().collect();
+                    config.iter().filter(|o| o.category.as_deref() == Some("thought_level")).cloned().collect();
                 if known.thought_levels.get(model) != Some(&levels) {
                     known.thought_levels.insert(model.to_owned(), levels);
                     changed = true;
                 }
             }
-            if !c.is_empty() && known.config != c {
-                known.config = c.to_vec();
+            if known.config != config {
+                known.config = config.to_vec();
                 changed = true;
             }
         }
-        let root = self.root_key();
-        if let Some(c) = commands.filter(|c| {
-            !c.is_empty()
-                && (!discovered || known.commands.get(&root).is_none_or(Vec::is_empty))
-                && known.commands.get(&root).map(Vec::as_slice) != Some(c)
-        }) {
-            known.commands.insert(root, c.to_vec());
+        if let Some(commands) = commands.filter(|c| !c.is_empty())
+            && known.commands.get(&self.root_key()).map(Vec::as_slice) != Some(commands)
+        {
+            known.commands.insert(self.root_key(), commands.to_vec());
             changed = true;
         }
-        if !changed {
-            return;
+        if changed {
+            self.persist_known(&cache);
         }
-        if let Ok(bytes) = serde_json::to_vec_pretty(&*cache)
+        drop(cache);
+        if changed {
+            self.emit(AgentEvent::Providers);
+        }
+    }
+
+    fn persist_known(&self, cache: &HashMap<String, Known>) {
+        if let Ok(bytes) = serde_json::to_vec_pretty(cache)
             && let Err(e) = write_file(&self.paths.models_file, &bytes)
         {
             tracing::warn!("saving agent settings: {e}");
         }
-        // The cached provider config actually changed (a session report, discovery,
-        // or a turn update): tell subscribers to re-list, so a changed model list
-        // reaches the composer without waiting for the next task (#1490). Unchanged
-        // reports stay silent, so routine session traffic emits nothing. The cache
-        // lock is released first; the sink never runs under it.
-        drop(cache);
-        self.emit(AgentEvent::Providers);
     }
 }
 
@@ -469,8 +379,7 @@ impl AgentManager {
     }
 
     fn with_connector(paths: AgentPaths, runtime: tokio::runtime::Handle, connector: Connector) -> Self {
-        let known =
-            std::fs::read(&paths.models_file).ok().and_then(|b| serde_json::from_slice(&b).ok()).unwrap_or_default();
+        let known = paths.catalogs.store(&paths.models_file);
         let providers = RwLock::new(provider::load(paths.custom_agents_dir.as_deref(), paths.env_secrets.as_deref()));
         let shared = Arc::new(Shared {
             paths,
@@ -479,13 +388,13 @@ impl AgentManager {
             sink: RwLock::new(None),
             security: RwLock::new(None),
             new_task_approvals: RwLock::new(None),
-            known: Mutex::new(known),
+            known,
             providers,
             probes: Mutex::new(HashMap::new()),
-            command_fetches: Mutex::new(HashMap::new()),
             idle_release_ms: AtomicU64::new(IDLE_RELEASE.as_millis() as u64),
             mcp_servers_hook: RwLock::new(None),
         });
+        shared.paths.catalogs.subscribe(&shared);
         let mut tasks = HashMap::new();
         for file in std::fs::read_dir(&shared.paths.store_dir).into_iter().flatten().flatten() {
             let path = file.path();
@@ -542,9 +451,9 @@ impl AgentManager {
             .filter(|p| !provider::is_unlisted(p) || in_use.contains(&p.id))
             .map(|p| {
                 let mut info = provider::describe(p);
-                info.config = self.shared.known_config(&p.id);
-                info.thought_levels =
-                    self.shared.known.lock().get(&p.id).map(|k| k.thought_levels.clone()).unwrap_or_default();
+                let catalog = self.shared.paths.catalogs.cached(&self.shared, &p.id);
+                info.config = self.shared.config_for_new_task(catalog.config, &p.id);
+                info.thought_levels = catalog.thought_levels;
                 info.commands = self.shared.known_commands(&p.id);
                 info
             })
@@ -632,17 +541,20 @@ impl AgentManager {
         // merged without duplicating what `availableCommands` or the disk offer.
         let mut offered = offered;
         if task.is_none()
-            && (offered.is_empty() || !self.shared.has_config(&provider) || !self.shared.knows_all_levels(&provider))
-            && let Some(spec) = self
-                .shared
-                .spec(&provider)
-                .filter(|s| matches!(s.driver, provider::Driver::Claude | provider::Driver::Acp))
+            && let Some(spec) =
+                provider::load(self.shared.paths.custom_agents_dir.as_deref(), self.shared.env_secrets())
+                    .into_iter()
+                    .find(|spec| spec.id == provider)
         {
-            let claude = spec.driver == provider::Driver::Claude;
-            self.shared.fetch_settings(spec).await;
-            if claude {
-                offered = self.shared.known_commands(&provider);
+            let (_, flight) = self.shared.paths.catalogs.request(&self.shared, spec, false);
+            if let Some(mut ready) = flight {
+                while !*ready.borrow_and_update() {
+                    if ready.changed().await.is_err() {
+                        break;
+                    }
+                }
             }
+            offered = self.shared.known_commands(&provider);
         }
         for &(name, description) in builtin_commands(&provider) {
             if !offered.iter().any(|c| c.name == name) {
@@ -794,16 +706,18 @@ impl AgentManager {
             }
         };
         // Until the session reports its own, show what the agent offered last time with the choices applied.
-        let mut config = self.shared.known_config(&spec.id);
+        let catalog = self.shared.paths.catalogs.cached(&self.shared, &spec.id);
+        let mut levels = catalog.thought_levels;
+        let mut config = self.shared.config_for_new_task(catalog.config, &spec.id);
         for choice in &req.config {
             if let Some(o) = config.iter_mut().find(|o| o.id == choice.id) {
                 o.current = Some(choice.value.clone());
             }
         }
         if let Some(model) = model_of(&config)
-            && let Some(levels) = self.shared.known.lock().get(&spec.id).and_then(|k| k.thought_levels.get(&model))
+            && let Some(levels) = levels.remove(&model)
         {
-            config.extend(levels.iter().cloned().map(|mut o| {
+            config.extend(levels.into_iter().map(|mut o| {
                 if let Some(choice) =
                     req.config.iter().find(|c| c.id == o.id && o.values.iter().any(|v| v.value == c.value))
                 {

crates/ide-agent/src/model.rs

@@ -538,6 +538,19 @@ pub struct AgentChanges {
     pub commits: Vec<AgentCommit>,
 }
 
+/// Authoritative choices for new tasks, independent of any running session's settings.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct AgentModelCatalog {
+    pub provider: String,
+    pub config: Vec<AgentConfigOption>,
+    pub thought_levels: BTreeMap<String, Vec<AgentConfigOption>>,
+    pub refreshing: bool,
+    pub refreshed_at_ms: Option<f64>,
+    pub retry_at_ms: Option<f64>,
+    pub error: Option<String>,
+}
+
 /// Streamed to the window that subscribed (`AgentManager::subscribe`).
 #[derive(Clone, Debug, Serialize, Type)]
 #[serde(tag = "type", rename_all = "camelCase", rename_all_fields = "camelCase")]
@@ -575,6 +588,10 @@ pub enum AgentEvent {
         provider: String,
         limits: Vec<AgentLimit>,
     },
+    /// A model lookup started or completed, including unsuccessful lookups.
+    ModelCatalog {
+        catalog: AgentModelCatalog,
+    },
     /// The installed or configured agent providers changed.
     Providers,
 }

crates/ide-agent/src/native/claude/mod.rs

@@ -85,6 +85,8 @@ pub(crate) async fn discover(spec: ProviderSpec, cwd: PathBuf) -> Result<Discove
         let (spec, cwd) = spec.await.map_err(|e| e.to_string())?;
         let mut args = spec.args;
         args.extend(Start::New { id: uuid::Uuid::new_v4().to_string() }.args());
+        // Metadata discovery must not launch project-configured MCP servers.
+        args.extend(["--strict-mcp-config".into(), "--mcp-config".into(), "{\"mcpServers\":{}}".into()]);
         let launch = Launch { program: spec.command, args, cwd, env: spec.env };
         let mut io = cli::Process.launch(&launch, Arc::new(|_| {})).map_err(|e| e.to_string())?;
         let _stop = io.kill.clone().drop_guard();

crates/ide-agent/src/native/codex/mod.rs

@@ -44,6 +44,92 @@ pub(crate) fn connect(
     })
 }
 
+/// A model lookup uses app-server directly: no thread, task, prompt or project MCP.
+pub(crate) async fn discover(
+    spec: ProviderSpec,
+    cwd: std::path::PathBuf,
+) -> Result<crate::catalogs::Discovered, String> {
+    let spec = tokio::task::spawn_blocking({
+        let cwd = cwd.clone();
+        move || spec.resolve_for_launch(&cwd)
+    })
+    .await
+    .map_err(|e| e.to_string())?;
+    let peer = Peer::spawn_framed(
+        &spec.command,
+        &spec.args,
+        &cwd,
+        &spec.env,
+        Arc::new(ide_jsonrpc::NoopHandler),
+        Box::new(|_| {}),
+        Framing::Lines,
+    )
+    .map_err(|e| e.to_string())?;
+    let _stop = crate::catalogs::KillPeer(peer.clone());
+    tokio::time::timeout(Duration::from_secs(30), async {
+        let _: Value = peer.request("initialize", initialize_params(), None).await.map_err(|e| e.to_string())?;
+        peer.notify("initialized", Value::Null).map_err(|e| e.to_string())?;
+        let mut models = list_models(&peer).await.map_err(|e| e.message)?;
+        models.retain(|model| !model.hidden);
+        let mut settings = Settings::of(&json!({}), &models);
+        if settings.model.is_empty()
+            && let Some(model) = models.first()
+        {
+            settings.model = model.id.clone();
+            settings.fit_effort(&models);
+        }
+        let options = translate::config_options(&models, &settings);
+        let config = crate::config::options_of(&json!({ "configOptions": options }));
+        let levels = models
+            .iter()
+            .map(|model| {
+                let mut settings = settings.clone();
+                settings.model = model.id.clone();
+                settings.fit_effort(&models);
+                let options = translate::config_options(&models, &settings);
+                let levels = crate::config::options_of(&json!({ "configOptions": options }))
+                    .into_iter()
+                    .filter(|o| o.category.as_deref() == Some("thought_level"))
+                    .collect();
+                (model.id.clone(), levels)
+            })
+            .collect();
+        Ok(crate::catalogs::Discovered { config, commands: None, levels })
+    })
+    .await
+    .map_err(|_| "Codex model discovery timed out".to_owned())?
+}
+
+fn initialize_params() -> Value {
+    json!({
+        "clientInfo": { "name": "openidea", "title": "OpenIDEA", "version": env!("CARGO_PKG_VERSION") },
+        "capabilities": { "experimentalApi": true, "optOutNotificationMethods": OPT_OUT },
+    })
+}
+
+async fn list_models(peer: &Peer) -> Result<Vec<ModelInfo>, ResponseError> {
+    let mut all = Vec::new();
+    let mut cursor = Value::Null;
+    let mut seen = HashSet::new();
+    loop {
+        let page: Value = peer.request("model/list", json!({ "cursor": cursor }), None).await.map_err(from_codex)?;
+        let Some(data) = page.get("data").and_then(Value::as_array) else {
+            return Err(error(codes::INTERNAL_ERROR, "Codex returned an invalid model list"));
+        };
+        let models = translate::models_of(&page);
+        if models.len() != data.len() {
+            return Err(error(codes::INTERNAL_ERROR, "Codex returned an invalid model list"));
+        }
+        all.extend(models);
+        match page.get("nextCursor") {
+            None | Some(Value::Null) => return Ok(all),
+            Some(Value::String(next)) if next.is_empty() => return Ok(all),
+            Some(Value::String(next)) if seen.insert(next.clone()) => cursor = json!(next),
+            _ => return Err(error(codes::INTERNAL_ERROR, "Codex returned an invalid model-list cursor")),
+        }
+    }
+}
+
 /// Connects `client` to a shim driving the codex connection `connect_codex` opens (it
 /// gets the handler for what codex sends). Each side's end closes the other.
 fn attach(
@@ -250,15 +336,7 @@ impl CodexShim {
     }
 
     async fn initialize(&self) -> Result<Value, ResponseError> {
-        let info = self
-            .call(
-                "initialize",
-                json!({
-                    "clientInfo": { "name": "openidea", "title": "OpenIDEA", "version": env!("CARGO_PKG_VERSION") },
-                    "capabilities": { "experimentalApi": true, "optOutNotificationMethods": OPT_OUT },
-                }),
-            )
-            .await?;
+        let info = self.call("initialize", initialize_params()).await?;
         self.codex().notify("initialized", Value::Null).map_err(from_codex)?;
         self.state.lock().initialized = true;
         // `<client>/<codex version> (<platform>) …`
@@ -282,32 +360,15 @@ impl CodexShim {
         }))
     }
 
-    /// The models codex offers; empty when it can't list them.
-    async fn models(&self) -> Arc<Vec<ModelInfo>> {
+    /// Cache only complete, successful listings; a failed page must never become availability.
+    async fn models(&self) -> Result<Arc<Vec<ModelInfo>>, ResponseError> {
         let mut cached = self.models.lock().await;
-        if let Some(m) = cached.as_ref() {
-            return m.clone();
+        if let Some(models) = cached.as_ref() {
+            return Ok(models.clone());
         }
-        let mut all = Vec::new();
-        let mut cursor = Value::Null;
-        loop {
-            match self.call("model/list", json!({ "cursor": cursor })).await {
-                Ok(page) => {
-                    all.extend(translate::models_of(&page));
-                    match page.get("nextCursor").filter(|c| c.is_string()) {
-                        Some(next) if *next != cursor => cursor = next.clone(),
-                        _ => break,
-                    }
-                }
-                Err(e) => {
-                    tracing::warn!("codex: listing models failed: {}", e.message);
-                    return Arc::new(all);
-                }
-            }
-        }
-        let models = Arc::new(all);
+        let models = Arc::new(list_models(self.codex()).await?);
         *cached = Some(models.clone());
-        models
+        Ok(models)
     }
 
     async fn publish_skills(&self, session: &str) {
@@ -341,7 +402,7 @@ impl CodexShim {
     }
 
     async fn new_session(&self, params: &Value) -> Result<Value, ResponseError> {
-        let models = self.models().await;
+        let models = self.models().await?;
         let mut request = json!({ "cwd": params.get("cwd") });
         if let Some(config) = translate::mcp_config(params) {
             request["config"] = config;
@@ -358,7 +419,7 @@ impl CodexShim {
     /// Resumes the thread and replays its history before answering.
     async fn load_session(&self, params: &Value) -> Result<Value, ResponseError> {
         let id = str_param(params, "sessionId")?;
-        let models = self.models().await;
+        let models = self.models().await?;
         let mut request = json!({ "threadId": id, "cwd": params.get("cwd") });
         if let Some(config) = translate::mcp_config(params) {
             request["config"] = config;
@@ -376,7 +437,7 @@ impl CodexShim {
 
     async fn fork_session(&self, params: &Value) -> Result<Value, ResponseError> {
         let source = str_param(params, "sessionId")?;
-        let models = self.models().await;
+        let models = self.models().await?;
         let settings = self.state.lock().threads.get(source).and_then(|t| t.settings.clone());
         let mut request = json!({ "threadId": source, "cwd": params.get("cwd") });
         if let Some(config) = translate::mcp_config(params) {
@@ -397,7 +458,7 @@ impl CodexShim {
         let session = str_param(params, "sessionId")?;
         let option = str_param(params, "configId")?;
         let value = str_param(params, "value")?;
-        let models = self.models().await;
+        let models = self.models().await?;
         let mut state = self.state.lock();
         let settings = state
             .threads
@@ -414,7 +475,7 @@ impl CodexShim {
         if input.is_empty() {
             return Err(invalid("empty prompt"));
         }
-        let models = self.models().await;
+        let models = self.models().await?;
         let (done, ended) = oneshot::channel();
         let settings = {
             let mut state = self.state.lock();

crates/ide-agent/src/native/codex/tests.rs

@@ -11,6 +11,155 @@ use std::collections::VecDeque;
 use std::path::PathBuf;
 use tokio::io::{AsyncBufReadExt, AsyncRead, AsyncWrite, AsyncWriteExt, BufReader};
 
+struct ModelPages {
+    pages: Mutex<VecDeque<Result<Value, (i64, String)>>>,
+    cursors: Mutex<Vec<Value>>,
+}
+
+impl Handler for ModelPages {
+    fn on_notification(&self, _: &str, _: Value) {}
+
+    fn on_request(&self, method: &str, params: Value) -> Result<Value, (i64, String)> {
+        assert_eq!(method, "model/list", "listing models must never start a thread or turn");
+        self.cursors.lock().push(params["cursor"].clone());
+        self.pages.lock().pop_front().expect("another expected page")
+    }
+}
+
+fn model_peer(pages: Arc<ModelPages>) -> (Peer, Peer) {
+    let (ours, theirs) = tokio::io::duplex(1 << 16);
+    let (read, write) = tokio::io::split(theirs);
+    let server = Peer::connect_framed(read, write, pages, Framing::Lines);
+    let (read, write) = tokio::io::split(ours);
+    (Peer::connect_framed(read, write, Arc::new(ide_jsonrpc::NoopHandler), Framing::Lines), server)
+}
+
+#[tokio::test]
+async fn model_pagination_failure_does_not_cache_an_incomplete_catalog() {
+    let first = json!({ "data": [{ "id": "first" }], "nextCursor": "next" });
+    let pages = Arc::new(ModelPages {
+        pages: Mutex::new(VecDeque::from([
+            Ok(first.clone()),
+            Err((-32000, "authentication expired".into())),
+            Ok(first),
+            Ok(json!({ "data": [{ "id": "second" }], "nextCursor": null })),
+        ])),
+        cursors: Mutex::default(),
+    });
+    let (peer, server) = model_peer(pages.clone());
+    let shim = CodexShim {
+        runtime: tokio::runtime::Handle::current(),
+        codex: OnceLock::from(peer.clone()),
+        client: OnceLock::new(),
+        state: Mutex::default(),
+        models: tokio::sync::Mutex::new(None),
+        skills: tokio::sync::Mutex::new(()),
+    };
+    assert_eq!(shim.models().await.unwrap_err().message, "authentication expired");
+    let models = shim.models().await.unwrap();
+    assert_eq!(models.iter().map(|m| m.id.as_str()).collect::<Vec<_>>(), ["first", "second"]);
+    assert_eq!(shim.models().await.unwrap().len(), 2);
+    assert_eq!(*pages.cursors.lock(), [Value::Null, json!("next"), Value::Null, json!("next")]);
+    peer.kill();
+    server.kill();
+}
+
+#[tokio::test]
+async fn repeated_or_invalid_model_cursors_and_malformed_pages_are_failures() {
+    for pages in [
+        vec![json!({ "data": [], "nextCursor": "a" }), json!({ "data": [], "nextCursor": "a" })],
+        vec![
+            json!({ "data": [], "nextCursor": "a" }),
+            json!({ "data": [], "nextCursor": "b" }),
+            json!({ "data": [], "nextCursor": "a" }),
+        ],
+        vec![json!({ "data": [], "nextCursor": 7 })],
+        vec![json!({ "nextCursor": null })],
+        vec![json!({ "data": [{}], "nextCursor": null })],
+    ] {
+        let pages =
+            Arc::new(ModelPages { pages: Mutex::new(pages.into_iter().map(Ok).collect()), cursors: Mutex::default() });
+        let (peer, server) = model_peer(pages);
+        assert!(list_models(&peer).await.is_err());
+        peer.kill();
+        server.kill();
+    }
+}
+
+#[cfg(unix)]
+#[tokio::test(flavor = "multi_thread")]
+async fn native_discovery_only_initializes_and_pages_models_then_stops_the_process() {
+    use std::os::unix::fs::PermissionsExt;
+    let tmp = tempfile::tempdir().unwrap();
+    let script = tmp.path().join("fake-codex");
+    std::fs::write(
+        &script,
+        r#"#!/usr/bin/env python3
+import json, os, pathlib, sys
+pathlib.Path('pid').write_text(str(os.getpid()))
+for line in sys.stdin:
+    request = json.loads(line)
+    with pathlib.Path('requests').open('a') as f:
+        f.write(json.dumps(request) + '\n')
+    method = request['method']
+    if method == 'initialized':
+        continue
+    if method == 'initialize':
+        result = {}
+    elif method == 'model/list':
+        cursor = request['params']['cursor']
+        model = 'one' if cursor is None else 'two'
+        result = {'data': [{'id': model, 'isDefault': cursor is None,
+            'defaultReasoningEffort': 'low', 'supportedReasoningEfforts': [{'reasoningEffort': 'low'}]}],
+            'nextCursor': 'second-page' if cursor is None else None}
+    else:
+        raise RuntimeError('must not create a thread or prompt: ' + method)
+    print(json.dumps({'jsonrpc': '2.0', 'id': request['id'], 'result': result}), flush=True)
+"#,
+    )
+    .unwrap();
+    std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o755)).unwrap();
+    let spec = ProviderSpec {
+        id: "codex".into(),
+        name: "Codex".into(),
+        driver: crate::provider::Driver::Codex,
+        command: script.to_string_lossy().into_owned(),
+        args: Vec::new(),
+        env: Vec::new(),
+        login_hint: String::new(),
+        source: crate::AgentSource::Builtin,
+    };
+    let found = discover(spec, tmp.path().to_path_buf()).await.unwrap();
+    let models: Vec<_> = found
+        .config
+        .iter()
+        .filter(|o| o.category.as_deref() == Some("model"))
+        .flat_map(|o| o.values.iter().map(|v| v.value.as_str()))
+        .collect();
+    assert_eq!(models, ["one", "two"]);
+    assert_eq!(found.levels.keys().map(String::as_str).collect::<Vec<_>>(), ["one", "two"]);
+    let requests = std::fs::read_to_string(tmp.path().join("requests")).unwrap();
+    let requests: Vec<Value> = requests.lines().map(|line| serde_json::from_str(line).unwrap()).collect();
+    assert_eq!(
+        requests.iter().map(|r| r["method"].as_str().unwrap()).collect::<Vec<_>>(),
+        ["initialize", "initialized", "model/list", "model/list"]
+    );
+    assert_eq!(requests[2]["params"]["cursor"], Value::Null);
+    assert_eq!(requests[3]["params"]["cursor"], "second-page");
+    let pid = std::fs::read_to_string(tmp.path().join("pid")).unwrap();
+    tokio::time::timeout(Duration::from_secs(5), async {
+        loop {
+            let alive = std::process::Command::new("kill").args(["-0", pid.trim()]).output().unwrap().status.success();
+            if !alive {
+                break;
+            }
+            tokio::time::sleep(Duration::from_millis(10)).await;
+        }
+    })
+    .await
+    .expect("discovery must kill and reap its child");
+}
+
 // ---- Pure translations -------------------------------------------------------------
 
 fn models() -> Vec<ModelInfo> {

crates/ide-agent/src/replay_tests.rs

@@ -25,6 +25,7 @@ fn paths(dir: &Path) -> AgentPaths {
         custom_agents_dir: None,
         home_dir: None,
         env_secrets: None,
+        catalogs: Arc::default(),
     }
 }
 

crates/ide-agent/src/tests.rs

@@ -405,6 +405,7 @@ fn manager_at(dir: &Path, models_file: &Path, agent: Arc<FakeAgent>) -> AgentMan
             // user's profile, when temp lives under it) leaks into the test.
             home_dir: Some(dir.to_path_buf()),
             env_secrets: None,
+            catalogs: Arc::default(),
         },
         tokio::runtime::Handle::current(),
         connector,
@@ -442,7 +443,7 @@ async fn saved_conversation_reads_do_not_start_or_load_the_agent() {
 
 #[cfg(unix)]
 #[tokio::test(flavor = "multi_thread")]
-async fn claude_commands_before_session_are_fetched_once_and_saved() {
+async fn claude_commands_share_catalog_discovery_and_persist_results() {
     use std::os::unix::fs::PermissionsExt;
 
     for outcome in ["success", "session_report", "empty", "settings_timeout", "error", "exit", "timeout", "missing"] {
@@ -502,14 +503,18 @@ for line in sys.stdin:
         std::fs::write(root.join(".claude/skills/triage/SKILL.md"), "---\nname: triage\ndescription: Triage\n---\n")
             .unwrap();
         let mgr = manager(root, Arc::new(FakeAgent::default()));
-        {
-            let mut providers = mgr.shared.providers.write();
-            let spec = providers.iter_mut().find(|p| p.id == "claude").unwrap();
-            if outcome != "missing" {
-                spec.command = script.to_string_lossy().into_owned();
-            }
-            spec.env = vec![("OUTCOME".into(), outcome.into())];
+        if outcome != "missing" {
+            provider::set_builtin_command(&root.join("agents"), None, "claude", Some(&script.to_string_lossy()))
+                .unwrap();
         }
+        provider::set_builtin_env(
+            &root.join("agents"),
+            None,
+            "claude",
+            BTreeMap::from([("OUTCOME".into(), outcome.into())]),
+        )
+        .unwrap();
+        mgr.reload_providers();
         let concurrent = async {
             if outcome == "session_report" {
                 tokio::time::timeout(Duration::from_secs(10), async {
@@ -553,7 +558,6 @@ for line in sys.stdin:
                     effort.unwrap().current.as_deref(),
                     Some(match outcome {
                         "settings_timeout" => "default",
-                        "session_report" => "low",
                         _ => "high",
                     })
                 );
@@ -571,6 +575,8 @@ for line in sys.stdin:
             assert_eq!(launches.lines().count(), 1, "{outcome}");
             let args: Vec<String> = serde_json::from_str(launches.trim()).unwrap();
             assert!(args.windows(2).any(|a| a == ["--input-format", "stream-json"]));
+            assert!(args.iter().any(|a| a == "--strict-mcp-config"));
+            assert!(args.windows(2).any(|a| a == ["--mcp-config", "{\"mcpServers\":{}}"]));
             let requests = std::fs::read_to_string(root.join("requests")).unwrap();
             let subtypes: Vec<String> = requests
                 .lines()
@@ -1431,6 +1437,7 @@ async fn real_claude_task_in_a_worktree() {
             custom_agents_dir: None,
             home_dir: None,
             env_secrets: None,
+            catalogs: Arc::default(),
         },
         tokio::runtime::Handle::current(),
     );
@@ -2265,6 +2272,7 @@ async fn reload_providers_updates_registry_install_clears_stale_probes_and_notif
             custom_agents_dir: Some(agents_dir.clone()),
             home_dir: None,
             env_secrets: None,
+            catalogs: Arc::default(),
         },
         tokio::runtime::Handle::current(),
         connector,
@@ -2597,6 +2605,7 @@ async fn delete_running_agent(no_load: bool) {
             custom_agents_dir: None,
             home_dir: None,
             env_secrets: None,
+            catalogs: Arc::default(),
         },
         tokio::runtime::Handle::current(),
         connector,
@@ -2659,34 +2668,6 @@ fn mcp_servers_follow_server_state_and_agent_capabilities() {
     );
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn session_settings_win_over_discovery_in_memory_and_on_disk() {
-    for discovery_first in [false, true] {
-        let tmp = tempfile::tempdir().unwrap();
-        let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
-        let options = |model: &str, effort: &str| {
-            config::options_of(&json!({ "configOptions": [
-                { "id": "model", "category": "model", "type": "select", "currentValue": model,
-                  "options": [{ "value": "saved" }, { "value": "discovered" }] },
-                { "id": "effort", "category": "thought_level", "type": "select", "currentValue": effort,
-                  "options": [{ "value": "low" }, { "value": "high" }] }
-            ] }))
-        };
-        let saved = options("saved", "low");
-        let discovered = options("discovered", "high");
-        if discovery_first {
-            mgr.shared.remember_discovered("claude", &discovered, &[], &[]);
-        }
-        mgr.shared.remember("claude", Some(&saved), None, Some("saved"));
-        mgr.shared.remember_discovered("claude", &discovered, &[], &[]);
-        let restored = manager(tmp.path(), Arc::new(FakeAgent::default()));
-        for mgr in [&mgr, &restored] {
-            assert_eq!(model_of(&mgr.shared.known_config("claude")).as_deref(), Some("saved"));
-            assert_eq!(mgr.shared.known.lock()["claude"].thought_levels["saved"], saved[1..]);
-        }
-    }
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn provider_reload_does_not_start_acp_discovery() {
     let agent = Arc::new(FakeAgent::default());
@@ -2773,31 +2754,6 @@ async fn discovery_times_out_when_session_new_hangs() {
     assert!(!cursor.config.iter().any(|o| o.category.as_deref() == Some("model")));
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn discovered_effort_levels_fill_models_no_session_has_reported() {
-    let tmp = tempfile::tempdir().unwrap();
-    let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
-    let effort = |values: &[&str], current: &str| {
-        config::options_of(&json!({ "configOptions": [
-            { "id": "effort", "category": "thought_level", "type": "select", "currentValue": current,
-              "options": values.iter().map(|v| json!({ "value": v })).collect::<Vec<_>>() }
-        ] }))
-    };
-    let model = config::options_of(&json!({ "configOptions": [
-        { "id": "model", "category": "model", "type": "select", "currentValue": "sonnet",
-          "options": [{ "value": "sonnet" }, { "value": "opus" }] }
-    ] }));
-    // A session already reported sonnet's levels; discovery adds opus's.
-    let reported = [model.clone(), effort(&["low", "high"], "high")].concat();
-    mgr.shared.remember("claude", Some(&reported), None, Some("sonnet"));
-    let levels =
-        [("sonnet".to_owned(), effort(&["low"], "low")), ("opus".to_owned(), effort(&["low", "max"], "default"))];
-    mgr.shared.remember_discovered("claude", &model, &[], &levels);
-    let known = mgr.shared.known.lock();
-    assert_eq!(known["claude"].thought_levels["sonnet"], effort(&["low", "high"], "high"), "the session's report wins");
-    assert_eq!(known["claude"].thought_levels["opus"], effort(&["low", "max"], "default"));
-}
-
 #[test]
 fn streamed_text_is_sent_as_appends() {
     let mut streamed = HashMap::new();

crates/ide-build/src/compile/mod.rs

@@ -53,6 +53,8 @@ pub enum BuildSystem {
     TypeScript,
     #[serde(rename = "cmake")]
     CMake,
+    #[serde(rename = "dotnet")]
+    Dotnet,
 }
 
 /// One command of a build.
@@ -165,6 +167,8 @@ fn detect_dir(dir: &Path, model: &BuildModel, root: &Path) -> Option<BuildSystem
         || has(dir, &["build.gradle", "build.gradle.kts", "settings.gradle", "settings.gradle.kts"])
     {
         Some(BuildSystem::Gradle)
+    } else if dotnet_target(dir).is_some() {
+        Some(BuildSystem::Dotnet)
     } else if has(dir, &["Cargo.toml"]) {
         Some(BuildSystem::Cargo)
     } else if has(dir, &["go.mod", "go.work"]) {
@@ -225,7 +229,7 @@ pub fn plan(
         .or((!model.gradle.is_empty()).then_some(BuildSystem::Gradle))
         .or_else(|| model.maven.as_ref().filter(|m| !m.projects.is_empty()).map(|_| BuildSystem::Maven))
         .ok_or_else(|| {
-            IdeError::not_found("no supported build system (Maven, Gradle, Cargo, Go, TypeScript, CMake) found")
+            IdeError::not_found("no supported build system (Maven, Gradle, .NET, Cargo, Go, TypeScript, CMake) found")
         })?;
     let module = module_dir.as_deref().filter(|d| *d != root);
     let title = match module {
@@ -244,6 +248,7 @@ pub fn plan(
         BuildSystem::Go => go_steps(file.and_then(Path::parent).unwrap_or(&dir), kind)?,
         BuildSystem::TypeScript => ts_steps(&dir, kind),
         BuildSystem::CMake => cmake_steps(&dir, kind, cmake.and_then(<[_]>::first)),
+        BuildSystem::Dotnet => dotnet_steps(&dir, kind)?,
     };
     Ok(BuildPlan { system, title, steps })
 }
@@ -451,6 +456,33 @@ fn has_build_script(dir: &Path) -> bool {
         .is_some_and(|v| v.pointer("/scripts/build").is_some_and(serde_json::Value::is_string))
 }
 
+/// The solution (`.sln` / `.slnx`) or project (`.csproj` / `.fsproj` / `.vbproj`) file `dir`
+/// builds: a solution first, then a project; the first by name when there are several.
+fn dotnet_target(dir: &Path) -> Option<PathBuf> {
+    let mut files: Vec<PathBuf> =
+        std::fs::read_dir(dir).ok()?.flatten().map(|e| e.path()).filter(|p| p.is_file()).collect();
+    files.sort();
+    let ext = |p: &Path| p.extension().map(|e| e.to_string_lossy().to_ascii_lowercase()).unwrap_or_default();
+    let solution = files.iter().find(|p| matches!(ext(p).as_str(), "sln" | "slnx"));
+    solution.or_else(|| files.iter().find(|p| matches!(ext(p).as_str(), "csproj" | "fsproj" | "vbproj"))).cloned()
+}
+
+/// `dotnet build` of the directory's solution or project; Rebuild skips incremental builds,
+/// Build Artifacts publishes. The summary that repeats every message is left out.
+fn dotnet_steps(dir: &Path, kind: BuildKind) -> IdeResult<Vec<BuildStep>> {
+    let target = dotnet_target(dir).ok_or_else(|| IdeError::not_found("no .NET solution or project found"))?;
+    let target = target.file_name().map_or_else(String::new, |n| n.to_string_lossy().into_owned());
+    let verb = if kind == BuildKind::Artifacts { "publish" } else { "build" };
+    let mut step = BuildStep::new("dotnet", &[verb, &target, "-nologo", "-clp:NoSummary"], dir, Format::Msbuild);
+    if kind == BuildKind::Rebuild {
+        step.args.push("--no-incremental".into());
+    }
+    // The classic console logger prints the canonical `file(line,col): error` lines; the
+    // terminal logger (.NET 8+) only appears on a terminal, but rules it out for older SDKs too.
+    step.env.insert("MSBUILDTERMINALLOGGER".into(), "off".into());
+    Ok(vec![step])
+}
+
 fn ts_steps(dir: &Path, kind: BuildKind) -> Vec<BuildStep> {
     let script = has_build_script(dir);
     if script && (kind == BuildKind::Artifacts || !dir.join("tsconfig.json").is_file()) {
@@ -1141,6 +1173,24 @@ mod tests {
             ("pnpm", &["run".to_owned(), "build".to_owned()][..])
         );
 
+        // .NET: the solution, else the project; a module build is the file's project. An ASP.NET
+        // project's package.json (its front end) doesn't make it a TypeScript build.
+        let net = tmp.path().join("net");
+        write(&net, "App.sln", "");
+        write(&net, "src/Api/Api.csproj", "<Project/>");
+        write(&net, "src/Api/package.json", "{}");
+        write(&net, "src/Api/Program.cs", "");
+        let p = plan(&net, &BuildModel::default(), BuildKind::Build, None, None).unwrap();
+        assert_eq!(p.system, BuildSystem::Dotnet);
+        assert_eq!(p.steps[0].args, ["build", "App.sln", "-nologo", "-clp:NoSummary"]);
+        assert_eq!(p.steps[0].env["MSBUILDTERMINALLOGGER"], "off");
+        let p = plan(&net, &BuildModel::default(), BuildKind::Rebuild, Some(&net.join("src/Api/Program.cs")), None)
+            .unwrap();
+        assert_eq!(p.steps[0].args, ["build", "Api.csproj", "-nologo", "-clp:NoSummary", "--no-incremental"]);
+        assert_eq!(p.steps[0].cwd, net.join("src/Api"));
+        let p = plan(&net, &BuildModel::default(), BuildKind::Artifacts, None, None).unwrap();
+        assert_eq!(p.steps[0].args[0], "publish");
+
         let cm = tmp.path().join("cm");
         write(&cm, "CMakeLists.txt", "project(app)");
         let args = |p: &BuildPlan| p.steps.iter().map(|s| s.args.join(" ")).collect::<Vec<_>>();

crates/ide-build/src/compile/parse.rs

@@ -25,6 +25,8 @@ pub(crate) enum Format {
     Go,
     /// GCC / Clang (through `cmake --build`): `src/a.cpp:12:5: error: msg`.
     Gcc,
+    /// MSBuild (`dotnet build`): `C:\p\A.cs(12,5): error CS1002: msg [C:\p\App.csproj]`.
+    Msbuild,
 }
 
 /// What a printed column counts.
@@ -268,6 +270,43 @@ fn tsc_line(line: &str) -> Option<RawMessage> {
     Some(m)
 }
 
+/// MSBuild's canonical form: `path(12,5): error CS1002: msg [project]`, `path(12,5,12,9): …`,
+/// or `path : error NU1101: msg [project]` for a project-level message (no position).
+/// The path may contain spaces (`C:\Users\Jane Doe\…`); "error" / "warning" are never localized.
+fn msbuild_line(line: &str) -> Option<RawMessage> {
+    let line = line.trim();
+    // The project the message came from, appended by the console logger.
+    let line = match line.rfind(" [") {
+        Some(i) if line.ends_with(']') => &line[..i],
+        _ => line,
+    };
+    let (head, severity, rest) =
+        [(" error ", Severity::Error), (" warning ", Severity::Warning)].into_iter().find_map(|(word, severity)| {
+            let i = line.find(&format!(":{word}"))?;
+            Some((&line[..i], severity, &line[i + word.len() + 1..]))
+        })?;
+    let (code, msg) = rest.split_once(':')?;
+    let code = code.trim();
+    if code.is_empty() || code.contains(' ') {
+        return None;
+    }
+    let head = head.trim_end();
+    let (path, pos) = match head.strip_suffix(')').and_then(|h| h.rsplit_once('(')) {
+        Some((path, pos)) => (path, pos.split(',').map(num).collect::<Vec<_>>()),
+        None => (head, Vec::new()),
+    };
+    let at = |i: usize| pos.get(i).copied().flatten();
+    // `MSBUILD : error MSB1009` and the like name no file.
+    let file = path.rsplit(['/', '\\']).next().is_some_and(|n| n.contains('.'));
+    let mut m = RawMessage::new(severity, msg.trim(), ColUnit::Utf16);
+    if file {
+        m.path = Some(path.trim().to_owned());
+        (m.line, m.col, m.end_line, m.end_col) = (at(0), at(1), at(2), at(3));
+    }
+    m.code = Some(code.to_owned());
+    Some(m)
+}
+
 /// go: `./a.go:12:5: msg` (errors only; `go vet` style `a.go:12: msg` too).
 fn go_line(line: &str) -> Option<RawMessage> {
     let (path, ln, col, rest) = path_line_col(line)?;
@@ -404,6 +443,7 @@ impl OutputParser {
             Format::Tsc => tsc_line(&line),
             Format::Go => go_line(&line),
             Format::Gcc => gcc_line(&line),
+            Format::Msbuild => msbuild_line(&line),
             Format::Cargo => None,
         };
         if let Some(msg) = parsed {
@@ -551,6 +591,27 @@ mod tests {
         assert!(plain.messages.is_empty() && plain.console.is_none());
     }
 
+    #[test]
+    fn msbuild_canonical_messages() {
+        let out = parse(
+            Format::Msbuild,
+            "  Determining projects to restore...\n\
+             C:\\Users\\Jane Doe\\App\\Program.cs(12,5): error CS1002: ; expected [C:\\Users\\Jane Doe\\App\\App.csproj]\n\
+             /p/App/Models/User.cs(3,8,3,12): warning CS0168: The variable 'e' is declared but never used [/p/App/App.csproj]\n\
+             /p/App/App.csproj : error NU1101: Unable to find package Foo. [/p/App/App.csproj]\n\
+             MSBUILD : error MSB1009: Project file does not exist.\n\
+             Build FAILED.\n",
+        );
+        assert_eq!(out.len(), 4, "{out:?}");
+        assert_eq!(pos(&out[0]), (Severity::Error, "C:\\Users\\Jane Doe\\App\\Program.cs", 12, Some(5)));
+        assert_eq!((out[0].code.as_deref(), out[0].text.as_str()), (Some("CS1002"), "; expected"));
+        assert_eq!(pos(&out[1]), (Severity::Warning, "/p/App/Models/User.cs", 3, Some(8)));
+        assert_eq!((out[1].end_line, out[1].end_col), (Some(3), Some(12)));
+        assert_eq!((out[2].path.as_deref(), out[2].line), (Some("/p/App/App.csproj"), None));
+        assert_eq!(out[2].text, "Unable to find package Foo.");
+        assert_eq!((out[3].path.as_deref(), out[3].code.as_deref()), (None, Some("MSB1009")));
+    }
+
     #[test]
     fn tsc_plain_and_pretty() {
         let out = parse(

crates/ide-core/src/event.rs

@@ -118,6 +118,10 @@ pub enum IdeEvent {
     LanguageServer {
         server: ServerId,
         name: String,
+        /// What the user sees as the server when another program serves in its place.
+        #[serde(default)]
+        #[specta(optional)]
+        label: Option<String>,
         status: ServerStatus,
         message: Option<String>,
     },

crates/ide-core/src/jsonc.rs

@@ -1,8 +1,10 @@
 //! JSON with comments (`devcontainer.json`, `deno.jsonc`, `tsconfig.json`): turned
 //! into plain JSON for `serde_json`.
 
-/// Strips `//` and `/* */` comments and trailing commas so JSONC parses as JSON.
+/// Strips `//` and `/* */` comments, trailing commas and a leading byte order mark (Visual
+/// Studio writes one into `launchSettings.json`) so JSONC parses as JSON.
 pub fn strip(src: &str) -> String {
+    let src = src.strip_prefix('\u{feff}').unwrap_or(src);
     let mut out = String::with_capacity(src.len());
     let mut chars = src.chars().peekable();
     let mut in_str = false;
@@ -87,4 +89,10 @@ mod tests {
         assert_eq!(v["url"], "https://x.dev//y /* no */");
         assert_eq!(v["q"], "say \"hi\",");
     }
+
+    #[test]
+    fn drops_a_byte_order_mark() {
+        let v: serde_json::Value = serde_json::from_str(&strip("\u{feff}{ \"a\": 1 }")).unwrap();
+        assert_eq!(v["a"], 1);
+    }
 }

crates/ide-core/src/settings.rs

@@ -1092,7 +1092,8 @@ impl Default for ExternalFormatterSettings {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct PythonSettings {
-    /// Project interpreter executable; empty = auto-detect (project venv, else `python3`).
+    /// Project interpreter executable; empty = auto-detect (project venv, else `python3`);
+    /// `target:<run-target-id>` = the Python of a Docker or Compose run target.
     pub interpreter: String,
     /// Activate the interpreter's virtualenv in new terminal sessions.
     pub activate_virtualenv: bool,
@@ -1121,6 +1122,17 @@ impl Default for PythonSettings {
     }
 }
 
+impl PythonSettings {
+    /// What `interpreter` starts with when the project interpreter is a run target's.
+    pub const TARGET_PREFIX: &str = "target:";
+
+    /// The run target whose Python is the project interpreter (`target:<id>`), if one is.
+    pub fn run_target(&self) -> Option<&str> {
+        let id = self.interpreter.trim().strip_prefix(Self::TARGET_PREFIX)?.trim();
+        (!id.is_empty()).then_some(id)
+    }
+}
+
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct PhpSettings {
@@ -1542,6 +1554,16 @@ impl Settings {
 mod tests {
     use super::*;
 
+    #[test]
+    fn python_interpreter_may_name_a_run_target() {
+        let python = |interpreter: &str| PythonSettings { interpreter: interpreter.into(), ..Default::default() };
+        assert_eq!(python("target:web").run_target(), Some("web"));
+        assert_eq!(python(" target: web ").run_target(), Some("web"));
+        for local in ["", "target:", "/usr/bin/python3", ".venv/bin/python", "targets/python"] {
+            assert_eq!(python(local).run_target(), None, "{local}");
+        }
+    }
+
     #[test]
     fn removed_one_themes_read_as_islands_themes() {
         let settings: Settings = serde_json::from_str(

crates/ide-core/src/workflow_settings.rs

@@ -260,6 +260,8 @@ pub struct DebuggerSettings {
     pub show_on_breakpoint: bool,
     pub focus_app_on_breakpoint: bool,
     pub hide_on_termination: bool,
+    /// A breakpoint or exception hit brings the Debug tool window's Threads & Variables tab to the front.
+    pub variables_on_breakpoint: bool,
     pub breakpoints_any_file: bool,
     /// While suspended, hovering the start of a line shows a Run to Cursor button.
     pub run_to_cursor_inlay: bool,
@@ -285,6 +287,7 @@ impl Default for DebuggerSettings {
             show_on_breakpoint: true,
             focus_app_on_breakpoint: false,
             hide_on_termination: false,
+            variables_on_breakpoint: true,
             breakpoints_any_file: false,
             run_to_cursor_inlay: true,
             inline_values: true,

crates/ide-dap/Cargo.toml

@@ -7,6 +7,8 @@ license.workspace = true
 
 [dependencies]
 futures.workspace = true
+tokio-tungstenite.workspace = true
+base64.workspace = true
 tempfile.workspace = true
 ide-core.workspace = true
 ide-language.workspace = true

crates/ide-dap/src/js_cdp.rs

@@ -0,0 +1,528 @@
+//! Replacing the responses a debugged page receives. js-debug hands out a WebSocket that
+//! speaks the browser's own protocol (`requestCDPProxy`); over it the browser is told to hold
+//! the requests whose URL matches a rule (`Fetch.enable`) and each held request is answered
+//! here, with the rule's response or by letting it through.
+//!
+//! A held request stays held until it is answered, so interception is always switched off
+//! (`Fetch.disable`) before the connection is given up: a page whose requests nobody answers hangs.
+
+use crate::{DebugManager, DebugSessionId, REQUEST_TIMEOUT, js_debug};
+use base64::Engine;
+use futures::{SinkExt, StreamExt};
+use ide_core::{IdeError, IdeResult};
+use serde::{Deserialize, Serialize};
+use serde_json::{Value, json};
+use specta::Type;
+use std::collections::HashMap;
+use tokio::sync::{oneshot, watch};
+use tokio_tungstenite::tungstenite::{Message, http::StatusCode};
+
+/// A response given in place of the server's to every request whose URL contains `url_contains`.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct JsResponseRule {
+    pub url_contains: String,
+    pub status: u16,
+    pub content_type: String,
+    pub body: String,
+}
+
+/// The browser's URL pattern (`*` any text, `?` one character, `\` escapes) for "contains `part`".
+pub(crate) fn url_pattern(part: &str) -> String {
+    let mut pattern = String::with_capacity(part.len() + 2);
+    pattern.push('*');
+    for c in part.chars() {
+        if matches!(c, '*' | '?' | '\\') {
+            pattern.push('\\');
+        }
+        pattern.push(c);
+    }
+    pattern.push('*');
+    pattern
+}
+
+pub(crate) fn rule_for<'a>(rules: &'a [JsResponseRule], url: &str) -> Option<&'a JsResponseRule> {
+    rules.iter().find(|rule| url.contains(&rule.url_contains))
+}
+
+/// What to tell the browser about a request it holds: the first matching rule's response, or
+/// to send the request on. Every held request gets one of the two.
+pub(crate) fn answer(held: &Value, rules: &[JsResponseRule]) -> (&'static str, Value) {
+    let request_id = held.get("requestId").and_then(Value::as_str).unwrap_or_default();
+    let url = held.pointer("/request/url").and_then(Value::as_str).unwrap_or_default();
+    let Some(rule) = rule_for(rules, url) else {
+        return ("Fetch.continueRequest", json!({ "requestId": request_id }));
+    };
+    let header = |name: &str, value: &str| json!({ "name": name, "value": value });
+    // A page on another origin only reads a response that names its origin. The server would
+    // say so; the response given in its place has to.
+    let mut cross_origin = Vec::new();
+    if let Some(origin) = request_header(held, "Origin") {
+        cross_origin.push(header("Access-Control-Allow-Origin", origin));
+        cross_origin.push(header("Access-Control-Allow-Credentials", "true"));
+    }
+    let method = held.pointer("/request/method").and_then(Value::as_str).unwrap_or_default();
+    // The browser's question before such a request: allowed here, the server may not exist.
+    if method == "OPTIONS"
+        && let Some(asked) = request_header(held, "Access-Control-Request-Method")
+    {
+        cross_origin.push(header("Access-Control-Allow-Methods", asked));
+        if let Some(asked) = request_header(held, "Access-Control-Request-Headers") {
+            cross_origin.push(header("Access-Control-Allow-Headers", asked));
+        }
+        let allowed = json!({
+            "requestId": request_id,
+            "responseCode": 204,
+            "responsePhrase": phrase(204),
+            "responseHeaders": cross_origin,
+        });
+        return ("Fetch.fulfillRequest", allowed);
+    }
+    let mut headers = vec![header("Content-Type", &rule.content_type)];
+    headers.extend(cross_origin);
+    let replaced = json!({
+        "requestId": request_id,
+        "responseCode": rule.status,
+        "responsePhrase": phrase(rule.status),
+        "responseHeaders": headers,
+        "body": base64::engine::general_purpose::STANDARD.encode(rule.body.as_bytes()),
+    });
+    ("Fetch.fulfillRequest", replaced)
+}
+
+/// A header of the held request; the browser reports names as the page wrote them.
+fn request_header<'a>(held: &'a Value, name: &str) -> Option<&'a str> {
+    held.pointer("/request/headers")?.as_object()?.iter().find(|(key, _)| key.eq_ignore_ascii_case(name))?.1.as_str()
+}
+
+/// The browser refuses a response without a phrase when it has none of its own for the status.
+fn phrase(status: u16) -> &'static str {
+    StatusCode::from_u16(status).ok().and_then(|status| status.canonical_reason()).unwrap_or("Unknown")
+}
+
+fn interception(rules: &[JsResponseRule]) -> Value {
+    let patterns: Vec<Value> = rules
+        .iter()
+        .map(|rule| json!({ "urlPattern": url_pattern(&rule.url_contains), "requestStage": "Request" }))
+        .collect();
+    json!({ "patterns": patterns })
+}
+
+/// Applies `rules` to the page behind js-debug's CDP proxy at `ws_url` until their sender is
+/// dropped (the session is gone) or the proxy closes the connection. The browser holds
+/// requests only while there are rules. `ready` hears whether the proxy reports held
+/// requests at all; nothing is held before it has agreed to.
+pub(crate) async fn serve(
+    ws_url: String,
+    mut rules: watch::Receiver<Vec<JsResponseRule>>,
+    ready: oneshot::Sender<Result<(), String>>,
+) {
+    let socket = match tokio_tungstenite::connect_async(ws_url.as_str()).await {
+        Ok((socket, _)) => socket,
+        Err(e) => {
+            let _ = ready.send(Err(e.to_string()));
+            return;
+        }
+    };
+    let (mut write, mut read) = socket.split();
+    let mut last_id = 0u64;
+    let mut call = |method: &str, params: Value| {
+        last_id += 1;
+        (last_id, Message::text(json!({ "id": last_id, "method": method, "params": params }).to_string()))
+    };
+
+    let (subscription, subscribe) = call("JsDebug.subscribe", json!({ "events": ["Fetch.requestPaused"] }));
+    let subscribed = tokio::time::timeout(REQUEST_TIMEOUT, async {
+        write.send(subscribe).await.map_err(|e| e.to_string())?;
+        loop {
+            let reply = read.next().await.ok_or("the connection closed")?.map_err(|e| e.to_string())?;
+            let Some(reply) = reply.to_text().ok().and_then(|text| serde_json::from_str::<Value>(text).ok()) else {
+                continue;
+            };
+            if reply.get("id").and_then(Value::as_u64) != Some(subscription) {
+                continue;
+            }
+            break match reply.get("error") {
+                Some(error) => Err(error.get("message").and_then(Value::as_str).unwrap_or("refused").to_owned()),
+                None => Ok(()),
+            };
+        }
+    })
+    .await
+    .unwrap_or_else(|_| Err("no answer".to_owned()));
+    if let Err(why) = subscribed {
+        let _ = ready.send(Err(why));
+        let _ = write.close().await;
+        return;
+    }
+    let _ = ready.send(Ok(()));
+
+    let mut current = rules.borrow_and_update().clone();
+    let mut holding = !current.is_empty();
+    if holding && write.send(call("Fetch.enable", interception(&current)).1).await.is_err() {
+        return;
+    }
+    // The request each sent replacement is for, by command id, until the browser has taken it.
+    let mut replacing: HashMap<u64, String> = HashMap::new();
+    loop {
+        tokio::select! {
+            changed = rules.changed() => {
+                if changed.is_err() {
+                    break;
+                }
+                current = rules.borrow_and_update().clone();
+                let (_, command) = match (current.is_empty(), holding) {
+                    (true, false) => continue,
+                    (true, true) => call("Fetch.disable", json!({})),
+                    (false, _) => call("Fetch.enable", interception(&current)),
+                };
+                holding = !current.is_empty();
+                if write.send(command).await.is_err() {
+                    return;
+                }
+            }
+            message = read.next() => {
+                // The proxy closed (the page or the session ended): nothing is held any more.
+                let Some(Ok(message)) = message else { return };
+                let Ok(text) = message.to_text() else { continue };
+                let Ok(message) = serde_json::from_str::<Value>(text) else { continue };
+                if let Some(id) = message.get("id").and_then(Value::as_u64) {
+                    // The browser did not take the replacement: let the request through, or
+                    // it stays held and the page waits for it.
+                    if let Some(request_id) = replacing.remove(&id)
+                        && message.get("error").is_some()
+                    {
+                        let (_, go_on) = call("Fetch.continueRequest", json!({ "requestId": request_id }));
+                        if write.send(go_on).await.is_err() {
+                            return;
+                        }
+                    }
+                    continue;
+                }
+                if message.get("method").and_then(Value::as_str) != Some("Fetch.requestPaused") {
+                    continue;
+                }
+                let Some(held) = message.get("params") else { continue };
+                let Some(request_id) = held.get("requestId").and_then(Value::as_str) else { continue };
+                let (method, params) = answer(held, &current);
+                let (id, command) = call(method, params);
+                if method == "Fetch.fulfillRequest" {
+                    replacing.insert(id, request_id.to_owned());
+                }
+                if write.send(command).await.is_err() {
+                    return;
+                }
+            }
+        }
+    }
+    if holding {
+        let _ = write.send(call("Fetch.disable", json!({})).1).await;
+    }
+    let _ = write.close().await;
+}
+
+impl DebugManager {
+    /// Makes `rules` the page's response rules; none switches the replacing off. The first
+    /// rules of a session open the connection to js-debug's CDP proxy, later ones go over it.
+    /// An error means the rules are not applied.
+    pub async fn js_set_response_overrides(&self, s: DebugSessionId, rules: Vec<JsResponseRule>) -> IdeResult<()> {
+        let session = self.session(s)?;
+        if !js_debug::is_page(&session) {
+            return Err(IdeError::unavailable("this debug session is not a page in a browser"));
+        }
+        // Held to the end: two callers at once would each open a connection.
+        let mut applied = session.js_overrides.lock().await;
+        if applied.as_ref().is_some_and(|sender| sender.send(rules.clone()).is_ok()) {
+            return Ok(());
+        }
+        // No connection yet, or the proxy closed it.
+        applied.take();
+        if rules.is_empty() {
+            return Ok(());
+        }
+        let refused =
+            |why: String| IdeError::unavailable(format!("the JavaScript debugger has no browser connection: {why}"));
+        if !js_debug::launched(&session).await {
+            return Err(refused("the page's debug session did not finish starting".into()));
+        }
+        let proxy = session
+            .conn
+            .request_timeout("requestCDPProxy", json!({}), REQUEST_TIMEOUT)
+            .await
+            .map_err(|e| refused(e.to_string()))?;
+        let (Some(host), Some(port)) =
+            (proxy.get("host").and_then(Value::as_str), proxy.get("port").and_then(Value::as_u64))
+        else {
+            return Err(refused("no address".into()));
+        };
+        let path = proxy.get("path").and_then(Value::as_str).unwrap_or_default();
+        let (sender, receiver) = watch::channel(rules);
+        let (ready, is_ready) = oneshot::channel();
+        tokio::spawn(serve(format!("ws://{host}:{port}{path}"), receiver, ready));
+        match is_ready.await {
+            Ok(Ok(())) => {
+                *applied = Some(sender);
+                Ok(())
+            }
+            Ok(Err(why)) => Err(refused(why)),
+            Err(_) => Err(refused("no answer".into())),
+        }
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use futures::{SinkExt, StreamExt};
+    use serde_json::json;
+    use tokio::sync::mpsc;
+    use tokio_tungstenite::tungstenite::Message;
+
+    pub(crate) fn rule(url_contains: &str, status: u16, body: &str) -> JsResponseRule {
+        JsResponseRule {
+            url_contains: url_contains.into(),
+            status,
+            content_type: "application/json".into(),
+            body: body.into(),
+        }
+    }
+
+    #[test]
+    fn a_part_of_a_url_becomes_a_pattern_that_matches_it_anywhere() {
+        assert_eq!(url_pattern("api/items"), "*api/items*");
+        // The pattern's own wildcards and escape character are taken literally.
+        assert_eq!(url_pattern(r"a*b?c\d"), r"*a\*b\?c\\d*");
+    }
+
+    #[test]
+    fn the_first_rule_whose_text_is_in_the_url_answers() {
+        let rules = [rule("api/items", 201, "{\"a\":\"é\"}"), rule("api", 500, "later")];
+        assert_eq!(rule_for(&rules, "http://h/api/items?x=1").map(|r| r.status), Some(201));
+        assert_eq!(rule_for(&rules, "http://h/api/users").map(|r| r.status), Some(500));
+        assert!(rule_for(&rules, "http://h/logo.png").is_none());
+
+        let (command, params) = answer(&held("7", "http://h/api/items")["params"], &rules);
+        assert_eq!(command, "Fetch.fulfillRequest");
+        assert_eq!(
+            params,
+            json!({
+                "requestId": "7",
+                "responseCode": 201,
+                "responsePhrase": "Created",
+                "responseHeaders": [{ "name": "Content-Type", "value": "application/json" }],
+                // base64 of the UTF-8 text `{"a":"é"}`
+                "body": "eyJhIjoiw6kifQ==",
+            })
+        );
+        // A request the browser held that no rule is for goes on to the network.
+        assert_eq!(
+            answer(&held("8", "http://h/logo.png")["params"], &rules),
+            ("Fetch.continueRequest", json!({ "requestId": "8" }))
+        );
+    }
+
+    #[test]
+    fn a_status_the_browser_has_no_phrase_for_is_given_one() {
+        // The browser refuses a response whose status it cannot name.
+        let (_, params) = answer(&held("1", "http://h/api")["params"], &[rule("api", 419, "")]);
+        assert_eq!((&params["responseCode"], &params["responsePhrase"]), (&json!(419), &json!("Unknown")));
+    }
+
+    fn header<'a>(params: &'a Value, name: &str) -> Option<&'a str> {
+        params["responseHeaders"].as_array()?.iter().find(|h| h["name"] == name)?["value"].as_str()
+    }
+
+    #[test]
+    fn a_replaced_response_passes_the_pages_cross_origin_check() {
+        let rules = [rule("api/items", 200, "[]")];
+        let from_page = |method: &str, headers: Value| json!({ "requestId": "3", "request": { "url": "http://localhost:8080/api/items", "method": method, "headers": headers } });
+        // A page on another origin: the response names that origin, as the real server would.
+        let (_, params) = answer(&from_page("GET", json!({ "origin": "http://localhost:5173" })), &rules);
+        assert_eq!(header(&params, "Access-Control-Allow-Origin"), Some("http://localhost:5173"));
+        assert_eq!(header(&params, "Access-Control-Allow-Credentials"), Some("true"));
+        assert_eq!(params["body"], "W10=");
+
+        // The browser's question before such a request is answered too: the server may not exist.
+        let preflight = from_page(
+            "OPTIONS",
+            json!({
+                "Origin": "http://localhost:5173",
+                "Access-Control-Request-Method": "PUT",
+                "Access-Control-Request-Headers": "content-type,x-token",
+            }),
+        );
+        let (command, params) = answer(&preflight, &rules);
+        assert_eq!((command, &params["responseCode"]), ("Fetch.fulfillRequest", &json!(204)));
+        assert_eq!(header(&params, "Access-Control-Allow-Origin"), Some("http://localhost:5173"));
+        assert_eq!(header(&params, "Access-Control-Allow-Methods"), Some("PUT"));
+        assert_eq!(header(&params, "Access-Control-Allow-Headers"), Some("content-type,x-token"));
+        assert_eq!(params.get("body"), None);
+
+        // Same origin: nothing but the rule's own header.
+        let (_, params) = answer(&from_page("GET", json!({})), &rules);
+        assert_eq!(params["responseHeaders"], json!([{ "name": "Content-Type", "value": "application/json" }]));
+    }
+
+    /// A stand-in for js-debug's CDP proxy: what it receives, and a way to send it events.
+    pub(crate) async fn proxy() -> (String, mpsc::UnboundedReceiver<Value>, mpsc::UnboundedSender<Value>) {
+        proxy_refusing(|_| false).await
+    }
+
+    /// A proxy that answers the commands `refused` picks with an error, like the real one does
+    /// for what it or the browser does not accept.
+    pub(crate) async fn proxy_refusing(
+        refused: fn(&Value) -> bool,
+    ) -> (String, mpsc::UnboundedReceiver<Value>, mpsc::UnboundedSender<Value>) {
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let url = format!("ws://127.0.0.1:{}/session", listener.local_addr().unwrap().port());
+        let (received_tx, received) = mpsc::unbounded_channel();
+        let (events, mut events_rx) = mpsc::unbounded_channel::<Value>();
+        tokio::spawn(async move {
+            let (stream, _) = listener.accept().await.unwrap();
+            let (mut write, mut read) = tokio_tungstenite::accept_async(stream).await.unwrap().split();
+            loop {
+                tokio::select! {
+                    message = read.next() => {
+                        let Some(Ok(message)) = message else { break };
+                        let Ok(text) = message.to_text() else { continue };
+                        let Ok(request) = serde_json::from_str::<Value>(text) else { continue };
+                        let reply = if refused(&request) {
+                            json!({ "id": request["id"], "error": { "code": -32602, "message": "refused" } })
+                        } else {
+                            json!({ "id": request["id"], "result": {} })
+                        };
+                        let _ = write.send(Message::text(reply.to_string())).await;
+                        let _ = received_tx.send(request);
+                    }
+                    Some(event) = events_rx.recv() => {
+                        let _ = write.send(Message::text(event.to_string())).await;
+                    }
+                }
+            }
+        });
+        (url, received, events)
+    }
+
+    pub(crate) async fn next(received: &mut mpsc::UnboundedReceiver<Value>) -> (String, Value) {
+        let request = tokio::time::timeout(std::time::Duration::from_secs(5), received.recv())
+            .await
+            .expect("the proxy got a request in time")
+            .expect("the connection is open");
+        (request["method"].as_str().unwrap().to_owned(), request["params"].clone())
+    }
+
+    /// The browser's event for a request it holds.
+    fn held(request_id: &str, url: &str) -> Value {
+        json!({ "method": "Fetch.requestPaused", "params": { "requestId": request_id, "request": { "url": url } } })
+    }
+
+    type Serving = (tokio::task::JoinHandle<()>, oneshot::Receiver<Result<(), String>>);
+
+    fn serving(url: String, rules: watch::Receiver<Vec<JsResponseRule>>) -> Serving {
+        let (ready, is_ready) = oneshot::channel();
+        (tokio::spawn(serve(url, rules, ready)), is_ready)
+    }
+
+    async fn ended(task: tokio::task::JoinHandle<()>) {
+        tokio::time::timeout(std::time::Duration::from_secs(5), task).await.unwrap().unwrap();
+    }
+
+    #[tokio::test]
+    async fn held_requests_are_answered_and_interception_ends_before_the_connection() {
+        let (url, mut received, events) = proxy().await;
+        let (rules, watched) = tokio::sync::watch::channel(vec![rule("api/items", 200, "[]")]);
+        let (serving, ready) = serving(url, watched);
+        assert_eq!(ready.await.unwrap(), Ok(()));
+
+        assert_eq!(
+            next(&mut received).await,
+            ("JsDebug.subscribe".into(), json!({ "events": ["Fetch.requestPaused"] }))
+        );
+        assert_eq!(
+            next(&mut received).await,
+            (
+                "Fetch.enable".into(),
+                json!({ "patterns": [{ "urlPattern": "*api/items*", "requestStage": "Request" }] })
+            )
+        );
+
+        events.send(held("1", "http://h/api/items")).unwrap();
+        let (command, params) = next(&mut received).await;
+        assert_eq!(
+            (command.as_str(), &params["requestId"], &params["responseCode"]),
+            ("Fetch.fulfillRequest", &json!("1"), &json!(200))
+        );
+        events.send(held("2", "http://h/other")).unwrap();
+        assert_eq!(next(&mut received).await, ("Fetch.continueRequest".into(), json!({ "requestId": "2" })));
+
+        // New rules replace the browser's patterns.
+        rules.send(vec![rule("api/users", 404, "{}")]).unwrap();
+        assert_eq!(
+            next(&mut received).await,
+            (
+                "Fetch.enable".into(),
+                json!({ "patterns": [{ "urlPattern": "*api/users*", "requestStage": "Request" }] })
+            )
+        );
+
+        // No rules left: the browser stops holding requests. The connection stays for the
+        // rules that come next, and goes with the session.
+        rules.send(Vec::new()).unwrap();
+        assert_eq!(next(&mut received).await.0, "Fetch.disable");
+        rules.send(vec![rule("api/items", 200, "[]")]).unwrap();
+        assert_eq!(next(&mut received).await.0, "Fetch.enable");
+        rules.send(Vec::new()).unwrap();
+        assert_eq!(next(&mut received).await.0, "Fetch.disable");
+        drop(rules);
+        ended(serving).await;
+        // Already off: not switched off a second time.
+        assert!(received.try_recv().is_err());
+    }
+
+    #[tokio::test]
+    async fn a_session_that_goes_away_switches_interception_off() {
+        let (url, mut received, _events) = proxy().await;
+        let (rules, watched) = tokio::sync::watch::channel(vec![rule("api", 200, "[]")]);
+        let (serving, _ready) = serving(url, watched);
+        assert_eq!(next(&mut received).await.0, "JsDebug.subscribe");
+        assert_eq!(next(&mut received).await.0, "Fetch.enable");
+        drop(rules);
+        assert_eq!(next(&mut received).await.0, "Fetch.disable");
+        ended(serving).await;
+    }
+
+    #[tokio::test]
+    async fn a_response_the_browser_refuses_lets_the_request_through() {
+        let (url, mut received, events) = proxy_refusing(|request| request["method"] == "Fetch.fulfillRequest").await;
+        let (_rules, watched) = tokio::sync::watch::channel(vec![rule("api", 200, "[]")]);
+        let (_serving, _ready) = serving(url, watched);
+        assert_eq!(next(&mut received).await.0, "JsDebug.subscribe");
+        assert_eq!(next(&mut received).await.0, "Fetch.enable");
+        events.send(held("9", "http://h/api")).unwrap();
+        assert_eq!(next(&mut received).await.0, "Fetch.fulfillRequest");
+        // Unanswered, the request would hang the page.
+        assert_eq!(next(&mut received).await, ("Fetch.continueRequest".into(), json!({ "requestId": "9" })));
+    }
+
+    #[tokio::test]
+    async fn a_proxy_that_does_not_report_held_requests_is_not_asked_to_hold_any() {
+        let (url, mut received, _events) = proxy_refusing(|request| request["method"] == "JsDebug.subscribe").await;
+        let (_rules, watched) = tokio::sync::watch::channel(vec![rule("api", 200, "[]")]);
+        let (serving, ready) = serving(url, watched);
+        assert_eq!(next(&mut received).await.0, "JsDebug.subscribe");
+        assert_eq!(ready.await.unwrap(), Err("refused".to_owned()));
+        ended(serving).await;
+        assert!(received.try_recv().is_err());
+    }
+
+    #[tokio::test]
+    async fn no_connection_to_the_proxy_is_reported() {
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let url = format!("ws://127.0.0.1:{}/session", listener.local_addr().unwrap().port());
+        drop(listener);
+        let (_rules, watched) = tokio::sync::watch::channel(vec![rule("api", 200, "[]")]);
+        let (serving, ready) = serving(url, watched);
+        assert!(ready.await.unwrap().is_err());
+        ended(serving).await;
+    }
+}

crates/ide-dap/src/js_debug.rs

@@ -11,6 +11,8 @@ use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use specta::Type;
 use std::collections::BTreeMap;
+use std::path::PathBuf;
+use std::sync::atomic::{AtomicU32, Ordering};
 
 pub(crate) const ADAPTER: &str = "js-debug";
 
@@ -25,7 +27,7 @@ pub(crate) fn is_page(session: &Session) -> bool {
 /// Waits until the adapter answered the `launch` of `session`. js-debug sets a page's session
 /// up between `configurationDone` and that answer; a request of its own that arrives then is
 /// answered and has no effect.
-async fn launched(session: &Session) -> bool {
+pub(crate) async fn launched(session: &Session) -> bool {
     let mut launched = session.launched.subscribe();
     let answered = tokio::time::timeout(REQUEST_TIMEOUT, launched.wait_for(|answered| *answered)).await;
     matches!(answered, Ok(Ok(_)))
@@ -59,6 +61,44 @@ impl DebugManager {
         self.js_page_request(s, "setCustomBreakpoints", json!({ "ids": ids, "xhr": xhr })).await?;
         Ok(())
     }
+
+    /// Starts recording the page's CPU profile; [`Self::js_stop_profile`] ends it.
+    pub async fn js_start_profile(&self, s: DebugSessionId) -> IdeResult<()> {
+        self.js_page_request(s, "startProfile", json!({ "type": "cpu" })).await?;
+        Ok(())
+    }
+
+    /// Ends the recording and returns a new directory holding it as `page.cpuprofile`
+    /// (what `ide-profiler` reads a directory of).
+    pub async fn js_stop_profile(&self, s: DebugSessionId) -> IdeResult<PathBuf> {
+        let session = self.session(s)?;
+        // js-debug names the file it records into when the recording starts.
+        let Some(recorded) = session.js_profile.lock().take() else {
+            return Err(IdeError::invalid("no CPU profile is being recorded"));
+        };
+        self.js_page_request(s, "stopProfile", json!({})).await?;
+        static HANDED_OVER: AtomicU32 = AtomicU32::new(0);
+        let dir = std::env::temp_dir().join(format!(
+            "openidea-js-profile-{}-{}-{}",
+            std::process::id(),
+            s.0,
+            HANDED_OVER.fetch_add(1, Ordering::Relaxed)
+        ));
+        let copied = tokio::task::spawn_blocking({
+            let dir = dir.clone();
+            move || {
+                std::fs::create_dir_all(&dir)?;
+                std::fs::copy(&recorded, dir.join("page.cpuprofile"))?;
+                // The adapter's own copy is in the system's temporary directory: no use keeping two.
+                let _ = std::fs::remove_file(&recorded);
+                Ok::<_, std::io::Error>(())
+            }
+        })
+        .await
+        .map_err(|e| IdeError::internal(e.to_string()))?;
+        copied.map_err(|e| IdeError::unavailable(format!("the recorded CPU profile cannot be read: {e}")))?;
+        Ok(dir)
+    }
 }
 
 /// The browser events js-debug is asked to pass on (`enableNetworking`'s `mirrorEvents`).

crates/ide-dap/src/lib.rs

@@ -13,6 +13,7 @@ pub mod attach;
 mod cargo;
 pub mod connection;
 pub mod jdwp;
+mod js_cdp;
 mod js_debug;
 mod jvm_memory;
 pub mod kotlin;
@@ -24,6 +25,7 @@ use connection::{Connection, DapError};
 use futures::future::join_all;
 use ide_core::{DebugSessionId, IdeError, IdeResult, SharedSink};
 use ide_language::LanguageRegistry;
+pub use js_cdp::JsResponseRule;
 pub use js_debug::JsResponseBody;
 pub use jvm_memory::*;
 use parking_lot::Mutex;

crates/ide-dap/src/session.rs

@@ -94,6 +94,11 @@ pub(crate) struct Session {
     /// The `type` of the launch or attach request (js-debug's `pwa-node`, `pwa-chrome`); a child
     /// session's comes from the configuration the adapter started it with.
     pub launch_type: std::sync::OnceLock<String>,
+    /// The response rules of a page once a connection applies them (`js_cdp::serve`).
+    /// Dropped with the session, which switches the browser's interception off.
+    pub js_overrides: tokio::sync::Mutex<Option<tokio::sync::watch::Sender<Vec<crate::JsResponseRule>>>>,
+    /// The file js-debug records the page's CPU profile into, while one is being recorded.
+    pub js_profile: parking_lot::Mutex<Option<std::path::PathBuf>>,
     pub jvm_inspector: parking_lot::Mutex<Option<Arc<dyn ide_jvm_inspect::JvmInspector>>>,
     /// One inspector request per session at a time.
     pub inspect_lock: tokio::sync::Mutex<()>,
@@ -255,6 +260,8 @@ impl Session {
             progress: Mutex::new(HashMap::new()),
             jdwp_link: parking_lot::Mutex::new(None),
             launch_type: std::sync::OnceLock::new(),
+            js_overrides: tokio::sync::Mutex::new(None),
+            js_profile: parking_lot::Mutex::new(None),
             jvm_inspector: parking_lot::Mutex::new(None),
             inspect_lock: tokio::sync::Mutex::default(),
             ended: ide_core::CancellationToken::new(),
@@ -474,10 +481,7 @@ impl Session {
             let _ = c.start_kill();
         }
         if let Some(mut program) = self.program.lock().take() {
-            let _ = program.child.kill();
-            let _ = std::thread::Builder::new().name("openidea-debug-reap".into()).spawn(move || {
-                let _ = program.child.wait();
-            });
+            program.kill();
         }
     }
 }
@@ -574,7 +578,7 @@ fn launch_groups(s: &Session) -> Vec<libc::pid_t> {
     for child in s.debuggees.lock().iter() {
         push(child.id());
     }
-    push(s.program.lock().as_ref().and_then(|p| p.child.process_id()));
+    push(s.program.lock().as_ref().and_then(ProgramTerminal::process_id));
     groups.retain(|g| *g > 0);
     groups
 }
@@ -845,6 +849,10 @@ async fn on_event(mgr: &Arc<DebugManager>, s: &Arc<Session>, event: &str, mut bo
                 s.emit(DebugEvent::JsNetwork { event });
             }
         }
+        // js-debug, after `startProfile`: where it records the profile.
+        "profileStarted" => {
+            *s.js_profile.lock() = str_("file").map(std::path::PathBuf::from);
+        }
         _ => tracing::trace!("dap: ignored event {event}"),
     }
 }
@@ -874,7 +882,10 @@ fn on_reverse_request(mgr: &Arc<DebugManager>, s: &Arc<Session>, seq: i64, comma
 /// A `runInTerminal` program and the pseudo-terminal it runs in.
 pub(crate) struct ProgramTerminal {
     writer: ide_core::input::InputWriter,
-    child: Box<dyn portable_pty::Child + Send + Sync>,
+    killer: Box<dyn portable_pty::ChildKiller + Send + Sync>,
+    pid: Option<u32>,
+    /// Set once the program has exited and been reaped.
+    exited: Arc<AtomicBool>,
     _master: Box<dyn portable_pty::MasterPty + Send>,
 }
 
@@ -882,6 +893,28 @@ impl ProgramTerminal {
     pub(crate) fn write(&mut self, text: &str) -> std::io::Result<()> {
         self.writer.write(text.as_bytes())
     }
+
+    /// The program's process id while it runs.
+    pub(crate) fn process_id(&self) -> Option<u32> {
+        if self.exited.load(Ordering::Acquire) { None } else { self.pid }
+    }
+
+    pub(crate) fn kill(&mut self) {
+        // After the reap the pid may belong to another process.
+        if !self.exited.load(Ordering::Acquire) {
+            let _ = self.killer.kill();
+        }
+    }
+}
+
+/// Reaps the program as soon as it exits. Until then it stays a zombie that `kill(pid, 0)` still
+/// finds: js-debug polls the `processId` it was given and keeps the session (and its terminal)
+/// open while that process looks alive, and Stop would wait for it as for a running program.
+fn reap_on_exit(mut child: Box<dyn portable_pty::Child + Send + Sync>, exited: Arc<AtomicBool>) {
+    let _ = std::thread::Builder::new().name("openidea-debug-reap".into()).spawn(move || {
+        let _ = child.wait();
+        exited.store(true, Ordering::Release);
+    });
 }
 
 /// `runInTerminal`: starts the debuggee on a pseudo-terminal, as an IDE terminal would (CodeLLDB
@@ -968,8 +1001,12 @@ pub(crate) fn run_in_terminal(s: &Arc<Session>, args: &Value) -> Result<Value, S
         #[cfg(unix)]
         wait_readable,
     );
-    if let Some(mut previous) = s.program.lock().replace(ProgramTerminal { writer, child, _master: pair.master }) {
-        let _ = previous.child.kill();
+    let killer = child.clone_killer();
+    let exited = Arc::new(AtomicBool::new(false));
+    reap_on_exit(child, exited.clone());
+    let program = ProgramTerminal { writer, killer, pid, exited, _master: pair.master };
+    if let Some(mut previous) = s.program.lock().replace(program) {
+        previous.kill();
     }
     s.owner.sink.emit(IdeEvent::Debug { session: s.id, event: DebugEvent::ProgramInput });
     Ok(json!({ "processId": pid }))
@@ -1338,4 +1375,29 @@ mod tests {
         assert_eq!(parse_jdwp_port("Listening for transport dt_socket at address: [::1]:51234"), Some(51234));
         assert_eq!(parse_jdwp_port("unrelated output"), None);
     }
+
+    /// js-debug polls the `runInTerminal` pid with `kill(pid, 0)`; an unreaped zombie answers it as
+    /// a live process and keeps the session open after the program ends.
+    #[cfg(unix)]
+    #[test]
+    fn a_terminal_program_is_reaped_when_it_exits() {
+        use portable_pty::{CommandBuilder, PtySize, native_pty_system};
+        use std::sync::Arc;
+        use std::sync::atomic::{AtomicBool, Ordering};
+        let pair =
+            native_pty_system().openpty(PtySize { rows: 24, cols: 80, pixel_width: 0, pixel_height: 0 }).unwrap();
+        let mut cmd = CommandBuilder::new("/bin/sh");
+        cmd.args(["-c", "exit 0"]);
+        let child = pair.slave.spawn_command(cmd).unwrap();
+        let pid = child.process_id().unwrap() as libc::pid_t;
+        let exited = Arc::new(AtomicBool::new(false));
+        super::reap_on_exit(child, exited.clone());
+        let deadline = std::time::Instant::now() + std::time::Duration::from_secs(10);
+        while !exited.load(Ordering::Acquire) {
+            assert!(std::time::Instant::now() < deadline, "program was not reaped");
+            std::thread::sleep(std::time::Duration::from_millis(10));
+        }
+        // SAFETY: signal 0 only checks whether the process exists.
+        assert_eq!(unsafe { libc::kill(pid, 0) }, -1);
+    }
 }

crates/ide-dap/src/tests.rs

@@ -1104,6 +1104,142 @@ async fn a_page_whose_requests_the_adapter_does_not_report_says_so() {
     h.wait_event(|e| matches!(e, DebugEvent::JsNetworkUnavailable)).await;
 }
 
+/// Where the fake adapter says its CDP proxy listens (`requestCDPProxy`).
+static CDP_PROXY_PORT: std::sync::atomic::AtomicU16 = std::sync::atomic::AtomicU16::new(0);
+
+fn proxy_adapter(msg: &Value) -> Option<CustomReply> {
+    let port = CDP_PROXY_PORT.load(std::sync::atomic::Ordering::Relaxed);
+    (msg["command"] == "requestCDPProxy")
+        .then(|| (json!({ "host": "127.0.0.1", "port": port, "path": "/session" }), Vec::new()))
+}
+
+#[tokio::test]
+async fn response_overrides_reach_the_page_through_the_adapters_proxy() {
+    use crate::js_cdp::tests::{next, proxy, rule};
+    let (url, mut received, _events) = proxy().await;
+    let port: u16 = url.trim_start_matches("ws://127.0.0.1:").trim_end_matches("/session").parse().unwrap();
+    CDP_PROXY_PORT.store(port, std::sync::atomic::Ordering::Relaxed);
+
+    let h = harness(Script {
+        start_debugging: true,
+        custom: Some(proxy_adapter),
+        child_launch_delay: Duration::from_millis(150),
+        ..Script::default()
+    });
+    let browser = h.start(js_config("pwa-chrome")).await.unwrap();
+    let page = child_of(&h, browser).await;
+
+    // Rules that are there as the page starts wait until its session takes requests.
+    tokio::time::sleep(Duration::from_millis(50)).await;
+    h.manager.js_set_response_overrides(page, vec![rule("api/items", 200, "[]")]).await.unwrap();
+    let dropped = h.log.lock().iter().filter(|m| m["type"] == "dropped").count();
+    assert_eq!(dropped, 0, "the proxy was asked for before the page took requests");
+    assert_eq!(next(&mut received).await.0, "JsDebug.subscribe");
+    assert_eq!(
+        next(&mut received).await,
+        ("Fetch.enable".into(), json!({ "patterns": [{ "urlPattern": "*api/items*", "requestStage": "Request" }] }))
+    );
+    // Changed rules go over the connection that is open: the proxy is asked for once.
+    h.manager.js_set_response_overrides(page, vec![rule("api/users", 200, "[]")]).await.unwrap();
+    assert_eq!(next(&mut received).await.1["patterns"][0]["urlPattern"], "*api/users*");
+    assert_eq!(requests(&h, "requestCDPProxy").len(), 1);
+
+    h.manager.js_set_response_overrides(page, Vec::new()).await.unwrap();
+    assert_eq!(next(&mut received).await.0, "Fetch.disable");
+    // A rule switched back on.
+    h.manager.js_set_response_overrides(page, vec![rule("api/items", 200, "[]")]).await.unwrap();
+    assert_eq!(next(&mut received).await.0, "Fetch.enable");
+    assert_eq!(requests(&h, "requestCDPProxy").len(), 1);
+
+    let not_a_page = h.manager.js_set_response_overrides(browser, vec![rule("api", 200, "")]).await.unwrap_err();
+    assert_eq!(not_a_page.kind, ide_core::error::ErrorKind::Unavailable);
+}
+
+#[tokio::test]
+async fn response_overrides_are_unavailable_without_the_adapters_proxy() {
+    use crate::js_cdp::tests::rule;
+    let h = harness(Script { start_debugging: true, ..Script::default() });
+    let browser = h.start(js_config("pwa-chrome")).await.unwrap();
+    let page = child_of(&h, browser).await;
+    let refused = h.manager.js_set_response_overrides(page, vec![rule("api", 200, "")]).await.unwrap_err();
+    assert_eq!(refused.kind, ide_core::error::ErrorKind::Unavailable);
+    // Nothing to switch off is not an error.
+    h.manager.js_set_response_overrides(page, Vec::new()).await.unwrap();
+}
+
+/// A port nothing listens on, which the fake adapter gives as its CDP proxy.
+static DEAD_PROXY_PORT: std::sync::atomic::AtomicU16 = std::sync::atomic::AtomicU16::new(0);
+
+fn dead_proxy_adapter(msg: &Value) -> Option<CustomReply> {
+    let port = DEAD_PROXY_PORT.load(std::sync::atomic::Ordering::Relaxed);
+    (msg["command"] == "requestCDPProxy")
+        .then(|| (json!({ "host": "127.0.0.1", "port": port, "path": "/session" }), Vec::new()))
+}
+
+#[tokio::test]
+async fn response_overrides_that_cannot_reach_the_browser_are_an_error() {
+    use crate::js_cdp::tests::rule;
+    let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
+    DEAD_PROXY_PORT.store(listener.local_addr().unwrap().port(), std::sync::atomic::Ordering::Relaxed);
+    drop(listener);
+
+    let h = harness(Script { start_debugging: true, custom: Some(dead_proxy_adapter), ..Script::default() });
+    let browser = h.start(js_config("pwa-chrome")).await.unwrap();
+    let page = child_of(&h, browser).await;
+    let unreachable = h.manager.js_set_response_overrides(page, vec![rule("api", 200, "")]).await.unwrap_err();
+    assert_eq!(unreachable.kind, ide_core::error::ErrorKind::Unavailable);
+    // The next rules try again instead of going to a connection that never was.
+    let again = h.manager.js_set_response_overrides(page, vec![rule("api", 200, "")]).await.unwrap_err();
+    assert_eq!(again.kind, ide_core::error::ErrorKind::Unavailable);
+    assert_eq!(requests(&h, "requestCDPProxy").len(), 2);
+}
+
+/// The file the fake adapter says it records a CPU profile into (`profileStarted`).
+static PROFILE_FILE: parking_lot::Mutex<String> = parking_lot::Mutex::new(String::new());
+
+fn profiling_adapter(msg: &Value) -> Option<CustomReply> {
+    match msg["command"].as_str()? {
+        "startProfile" => {
+            Some((json!({}), vec![("profileStarted", json!({ "file": *PROFILE_FILE.lock(), "type": "cpu" }))]))
+        }
+        "stopProfile" => Some((json!({}), vec![("profilerStateUpdate", json!({ "label": "", "running": false }))])),
+        _ => None,
+    }
+}
+
+#[tokio::test]
+async fn a_pages_cpu_profile_is_handed_over_as_a_cpuprofile_file() {
+    let recorded = std::env::temp_dir().join(format!("openidea-dap-profile-{}", std::process::id()));
+    std::fs::write(&recorded, r#"{"nodes":[],"samples":[]}"#).unwrap();
+    *PROFILE_FILE.lock() = recorded.to_string_lossy().into_owned();
+
+    let h = harness(Script { start_debugging: true, custom: Some(profiling_adapter), ..Script::default() });
+    let browser = h.start(js_config("pwa-chrome")).await.unwrap();
+    let page = child_of(&h, browser).await;
+
+    // Nothing is being recorded yet.
+    let idle = h.manager.js_stop_profile(page).await.unwrap_err();
+    assert_eq!(idle.kind, ide_core::error::ErrorKind::InvalidInput);
+
+    h.manager.js_start_profile(page).await.unwrap();
+    assert_eq!(requests(&h, "startProfile"), [json!({ "type": "cpu" })]);
+    let dir = h.manager.js_stop_profile(page).await.unwrap();
+    assert_eq!(requests(&h, "stopProfile").len(), 1);
+    let files: Vec<_> = std::fs::read_dir(&dir).unwrap().map(|e| e.unwrap().file_name()).collect();
+    assert_eq!(files, ["page.cpuprofile"]);
+    assert_eq!(std::fs::read_to_string(dir.join("page.cpuprofile")).unwrap(), r#"{"nodes":[],"samples":[]}"#);
+    // One recording is handed over once.
+    assert_eq!(h.manager.js_stop_profile(page).await.unwrap_err().kind, ide_core::error::ErrorKind::InvalidInput);
+
+    // The adapter's file isn't there when it is asked for (the hand-over above took the first one).
+    assert!(!recorded.exists());
+    h.manager.js_start_profile(page).await.unwrap();
+    assert_eq!(h.manager.js_stop_profile(page).await.unwrap_err().kind, ide_core::error::ErrorKind::Unavailable);
+
+    assert_eq!(h.manager.js_start_profile(browser).await.unwrap_err().kind, ide_core::error::ErrorKind::Unavailable);
+    let _ = std::fs::remove_dir_all(dir);
+}
+
 #[test]
 fn a_child_session_is_named_by_the_adapter_unless_it_is_a_blank_page() {
     assert_eq!(child_name(&json!({ "name": "server.js [4120]" }), "Server"), "server.js [4120]");

crates/ide-docker/src/lib.rs

@@ -542,6 +542,24 @@ pub fn compose_config(ep: &DockerEndpoint, dir: &Path, files: &[String]) -> IdeR
     if out.success { Ok(out.stdout) } else { Err(failure(&args, &out.stderr, &out.stdout)) }
 }
 
+/// Runs the docker CLI with `args` in `dir` and returns its standard output; a non-zero
+/// exit is an error with docker's message.
+pub fn cli(
+    ep: &DockerEndpoint,
+    dir: Option<&Path>,
+    args: &[String],
+    timeout: Duration,
+    cancel: Option<&CancellationToken>,
+) -> IdeResult<String> {
+    let args: Vec<&str> = args.iter().map(String::as_str).collect();
+    let mut cmd = command(ep, &args)?;
+    if let Some(dir) = dir {
+        cmd.current_dir(dir);
+    }
+    let out = process::run(cmd, timeout, cancel)?;
+    if out.success { Ok(out.stdout) } else { Err(failure(&args, &out.stderr, &out.stdout)) }
+}
+
 #[cfg(test)]
 mod local_tests {
     use super::*;

crates/ide-host/src/lib.rs

@@ -66,6 +66,7 @@ pub struct Host {
     pub mcp_requests: mcp::Requests,
     /// Commands agents run in the Run tool window (`run_command`).
     pub mcp_agent_runs: mcp::AgentRuns,
+    pub(crate) agent_catalogs: Arc<ide_agent::AgentCatalogs>,
     pub trust: trust::TrustStore,
     pub(crate) mcp_approvals: Arc<trust::McpServerApprovals>,
     pub config_dir: PathBuf,
@@ -152,6 +153,7 @@ impl Host {
             mcp_reports: Default::default(),
             mcp_requests: Default::default(),
             mcp_agent_runs: Default::default(),
+            agent_catalogs: Arc::default(),
             trust: trust::TrustStore::load(&config_dir, &data_dir),
             mcp_approvals: Arc::new(trust::McpServerApprovals::load(&data_dir)),
             proxy_password: ide_ssh::secrets::SecretFile::new(data_dir.join("proxy-password.json")),

crates/ide-host/src/ops/agent.rs

@@ -7,8 +7,8 @@ use crate::rpc::Dispatcher;
 use ide_agent::registry::{AgentRegistry, RegistryPaths};
 use ide_agent::{
     AcpImportOutcome, AgentAcceptOutcome, AgentChange, AgentChanges, AgentChangesView, AgentCommand, AgentEntry,
-    AgentEvent, AgentProbe, AgentPrompt, AgentProvider, AgentQueued, AgentTask, CustomAgentInput, ExternalSession,
-    McpScope, McpServer, McpServerInput, NewAgentTask,
+    AgentEvent, AgentModelCatalog, AgentProbe, AgentPrompt, AgentProvider, AgentQueued, AgentTask, CustomAgentInput,
+    ExternalSession, McpScope, McpServer, McpServerInput, NewAgentTask,
 };
 use ide_core::error::ErrorKind;
 use ide_core::{IdeError, IdeEvent, IdeResult, IpcPath, RequestId, SharedSink, TaskId};
@@ -28,6 +28,12 @@ pub fn providers(host: &Host, window: &str) -> IdeResult<Vec<AgentProvider>> {
     Ok(providers)
 }
 
+/// Refreshes the selected agent's model catalog without sending a prompt.
+pub fn refresh_models(host: &Host, window: &str, provider: String, force: bool) -> IdeResult<AgentModelCatalog> {
+    host.require_trust(window)?;
+    host.project(window)?.agents.refresh_models(&provider, force)
+}
+
 /// Overrides built-in agent `id`'s command with `command` (its agent file keeps the
 /// built-in's driver and arguments), or returns it to auto-detection with `None`.
 pub fn set_command(host: &Host, window: &str, id: String, command: Option<String>) -> IdeResult<()> {
@@ -557,6 +563,9 @@ pub fn mcp_import(host: &Host, window: &str) -> IdeResult<Vec<McpServer>> {
 pub(crate) fn register(d: &mut Dispatcher) {
     d.add("agent_subscribe", |c| async move { subscribe(&c.host, &c.window, c.channel("onEvent")?) });
     d.add("agent_providers", |c| async move { providers(&c.host, &c.window) });
+    d.add("agent_refresh_models", |c| async move {
+        refresh_models(&c.host, &c.window, c.arg("provider")?, c.arg("force")?)
+    });
     d.add("agent_set_command", |c| async move { set_command(&c.host, &c.window, c.arg("id")?, c.arg("command")?) });
     d.add("agent_set_env", |c| async move { set_env(&c.host, &c.window, c.arg("id")?, c.arg("env")?) });
     d.add("agent_registry_list", |c| async move { registry_list(&c.host, &c.window, c.arg("request")?).await });

crates/ide-host/src/ops/debug.rs

@@ -382,6 +382,15 @@ pub async fn debug_js_custom_breakpoints(
     host.debugger.js_set_custom_breakpoints(session, ids, xhr).await
 }
 
+pub async fn debug_js_response_overrides(
+    host: &Host,
+    _window: &str,
+    session: DebugSessionId,
+    rules: Vec<ide_dap::JsResponseRule>,
+) -> IdeResult<()> {
+    host.debugger.js_set_response_overrides(session, rules).await
+}
+
 pub async fn debug_js_response_body(
     host: &Host,
     _window: &str,
@@ -391,6 +400,18 @@ pub async fn debug_js_response_body(
     host.debugger.js_response_body(session, request_id).await
 }
 
+pub async fn debug_js_start_profile(host: &Host, _window: &str, session: DebugSessionId) -> IdeResult<()> {
+    host.debugger.js_start_profile(session).await
+}
+
+pub async fn debug_js_stop_profile(
+    host: &Host,
+    _window: &str,
+    session: DebugSessionId,
+) -> IdeResult<ide_core::IpcPath> {
+    host.debugger.js_stop_profile(session).await.map(Into::into)
+}
+
 pub fn debug_capabilities(host: &Host, _window: &str, session: DebugSessionId) -> IdeResult<DebugCapabilities> {
     host.debugger.capabilities(session)
 }
@@ -607,12 +628,23 @@ pub(crate) fn register(d: &mut Dispatcher) {
         debug_restart_frame(&c.host, &c.window, c.arg("session")?, c.arg("frameId")?).await
     });
     d.add("debug_capabilities", |c| async move { debug_capabilities(&c.host, &c.window, c.arg("session")?) });
+    d.add("debug_js_response_overrides", |c| async move {
+        debug_js_response_overrides(&c.host, &c.window, c.arg("session")?, c.arg("rules")?).await
+    });
     d.add("debug_js_response_body", |c| async move {
         debug_js_response_body(&c.host, &c.window, c.arg("session")?, c.arg("requestId")?).await
     });
     d.add("debug_js_custom_breakpoints", |c| async move {
         debug_js_custom_breakpoints(&c.host, &c.window, c.arg("session")?, c.arg("ids")?, c.arg("xhr")?).await
     });
+    d.add(
+        "debug_js_start_profile",
+        |c| async move { debug_js_start_profile(&c.host, &c.window, c.arg("session")?).await },
+    );
+    d.add(
+        "debug_js_stop_profile",
+        |c| async move { debug_js_stop_profile(&c.host, &c.window, c.arg("session")?).await },
+    );
     d.add("debug_set_function_breakpoints", |c| async move {
         debug_set_function_breakpoints(&c.host, &c.window, c.arg("breakpoints")?).await
     });

crates/ide-host/src/ops/doc/commands.rs

@@ -159,6 +159,15 @@ pub async fn doc_highlights(host: &Host, window: &str, doc: DocId) -> IdeResult<
     .await
 }
 
+/// Python class facts the inheritance inspections read: base names as written, a method's
+/// parameters, decorator semantics and its body shape. Tree-sitter answers; no LSP.
+pub async fn doc_python_facts(host: &Host, window: &str, doc: DocId) -> IdeResult<ide_language::PythonFacts> {
+    let project = host.project(window)?;
+    let syntax = host.syntax();
+    let snap = project.documents.text_snapshot(doc)?;
+    blocking(move || Ok(syntax.python_facts(&snap.language, &snap.text))).await
+}
+
 /// Extend Selection (⌥↑): syntax ranges around `offset`, innermost first.
 /// Large documents fall back to word / line / document ranges.
 pub async fn doc_selection_ranges(host: &Host, window: &str, doc: DocId, offset: u32) -> IdeResult<Vec<Range>> {
@@ -208,6 +217,7 @@ pub(crate) fn register(d: &mut Dispatcher) {
     d.add("doc_outline", |c| async move { doc_outline(&c.host, &c.window, c.arg("doc")?).await });
     d.add("doc_folding", |c| async move { doc_folding(&c.host, &c.window, c.arg("doc")?).await });
     d.add("doc_highlights", |c| async move { doc_highlights(&c.host, &c.window, c.arg("doc")?).await });
+    d.add("doc_python_facts", |c| async move { doc_python_facts(&c.host, &c.window, c.arg("doc")?).await });
     d.add("doc_selection_ranges", |c| async move {
         doc_selection_ranges(&c.host, &c.window, c.arg("doc")?, c.arg("offset")?).await
     });

crates/ide-host/src/ops/project.rs

@@ -239,6 +239,12 @@ pub fn set_settings(
     let toolchain = ["languages", "tools", "languageServers", "projectStructure"]
         .iter()
         .any(|k| key == *k || key.starts_with(&format!("{k}.")));
+    // A run target chosen as the Python interpreter (or changed) needs a snapshot of its libraries.
+    if ["languages", "languages.python", "languages.python.interpreter", "runTargets"].contains(&key) {
+        for project in affected() {
+            crate::ops::sdk::container_python::ensure(host, &project);
+        }
+    }
     // Code style only reaches servers as settings (e.g. jdtls' formatter profile); builds don't depend on it.
     if code_style || toolchain {
         for project in affected() {

crates/ide-host/src/ops/run.rs

@@ -508,7 +508,7 @@ pub fn list(host: &Host) -> Vec<RunInfo> {
 }
 
 mod commands;
-mod container;
+pub(crate) mod container;
 pub use commands::*;
 
 #[cfg(test)]

crates/ide-host/src/ops/run/container.rs

@@ -33,23 +33,11 @@ pub(super) async fn prepare(host: &Host, root: &Path, target: RunTarget, config:
     let root = root.to_path_buf();
     let data_dir = host.data_dir.clone();
     host.blocking(move || {
-        if !ide_docker::endpoint_is_local(&endpoint)? {
-            return Err(IdeError::invalid(format!(
-                "Run target '{}' uses a Docker daemon on another machine: the project can only be mounted from a local one",
-                target.name
-            )));
-        }
+        require_local(&endpoint, &target)?;
         let docker = ide_docker::docker_executable().ok_or_else(|| {
             IdeError::unavailable("docker executable not found; install Docker and make sure it is on PATH")
         })?;
-        let container_root = match target.container_root.trim() {
-            "" if target.kind == RunTargetKind::Compose => {
-                let json = ide_docker::compose_config(&endpoint, &root, &target.compose_files)?;
-                compose_container_root(&json, target.service.trim(), &root)?
-            }
-            "" => default_container_root(&root),
-            folder => folder.to_owned(),
-        };
+        let container_root = container_root(&endpoint, &root, &target)?;
         let file_env = env_files(&root, &config)?;
         let name = container_name(&config.id, &unique());
         let debugging = if debug { Some(Debugging::prepare(&data_dir)?) } else { None };
@@ -75,6 +63,29 @@ pub(super) async fn prepare(host: &Host, root: &Path, target: RunTarget, config:
     .await
 }
 
+/// The project can only be bind-mounted from a daemon on this machine.
+pub(crate) fn require_local(endpoint: &DockerEndpoint, target: &RunTarget) -> IdeResult<()> {
+    if !ide_docker::endpoint_is_local(endpoint)? {
+        return Err(IdeError::invalid(format!(
+            "Run target '{}' uses a Docker daemon on another machine: the project can only be mounted from a local one",
+            target.name
+        )));
+    }
+    Ok(())
+}
+
+/// Where the project is in the target's containers.
+pub(crate) fn container_root(endpoint: &DockerEndpoint, root: &Path, target: &RunTarget) -> IdeResult<String> {
+    Ok(match target.container_root.trim() {
+        "" if target.kind == RunTargetKind::Compose => {
+            let json = ide_docker::compose_config(endpoint, root, &target.compose_files)?;
+            compose_container_root(&json, target.service.trim(), root)?
+        }
+        "" => default_container_root(root),
+        folder => folder.to_owned(),
+    })
+}
+
 /// What a debug run mounts and publishes.
 struct Debugging {
     port: u16,
@@ -104,7 +115,7 @@ fn free_port() -> IdeResult<u16> {
 }
 
 /// The target's Docker connection (Services tool window), by id; none = the CLI's daemon.
-fn endpoint(data_dir: &Path, target: &RunTarget) -> IdeResult<DockerEndpoint> {
+pub(crate) fn endpoint(data_dir: &Path, target: &RunTarget) -> IdeResult<DockerEndpoint> {
     let id = target.docker_connection.trim();
     if id.is_empty() {
         return Ok(DockerEndpoint::Default);

crates/ide-host/src/ops/sdk.rs

@@ -10,6 +10,9 @@ use std::path::PathBuf;
 use std::sync::Mutex;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
+pub(crate) mod container_python;
+pub use container_python::{ContainerPython, sdk_container_python, sdk_container_python_refresh};
+
 fn join_err(e: impl std::fmt::Display) -> IdeError {
     IdeError::internal(e.to_string())
 }
@@ -232,12 +235,17 @@ pub async fn sdk_project_libraries(
     let project = host.project(window)?;
     let (root, cache, settings) = (project.root.clone(), project.build_cache_dir(), project.settings.effective());
     let cancel = host.begin_project_request(window, request);
+    let container = container_python::library_group(host, &root, &settings);
     let libraries = {
         let (root, settings, cancel, on_groups) = (root.clone(), settings.clone(), cancel.clone(), on_groups.clone());
         tokio::task::spawn_blocking(move || {
-            ide_sdk::libraries::project_libraries_stream(&root, &settings, &[], &cancel, &|groups| {
+            if let Some(group) = &container {
+                let _ = on_groups.send(vec![group.clone()]);
+            }
+            let groups = ide_sdk::libraries::project_libraries_stream(&root, &settings, &[], &cancel, &|groups| {
                 let _ = on_groups.send(groups);
-            })
+            });
+            container.into_iter().chain(groups).collect::<Vec<_>>()
         })
     };
     let dependencies = {
@@ -377,6 +385,8 @@ pub(crate) fn register(d: &mut Dispatcher) {
     );
     d.add("sdk_python_effective", |c| async move { sdk_python_effective(&c.host, &c.window, c.arg("near")?) });
     d.add("sdk_php_effective", |c| async move { sdk_php_effective(&c.host, &c.window) });
+    d.add("sdk_container_python", |c| async move { sdk_container_python(&c.host, &c.window) });
+    d.add("sdk_container_python_refresh", |c| async move { sdk_container_python_refresh(&c.host, &c.window).await });
     d.add("sdk_php_xdebug", |c| async move { sdk_php_xdebug(&c.host, &c.window, c.arg("php")?, c.arg("cwd")?).await });
     d.add(
         "sdk_php_language_level",

crates/ide-host/src/ops/sdk/container_python.rs

@@ -0,0 +1,298 @@
+//! A Docker or Compose run target's Python as the project interpreter: snapshots of the
+//! container's library folders for the language server (see `ide_sdk::container_python`).
+//!
+//! A snapshot runs the target's Python once in a new container (the image's entrypoint
+//! and the service's dependencies skipped), then copies its `sys.path` folders out of
+//! the stopped container with `docker cp`. Nothing is installed in the container.
+
+use crate::Host;
+use crate::project::Project;
+use ide_core::event::NotifyLevel;
+use ide_core::remote_settings::{RunTarget, RunTargetKind};
+use ide_core::settings::Settings;
+use ide_core::{IdeError, IdeEvent, IdeResult, IpcPath, TaskId};
+use ide_sdk::container_python::{self as snapshots, Snapshot};
+use ide_sdk::python::PythonPackage;
+use std::collections::HashSet;
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, LazyLock, Mutex};
+use std::time::Duration;
+
+/// Building or pulling the image may come first.
+const PROBE_TIMEOUT: Duration = Duration::from_secs(15 * 60);
+const COPY_TIMEOUT: Duration = Duration::from_secs(10 * 60);
+const QUICK: Duration = Duration::from_secs(30);
+
+/// The project interpreter when it is a run target's.
+#[derive(Clone, Debug, serde::Serialize, specta::Type)]
+#[serde(rename_all = "camelCase")]
+pub struct ContainerPython {
+    /// The run target's id.
+    pub target: String,
+    /// Its name; empty when no run target has the id.
+    pub name: String,
+    /// The Python version of the snapshot in use; `None`: no snapshot yet.
+    pub version: Option<String>,
+    /// The image the snapshot was copied from.
+    pub image: Option<String>,
+    /// The copied library folders on this machine.
+    pub folders: Vec<IpcPath>,
+    /// Packages of the snapshot (read-only).
+    pub packages: Vec<PythonPackage>,
+    /// A snapshot is being taken.
+    pub updating: bool,
+}
+
+/// Where snapshots are kept, and the Docker connections the targets refer to.
+#[derive(Clone)]
+struct Dirs {
+    data: PathBuf,
+    /// `<local data>/container-python/`: `<project>/<target>/<image>/` and `neutral/`.
+    cache: PathBuf,
+}
+
+impl Dirs {
+    fn of(host: &Host) -> Self {
+        Self::new(&host.data_dir, &host.local_data_dir)
+    }
+
+    fn new(data_dir: &Path, local_data_dir: &Path) -> Self {
+        Self { data: data_dir.to_path_buf(), cache: local_data_dir.join("container-python") }
+    }
+
+    fn target(&self, root: &Path, target: &str) -> PathBuf {
+        snapshots::target_dir(&self.cache.join(crate::project::project_key(root)), target)
+    }
+}
+
+/// Target folders with a snapshot being taken.
+static UPDATING: LazyLock<Mutex<HashSet<PathBuf>>> = LazyLock::new(Default::default);
+
+fn updating(dir: &Path) -> bool {
+    UPDATING.lock().unwrap_or_else(|e| e.into_inner()).contains(dir)
+}
+
+/// The snapshot in use for the project's interpreter, if it is a run target's.
+fn current(dirs: &Dirs, root: &Path, settings: &Settings) -> Option<(PathBuf, Snapshot)> {
+    let target = settings.languages.python.run_target()?;
+    snapshots::current(&dirs.target(root, target))
+}
+
+/// Language server configuration: basedpyright / pyright see the container's libraries.
+pub(crate) fn configure_server(
+    cfg: &mut ide_language::LanguageServerConfig,
+    local_data_dir: &Path,
+    root: &Path,
+    settings: &Settings,
+) {
+    if settings.languages.python.run_target().is_none() {
+        return;
+    }
+    let current = current(&Dirs::new(local_data_dir, local_data_dir), root, settings);
+    snapshots::configure_server(cfg, current.as_ref().map(|(d, s)| (d.as_path(), s)));
+}
+
+/// External Libraries: the snapshot's folders, named after the run target.
+pub(crate) fn library_group(host: &Host, root: &Path, settings: &Settings) -> Option<ide_sdk::libraries::LibraryGroup> {
+    let target = settings.languages.python.run_target()?;
+    let (dir, snapshot) = current(&Dirs::of(host), root, settings)?;
+    let name = settings.run_targets.iter().find(|t| t.id == target).map_or(target, |t| t.name.as_str());
+    snapshots::library_group(name, &dir, &snapshot)
+}
+
+/// The project interpreter when it is a run target's, with its snapshot.
+pub fn sdk_container_python(host: &Host, window: &str) -> IdeResult<Option<ContainerPython>> {
+    host.require_trust(window)?;
+    let project = host.project(window)?;
+    Ok(describe(host, &project.root, &project.settings.effective()))
+}
+
+fn describe(host: &Host, root: &Path, settings: &Settings) -> Option<ContainerPython> {
+    let target = settings.languages.python.run_target()?;
+    let name = settings.run_targets.iter().find(|t| t.id == target).map(|t| t.name.clone()).unwrap_or_default();
+    let dir = Dirs::of(host).target(root, target);
+    let mut out = ContainerPython {
+        target: target.to_owned(),
+        name,
+        version: None,
+        image: None,
+        folders: Vec::new(),
+        packages: Vec::new(),
+        updating: updating(&dir),
+    };
+    if let Some((dir, snapshot)) = snapshots::current(&dir) {
+        out.folders = snapshots::local_folders(&dir, &snapshot).into_iter().map(Into::into).collect();
+        out.packages = snapshots::packages(&dir, &snapshot);
+        out.version = Some(snapshot.probe.version);
+        out.image = Some(snapshot.image);
+    }
+    Some(out)
+}
+
+/// Takes a new snapshot of the project interpreter's container (also of an image that
+/// has one already), then the language servers pick it up.
+pub async fn sdk_container_python_refresh(host: &Host, window: &str) -> IdeResult<Option<ContainerPython>> {
+    host.require_trust(window)?;
+    let project = host.project(window)?;
+    update(Dirs::of(host), &project, true).await?;
+    Ok(describe(host, &project.root, &project.settings.effective()))
+}
+
+/// Takes a snapshot when the project interpreter is a run target's and the current image
+/// has none yet (a new choice, a rebuilt image), in the background. Errors are notified.
+pub(crate) fn ensure(host: &Host, project: &Arc<Project>) {
+    if !project.is_trusted() || project.settings.effective().languages.python.run_target().is_none() {
+        return;
+    }
+    let (dirs, project) = (Dirs::of(host), project.clone());
+    host.runtime.spawn(async move {
+        if let Err(e) = update(dirs, &project, false).await
+            && e.kind != ide_core::error::ErrorKind::Cancelled
+        {
+            project.sink.emit(IdeEvent::Notify {
+                level: NotifyLevel::Warning,
+                title: "Cannot copy the container's Python libraries".into(),
+                body: Some(e.message),
+            });
+        }
+    });
+}
+
+async fn update(dirs: Dirs, project: &Arc<Project>, force: bool) -> IdeResult<()> {
+    let settings = project.settings.effective();
+    let Some(id) = settings.languages.python.run_target() else { return Ok(()) };
+    let target = ide_remote::service::run_target(&settings, id)?;
+    if target.kind == RunTargetKind::Ssh {
+        return Err(IdeError::invalid(format!(
+            "Run target '{}' runs over SSH: only a Docker or Compose run target can be the project interpreter",
+            target.name
+        )));
+    }
+    let dir = dirs.target(&project.root, id);
+    if !UPDATING.lock().unwrap_or_else(|e| e.into_inner()).insert(dir.clone()) {
+        return Ok(());
+    }
+    let _done = Updating(dir.clone());
+    let endpoint = crate::ops::run::container::endpoint(&dirs.data, &target)?;
+    let task = TaskId::next();
+    let title = format!("Python libraries of {}", target.name);
+    let (root, sink) = (project.root.clone(), project.sink.clone());
+    let progress = move |message: &str, done: bool| {
+        sink.emit(IdeEvent::Task {
+            id: task,
+            title: title.clone(),
+            message: Some(message.to_owned()),
+            fraction: None,
+            done,
+            cancellable: false,
+        })
+    };
+    let report = progress.clone();
+    let result = tokio::task::spawn_blocking(move || {
+        take(&endpoint, &root, &target, &dir, &dirs.cache, force, &|message| report(message, false))
+    })
+    .await
+    .map_err(|e| IdeError::internal(e.to_string()))
+    .and_then(|r| r);
+    progress(if result.is_ok() { "Done" } else { "Failed" }, true);
+    if result? {
+        project.lsp.reconfigure().await;
+    }
+    Ok(())
+}
+
+struct Updating(PathBuf);
+
+impl Drop for Updating {
+    fn drop(&mut self) {
+        UPDATING.lock().unwrap_or_else(|e| e.into_inner()).remove(&self.0);
+    }
+}
+
+/// Removes the probe container, also when copying failed.
+struct Container<'a> {
+    endpoint: &'a ide_docker::DockerEndpoint,
+    name: String,
+}
+
+impl Drop for Container<'_> {
+    fn drop(&mut self) {
+        let args = ["rm", "--force", "--volumes", &self.name].map(String::from);
+        if let Err(e) = ide_docker::cli(self.endpoint, None, &args, QUICK, None) {
+            tracing::warn!("cannot remove container {}: {}", self.name, e.message);
+        }
+    }
+}
+
+/// Takes the snapshot in `target_dir` and makes it the one in use; `false` when the image
+/// had one already and it is in use (unless `force`).
+fn take(
+    endpoint: &ide_docker::DockerEndpoint,
+    root: &Path,
+    target: &RunTarget,
+    target_dir: &Path,
+    cache: &Path,
+    force: bool,
+    progress: &dyn Fn(&str),
+) -> IdeResult<bool> {
+    crate::ops::run::container::require_local(endpoint, target)?;
+    let container_root = crate::ops::run::container::container_root(endpoint, root, target)?;
+    let name = format!("openidea-python-{}", unique());
+    let args = ide_remote::docker::python_probe_args(target, root, &name, snapshots::PROBE)?;
+    progress("Starting the container's Python");
+    let container = Container { endpoint, name };
+    let out = ide_docker::cli(endpoint, Some(root), &args, PROBE_TIMEOUT, None);
+    let probe = snapshots::parse_probe(&out?)?;
+    let inspect = ["inspect".into(), "--format".into(), "{{.Image}}".into(), container.name.clone()];
+    let image = ide_docker::cli(endpoint, None, &inspect, QUICK, None)?.trim().to_owned();
+    if image.is_empty() {
+        return Err(IdeError::internal(format!("docker inspect printed no image for {}", container.name)));
+    }
+    let dir = target_dir.join(snapshots::dir_name(&image));
+    let before = snapshots::current(target_dir).map(|(_, s)| s.image);
+    if !force && snapshots::read(&dir).is_some() {
+        snapshots::make_current(target_dir, &image)?;
+        return Ok(before.as_deref() != Some(image.as_str()));
+    }
+    let partial = target_dir.join(format!("{}.partial", snapshots::dir_name(&image)));
+    if partial.exists() {
+        std::fs::remove_dir_all(&partial)?;
+    }
+    std::fs::create_dir_all(&partial)?;
+    let mut folders = Vec::new();
+    for folder in snapshots::folders_to_copy(&probe, &container_root) {
+        progress(&format!("Copying {folder}"));
+        let local = snapshots::local_folder(&partial, &folder);
+        let Some(parent) = local.parent() else { continue };
+        std::fs::create_dir_all(parent)?;
+        // Into an existing folder: `docker cp` puts the source folder in it under its own name.
+        let args = ["cp".into(), format!("{}:{folder}", container.name), format!("{}/", parent.to_string_lossy())];
+        match ide_docker::cli(endpoint, None, &args, COPY_TIMEOUT, None) {
+            Ok(_) => folders.push(folder),
+            Err(e) => tracing::warn!("cannot copy {folder} from {}: {}", container.name, e.message),
+        }
+    }
+    drop(container);
+    progress("Preparing the language server's interpreter");
+    let snapshot = Snapshot {
+        neutral_python: snapshots::neutral_python(cache, &probe.version),
+        image: image.clone(),
+        probe,
+        folders,
+    };
+    snapshots::write(&partial, &snapshot)?;
+    if dir.exists() {
+        std::fs::remove_dir_all(&dir)?;
+    }
+    std::fs::rename(&partial, &dir)?;
+    snapshots::make_current(target_dir, &image)?;
+    Ok(true)
+}
+
+/// Distinguishes probe containers.
+fn unique() -> String {
+    use std::sync::atomic::{AtomicU32, Ordering};
+    static COUNT: AtomicU32 = AtomicU32::new(0);
+    let secs = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).map_or(0, |d| d.as_secs());
+    format!("{:x}-{}-{}", secs & 0xff_ffff, std::process::id(), COUNT.fetch_add(1, Ordering::Relaxed))
+}

crates/ide-host/src/project.rs

@@ -174,6 +174,7 @@ impl Host {
                 let root = member.as_ref().unwrap_or(window_root);
                 ide_sdk::apply::server_launch_overrides(cfg, &effective);
                 ide_sdk::apply::configure_server(cfg, root, server_root, &effective);
+                crate::ops::sdk::container_python::configure_server(cfg, &data_dir, root, &effective);
                 if cfg.name == "jdtls" {
                     // A workspace member keeps its build model under its own key (Build Project).
                     let cache = match &member {
@@ -630,6 +631,7 @@ impl Host {
         if let Some(cmd) = post_start {
             self.environment.spawn_post_start(cmd, project.root.clone(), project.sink.clone());
         }
+        crate::ops::sdk::container_python::ensure(self, &project);
         Ok(project)
     }
 
@@ -664,6 +666,7 @@ impl Host {
                         .join(project_key)
                 }),
                 models_file: self.data_dir.join("agents").join("models.json"),
+                catalogs: self.agent_catalogs.clone(),
                 custom_agents_dir: Some(self.config_dir.join("agents")),
                 home_dir: dirs::home_dir(),
                 env_secrets: Some(Arc::new(AgentEnvSecrets {

crates/ide-host/src/trust.rs

@@ -289,6 +289,7 @@ impl crate::Host {
                 }
             }
             project.lsp.reconfigure().await;
+            crate::ops::sdk::container_python::ensure(self, &project);
             project.sink.emit(ide_core::IdeEvent::ProjectTrustChanged { root: project.root.clone().into(), trusted });
         }
         Ok(())

crates/ide-host/tests/agent_model_refresh.rs

@@ -0,0 +1,98 @@
+//! Separate project windows share discovery and its backend-enforced cooldown.
+#![cfg(unix)]
+
+use ide_agent::AgentEvent;
+use ide_core::NullSink;
+use ide_host::{Host, HostConfig, ops};
+use std::sync::Arc;
+use std::time::Duration;
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn windows_share_model_discovery_and_manual_refresh_cooldown() {
+    let tmp = tempfile::tempdir().unwrap();
+    let root = tmp.path().join("project");
+    let config = tmp.path().join("config");
+    std::fs::create_dir_all(&root).unwrap();
+    std::fs::create_dir_all(config.join("agents")).unwrap();
+    let script = tmp.path().join("catalog.sh");
+    std::fs::write(
+        &script,
+        r#"#!/bin/sh
+printf 'launch\n' >> "${0%/*}/launches"
+while IFS= read -r line; do
+    case "$line" in
+        *'"id":'*) rest=${line#*\"id\":}; id=${rest%%,*}; id=${id%%\}*} ;;
+        *) continue ;;
+    esac
+    case "$line" in
+        *'"method":"initialize"'*)
+            printf '{"jsonrpc":"2.0","id":%s,"result":{"protocolVersion":1,"agentCapabilities":{}}}\n' "$id" ;;
+        *'"method":"session/new"'*)
+            while [ ! -f "${0%/*}/release" ]; do sleep 0.01; done
+            printf '{"jsonrpc":"2.0","id":%s,"result":{"sessionId":"catalog","configOptions":[{"id":"model","name":"Model","category":"model","type":"select","currentValue":"new-model","options":[{"value":"new-model","name":"New model"}]}]}}\n' "$id" ;;
+    esac
+done
+"#,
+    )
+    .unwrap();
+    std::fs::write(
+        config.join("agents/catalog-test.toml"),
+        format!(
+            "name = \"Catalog test\"\ncommand = \"/bin/sh\"\nargs = [{}]\n",
+            serde_json::to_string(&script).unwrap()
+        ),
+    )
+    .unwrap();
+    let host = Host::new(HostConfig {
+        config_dir: config,
+        data_dir: tmp.path().join("data"),
+        local_data_dir: tmp.path().join("local"),
+        languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+        syntax: Arc::default(),
+        sink_for: Box::new(|_| Arc::new(NullSink)),
+        owner: |window| window,
+        runtime: tokio::runtime::Handle::current(),
+        project_environment: false,
+    });
+    host.trust.decide(&root, true, false).unwrap();
+    host.open_project("first", &root).unwrap();
+    host.open_project("second", &root).unwrap();
+    let (send, mut events) = tokio::sync::mpsc::unbounded_channel();
+    for window in ["first", "second"] {
+        let send = send.clone();
+        host.project(window).unwrap().agents.subscribe(Arc::new(move |event| {
+            if let AgentEvent::ModelCatalog { catalog } = event {
+                let _ = send.send((window, catalog));
+            }
+        }));
+    }
+    for _ in 0..20 {
+        for window in ["first", "second"] {
+            let state = ops::agent::refresh_models(&host, window, "catalog-test".into(), true).unwrap();
+            assert!(state.refreshing);
+        }
+    }
+    std::fs::write(tmp.path().join("release"), "").unwrap();
+    let completed = tokio::time::timeout(Duration::from_secs(10), async {
+        let mut windows = std::collections::HashSet::new();
+        while windows.len() < 2 {
+            let (window, catalog) = events.recv().await.expect("catalog event stream closed");
+            if !catalog.refreshing && catalog.refreshed_at_ms.is_some() {
+                assert!(catalog.error.is_none(), "{:?}", catalog.error);
+                windows.insert(window);
+            }
+        }
+    })
+    .await;
+    assert!(completed.is_ok(), "both windows must receive the completed catalog");
+    for _ in 0..20 {
+        for window in ["first", "second"] {
+            let catalog = ops::agent::refresh_models(&host, window, "catalog-test".into(), true).unwrap();
+            assert!(!catalog.refreshing);
+            assert!(catalog.retry_at_ms.is_some());
+            let models = catalog.config.iter().find(|o| o.category.as_deref() == Some("model")).unwrap();
+            assert_eq!(models.values[0].value, "new-model");
+        }
+    }
+    assert_eq!(std::fs::read_to_string(tmp.path().join("launches")).unwrap(), "launch\n");
+}

crates/ide-host/tests/container_python_real.rs

@@ -0,0 +1,174 @@
+//! A Compose run target as the Python interpreter, against a real daemon and the real
+//! basedpyright. Ignored by default: `OPENIDEA_DOCKER_TEST_DIR` names an empty folder the
+//! daemon can bind-mount (on this machine, or at the same path in a VM such as OrbStack's),
+//! `docker` with the Compose plugin and `basedpyright-langserver` must be on `PATH`, and
+//! this machine's Python must not have Django installed.
+#![cfg(unix)]
+
+use ide_core::IdeEvent;
+use ide_host::{Host, HostConfig, ops};
+use ide_run::{OutputChunk, RunConfig};
+use std::path::{Path, PathBuf};
+use std::process::Command;
+use std::sync::{Arc, Mutex};
+use std::time::{Duration, Instant};
+
+const WINDOW: &str = "main";
+type Events = Arc<Mutex<Vec<IdeEvent>>>;
+
+fn host(base: &Path, events: &Events) -> Arc<Host> {
+    Arc::new(Host::new(HostConfig {
+        config_dir: base.join("config"),
+        data_dir: base.join("data"),
+        local_data_dir: base.join("data"),
+        languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+        syntax: Arc::default(),
+        sink_for: Box::new({
+            let events = events.clone();
+            move |_| {
+                let events = events.clone();
+                Arc::new(move |e: IdeEvent| events.lock().unwrap().push(e))
+            }
+        }),
+        owner: |w| w,
+        runtime: tokio::runtime::Handle::current(),
+        project_environment: false,
+    }))
+}
+
+/// basedpyright's latest diagnostics of `path` once `done` accepts them.
+async fn diagnostics(events: &Events, path: &Path, timeout: Duration, done: impl Fn(&[String]) -> bool) -> Vec<String> {
+    let deadline = Instant::now() + timeout;
+    loop {
+        let latest = events.lock().unwrap().iter().rev().find_map(|e| match e {
+            IdeEvent::Diagnostics { path: p, items, source } if **p == *path && source.contains("basedpyright") => {
+                Some(items.iter().map(|d| d.message.clone()).collect::<Vec<_>>())
+            }
+            _ => None,
+        });
+        if let Some(messages) = &latest
+            && done(messages)
+        {
+            return messages.clone();
+        }
+        assert!(Instant::now() < deadline, "timed out; last diagnostics: {latest:?}");
+        tokio::time::sleep(Duration::from_millis(500)).await;
+    }
+}
+
+fn unresolved(messages: &[String]) -> bool {
+    messages.iter().any(|m| m.contains("\"django") && m.contains("could not be resolved"))
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "requires a Docker daemon, basedpyright and OPENIDEA_DOCKER_TEST_DIR"]
+async fn compose_target_is_the_python_interpreter() {
+    let root = PathBuf::from(std::env::var("OPENIDEA_DOCKER_TEST_DIR").expect("OPENIDEA_DOCKER_TEST_DIR"));
+    let root = dunce::canonicalize(root).unwrap();
+    let files = [
+        ("compose.yaml", "services:\n  web:\n    build: .\n    volumes:\n      - .:/app\n    working_dir: /app\n"),
+        (
+            "Dockerfile",
+            "FROM python:3.12-slim\nCOPY requirements.txt /tmp/requirements.txt\n\
+             RUN pip install --no-cache-dir -r /tmp/requirements.txt\n",
+        ),
+        ("requirements.txt", "Django==5.1.3\n"),
+        (
+            "app/main.py",
+            "import django\nfrom django.http import HttpResponse\n\nprint(django.get_version(), HttpResponse)\n",
+        ),
+    ];
+    for (path, text) in files {
+        std::fs::create_dir_all(root.join(path).parent().unwrap()).unwrap();
+        std::fs::write(root.join(path), text).unwrap();
+    }
+    let main = root.join("app/main.py");
+    let state = tempfile::tempdir().unwrap();
+    let events: Events = Arc::default();
+    let host = host(state.path(), &events);
+    host.trust.decide(&root, true, false).unwrap();
+    host.open_project(WINDOW, &root).unwrap();
+    let set = |key: &str, value: serde_json::Value| {
+        ops::project::set_settings(
+            &host,
+            WINDOW,
+            ide_workspace::settings::SettingsScope::Project,
+            key,
+            &value.to_string(),
+        )
+        .unwrap();
+    };
+    set("runTargets", serde_json::json!([{ "kind": "compose", "id": "web", "name": "Compose web", "service": "web" }]));
+
+    // A local interpreter: Django is only in the image.
+    ops::doc::open(&host, WINDOW, main.clone()).await.unwrap();
+    let before = diagnostics(&events, &main, Duration::from_secs(120), unresolved).await;
+    eprintln!("local interpreter: {before:?}");
+
+    // The run target as the interpreter: a snapshot is taken in the background, then the
+    // server restarts with the copied site-packages as `extraPaths`.
+    set("languages.python.interpreter", serde_json::json!("target:web"));
+    let after = diagnostics(&events, &main, Duration::from_secs(900), |m| !unresolved(m)).await;
+    eprintln!("run target interpreter: {after:?}");
+    assert!(after.iter().all(|m| !m.contains("could not be resolved")), "{after:?}");
+
+    let info = ops::sdk::sdk_container_python(&host, WINDOW).unwrap().expect("a run target interpreter");
+    eprintln!("snapshot: version {:?}, image {:?}, folders {:?}", info.version, info.image, info.folders);
+    assert_eq!(info.name, "Compose web");
+    assert!(info.version.as_deref().is_some_and(|v| v.starts_with("3.12.")), "{info:?}");
+    assert!(info.packages.iter().any(|p| p.name == "Django" && p.version == "5.1.3"), "{:?}", info.packages);
+    let site = info.folders.iter().find(|f| f.0.ends_with("site-packages")).expect("site-packages copied");
+    assert!(site.0.join("django/__init__.py").is_file());
+    assert!(site.0.starts_with(state.path().join("data/container-python")), "{site:?}");
+    let servers = ops::lsp::lsp_servers(&host, WINDOW).unwrap();
+    eprintln!("servers: {:?}", servers.iter().map(|s| (&s.name, s.status)).collect::<Vec<_>>());
+
+    // Run: a Python configuration without its own target runs in the container.
+    let out = Arc::new(Mutex::new(String::new()));
+    let sink = out.clone();
+    let config = RunConfig {
+        id: "main".into(),
+        name: "main".into(),
+        kind: "python".into(),
+        command: "python3".into(),
+        args: vec!["app/main.py".into()],
+        cwd: None,
+        env: Default::default(),
+        detected: false,
+        is_test: false,
+        debug_adapter: None,
+        allow_parallel: false,
+        extras: Default::default(),
+    };
+    ops::run::start(
+        &host,
+        WINDOW,
+        config,
+        Arc::new(move |chunk| match chunk {
+            OutputChunk::Stdout { text } | OutputChunk::Stderr { text } | OutputChunk::System { text } => {
+                sink.lock().unwrap().push_str(&text)
+            }
+        }),
+    )
+    .await
+    .unwrap();
+    for _ in 0..1200 {
+        if out.lock().unwrap().contains("Process finished") {
+            break;
+        }
+        tokio::time::sleep(Duration::from_millis(100)).await;
+    }
+    let out = out.lock().unwrap().clone();
+    eprintln!("run output: {out}");
+    assert!(out.contains("5.1.3") && out.contains("exit code 0"), "{out}");
+
+    // Refresh takes a new snapshot of the same image; nothing is left running.
+    let refreshed = ops::sdk::sdk_container_python_refresh(&host, WINDOW).await.unwrap().unwrap();
+    assert_eq!(refreshed.image, info.image);
+    let probes = Command::new("docker")
+        .args(["ps", "--all", "--quiet", "--filter", "label=openidea.python-probe=true"])
+        .output()
+        .unwrap();
+    assert_eq!(String::from_utf8_lossy(&probes.stdout).trim(), "", "probe containers are removed");
+    Command::new("docker").args(["compose", "down", "--rmi", "local"]).current_dir(&root).status().unwrap();
+}

crates/ide-host/tests/rpc.rs

@@ -82,7 +82,9 @@ async fn serves_projects_files_documents_search_and_runs() {
     invoke(&peer, "lsp_resend_diagnostics", json!({})).await.unwrap();
     let files = invoke(&peer, "find_files", json!({"query": "main", "limit": 10})).await.unwrap();
     assert!(files.is_array());
-    for command in ["build_sync", "run_start", "sdk_locate_tools", "notebook_execute", "debug_start"] {
+    for command in
+        ["build_sync", "run_start", "sdk_locate_tools", "notebook_execute", "debug_start", "agent_refresh_models"]
+    {
         let error = invoke(&peer, command, json!({})).await.unwrap_err();
         assert!(error.message.contains("Restricted Mode"), "{command}: {error:?}");
     }

crates/ide-host/tests/trust.rs

@@ -93,6 +93,7 @@ async fn application_commands_work_in_restricted_projects_and_without_a_project(
         "vcs_git_version",
         "docker_compose_op",
         "db_execute",
+        "agent_refresh_models",
         "remote_delete",
         "remote_mkdir",
         "remote_rename",

crates/ide-index/src/store.rs

@@ -599,6 +599,28 @@ impl Store {
         txn.commit().map_err(err)
     }
 
+    /// [`Self::apply`] for records already serialized (by the parse pool).
+    pub(crate) fn apply_raw(&self, puts: &[(String, Vec<u8>)], deletes: &[String], durable: bool) -> Result<()> {
+        self.ensure_db()?;
+        let db = self.db.read();
+        let mut txn = db.as_ref().expect("ensured").begin_write().map_err(err)?;
+        if !durable {
+            txn.set_durability(Durability::None).map_err(err)?;
+        }
+        {
+            let mut table = txn.open_table(FILES).map_err(err)?;
+            for (rel, bytes) in puts {
+                table.insert(rel.as_str(), bytes.as_slice()).map_err(err)?;
+            }
+            for rel in deletes {
+                table.remove(rel.as_str()).map_err(err)?;
+            }
+        }
+        // Any file change makes the columnar start-up snapshot stale.
+        let _ = std::fs::remove_file(&self.snapshot);
+        txn.commit().map_err(err)
+    }
+
     /// Reclaims free pages in the database file; `true` if anything was compacted.
     pub(crate) fn compact(&self) -> Result<bool> {
         self.ensure_db()?;

crates/ide-index/src/worker.rs

@@ -17,6 +17,8 @@ use std::time::{Duration, Instant, SystemTime};
 /// Files larger than this are listed but not parsed for symbols.
 pub const MAX_SYMBOL_FILE: u64 = 2 * 1024 * 1024;
 const CHUNK: usize = 512;
+/// Insert/persist batch of the initial scan's streaming pass.
+const SCAN_BATCH: usize = 2048;
 const PROGRESS_EVERY: Duration = Duration::from_millis(250);
 #[cfg(not(test))]
 const SNAPSHOT_DELAY: Duration = Duration::from_secs(2);
@@ -436,10 +438,13 @@ impl Shared {
         });
 
         let filter = self.filter();
+        let walk_started = Instant::now();
         let found = prewalked.unwrap_or_else(|| self.walk_roots(dirs));
+        let walk = walk_started.elapsed();
         if self.is_cancelled() {
             return self.end_scan(task);
         }
+        let classify_started = Instant::now();
         let seen: HashSet<&Path> = found.iter().map(|f| f.path.as_path()).collect();
         let (todo, stale): (Vec<&Found>, Vec<PathBuf>) = {
             let d = self.data.read();
@@ -452,6 +457,7 @@ impl Shared {
                 .collect();
             (todo, stale)
         };
+        let classify = classify_started.elapsed();
         if !stale.is_empty() {
             let mut d = self.data.write();
             for path in &stale {
@@ -462,33 +468,76 @@ impl Shared {
         self.persist(&[], &stale, false);
 
         let total = todo.len();
-        let mut done = 0usize;
-        let mut last_progress = Instant::now();
-        for chunk in todo.chunks(CHUNK) {
-            if self.is_cancelled() {
-                return self.end_scan(task);
-            }
-            self.index_files(chunk.iter().copied(), false);
-            done += chunk.len();
-            if last_progress.elapsed() >= PROGRESS_EVERY {
-                last_progress = Instant::now();
-                self.sink.emit(IdeEvent::Task {
-                    id: task,
-                    title: "Indexing".into(),
-                    message: Some(format!("{done} / {total} files")),
-                    fraction: Some(done as f32 / total.max(1) as f32),
-                    done: false,
-                    cancellable: false,
+        let mut laps = ChunkLaps::default();
+        {
+            // One streaming parallel pass: parse on the rayon pool without
+            // per-chunk joins (a straggler file at a join's tail idles every
+            // other core), while parsed files flow to this thread to be
+            // inserted and persisted in batches. `filter` moves into the
+            // parse thread; this thread keeps the outer one.
+            let filter = self.filter();
+            // Bounded: when inserting and persisting fall behind, the parse waits instead
+            // of holding the whole project's records (and their bytes) in the channel.
+            let (tx, rx) = std::sync::mpsc::sync_channel::<ParsedFile>(2 * SCAN_BATCH);
+            let cancelled = &self.cancelled;
+            let mut done = 0usize;
+            let mut last_progress = Instant::now();
+            let pass_started = Instant::now();
+            std::thread::scope(|scope| -> () {
+                scope.spawn(move || {
+                    todo.par_iter().for_each(|f| {
+                        if cancelled.load(Ordering::Relaxed) {
+                            return;
+                        }
+                        let Some(out) = self.parse_found(f, &filter, false) else { return };
+                        let _ = tx.send(out);
+                    });
+                    // `tx` drops here: the consumer's loop ends with the channel.
                 });
-            }
+                let mut batch: Vec<ParsedFile> = Vec::with_capacity(SCAN_BATCH);
+                for out in rx {
+                    if self.is_cancelled() {
+                        break;
+                    }
+                    batch.push(out);
+                    if batch.len() < SCAN_BATCH {
+                        continue;
+                    }
+                    done += batch.len();
+                    laps.add(self.publish(batch.drain(..)));
+                    if last_progress.elapsed() >= PROGRESS_EVERY {
+                        last_progress = Instant::now();
+                        self.sink.emit(IdeEvent::Task {
+                            id: task,
+                            title: "Indexing".into(),
+                            message: Some(format!("{done} / {total} files")),
+                            fraction: Some(done as f32 / total.max(1) as f32),
+                            done: false,
+                            cancellable: false,
+                        });
+                    }
+                }
+                if !batch.is_empty() && !self.is_cancelled() {
+                    done += batch.len();
+                    laps.add(self.publish(batch.drain(..)));
+                }
+            });
+            laps.extract = pass_started.elapsed();
         }
+        if self.is_cancelled() {
+            return self.end_scan(task);
+        }
+        let durable_started = Instant::now();
         self.persist(&[], &[], true);
+        let durable = durable_started.elapsed();
         if let Some(store) = &self.store {
             let recent: Vec<String> = self.recent.lock().iter().filter_map(|p| filter.store_key(p)).collect();
             let d = self.data.read();
+            let snapshot_started = Instant::now();
             if let Err(e) = store.save_snapshot(&d, &filter, guard) {
                 tracing::warn!("index snapshot: {e}");
             }
+            tracing::info!("index snapshot: written in {:?}", snapshot_started.elapsed());
             if let Err(e) = store.save_recent_file(&recent) {
                 tracing::warn!("index recent snapshot: {e}");
             }
@@ -506,54 +555,85 @@ impl Shared {
         self.emit_state();
         let d = self.data.read();
         tracing::info!(
-            "indexed {} files ({} parsed, {} symbols) in {:?}",
+            "indexed {} files ({} parsed, {} symbols) in {:?} (walk {:?}, classify {:?}, extract {:?}, insert {:?}, persist {:?}, durable {:?})",
             d.file_count,
             total,
             d.symbol_count,
-            started.elapsed()
+            started.elapsed(),
+            walk,
+            classify,
+            laps.extract,
+            laps.insert,
+            laps.persist,
+            durable
         );
     }
 
     /// Extracts records in parallel, then publishes them to memory and disk.
     /// `force` re-parses files whose content is unchanged (their language changed).
-    fn index_files<'a>(&self, files: impl Iterator<Item = &'a Found>, force: bool) {
+    fn index_files<'a>(&self, files: impl Iterator<Item = &'a Found>, force: bool) -> ChunkLaps {
+        let mut laps = ChunkLaps::default();
         let files: Vec<&Found> = files.collect();
         let filter = self.filter();
-        let extracted: Vec<(String, FileRecord, PathBuf)> = files
-            .par_iter()
-            .filter_map(|f| {
-                if self.is_cancelled() {
-                    return None;
-                }
-                let rel = filter.rel(&f.path)?;
-                let prev_hash = if force { None } else { self.data.read().get(&f.path).map(|e| e.hash) };
-                match self.extract(f, prev_hash) {
-                    Extracted::Unchanged => {
-                        // Same content, new mtime: keep the symbols, refresh metadata.
-                        let mut rec = self.data.read().record_of(&f.path)?;
-                        rec.mtime = f.mtime;
-                        rec.size = f.size;
-                        rec.ignored = f.ignored;
-                        Some((rel, rec, f.path.clone()))
-                    }
-                    Extracted::New(rec) => Some((rel, rec, f.path.clone())),
-                }
-            })
-            .collect();
+        let started = Instant::now();
+        let extracted: Vec<ParsedFile> = files.par_iter().filter_map(|f| self.parse_found(f, &filter, force)).collect();
+        laps.extract = started.elapsed();
         if extracted.is_empty() {
-            return;
+            return laps;
+        }
+        laps.add(self.publish(extracted.into_iter()));
+        laps
+    }
+
+    /// Reads and parses one file (parallel-safe), serializing its record for
+    /// the cache alongside the parse. `None` when the file is outside the
+    /// scope or the scan was cancelled.
+    fn parse_found(&self, f: &Found, filter: &std::sync::Arc<PathFilter>, force: bool) -> Option<ParsedFile> {
+        if self.is_cancelled() {
+            return None;
+        }
+        let rel = filter.rel(&f.path)?;
+        let prev_hash = if force { None } else { self.data.read().get(&f.path).map(|e| e.hash) };
+        let rec = match self.extract(f, prev_hash) {
+            Extracted::Unchanged => {
+                // Same content, new mtime: keep the symbols, refresh metadata.
+                let mut rec = self.data.read().record_of(&f.path)?;
+                rec.mtime = f.mtime;
+                rec.size = f.size;
+                rec.ignored = f.ignored;
+                rec
+            }
+            Extracted::New(rec) => rec,
+        };
+        let key = filter.store_key(&f.path);
+        let bytes = postcard::to_allocvec(&rec).ok();
+        Some(ParsedFile { rel, rec, key, bytes, path: f.path.clone() })
+    }
+
+    /// Inserts a parsed batch into the in-memory index and persists the records.
+    fn publish(&self, batch: impl Iterator<Item = ParsedFile>) -> ChunkLaps {
+        let mut laps = ChunkLaps::default();
+        let started = Instant::now();
+        let mut entries: Vec<(FileEntry, Vec<StoredSymbol>)> = Vec::new();
+        let mut puts: Vec<(String, Vec<u8>)> = Vec::new();
+        for out in batch {
+            let ParsedFile { rel, rec, key, bytes, path } = out;
+            if let (Some(key), Some(bytes)) = (key, bytes) {
+                puts.push((key, bytes));
+            }
+            entries.push(FileEntry::new(path, rel, rec));
         }
-        let puts: Vec<(String, FileRecord)> =
-            extracted.iter().filter_map(|(_, rec, path)| Some((filter.store_key(path)?, rec.clone()))).collect();
         {
-            let entries: Vec<(FileEntry, Vec<StoredSymbol>)> =
-                extracted.into_iter().map(|(rel, rec, path)| FileEntry::new(path, rel, rec)).collect();
             let mut d = self.data.write();
             for (e, symbols) in entries {
                 d.insert(e, symbols);
             }
         }
-        self.persist(&puts, &[], false);
+        laps.insert = started.elapsed();
+        let started = Instant::now();
+        self.persist_raw(&puts, &[], false);
+        laps.persist = started.elapsed();
+        laps
     }
 
     fn schedule_snapshot(&self) {
@@ -594,6 +674,15 @@ impl Shared {
         }
     }
 
+    /// [`Self::persist`] for records already serialized by the parse pool.
+    fn persist_raw(&self, puts: &[(String, Vec<u8>)], deletes: &[String], durable: bool) {
+        if let Some(store) = &self.store
+            && let Err(e) = store.apply_raw(puts, deletes, durable)
+        {
+            tracing::warn!("index cache write failed: {e}");
+        }
+    }
+
     fn extract(&self, f: &Found, prev_hash: Option<[u8; 32]>) -> Extracted {
         let mut rec = FileRecord { mtime: f.mtime, size: f.size, ignored: f.ignored, ..Default::default() };
         if f.ignored || f.size > MAX_SYMBOL_FILE {
@@ -793,6 +882,33 @@ enum Extracted {
     New(FileRecord),
 }
 
+/// Wall-time laps of one `index_files` chunk, accumulated by the scan.
+#[derive(Default)]
+struct ChunkLaps {
+    extract: Duration,
+    insert: Duration,
+    persist: Duration,
+}
+
+impl ChunkLaps {
+    fn add(&mut self, other: ChunkLaps) {
+        self.extract += other.extract;
+        self.insert += other.insert;
+        self.persist += other.persist;
+    }
+}
+
+/// One file parsed off the index thread: its record ready to publish, already
+/// serialized for the cache (in parallel with the parse).
+struct ParsedFile {
+    rel: String,
+    rec: FileRecord,
+    /// Cache key and postcard bytes; `None` when outside the persisted root.
+    key: Option<String>,
+    bytes: Option<Vec<u8>>,
+    path: PathBuf,
+}
+
 #[cfg(test)]
 mod tests {
     use crate::data::safe_rel;

crates/ide-language/src/lib.rs

@@ -28,6 +28,7 @@ pub use syntax::{
     VueComponentImport, VueRefAccess, VueRefElement, WebReference, WebReferenceKind, merge_visibility,
     set_external_syntax, shift_pos, shift_range,
 };
+pub use syntax::{MethodBody, PythonClassFacts, PythonFacts, PythonMethodFacts};
 
 /// Parsed form of `languages/<id>.toml`. Backend-only; the UI gets [`LanguageInfo`].
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -198,6 +199,10 @@ pub struct LanguageServerConfig {
     /// it parses a document.
     #[serde(default)]
     pub resync_on_configuration: bool,
+    /// Set by the settings hook: what the user sees as the server when another program serves
+    /// in its place (TypeScript 7's own `tsc --lsp` for vtsls).
+    #[serde(skip)]
+    pub display_name: Option<String>,
     /// Set on plugin languages: start exactly this approved program.
     #[serde(skip)]
     pub pinned: Option<ProgramPin>,

crates/ide-language/src/syntax/inheritance.rs

@@ -43,7 +43,7 @@ fn extract(tree: &Tree, text: &str) -> Vec<ClassBases> {
         // Selection-range start of the class: its name identifier (`class Foo`
         // -> `Foo`), matching `outline.rs` and the gutter marker candidates.
         let range = idx.range(name_node.start_byte(), name_node.end_byte());
-        let bases = node.child_by_field_name("superclasses").map(|args| base_names(args, text)).unwrap_or_default();
+        let bases = class_base_names(node, text);
         out.push(ClassBases { name, line: range.start.line, col: range.start.col, bases });
     });
     out
@@ -67,6 +67,11 @@ fn visit(cursor: &mut tree_sitter::TreeCursor, f: &mut impl FnMut(Node)) {
     }
 }
 
+/// The bare base names a `class_definition` node writes (keyword arguments left out).
+pub(super) fn class_base_names(node: Node, text: &str) -> Vec<String> {
+    node.child_by_field_name("superclasses").map(|args| base_names(args, text)).unwrap_or_default()
+}
+
 fn base_names(args: Node, text: &str) -> Vec<String> {
     let mut out = Vec::new();
     let mut cursor = args.walk();

crates/ide-language/src/syntax/mod.rs

@@ -10,6 +10,7 @@ mod inheritance;
 pub(crate) mod lines;
 mod literals;
 mod outline;
+mod python_facts;
 mod rst;
 mod selection;
 mod sfc;
@@ -27,6 +28,7 @@ pub use inheritance::ClassBases;
 pub use lines::{shift_pos, shift_range};
 pub use literals::{Literal, LiteralKind, SpellingKind, SpellingRegion};
 pub use outline::merge_visibility;
+pub use python_facts::{MethodBody, PythonClassFacts, PythonFacts, PythonMethodFacts};
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::sync::OnceLock;

crates/ide-language/src/syntax/python_facts.rs

@@ -0,0 +1,438 @@
+//! Python class facts the inheritance inspections need: base names as written, parameter
+//! lists, decorator semantics and what a method body does. They come from the syntax tree in
+//! one pass, so the frontend reasons about the inheritance graph without parsing source text.
+//!
+//! Deliberately small: a fact exists here only when a check can decide it without guessing.
+
+use super::lines::LineIndex;
+use crate::{LanguageId, Syntax};
+use serde::{Deserialize, Serialize};
+use specta::Type;
+use tree_sitter::{Node, Tree};
+
+/// One Python module's classes, in source order.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct PythonFacts {
+    pub classes: Vec<PythonClassFacts>,
+}
+
+/// A class definition and the methods it declares.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct PythonClassFacts {
+    pub name: String,
+    /// The class name identifier (selection range).
+    pub selection: crate::Range,
+    /// Base names as written, a qualified name reduced to its last segment.
+    pub bases: Vec<String>,
+    pub methods: Vec<PythonMethodFacts>,
+}
+
+/// A method definition the inspections can reason about.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct PythonMethodFacts {
+    pub name: String,
+    /// The method name identifier (selection range).
+    pub selection: crate::Range,
+    /// Parameter names in order; `None` for a form whose forwarding cannot be compared
+    /// (`*args`, `**kwargs`, keyword-only, positional-only).
+    pub params: Option<Vec<String>>,
+    /// Decorated with `abstractmethod` (`abc.abstractmethod` included).
+    pub abstract_method: bool,
+    /// Decorated with `override` from `typing` / `typing_extensions`.
+    pub override_decorated: bool,
+    pub body: MethodBody,
+}
+
+/// What a method body does, for the shapes a check can decide without guessing.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase", tag = "kind")]
+pub enum MethodBody {
+    /// `pass`, `...`, a docstring, or nothing at all.
+    Empty,
+    /// Exactly one `super().name(args)` call, optionally `return`ed.
+    SuperCall { returns: bool, target: String, args: Vec<String> },
+    /// Anything else.
+    Other,
+}
+
+impl Syntax {
+    /// The classes of a Python `text` with the facts the inheritance checks need.
+    /// Every other language returns an empty result.
+    pub fn python_facts(&self, lang: &LanguageId, text: &str) -> PythonFacts {
+        self.analyze(lang, text, |g, tree, text| (g.spec.name == "python").then(|| extract(tree, text)))
+            .unwrap_or_default()
+    }
+}
+
+fn extract(tree: &Tree, text: &str) -> PythonFacts {
+    let idx = LineIndex::new(text);
+    let imports = ImportBindings::collect(tree, text);
+    let mut classes = Vec::new();
+    let mut cursor = tree.walk();
+    visit(&mut cursor, &mut |node| {
+        if node.kind() != "class_definition" {
+            return;
+        }
+        let Some(name_node) = node.child_by_field_name("name") else { return };
+        let name = text_of(name_node, text);
+        if name.is_empty() {
+            return;
+        }
+        classes.push(PythonClassFacts {
+            name,
+            selection: idx.range(name_node.start_byte(), name_node.end_byte()),
+            bases: super::inheritance::class_base_names(node, text),
+            methods: methods_of(node, text, &idx, &imports),
+        });
+    });
+    PythonFacts { classes }
+}
+
+/// The methods declared directly in `class`.
+fn methods_of(class: Node, text: &str, idx: &LineIndex, imports: &ImportBindings) -> Vec<PythonMethodFacts> {
+    let Some(body) = class.child_by_field_name("body") else { return Vec::new() };
+    let mut out = Vec::new();
+    let mut cursor = body.walk();
+    for member in body.named_children(&mut cursor) {
+        // A decorated method is a `decorated_definition` wrapping the `function_definition`.
+        let method = match member.kind() {
+            "function_definition" => member,
+            "decorated_definition" => match member.child_by_field_name("definition") {
+                Some(inner) if inner.kind() == "function_definition" => inner,
+                _ => continue,
+            },
+            _ => continue,
+        };
+        let Some(name_node) = method.child_by_field_name("name") else { continue };
+        let name = text_of(name_node, text);
+        if name.is_empty() {
+            continue;
+        }
+        let decorators = decorators_of(method, text);
+        out.push(PythonMethodFacts {
+            name,
+            selection: idx.range(name_node.start_byte(), name_node.end_byte()),
+            params: parameters_of(method, text),
+            abstract_method: decorators.iter().any(|d| last_segment(d) == "abstractmethod"),
+            override_decorated: decorators.iter().any(|d| imports.is_typing_override(d)),
+            body: body_of(method, text),
+        });
+    }
+    out
+}
+
+/// The parameter names of a `function_definition`, or `None` when the signature contains a
+/// form whose forwarding cannot be compared without guessing.
+fn parameters_of(function: Node, text: &str) -> Option<Vec<String>> {
+    let params = function.child_by_field_name("parameters")?;
+    let mut names = Vec::new();
+    let mut cursor = params.walk();
+    for param in params.named_children(&mut cursor) {
+        let name = match param.kind() {
+            "identifier" => text_of(param, text),
+            "typed_parameter" | "default_parameter" | "typed_default_parameter" => {
+                let named = param
+                    .child_by_field_name("name")
+                    .or_else(|| param.child_by_field_name("pattern"))
+                    .or_else(|| param.named_child(0))?;
+                if named.kind() != "identifier" {
+                    return None;
+                }
+                text_of(named, text)
+            }
+            // `*args`, `**kwargs`, `/`, `*`: the call form cannot be compared textually.
+            _ => return None,
+        };
+        if !name.is_empty() {
+            names.push(name);
+        }
+    }
+    Some(names)
+}
+
+/// A `function_definition`'s body, classified into the shapes a check can decide.
+fn body_of(function: Node, text: &str) -> MethodBody {
+    let Some(body) = function.child_by_field_name("body") else { return MethodBody::Empty };
+    // A docstring is not a statement the checks care about.
+    let statements: Vec<Node> = statements_of(body).into_iter().filter(|s| !is_string(*s)).collect();
+    if statements.is_empty() || statements.iter().all(|s| is_noop(*s)) {
+        return MethodBody::Empty;
+    }
+    let [only] = statements.as_slice() else { return MethodBody::Other };
+    let call = match only.kind() {
+        "expression_statement" => (only.named_child(0), false),
+        "return_statement" => (only.named_child(0), true),
+        _ => (None, false),
+    };
+    match call {
+        (Some(call), returns) if is_super_call(call, text) => {
+            let target = call
+                .child_by_field_name("function")
+                .and_then(|f| f.child_by_field_name("attribute"))
+                .map(|a| text_of(a, text))
+                .unwrap_or_default();
+            let args = call
+                .child_by_field_name("arguments")
+                .map(|args| {
+                    let mut cursor = args.walk();
+                    args.named_children(&mut cursor).map(|a| text_of(a, text)).collect()
+                })
+                .unwrap_or_default();
+            MethodBody::SuperCall { returns, target, args }
+        }
+        _ => MethodBody::Other,
+    }
+}
+
+/// Whether `node` is a `super().name(...)` call.
+fn is_super_call(node: Node, text: &str) -> bool {
+    if node.kind() != "call" {
+        return false;
+    }
+    let Some(function) = node.child_by_field_name("function") else { return false };
+    if function.kind() != "attribute" {
+        return false;
+    }
+    function.child_by_field_name("object").is_some_and(|object| {
+        object.kind() == "call"
+            && object
+                .child_by_field_name("function")
+                .is_some_and(|f| f.kind() == "identifier" && text_of(f, text) == "super")
+    })
+}
+
+/// Whether `statement` is `pass` or a bare `...`.
+fn is_noop(statement: Node) -> bool {
+    match statement.kind() {
+        "pass_statement" => true,
+        "expression_statement" => statement.named_child(0).is_some_and(|child| child.kind() == "ellipsis"),
+        _ => false,
+    }
+}
+
+/// A string expression statement: a docstring.
+fn is_string(statement: Node) -> bool {
+    statement.kind() == "expression_statement" && statement.named_child(0).is_some_and(|child| child.kind() == "string")
+}
+
+/// The statements of a `block`, comments excluded.
+fn statements_of(block: Node) -> Vec<Node> {
+    let mut cursor = block.walk();
+    block.named_children(&mut cursor).filter(|child| child.kind() != "comment").collect()
+}
+
+/// The decorators written on a definition, without the `@` or the call arguments.
+fn decorators_of(definition: Node, text: &str) -> Vec<String> {
+    let Some(parent) = definition.parent() else { return Vec::new() };
+    if parent.kind() != "decorated_definition" {
+        return Vec::new();
+    }
+    let mut out = Vec::new();
+    let mut cursor = parent.walk();
+    for decorator in parent.named_children(&mut cursor) {
+        if decorator.kind() != "decorator" {
+            continue;
+        }
+        let Some(inner) = decorator.named_child(0) else { continue };
+        let target =
+            if inner.kind() == "call" { inner.child_by_field_name("function").unwrap_or(inner) } else { inner };
+        let name = text_of(target, text).trim().to_owned();
+        if !name.is_empty() {
+            out.push(name);
+        }
+    }
+    out
+}
+
+/// The last segment of a dotted name (`typing.override` -> `override`).
+fn last_segment(name: &str) -> &str {
+    name.rsplit('.').next().unwrap_or(name)
+}
+
+fn text_of(node: Node, text: &str) -> String {
+    text.get(node.byte_range()).unwrap_or_default().to_owned()
+}
+
+/// The module-level `from ... import ...` bindings, so `override` can be told apart from a
+/// same-named decorator of another library.
+struct ImportBindings {
+    /// (local name, module, exported name)
+    bindings: Vec<(String, String, String)>,
+}
+
+impl ImportBindings {
+    fn collect(tree: &Tree, text: &str) -> Self {
+        let mut bindings = Vec::new();
+        let mut cursor = tree.walk();
+        visit(&mut cursor, &mut |node| {
+            if node.kind() != "import_from_statement" {
+                return;
+            }
+            let Some(module) = node.child_by_field_name("module_name") else { return };
+            let module = text_of(module, text);
+            let mut names = node.walk();
+            for name in node.children_by_field_name("name", &mut names) {
+                let (local, exported) = match name.kind() {
+                    "aliased_import" => (
+                        name.child_by_field_name("alias").map(|n| text_of(n, text)),
+                        name.child_by_field_name("name").map(|n| text_of(n, text)),
+                    ),
+                    _ => {
+                        let written = text_of(name, text);
+                        (Some(written.clone()), Some(written))
+                    }
+                };
+                if let (Some(local), Some(exported)) = (local, exported) {
+                    bindings.push((local, module.clone(), exported));
+                }
+            }
+        });
+        Self { bindings }
+    }
+
+    /// Whether `decorator` names `override` from `typing` / `typing_extensions`.
+    fn is_typing_override(&self, decorator: &str) -> bool {
+        const MODULES: [&str; 2] = ["typing", "typing_extensions"];
+        let segments: Vec<&str> = decorator.split('.').filter(|s| !s.is_empty()).collect();
+        match segments.as_slice() {
+            // `@typing.override`, or `@t.override` after `import typing as t`.
+            [prefix, "override"] => {
+                MODULES.contains(prefix)
+                    || self
+                        .bindings
+                        .iter()
+                        .find(|(local, _, _)| local == prefix)
+                        .is_some_and(|(_, module, _)| MODULES.contains(&module.as_str()))
+            }
+            // `@override`, or `@ov` after `from typing import override as ov`.
+            [local] => match self.bindings.iter().find(|(bound, _, _)| bound == local) {
+                Some((_, module, exported)) => exported == "override" && MODULES.contains(&module.as_str()),
+                // Nothing contradicts a bare `@override`: the usual `from typing import *`.
+                None => *local == "override",
+            },
+            _ => false,
+        }
+    }
+}
+
+/// Depth-first pre-order traversal of all descendants of `cursor`'s node.
+fn visit(cursor: &mut tree_sitter::TreeCursor, f: &mut impl FnMut(Node)) {
+    loop {
+        f(cursor.node());
+        if cursor.goto_first_child() {
+            continue;
+        }
+        loop {
+            if cursor.goto_next_sibling() {
+                break;
+            }
+            if !cursor.goto_parent() {
+                return;
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    static SYNTAX: std::sync::OnceLock<Syntax> = std::sync::OnceLock::new();
+
+    fn facts(src: &str) -> PythonFacts {
+        SYNTAX.get_or_init(Syntax::new).python_facts(&LanguageId::new("python"), src)
+    }
+
+    fn method<'a>(facts: &'a PythonFacts, class: &str, method: &str) -> &'a PythonMethodFacts {
+        facts
+            .classes
+            .iter()
+            .find(|c| c.name == class)
+            .and_then(|c| c.methods.iter().find(|m| m.name == method))
+            .expect("method not found")
+    }
+
+    #[test]
+    fn classes_carry_bases_and_methods() {
+        let f = facts(
+            "class Base(ABC):\n    pass\n\nclass Child(Base, pkg.Mixin):\n    def run(self, x=1):\n        pass\n",
+        );
+        assert_eq!(f.classes.len(), 2);
+        assert_eq!(f.classes[0].name, "Base");
+        assert_eq!(f.classes[0].bases, ["ABC"]);
+        assert_eq!(f.classes[1].bases, ["Base", "Mixin"]);
+        assert_eq!(f.classes[1].methods.len(), 1);
+        assert_eq!(f.classes[1].selection.start.line, 3);
+        assert_eq!(f.classes[1].selection.start.col, 6);
+    }
+
+    #[test]
+    fn parameters_are_names_in_order_and_none_for_splats() {
+        let f = facts(
+            "class C:\n    def a(self, x: int, y=2):\n        pass\n\n    def b(self, *args):\n        pass\n\n    def c(self, *, x):\n        pass\n",
+        );
+        assert_eq!(
+            method(&f, "C", "a").params.as_deref(),
+            Some(["self".to_string(), "x".to_string(), "y".to_string()].as_slice())
+        );
+        assert_eq!(method(&f, "C", "b").params, None);
+        assert_eq!(method(&f, "C", "c").params, None);
+    }
+
+    #[test]
+    fn body_shapes_are_classified() {
+        let f = facts(
+            "class C:\n    def noop(self):\n        pass\n\n    def dots(self):\n        ...\n\n    def doc(self):\n        \"\"\"text\"\"\"\n\n    def forward(self, x):\n        return super().run(x)\n\n    def call(self):\n        super().run()\n\n    def other(self):\n        return 1\n",
+        );
+        assert_eq!(method(&f, "C", "noop").body, MethodBody::Empty);
+        assert_eq!(method(&f, "C", "dots").body, MethodBody::Empty);
+        assert_eq!(method(&f, "C", "doc").body, MethodBody::Empty);
+        assert_eq!(
+            method(&f, "C", "forward").body,
+            MethodBody::SuperCall { returns: true, target: "run".into(), args: vec!["x".into()] }
+        );
+        assert_eq!(
+            method(&f, "C", "call").body,
+            MethodBody::SuperCall { returns: false, target: "run".into(), args: vec![] }
+        );
+        assert_eq!(method(&f, "C", "other").body, MethodBody::Other);
+    }
+
+    #[test]
+    fn decorators_are_their_names_and_semantics() {
+        let f = facts(
+            "from abc import abstractmethod\nfrom typing import override\n\nclass C:\n    @abstractmethod\n    def a(self):\n        pass\n\n    @override\n    def b(self):\n        pass\n\n    @functools.cache\n    def c(self):\n        pass\n",
+        );
+        assert!(method(&f, "C", "a").abstract_method);
+        assert!(!method(&f, "C", "a").override_decorated);
+        assert!(method(&f, "C", "b").override_decorated);
+        assert!(!method(&f, "C", "c").override_decorated);
+    }
+
+    #[test]
+    fn override_of_another_library_is_not_typing_override() {
+        let f = facts("from mylib import override\n\nclass C:\n    @override\n    def a(self):\n        pass\n");
+        assert!(!method(&f, "C", "a").override_decorated);
+    }
+
+    #[test]
+    fn aliased_override_and_qualified_forms_are_recognised() {
+        let f = facts(
+            "from typing import override as ov\n\nclass C:\n    @ov\n    def a(self):\n        pass\n\nclass D:\n    @typing_extensions.override\n    def b(self):\n        pass\n",
+        );
+        assert!(method(&f, "C", "a").override_decorated);
+        assert!(method(&f, "D", "b").override_decorated);
+    }
+
+    #[test]
+    fn nested_classes_and_other_languages() {
+        let f = facts("class Outer:\n    class Inner:\n        def m(self):\n            pass\n");
+        let names: Vec<&str> = f.classes.iter().map(|c| c.name.as_str()).collect();
+        assert_eq!(names, ["Outer", "Inner"]);
+        let other = SYNTAX.get_or_init(Syntax::new).python_facts(&LanguageId::new("rust"), "class C {}");
+        assert_eq!(other.classes.len(), 0);
+    }
+}

crates/ide-lsp/src/lib.rs

@@ -3855,6 +3855,7 @@ impl LspManager {
                 languages: s.languages(),
                 status: s.status(),
                 pid: s.running().and_then(|r| r.peer.pid()),
+                label: s.display_name(),
             })
             .collect()
     }

crates/ide-lsp/src/server.rs

@@ -213,6 +213,11 @@ impl Server {
         config
     }
 
+    /// The configured server's display name for the current (or last) instance.
+    pub fn display_name(&self) -> Option<String> {
+        self.effective.lock().as_ref().and_then(|c| c.display_name.clone())
+    }
+
     pub fn set_effective_config(&self, generation: u64, config: LanguageServerConfig) {
         let st = self.state.lock();
         if st.generation == generation && matches!(st.conn, Conn::Starting | Conn::Ready(_)) {
@@ -507,7 +512,13 @@ impl Server {
             return;
         }
         *cur = (status, message.clone());
-        st.events.push_back(IdeEvent::LanguageServer { server: self.id, name: self.name.clone(), status, message });
+        st.events.push_back(IdeEvent::LanguageServer {
+            server: self.id,
+            name: self.name.clone(),
+            label: self.display_name(),
+            status,
+            message,
+        });
     }
 
     fn queue_cleanup(&self, st: &mut State) {

crates/ide-lsp/src/types.rs

@@ -341,6 +341,10 @@ pub struct ServerInfo {
     pub status: ServerStatus,
     /// OS process of the running instance (for memory attribution).
     pub pid: Option<u32>,
+    /// What the user sees as the server when another program serves in its place.
+    #[serde(default)]
+    #[specta(optional)]
+    pub label: Option<String>,
 }
 
 /// Read-only contents a language server provides for a non-`file:` URI

crates/ide-lsp/tests/mock_server.rs

@@ -268,6 +268,7 @@ fn server_cfg(name: &str) -> LanguageServerConfig {
         tsserver_project: false,
         tsserver_project_extras: Default::default(),
         resync_on_configuration: false,
+        display_name: None,
         pinned: None,
     }
 }

crates/ide-lsp/tests/real_servers.rs

@@ -426,6 +426,7 @@ async fn missing_binary_is_reported_with_install_hint() {
         tsserver_project: false,
         tsserver_project_extras: Default::default(),
         resync_on_configuration: false,
+        display_name: None,
         pinned: None,
     };
     let (mgr, events) = manager(dir.path(), LanguageRegistry::from_configs(vec![lang("nope", "nope", server)]));
@@ -698,6 +699,7 @@ async fn typescript_language_server_end_to_end() {
         tsserver_project: false,
         tsserver_project_extras: Default::default(),
         resync_on_configuration: false,
+        display_name: None,
         pinned: None,
     };
     let (mgr, events) = manager(&root, LanguageRegistry::from_configs(vec![lang("typescript", "ts", server)]));
@@ -750,6 +752,7 @@ fn npm_server(tools: &Path, name: &str, bin: &str, init: Option<serde_json::Valu
         tsserver_project: false,
         tsserver_project_extras: Default::default(),
         resync_on_configuration: false,
+        display_name: None,
         pinned: None,
     }
 }

crates/ide-profiler/src/formats.rs

@@ -109,6 +109,17 @@ pub(crate) fn cpuprofile_runs_code_of(json: &str, root: &Path) -> bool {
     })
 }
 
+/// The file on disk of one `$vscode.locations` entry and its 0-based line. The entry lists a
+/// frame's places in order: the source it was mapped to, then the script that ran, which a
+/// page serves from a URL and has no file.
+fn source_location(entry: &Value) -> Option<(PathBuf, u32)> {
+    entry.get("locations")?.as_array()?.iter().find_map(|l| {
+        let path = Path::new(l.pointer("/source/path")?.as_str()?);
+        let line = l.get("lineNumber")?.as_u64()?;
+        path.is_absolute().then(|| (path.to_path_buf(), line.saturating_sub(1) as u32))
+    })
+}
+
 /// Adds a V8 CPU profile (`node --cpu-prof`), weighted by sampled time in milliseconds.
 pub(crate) fn add_cpuprofile(b: &mut TreeBuilder, json: &str) -> Result<(), String> {
     let v: Value = serde_json::from_str(json).map_err(|e| e.to_string())?;
@@ -146,6 +157,8 @@ pub(crate) fn add_cpuprofile(b: &mut TreeBuilder, json: &str) -> Result<(), Stri
             }
         }
     }
+    // A recording made through a debugger (js-debug) says where each frame is in the sources.
+    let mapped = v.pointer("/$vscode/locations").and_then(Value::as_array);
     let frame_of = |n: &Value| -> Option<FrameKey> {
         let cf = n.get("callFrame")?;
         let name = cf.get("functionName").and_then(Value::as_str).unwrap_or_default();
@@ -153,10 +166,22 @@ pub(crate) fn add_cpuprofile(b: &mut TreeBuilder, json: &str) -> Result<(), Stri
         if name == "(root)" {
             return None;
         }
-        let file = url_path(url);
         let name = if name.is_empty() { "(anonymous)".to_owned() } else { name.to_owned() };
-        let line =
-            file.as_ref().and(cf.get("lineNumber").and_then(Value::as_i64)).filter(|l| *l >= 0).map(|l| l as u32);
+        let (file, line) = n
+            .get("locationId")
+            .and_then(Value::as_u64)
+            .and_then(|id| mapped?.get(id as usize))
+            .and_then(source_location)
+            .map(|(file, line)| (Some(file), Some(line)))
+            .unwrap_or_else(|| {
+                let file = url_path(url);
+                let line = file
+                    .as_ref()
+                    .and(cf.get("lineNumber").and_then(Value::as_i64))
+                    .filter(|l| *l >= 0)
+                    .map(|l| l as u32);
+                (file, line)
+            });
         Some(FrameKey { name, file, line, kind: ProfileFrameKind::Code })
     };
     for (id, weight) in self_time {
@@ -301,6 +326,32 @@ mod tests {
         assert!(add_cpuprofile(&mut TreeBuilder::new(), "{}").is_err());
     }
 
+    #[test]
+    fn cpuprofile_frames_take_the_source_a_debugger_mapped_them_to() {
+        // js-debug's recording of a page: scripts are URLs, and `$vscode.locations` holds where
+        // each frame is in the sources (1-based lines), first the mapped file, then the script.
+        let json = r#"{"nodes":[
+            {"id":1,"callFrame":{"functionName":"(root)","url":"","lineNumber":-1},"children":[2,3,4]},
+            {"id":2,"callFrame":{"functionName":"increment","url":"http://localhost:5173/src/App.vue","lineNumber":40},"hitCount":3,"locationId":0},
+            {"id":3,"callFrame":{"functionName":"inline","url":"http://localhost:5173/","lineNumber":9},"hitCount":1,"locationId":1},
+            {"id":4,"callFrame":{"functionName":"(idle)","url":"","lineNumber":-1},"hitCount":1,"locationId":2}],
+            "$vscode":{"rootPath":"/work/shop","locations":[
+              {"locations":[
+                {"lineNumber":13,"columnNumber":10,"source":{"path":"/work/shop/src/App.vue","sourceReference":0}},
+                {"lineNumber":41,"columnNumber":21,"source":{"path":"localhost꞉5173/src/App.vue","sourceReference":7}}]},
+              {"locations":[{"lineNumber":10,"columnNumber":1,"source":{"path":"localhost꞉5173/","sourceReference":9}}]},
+              {"locations":[]}]}}"#;
+        let mut b = TreeBuilder::new();
+        add_cpuprofile(&mut b, json).unwrap();
+        let p = b.finish("node", "samples", ProfileMode::Cpu);
+        let frame = |name: &str| p.frames.iter().find(|f| f.name == name).unwrap();
+        assert_eq!(frame("increment").file.as_deref(), Some(Path::new("/work/shop/src/App.vue")));
+        assert_eq!(frame("increment").line, Some(12));
+        // No file on disk behind the frame: it stays without one.
+        assert_eq!((frame("inline").file.as_deref(), frame("inline").line), (None, None));
+        assert_eq!(frame("(idle)").file, None);
+    }
+
     #[test]
     fn cpuprofile_without_deltas_uses_hit_counts() {
         let json = r#"{"nodes":[{"id":1,"callFrame":{"functionName":"(root)","url":""},"children":[2]},

crates/ide-remote/src/docker.rs

@@ -178,6 +178,47 @@ pub fn container_config(config: &RunConfig, run: &ContainerRun) -> IdeResult<Run
     Ok(out)
 }
 
+/// The docker CLI arguments that run `python -c code` in a new container of the target's
+/// image or service, named `name`. The container is kept when it exits, so `docker cp` can
+/// copy from it while nothing runs; the caller removes it. The image's entrypoint is
+/// skipped (it may wait for other services), as are the service's dependencies.
+pub fn python_probe_args(target: &RunTarget, root: &Path, name: &str, code: &str) -> IdeResult<Vec<String>> {
+    let python = match target.python.trim() {
+        "" => "python3",
+        python => python,
+    };
+    let mut args: Vec<String> = Vec::new();
+    match target.kind {
+        RunTargetKind::Docker => {
+            if target.image.trim().is_empty() {
+                return Err(IdeError::invalid(format!("Run target '{}' has no image", target.name)));
+            }
+            args.push("run".into());
+        }
+        RunTargetKind::Compose => {
+            if target.service.trim().is_empty() {
+                return Err(IdeError::invalid(format!("Run target '{}' has no service", target.name)));
+            }
+            args.push("compose".into());
+            for file in target.compose_files.iter().map(|f| f.trim()).filter(|f| !f.is_empty()) {
+                args.extend(["--file".into(), root.join(file).to_string_lossy().into_owned()]);
+            }
+            args.extend(["run", "--no-deps", "--no-TTY"].map(String::from));
+        }
+        RunTargetKind::Ssh => {
+            return Err(IdeError::invalid(format!("Run target '{}' is not a container", target.name)));
+        }
+    }
+    args.extend(["--name".into(), name.to_owned(), "--label".into(), "openidea.python-probe=true".into()]);
+    args.extend(["--entrypoint".into(), python.to_owned()]);
+    args.push(match target.kind {
+        RunTargetKind::Compose => target.service.trim().to_owned(),
+        _ => target.image.trim().to_owned(),
+    });
+    args.extend(["-c".into(), code.to_owned()]);
+    Ok(args)
+}
+
 /// Project managers whose `run` executes in the project's environment (`uv run python …`).
 const PYTHON_RUNNERS: [&str; 6] = ["uv", "poetry", "pdm", "pipenv", "hatch", "rye"];
 
@@ -429,6 +470,34 @@ mod tests {
         assert!(container_config(&c, &run(&target, &none, &none)).unwrap_err().message.contains("no service"));
     }
 
+    #[cfg(unix)]
+    #[test]
+    fn python_probe_runs_the_interpreter_in_a_kept_container() {
+        let root = Path::new("/work/proj");
+        let target = RunTarget {
+            kind: RunTargetKind::Compose,
+            compose_files: vec!["compose.yaml".into()],
+            service: "web".into(),
+            python: "/venv/bin/python".into(),
+            run_options: "--rm".into(),
+            ..Default::default()
+        };
+        assert_eq!(
+            python_probe_args(&target, root, "openidea-python-1", "print(1)").unwrap().join(" "),
+            "compose --file /work/proj/compose.yaml run --no-deps --no-TTY --name openidea-python-1 \
+             --label openidea.python-probe=true --entrypoint /venv/bin/python web -c print(1)"
+        );
+        let target = RunTarget { kind: RunTargetKind::Docker, image: "python:3.12".into(), ..Default::default() };
+        assert_eq!(
+            python_probe_args(&target, root, "p", "x").unwrap().join(" "),
+            "run --name p --label openidea.python-probe=true --entrypoint python3 python:3.12 -c x"
+        );
+        let ssh = RunTarget { name: "box".into(), ..Default::default() };
+        assert!(python_probe_args(&ssh, root, "p", "x").unwrap_err().message.contains("not a container"));
+        let empty = RunTarget { kind: RunTargetKind::Compose, name: "c".into(), ..Default::default() };
+        assert!(python_probe_args(&empty, root, "p", "x").unwrap_err().message.contains("no service"));
+    }
+
     /// The container's command line of `c` debugged on `target` (after the image).
     #[cfg(unix)]
     fn debugged(target: &RunTarget, c: &RunConfig) -> IdeResult<Vec<String>> {

crates/ide-run/tests/dotnet.rs

@@ -68,6 +68,8 @@ fn profiles_filter_and_preserve_launch_properties() {
     assert_eq!(p["http"].command_line_args, "--message \"hello world\"");
     assert_eq!(p["http"].working_directory, "work");
     assert!(parse_profiles("invalid").is_empty());
+    // Visual Studio saves launchSettings.json with a byte order mark.
+    assert_eq!(parse_profiles(&format!("\u{feff}{PROFILES}")).len(), 2);
 }
 
 #[test]

crates/ide-sdk/src/apply.rs

@@ -69,7 +69,11 @@ pub fn ruff_configuration(root: &Path, configured: &str) -> IdeResult<Option<Pat
 /// root, else the Python the project pins for mise / asdf. A configured
 /// interpreter whose executable is gone (uninstalled, moved) is skipped like
 /// PyCharm's "Invalid" SDKs, so runs fall back instead of failing on a dead path.
+/// `None` when the project interpreter is a run target's (see [`crate::container_python`]).
 pub fn python_interpreter(root: &Path, s: &Settings) -> Option<PathBuf> {
+    if s.languages.python.run_target().is_some() {
+        return None;
+    }
     setting_path(root, &s.languages.python.interpreter)
         .filter(|p| p.is_file())
         .or_else(|| project_venv_python(root))
@@ -78,6 +82,9 @@ pub fn python_interpreter(root: &Path, s: &Settings) -> Option<PathBuf> {
 
 /// An explicit project interpreter wins; otherwise use the closest virtualenv to the file.
 pub fn python_interpreter_near(root: &Path, near: Option<&Path>, s: &Settings) -> Option<PathBuf> {
+    if s.languages.python.run_target().is_some() {
+        return None;
+    }
     if let Some(python) = setting_path(root, &s.languages.python.interpreter).filter(|p| p.is_file()) {
         return Some(python);
     }
@@ -1156,6 +1163,7 @@ pub fn configure_server(cfg: &mut LanguageServerConfig, root: &Path, server_root
     {
         cfg.command = native.to_string_lossy().into_owned();
         cfg.args = vec!["--lsp".into(), "--stdio".into()];
+        cfg.display_name = Some("TypeScript 7".into());
         cfg.initialization_options = None;
         cfg.tsserver_project = false;
         return;
@@ -1299,6 +1307,7 @@ fn custom_server(name: &str, ls: &LanguageServerSettings) -> LanguageServerConfi
         tsserver_project: false,
         tsserver_project_extras: Default::default(),
         resync_on_configuration: false,
+        display_name: None,
         pinned: None,
     }
 }
@@ -1476,6 +1485,9 @@ pub fn run_target<'a>(config: &RunConfig, settings: &'a Settings) -> Option<&'a
         || matches!(config.kind.as_str(), "node" | "npm" | "vitest" | "jest" | "mocha")
     {
         &settings.languages.node.run_target
+    } else if let Some(target) = settings.languages.python.run_target().filter(|_| is_python_config(config, &name)) {
+        // The project interpreter is a run target's: Python runs there.
+        return Some(target);
     } else {
         return non_empty(&settings.run.default_target);
     };
@@ -1488,6 +1500,10 @@ pub fn run_target<'a>(config: &RunConfig, settings: &'a Settings) -> Option<&'a
     }
 }
 
+fn is_python_config(config: &RunConfig, program: &str) -> bool {
+    matches!(config.kind.as_str(), "python" | "pytest" | "django-test") || is_python_command(program)
+}
+
 /// Whether the configuration's `JAVA_HOME` is the one Settings choose (the Maven runner JRE,
 /// the Gradle JVM) rather than a choice of its own: an IDE-generated build-tool configuration —
 /// a Maven goal or Gradle task from the tool window — carries the model's `JAVA_HOME`, which

crates/ide-sdk/src/container_python.rs

@@ -0,0 +1,418 @@
+//! A Docker or Compose run target's Python as the project interpreter
+//! (`languages.python.interpreter = "target:<id>"`, PyCharm's Docker / Docker Compose
+//! interpreter).
+//!
+//! basedpyright / pyright run on this machine, so the library folders of the
+//! container's `sys.path` are copied here once per image (a snapshot) and given to
+//! the server as `extraPaths`. Its interpreter is a neutral one: an empty virtualenv
+//! the IDE creates, so no local site-packages mix in. Without any local Python the
+//! server gets `extraPaths` alone and its bundled typeshed standard library.
+//!
+//! The snapshot is read-only: packages change in the image (requirements, Dockerfile)
+//! and a rebuilt image gets a new snapshot. Taking one runs the docker CLI (`ide-host`).
+
+use crate::apply::merge_init_options;
+use crate::exec::{query_in, which};
+use crate::libraries::{LibraryGroup, LibraryRoot};
+use crate::python::PythonPackage;
+use ide_core::{IdeError, IdeResult};
+use ide_language::LanguageServerConfig;
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+use std::path::{Path, PathBuf};
+use std::time::Duration;
+
+/// Run in the container with `python -c`: prints [`PROBE_MARKER`] and a JSON
+/// [`Probe`] (an entrypoint may print more around it).
+pub const PROBE: &str = "import json,os,sys,sysconfig\n\
+p=sysconfig.get_paths()\n\
+print('OPENIDEA-PYTHON '+json.dumps({'version':'%d.%d.%d'%sys.version_info[:3],\
+'executable':sys.executable,'stdlib':[p.get('stdlib'),p.get('platstdlib')],\
+'path':[x for x in sys.path if x and os.path.isdir(x)]}))";
+const PROBE_MARKER: &str = "OPENIDEA-PYTHON ";
+
+/// What [`PROBE`] prints about the container's interpreter.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+pub struct Probe {
+    /// `3.12.7`.
+    pub version: String,
+    pub executable: String,
+    /// `stdlib` and `platstdlib` of `sysconfig`.
+    pub stdlib: Vec<Option<String>>,
+    /// The folders of `sys.path`, in order.
+    pub path: Vec<String>,
+}
+
+pub fn parse_probe(out: &str) -> IdeResult<Probe> {
+    let json = out
+        .lines()
+        .rev()
+        .find_map(|l| l.trim().strip_prefix(PROBE_MARKER))
+        .ok_or_else(|| IdeError::internal(format!("the container's Python printed no paths: {}", out.trim())))?;
+    serde_json::from_str(json).map_err(|e| IdeError::internal(format!("cannot read the container's Python paths: {e}")))
+}
+
+/// The container folders a snapshot copies: the `sys.path` folders outside the standard
+/// library (its stubs come with the server) and outside the project, which is here already.
+/// A folder inside another one of the list is copied with it.
+pub fn folders_to_copy(probe: &Probe, container_root: &str) -> Vec<String> {
+    let under = |path: &str, dir: &str| {
+        let dir = dir.trim_end_matches('/');
+        path == dir || path.starts_with(&format!("{dir}/")) || dir.is_empty()
+    };
+    let stdlib: Vec<&str> = probe.stdlib.iter().flatten().map(String::as_str).collect();
+    // `site-packages` lives inside the standard library's folder.
+    let packages = |path: &str| path.split('/').any(|c| c == "site-packages" || c == "dist-packages");
+    let mut out: Vec<String> = Vec::new();
+    for path in &probe.path {
+        let path = path.trim_end_matches('/');
+        if !path.starts_with('/')
+            || (stdlib.iter().any(|s| under(path, s)) && !packages(path))
+            || (!container_root.trim().is_empty() && under(path, container_root))
+            || out.iter().any(|o| under(path, o))
+        {
+            continue;
+        }
+        out.retain(|o| !under(o, path));
+        out.push(path.to_owned());
+    }
+    out
+}
+
+/// Where a snapshot in `dir` keeps its copy of the container folder `container`.
+pub fn local_folder(dir: &Path, container: &str) -> PathBuf {
+    container.split('/').filter(|c| !c.is_empty() && *c != "." && *c != "..").fold(dir.join("fs"), |p, c| p.join(c))
+}
+
+/// `snapshot.json` of a snapshot folder.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(default, rename_all = "camelCase")]
+pub struct Snapshot {
+    /// `sha256:…` of the image the folders were copied from.
+    pub image: String,
+    pub probe: Probe,
+    /// The copied container folders ([`local_folder`] has them here).
+    pub folders: Vec<String>,
+    /// The neutral interpreter given to the language server; `None` without a local Python.
+    pub neutral_python: Option<PathBuf>,
+}
+
+const SNAPSHOT_FILE: &str = "snapshot.json";
+/// Names the snapshot folder in use, in the target's folder.
+const CURRENT_FILE: &str = "current";
+
+/// A target's snapshots: `<cache>/<target>/<image>/`.
+pub fn target_dir(cache: &Path, target_id: &str) -> PathBuf {
+    cache.join(dir_name(target_id))
+}
+
+/// The folder name of an image id or target id.
+pub fn dir_name(id: &str) -> String {
+    let id = id.strip_prefix("sha256:").map(|hex| &hex[..hex.len().min(16)]).unwrap_or(id);
+    let name: String =
+        id.chars().map(|c| if c.is_ascii_alphanumeric() || c == '-' || c == '_' { c } else { '_' }).collect();
+    if name.is_empty() { "_".into() } else { name }
+}
+
+/// The snapshot in use for the target whose folder is `target_dir`, with its folder.
+pub fn current(target_dir: &Path) -> Option<(PathBuf, Snapshot)> {
+    let name = std::fs::read_to_string(target_dir.join(CURRENT_FILE)).ok()?;
+    let dir = target_dir.join(dir_name(name.trim()));
+    read(&dir).map(|s| (dir, s))
+}
+
+/// The complete snapshot in `dir`, if there is one.
+pub fn read(dir: &Path) -> Option<Snapshot> {
+    serde_json::from_str(&std::fs::read_to_string(dir.join(SNAPSHOT_FILE)).ok()?).ok()
+}
+
+/// Writes `snapshot.json` (last: a folder without it is incomplete).
+pub fn write(dir: &Path, snapshot: &Snapshot) -> IdeResult<()> {
+    let json = serde_json::to_string_pretty(snapshot).map_err(|e| IdeError::internal(e.to_string()))?;
+    std::fs::write(dir.join(SNAPSHOT_FILE), json)?;
+    Ok(())
+}
+
+/// Makes the snapshot of `image` the one in use and removes the target's other snapshots.
+pub fn make_current(target_dir: &Path, image: &str) -> IdeResult<()> {
+    let keep = dir_name(image);
+    std::fs::write(target_dir.join(CURRENT_FILE), &keep)?;
+    for entry in std::fs::read_dir(target_dir)?.flatten() {
+        let path = entry.path();
+        if path.is_dir()
+            && entry.file_name().to_string_lossy() != keep.as_str()
+            && let Err(e) = std::fs::remove_dir_all(&path)
+        {
+            tracing::warn!("cannot remove the old Python snapshot {}: {e}", path.display());
+        }
+    }
+    Ok(())
+}
+
+/// The local folders of a snapshot that exist.
+pub fn local_folders(dir: &Path, snapshot: &Snapshot) -> Vec<PathBuf> {
+    snapshot.folders.iter().map(|f| local_folder(dir, f)).filter(|p| p.is_dir()).collect()
+}
+
+/// basedpyright / pyright: the neutral interpreter and the snapshot's folders as
+/// `extraPaths`. Without a snapshot yet the server only loses the local interpreter.
+pub fn configure_server(cfg: &mut LanguageServerConfig, snapshot: Option<(&Path, &Snapshot)>) {
+    let section = match cfg.name.as_str() {
+        "basedpyright" => "basedpyright",
+        "pyright" => "python",
+        _ => return,
+    };
+    let Some((dir, snapshot)) = snapshot else { return };
+    if let Some(python) = snapshot.neutral_python.as_deref().filter(|p| p.is_file()) {
+        merge_init_options(cfg, json!({ "python": { "pythonPath": python.to_string_lossy() } }));
+        if let Some(venv) = crate::venv_of(python) {
+            cfg.env.insert("VIRTUAL_ENV".into(), venv.to_string_lossy().into_owned());
+        }
+    }
+    let paths: Vec<String> = local_folders(dir, snapshot).iter().map(|p| p.to_string_lossy().into_owned()).collect();
+    merge_init_options(cfg, json!({ "settings": { section: { "analysis": { "extraPaths": paths } } } }));
+}
+
+/// External Libraries: the snapshot's folders, named after the target.
+pub fn library_group(target_name: &str, dir: &Path, snapshot: &Snapshot) -> Option<LibraryGroup> {
+    let short = snapshot.probe.version.split('.').take(2).collect::<Vec<_>>().join(".");
+    let roots: Vec<LibraryRoot> = snapshot
+        .folders
+        .iter()
+        .map(|f| (f, local_folder(dir, f)))
+        .filter(|(_, p)| p.is_dir())
+        .map(|(f, p)| LibraryRoot { name: f.rsplit('/').next().unwrap_or(f).to_owned(), path: p.into() })
+        .collect();
+    (!roots.is_empty()).then(|| LibraryGroup {
+        name: format!("Python {short} ({target_name})"),
+        kind: "python".into(),
+        roots,
+    })
+}
+
+/// The packages of a snapshot, from the `*.dist-info` / `*.egg-info` metadata it copied.
+pub fn packages(dir: &Path, snapshot: &Snapshot) -> Vec<PythonPackage> {
+    let mut out: Vec<PythonPackage> = Vec::new();
+    for folder in local_folders(dir, snapshot) {
+        let Ok(entries) = std::fs::read_dir(&folder) else { continue };
+        for entry in entries.flatten() {
+            let name = entry.file_name().to_string_lossy().into_owned();
+            let path = entry.path();
+            let metadata = if name.ends_with(".dist-info") {
+                path.join("METADATA")
+            } else if name.ends_with(".egg-info") {
+                if path.is_dir() { path.join("PKG-INFO") } else { path }
+            } else {
+                continue;
+            };
+            let Some(package) = std::fs::read_to_string(&metadata).ok().and_then(|m| package_of(&m)) else {
+                continue;
+            };
+            if !out.iter().any(|p| p.name.eq_ignore_ascii_case(&package.name)) {
+                out.push(package);
+            }
+        }
+    }
+    out.sort_by_key(|p| p.name.to_lowercase());
+    out
+}
+
+fn package_of(metadata: &str) -> Option<PythonPackage> {
+    let header = |key: &str| {
+        metadata
+            .lines()
+            .take_while(|l| !l.is_empty())
+            .find_map(|l| l.strip_prefix(key).and_then(|v| v.strip_prefix(':')))
+            .map(|v| v.trim().to_owned())
+    };
+    Some(PythonPackage { name: header("Name")?, version: header("Version").unwrap_or_default() })
+}
+
+/// The neutral interpreter for a container Python of `version`: an empty virtualenv in
+/// `cache`, made from a local Python of the same minor version when there is one. `None`
+/// when this machine has no Python at all.
+pub fn neutral_python(cache: &Path, version: &str) -> Option<PathBuf> {
+    neutral_python_with(cache, version, which)
+}
+
+pub(crate) fn neutral_python_with(
+    cache: &Path,
+    version: &str,
+    which: impl Fn(&str) -> Option<PathBuf>,
+) -> Option<PathBuf> {
+    let short = version.split('.').take(2).collect::<Vec<_>>().join(".");
+    let named = (!short.is_empty()).then(|| format!("python{short}"));
+    let (base, label) = match named.as_deref().and_then(|n| which(n).map(|p| (p, short.clone()))) {
+        Some(found) => found,
+        None => (which("python3").or_else(|| which("python"))?, "default".to_owned()),
+    };
+    let venv = cache.join("neutral").join(label);
+    let python = venv.join(crate::bin_dir()).join(crate::exe("python"));
+    if python.is_file() && venv.join("pyvenv.cfg").is_file() {
+        return Some(python);
+    }
+    std::fs::create_dir_all(&venv).ok()?;
+    let location = venv.to_string_lossy().into_owned();
+    query_in(&base, &["-m", "venv", "--without-pip", &location], None, &[], Duration::from_secs(60));
+    python.is_file().then_some(python)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::tests::server;
+
+    fn probe() -> Probe {
+        Probe {
+            version: "3.12.7".into(),
+            executable: "/usr/local/bin/python3".into(),
+            stdlib: vec![Some("/usr/local/lib/python3.12".into()), Some("/usr/local/lib/python3.12".into())],
+            path: [
+                "/workspaces/app",
+                "/workspaces/app/src",
+                "/usr/local/lib/python3.12",
+                "/usr/local/lib/python3.12/lib-dynload",
+                "/opt/lib/extra",
+                "/usr/local/lib/python3.12/site-packages",
+                "/usr/local/lib/python3.12/site-packages/setuptools/_vendor",
+                "relative",
+            ]
+            .map(String::from)
+            .to_vec(),
+        }
+    }
+
+    #[test]
+    fn copies_library_folders_outside_the_stdlib_and_the_project() {
+        assert_eq!(
+            folders_to_copy(&probe(), "/workspaces/app"),
+            ["/opt/lib/extra", "/usr/local/lib/python3.12/site-packages"]
+        );
+        let mut p = probe();
+        p.path.insert(0, "/opt/lib/extra/inner".into());
+        assert_eq!(folders_to_copy(&p, "/workspaces/app")[0], "/opt/lib/extra", "the outer folder replaces the inner");
+    }
+
+    #[test]
+    fn reads_the_probe_after_other_output() {
+        let line = format!("{PROBE_MARKER}{}", serde_json::to_string(&probe()).unwrap());
+        let out = format!("waiting for the entrypoint\n{line}\nbye\n");
+        assert_eq!(parse_probe(&out).unwrap(), probe());
+        assert!(parse_probe("python3: not found").unwrap_err().message.contains("not found"));
+    }
+
+    #[test]
+    fn mirrors_container_paths_and_names_folders() {
+        let dir = Path::new("snap");
+        assert_eq!(
+            local_folder(dir, "/usr/local/lib/../site-packages"),
+            Path::new("snap").join("fs").join("usr").join("local").join("lib").join("site-packages")
+        );
+        assert_eq!(dir_name("sha256:0123456789abcdef0123"), "0123456789abcdef");
+        assert_eq!(dir_name("target/../x y"), "target____x_y");
+    }
+
+    fn snapshot_in(dir: &Path, neutral: Option<PathBuf>) -> Snapshot {
+        let snapshot = Snapshot {
+            image: "sha256:abc".into(),
+            probe: probe(),
+            folders: vec!["/usr/local/lib/python3.12/site-packages".into(), "/gone".into()],
+            neutral_python: neutral,
+        };
+        let site = local_folder(dir, &snapshot.folders[0]);
+        std::fs::create_dir_all(site.join("Django-5.1.3.dist-info")).unwrap();
+        std::fs::write(
+            site.join("Django-5.1.3.dist-info/METADATA"),
+            "Metadata-Version: 2.1\nName: Django\nVersion: 5.1.3\n\nName: not a header\n",
+        )
+        .unwrap();
+        std::fs::create_dir_all(site.join("asgiref-3.8.1.dist-info")).unwrap();
+        std::fs::write(site.join("asgiref-3.8.1.dist-info/METADATA"), "Name: asgiref\nVersion: 3.8.1\n").unwrap();
+        std::fs::write(site.join("legacy.egg-info"), "Name: legacy\nVersion: 0.1\n").unwrap();
+        snapshot
+    }
+
+    #[test]
+    fn lists_packages_and_library_roots_of_a_snapshot() {
+        let tmp = tempfile::tempdir().unwrap();
+        let snapshot = snapshot_in(tmp.path(), None);
+        let names: Vec<String> =
+            packages(tmp.path(), &snapshot).into_iter().map(|p| format!("{} {}", p.name, p.version)).collect();
+        assert_eq!(names, ["asgiref 3.8.1", "Django 5.1.3", "legacy 0.1"]);
+        let group = library_group("web", tmp.path(), &snapshot).unwrap();
+        assert_eq!(group.name, "Python 3.12 (web)");
+        assert_eq!(group.roots.len(), 1, "a folder that was not copied is left out");
+        assert_eq!(group.roots[0].name, "site-packages");
+    }
+
+    #[test]
+    fn current_snapshot_switches_and_drops_old_ones() {
+        let tmp = tempfile::tempdir().unwrap();
+        let target = target_dir(tmp.path(), "web");
+        for image in ["sha256:old", "sha256:new"] {
+            let dir = target.join(dir_name(image));
+            std::fs::create_dir_all(&dir).unwrap();
+            write(&dir, &Snapshot { image: image.into(), ..Default::default() }).unwrap();
+        }
+        std::fs::create_dir_all(target.join("new.partial")).unwrap();
+        assert!(current(&target).is_none());
+        make_current(&target, "sha256:new").unwrap();
+        let (dir, snapshot) = current(&target).unwrap();
+        assert_eq!((dir, snapshot.image.as_str()), (target.join("new"), "sha256:new"));
+        assert!(!target.join("old").exists() && !target.join("new.partial").exists());
+    }
+
+    #[test]
+    fn basedpyright_gets_the_neutral_interpreter_and_extra_paths() {
+        let tmp = tempfile::tempdir().unwrap();
+        let venv = tmp.path().join("neutral");
+        let python = venv.join(crate::bin_dir()).join(crate::exe("python"));
+        std::fs::create_dir_all(python.parent().unwrap()).unwrap();
+        std::fs::write(&python, "").unwrap();
+        std::fs::write(venv.join("pyvenv.cfg"), "include-system-site-packages = false\n").unwrap();
+        let snapshot = snapshot_in(tmp.path(), Some(python.clone()));
+        let site = local_folder(tmp.path(), &snapshot.folders[0]).to_string_lossy().into_owned();
+
+        let mut cfg = server("basedpyright");
+        configure_server(&mut cfg, Some((tmp.path(), &snapshot)));
+        let opts = serde_json::to_value(cfg.initialization_options.as_ref().unwrap()).unwrap();
+        assert_eq!(opts["python"]["pythonPath"], python.to_string_lossy().as_ref());
+        assert_eq!(opts["settings"]["basedpyright"]["analysis"]["extraPaths"], json!([site]));
+        assert_eq!(cfg.env["VIRTUAL_ENV"], venv.to_string_lossy().as_ref());
+
+        let mut cfg = server("pyright");
+        configure_server(&mut cfg, Some((tmp.path(), &snapshot)));
+        let opts = serde_json::to_value(cfg.initialization_options.as_ref().unwrap()).unwrap();
+        assert_eq!(opts["settings"]["python"]["analysis"]["extraPaths"], json!([site]));
+
+        let mut cfg = server("ruff");
+        configure_server(&mut cfg, Some((tmp.path(), &snapshot)));
+        assert!(cfg.initialization_options.is_none());
+    }
+
+    #[test]
+    fn without_a_local_python_only_extra_paths_reach_the_server() {
+        let tmp = tempfile::tempdir().unwrap();
+        assert_eq!(neutral_python_with(tmp.path(), "3.12.7", |_| None), None);
+        let snapshot = snapshot_in(tmp.path(), None);
+        let mut cfg = server("basedpyright");
+        configure_server(&mut cfg, Some((tmp.path(), &snapshot)));
+        let opts = serde_json::to_value(cfg.initialization_options.as_ref().unwrap()).unwrap();
+        assert!(opts.get("python").is_none(), "no pythonPath: the server falls back to its bundled typeshed");
+        assert_eq!(opts["settings"]["basedpyright"]["analysis"]["extraPaths"].as_array().unwrap().len(), 1);
+        assert!(!cfg.env.contains_key("VIRTUAL_ENV"));
+    }
+
+    // A real `python3 -m venv`: runs where a Python is installed (the dev container, CI).
+    #[test]
+    fn neutral_python_is_an_empty_virtualenv() {
+        let Some(base) = which("python3") else { return };
+        let tmp = tempfile::tempdir().unwrap();
+        let which = |name: &str| (name == "python3").then(|| base.clone());
+        let python = neutral_python_with(tmp.path(), "0.0.1", which).unwrap();
+        assert!(python.starts_with(tmp.path().join("neutral").join("default")));
+        let cfg = std::fs::read_to_string(crate::venv_of(&python).unwrap().join("pyvenv.cfg")).unwrap();
+        assert!(cfg.contains("include-system-site-packages = false"));
+        assert_eq!(neutral_python_with(tmp.path(), "0.0.1", which), Some(python), "reused");
+    }
+}

crates/ide-sdk/src/lib.rs

@@ -9,6 +9,7 @@ mod angular;
 pub mod apply;
 pub mod arduino;
 mod astro;
+pub mod container_python;
 mod discover;
 mod exec;
 pub mod go;

crates/ide-sdk/src/libraries.rs

@@ -254,6 +254,10 @@ fn module_settings(root: &Path, settings: &Settings) -> Settings {
         &mut l.go.gopath,
         &mut l.java.jdk,
     ] {
+        // `target:<id>` names a run target, not a path.
+        if value.trim().starts_with(ide_core::settings::PythonSettings::TARGET_PREFIX) {
+            continue;
+        }
         if let Some(path) = crate::apply::setting_path(root, value) {
             *value = path.to_string_lossy().into_owned();
         }

crates/ide-sdk/src/tests.rs

@@ -21,7 +21,7 @@ fn fake_venv(root: &Path, name: &str) -> std::path::PathBuf {
     py
 }
 
-fn server(name: &str) -> LanguageServerConfig {
+pub(crate) fn server(name: &str) -> LanguageServerConfig {
     LanguageServerConfig {
         name: name.into(),
         command: name.into(),
@@ -42,6 +42,7 @@ fn server(name: &str) -> LanguageServerConfig {
         tsserver_project: false,
         tsserver_project_extras: Default::default(),
         resync_on_configuration: false,
+        display_name: None,
         pinned: None,
     }
 }
@@ -188,6 +189,48 @@ fn pyright_gets_python_path_and_venv_env() {
     assert!(cfg.env["PATH"].starts_with(&*tmp.path().join(".venv").join(bin_dir()).to_string_lossy()));
 }
 
+#[test]
+fn a_run_target_interpreter_hides_local_pythons() {
+    let tmp = tempfile::tempdir().unwrap();
+    fake_venv(tmp.path(), ".venv");
+    let mut s = Settings::default();
+    s.languages.python.interpreter = "target:web".into();
+    assert_eq!(python_interpreter(tmp.path(), &s), None, "the project virtualenv is not the interpreter");
+    assert_eq!(terminal_activation(tmp.path(), &s, "bash"), None);
+    assert!(!tool_install_environment(tmp.path(), &s).commands.contains_key("python"));
+    let mut cfg = server("basedpyright");
+    configure_server(&mut cfg, tmp.path(), tmp.path(), &s);
+    let opts = cfg.initialization_options.map(|o| serde_json::to_value(o).unwrap());
+    assert!(opts.and_then(|o| o.pointer("/python/pythonPath").cloned()).is_none());
+    assert!(!cfg.env.contains_key("VIRTUAL_ENV"));
+}
+
+#[test]
+fn python_configurations_run_on_the_interpreters_target() {
+    let tmp = tempfile::tempdir().unwrap();
+    fake_venv(tmp.path(), ".venv");
+    let mut s = Settings::default();
+    s.languages.python.interpreter = "target:web".into();
+    s.run.default_target = "box".into();
+    let mut own = run("python", "python3", &["main.py"]);
+    own.extras.target = Some(String::new());
+    let mut configs = vec![
+        run("python", "python3", &["manage.py", "runserver"]),
+        run("pytest", "python3", &["-m", "pytest"]),
+        run("npm", "npm", &["run", "dev"]),
+        own,
+    ];
+    apply_to_run_configs(&mut configs, tmp.path(), &s);
+    assert_eq!(configs[0].extras.target.as_deref(), Some("web"));
+    assert_eq!(configs[0].command, "python3", "the container resolves the interpreter");
+    assert!(!configs[0].env.contains_key("VIRTUAL_ENV"));
+    assert_eq!(configs[1].extras.target.as_deref(), Some("web"));
+    assert_eq!(configs[2].extras.target.as_deref(), Some("box"), "other languages keep the default target");
+    assert_eq!(configs[3].extras.target.as_deref(), Some(""), "a configuration's own choice wins");
+    let derived = without_derived(&configs[0], tmp.path(), &s);
+    assert_eq!(derived.extras.target, None, "the target is derived from the interpreter");
+}
+
 #[test]
 fn jdtls_vm_args() {
     let tmp = tempfile::tempdir().unwrap();
@@ -1387,6 +1430,7 @@ fn typescript_7_runs_its_own_language_server() {
         configure_server(&mut cfg, tmp.path(), tmp.path(), &s);
         assert_eq!(Path::new(&cfg.command), native, "{name}");
         assert_eq!(cfg.args, ["--lsp", "--stdio"]);
+        assert_eq!(cfg.display_name.as_deref(), Some("TypeScript 7"));
         assert!(cfg.initialization_options.is_none());
     }
     // Picked as a directory (its `lib`, as for older versions), too.

docs/en/guide/agents.mdx

@@ -50,7 +50,12 @@ Agents are unavailable in a project you have not marked as trusted.
     - **Local checkout**: the agent edits your files directly.
   </Step>
   <Step title="Pick the agent and its settings">
-    Choose the agent, and its model, mode and other options when it offers them. Models and modes appear after the agent's first task.
+    Choose the agent, and its model, mode and other options when it offers them. Cached models appear immediately; the selected agent's catalog refreshes in the background when it is more than 15 minutes old, without sending a prompt or attaching project MCP servers.
+
+    After changing the agent CLI or account, open the model picker and choose **Refresh models**. Refreshes share one lookup and have a 30-second cooldown after completion, including failures. Cached choices remain usable while refreshing or after a failure.
+
+    Available models depend on the installed agent and account. If a selected model is removed, choose another before starting. Refreshing does not change running tasks.
+
   </Step>
   <Step title="Send">
     The task opens as an editor tab and starts.
@@ -67,6 +72,10 @@ The task tab shows the conversation: your messages, the agent's replies, its rea
 
 On your own messages you can **Edit** (the messages after it are replaced; files already changed stay as they are) or **Retract Message**. On replies you can **Copy Markdown**, **Quote Reply**, **Regenerate Response** and **Branch Conversation from Here**, which starts a new task from that point.
 
+**Focus Agent Input** defaults to `⌘L` on macOS and `Ctrl+L` on Windows / Linux in every built-in keymap. When focus is inside your writable task conversation, in either an editor tab or the tool window, it returns focus to the message input without changing your draft, caret position or selection—even when pressed repeatedly. It does not send a message or jump through message history.
+
+The shortcut does not apply to archived tasks, subagent conversations or the New Task page, and does not take focus from open popups or dialogs. Outside the task conversation, the keys keep their usual editor or terminal behavior. To change or remove the binding, open **Settings › Keymap › Agents › Focus Agent Input**.
+
 Right-click a link and choose **Copy Link Address** to copy its URL; **Copy** copies the selected text.
 
 ### Permissions

docs/en/guide/remote/containers.mdx

@@ -96,4 +96,7 @@ Container target options:
 | **Run options**                                                     | Extra `docker run` options, for example `--network host`.                                                                                         |
 | **Run as the image's user, not the project folder's owner (Linux)** | On Linux the container runs as the owner of the project folder by default, so the files it writes stay yours. Tick this to keep the image's user. |
 
+A container target can also be the project's Python interpreter, so the editor resolves the packages installed in the
+image; see [Python](/en/languages/python#a-docker-or-compose-run-target-as-the-interpreter).
+
 See [Run configurations](/en/guide/run) for run targets in general, including SSH targets.

docs/en/languages/python.mdx

@@ -49,6 +49,17 @@ The selected interpreter is passed to basedpyright and Pyright (`python.pythonPa
 
 The **Python Interpreter** item in the status bar shows the current interpreter. Click it to switch, or to open **Add New Interpreter…** and **Interpreter Settings…**.
 
+### A Docker or Compose run target as the interpreter
+
+When the project's dependencies are installed only in an image, choose a Docker or Docker Compose [run target](/en/guide/remote/containers#docker-and-docker-compose-run-targets) as the interpreter: the interpreter list and the status bar item show those targets next to the local interpreters.
+
+- **Editor.** The IDE runs the target's Python once in a new container (the image's entrypoint and the service's dependencies are skipped) and copies the folders of its `sys.path` outside the standard library and the project, such as `site-packages`, to its cache with `docker cp`. basedpyright and Pyright get the copies as `extraPaths`, with an empty virtualenv the IDE creates as their interpreter, so local packages don't mix in. Without any Python on this machine they get `extraPaths` alone and use their bundled standard library stubs. The copy is shown under **External Libraries**.
+- **Rebuilds.** The copy belongs to the image: when the project opens or the interpreter is chosen, a rebuilt image gets a new copy. The refresh button on the packages list copies again.
+- **Run.** Python run configurations without a run target of their own run on that target.
+- **Packages.** The list comes from the copy and is read-only: change the image or its requirements, rebuild it, and copy again. Nothing is installed into the container.
+
+A `pyrightconfig.json` or a `[tool.basedpyright]` / `[tool.pyright]` section with its own `extraPaths` replaces the copied paths. The interpreter's Python version is the empty virtualenv's, from a local Python of the same version when there is one.
+
 ### Creating an environment
 
 On **Settings › Languages & Frameworks › Python Interpreter**, choose **Add Python Interpreter** and pick the **Interpreter type**:

docs/zh/guide/agents.mdx

@@ -50,7 +50,12 @@ OpenIDEA 本身不带模型或账号：它启动你已安装并登录的 agent
     - **当前工作区**：agent 直接修改你的文件。
   </Step>
   <Step title="选择 agent 及其设置">
-    选择 agent，以及它提供的模型、模式等选项。这些选项会在该 agent 跑完第一个任务后出现。
+    选择 agent，以及它提供的模型、模式等选项。缓存的模型会立即显示；所选 agent 的模型列表超过 15 分钟未更新时，会在后台刷新，不发送提示词，也不接入项目 MCP 服务器。
+
+    更改 agent CLI 或账号后，打开模型选择器并单击 **刷新模型**。并发刷新会共用一次查询；每次查询完成后（包括失败）都有 30 秒冷却时间。刷新中或刷新失败后，缓存选项仍可使用。
+
+    可用模型取决于已安装的 agent 和账号。如果已选模型被移除，需要先选择其他模型才能开始任务。刷新不会更改正在运行的任务。
+
   </Step>
   <Step title="发送">
     任务会在编辑器标签页中打开并开始运行。
@@ -67,6 +72,10 @@ OpenIDEA 本身不带模型或账号：它启动你已安装并登录的 agent
 
 在你自己的消息上可以 **编辑**（其后的消息会被替换，已经改动的文件保持不变）或 **撤回消息**。在回复上可以 **复制 Markdown**、**引用回复**、**重新生成回复**，以及 **从此处创建分支对话**，从这一点开始一个新任务。
 
+所有内置按键映射中，**聚焦 Agent 输入框** 的默认快捷键都是 macOS 上的 `⌘L`、Windows / Linux 上的 `Ctrl+L`。焦点位于你自己的可输入任务对话中时，无论对话显示在编辑器标签页还是工具窗口中，它都会将焦点移回消息输入框，保留草稿、光标位置和选区；重复按下也不会改变这些内容。它不会发送消息，也不会跳转消息历史。
+
+此快捷键不适用于已归档任务、子 agent 对话或“新建任务”页面，也不会从打开的弹出窗口或对话框中抢走焦点。在任务对话之外，按键保留原有的编辑器或终端行为。要修改或移除绑定，请打开 **设置 › 按键映射 › 智能体 › 聚焦 Agent 输入框**。
+
 右键点击链接并选择 **复制链接地址** 可复制它的 URL；**复制** 复制选中的文字。
 
 ### 权限

docs/zh/guide/remote/containers.mdx

@@ -78,4 +78,6 @@ OpenIDEA 安装的语言服务器和调试器会装进容器，位于容器用
 | **运行选项**                                            | 额外的 `docker run` 参数，例如 `--network host`。                                                                 |
 | **以镜像的用户运行，而不是项目文件夹的所有者（Linux）** | 在 Linux 上，容器默认以项目文件夹所有者的身份运行，写出的文件仍归你所有。勾选后保留镜像自带的用户。               |
 
+容器类目标也可以作为项目的 Python 解释器，让编辑器识别镜像中安装的软件包，见 [Python](/zh/languages/python#以-docker-或-compose-运行目标作为解释器)。
+
 运行目标的整体说明（包括 SSH 目标）见[运行配置](/zh/guide/run)。

docs/zh/languages/python.mdx

@@ -49,6 +49,17 @@ Ruff 只为位于 Ruff 配置之下的文件启动：`ruff.toml`、`.ruff.toml`
 
 状态栏上的 **Python 解释器** 显示当前解释器，点击可以切换，也可以打开 **添加新的解释器…** 和 **解释器设置…**。
 
+### 以 Docker 或 Compose 运行目标作为解释器
+
+如果项目的依赖只安装在镜像里，可以把 Docker 或 Docker Compose [运行目标](/zh/guide/remote/containers#docker-和-docker-compose-运行目标)选为解释器：解释器列表和状态栏项会把这些目标列在本地解释器旁边。
+
+- **编辑器。** IDE 在新容器中运行一次目标的 Python（跳过镜像的入口点和服务的依赖），然后用 `docker cp` 把其 `sys.path` 中标准库和项目以外的目录（例如 `site-packages`）复制到缓存。basedpyright 和 Pyright 以 `extraPaths` 的形式获得这些副本，解释器则是 IDE 创建的空虚拟环境，因此不会混入本地软件包。本机完全没有 Python 时，只传 `extraPaths`，并使用它们自带的标准库存根。副本显示在 **外部库** 下。
+- **重新构建。** 副本与镜像对应：项目打开或选择解释器时，重新构建过的镜像会得到新的副本。软件包列表上的刷新按钮会重新复制。
+- **运行。** 没有自己运行目标的 Python 运行配置会在该目标上运行。
+- **软件包。** 列表来自副本，并且只读：请修改镜像或其依赖要求，重新构建，再重新复制。不会向容器中安装任何内容。
+
+如果 `pyrightconfig.json` 或 `[tool.basedpyright]` / `[tool.pyright]` 设置了自己的 `extraPaths`，它们会取代复制的路径。解释器的 Python 版本取自空虚拟环境；本机有相同版本的 Python 时会用它来创建。
+
 ### 创建环境
 
 在 **设置 › 语言和框架 › Python 解释器** 中选择 **添加 Python 解释器**，再选 **解释器类型**：

e2e/agentFocusInput.spec.ts

@@ -0,0 +1,379 @@
+import type { Locator, Page } from "@playwright/test";
+import type { AgentEntry, AgentTask } from "../src/bindings";
+import { expect, openFromTree, test } from "./fixtures";
+
+type Placement = "editor" | "toolWindow";
+
+const firstTask: AgentTask = {
+  id: "focus-first",
+  title: "First focus task",
+  provider: "codex",
+  status: "ready",
+  isolation: "local",
+  model: null,
+  cwd: "/dev/acme-api",
+  branch: null,
+  base: null,
+  baseCommit: null,
+  error: null,
+  createdMs: 0,
+  updatedMs: 0,
+  config: [],
+  commands: [],
+  usage: null,
+  queue: [],
+};
+const secondTask: AgentTask = { ...firstTask, id: "focus-second", title: "Second focus task" };
+const draft = "draft keep this unsent";
+const reboundShortcut = "Control+Meta+Shift+J";
+const subagent: AgentEntry = {
+  type: "subagent",
+  id: "focus-child",
+  title: "Inspect focus behavior",
+  description: null,
+  status: "done",
+  error: null,
+  prompt: null,
+  reply: null,
+  tools: 0,
+  activity: null,
+  startedMs: null,
+  endedMs: null,
+  cancellable: false,
+};
+
+async function seedTasks(page: Page, placement: Placement, status: AgentTask["status"] = "ready") {
+  const entries: AgentEntry[] = Array.from({ length: 24 }, (_, turn): AgentEntry[] => [
+    { type: "user", text: `Request ${turn}`, attachments: [] },
+    { type: "agent", text: `Reply ${turn}` },
+  ]).flat();
+  await page.evaluate(
+    async ({ firstTask, secondTask, entries, subagent, placement, status }) => {
+      // These modules must load in the browser's Vite realm, not Playwright's Node process.
+      const storePath = "/src/features/agents/store.ts";
+      const ipcPath = "/src/platform/ipc.ts";
+      const store = await import(storePath);
+      const { commands } = await import(ipcPath);
+      commands.agentChanges = async () => ({ status: "ok", data: [] });
+      document.documentElement.dataset.agentPromptCount = "0";
+      commands.agentPrompt = async () => {
+        const root = document.documentElement;
+        root.dataset.agentPromptCount = String(Number(root.dataset.agentPromptCount) + 1);
+        return { status: "ok", data: null };
+      };
+      store.useAgents.setState({
+        loaded: true,
+        error: null,
+        providers: [],
+        tasks: new Map([
+          [firstTask.id, { ...firstTask, status }],
+          [secondTask.id, secondTask],
+        ]),
+        entries: new Map([
+          [firstTask.id, [...entries, subagent]],
+          [secondTask.id, entries],
+          [`${firstTask.id}/${subagent.id}`, [{ type: "agent", text: "Subagent findings" }]],
+        ]),
+        composers: new Map(),
+        unread: new Set(),
+        docked: null,
+        homeOpen: false,
+        sessionLocation: placement,
+      });
+      store.openTask(firstTask.id);
+    },
+    { firstTask, secondTask, entries, subagent, placement, status },
+  );
+  await expect(messageBox(page)).toBeVisible();
+  await page.evaluate(() => document.fonts.ready);
+}
+
+function messageBox(page: Page) {
+  return page.getByRole("textbox", { name: "Message", exact: true }).filter({ visible: true });
+}
+
+function conversation(page: Page) {
+  return page.locator("[class*='_stream_']:visible");
+}
+
+// Read the browser selection, not the store's focus request or a registry entry.
+async function selection(box: Locator) {
+  return box.evaluate((element) => {
+    const selected = window.getSelection();
+    if (!selected?.anchorNode || !selected.focusNode) return null;
+    if (!element.contains(selected.anchorNode) || !element.contains(selected.focusNode)) return null;
+    const offset = (node: Node, at: number) => {
+      const range = document.createRange();
+      range.selectNodeContents(element);
+      range.setEnd(node, at);
+      return range.toString().length;
+    };
+    return {
+      anchor: offset(selected.anchorNode, selected.anchorOffset),
+      head: offset(selected.focusNode, selected.focusOffset),
+      text: selected.toString(),
+    };
+  });
+}
+
+async function selectDraft(box: Locator, range: boolean) {
+  await box.fill(draft);
+  await box.press("Home");
+  for (let index = 0; index < 6; index++) await box.press("ArrowRight");
+  if (range) {
+    for (let index = 0; index < 4; index++) await box.press("Shift+ArrowRight");
+  }
+  const expected = { anchor: 6, head: range ? 10 : 6, text: range ? "keep" : "" };
+  await expect.poll(() => selection(box)).toEqual(expected);
+  return expected;
+}
+
+for (const placement of ["editor", "toolWindow"] as const) {
+  for (const status of ["ready", "running"] as const) {
+    test(`${placement}: default shortcut restores ${status} task input without changing draft, selection or history`, async ({
+      workbench: page,
+    }) => {
+      await seedTasks(page, placement, status);
+      const box = messageBox(page);
+      const history = conversation(page);
+      for (const range of [false, true]) {
+        const expected = await selectDraft(box, range);
+        await history.click({ position: { x: 12, y: 20 } });
+        await expect(history).toBeFocused();
+        await history.press("Home");
+        await expect.poll(() => history.evaluate((element) => element.scrollTop)).toBe(0);
+        for (let repeat = 0; repeat < 3; repeat++) {
+          await page.keyboard.press("Meta+L");
+          await expect(box).toBeFocused();
+          await expect(box).toHaveText(draft);
+          await expect.poll(() => selection(box)).toEqual(expected);
+          await expect.poll(() => history.evaluate((element) => element.scrollTop)).toBe(0);
+        }
+      }
+      await expect(page.getByRole("dialog", { name: "Go to Line:Column", exact: true })).toHaveCount(0);
+      await expect(page.locator("html")).toHaveAttribute("data-agent-prompt-count", "0");
+    });
+  }
+
+  test(`${placement}: focuses the shown task rather than another kept-alive composer`, async ({ workbench: page }) => {
+    await seedTasks(page, placement);
+    await messageBox(page).fill("first task's unsent draft");
+    await page.evaluate(async (id) => {
+      // Load the workbench store inside the browser, not the test runner.
+      const storePath = "/src/features/agents/store.ts";
+      (await import(storePath)).openTask(id);
+    }, secondTask.id);
+    await messageBox(page).fill("second task's unsent draft");
+    if (placement === "editor") {
+      await expect(page.getByRole("textbox", { name: "Message", exact: true, includeHidden: true })).toHaveCount(2);
+      await page.getByRole("tab", { name: firstTask.title, exact: true }).click();
+    } else {
+      await page.getByRole("button", { name: "Agent sessions", exact: true }).click();
+      await page.getByRole("tree", { name: "Agent tasks" }).getByText(firstTask.title, { exact: true }).dblclick();
+    }
+    await expect(messageBox(page)).toHaveText("first task's unsent draft");
+    await conversation(page).click({ position: { x: 12, y: 20 } });
+    await page.keyboard.press("Meta+L");
+    await expect(messageBox(page)).toBeFocused();
+    await expect(messageBox(page)).toHaveText("first task's unsent draft");
+    if (placement === "editor") {
+      await page.getByRole("tab", { name: secondTask.title, exact: true }).click();
+    } else {
+      await page.getByRole("button", { name: "Agent sessions", exact: true }).click();
+      await page.getByRole("tree", { name: "Agent tasks" }).getByText(secondTask.title, { exact: true }).dblclick();
+    }
+    await conversation(page).click({ position: { x: 12, y: 20 } });
+    await page.keyboard.press("Meta+L");
+    await expect(messageBox(page)).toBeFocused();
+    await expect(messageBox(page)).toHaveText("second task's unsent draft");
+    await expect(page.locator("html")).toHaveAttribute("data-agent-prompt-count", "0");
+  });
+}
+
+test("Settings → Keymap rebinds Focus Agent Input and removes its default shortcut", async ({ workbench: page }) => {
+  await seedTasks(page, "editor");
+  const box = messageBox(page);
+  const expected = await selectDraft(box, true);
+  await page.keyboard.press("Meta+,");
+  const settings = page.getByRole("dialog", { name: "Settings", exact: true });
+  await settings.getByRole("treeitem", { name: "Keymap", exact: true }).click();
+  await settings.getByRole("textbox", { name: "Search actions", exact: true }).fill("Focus Agent Input");
+  const row = settings.getByRole("tree", { name: "Actions" }).getByRole("treeitem", { name: /Focus Agent Input/ });
+  await row.dblclick();
+  await page.getByRole("menuitem", { name: "Add Keyboard Shortcut", exact: true }).click();
+  const recorder = page.getByRole("dialog", { name: "Keyboard Shortcut: Focus Agent Input", exact: true });
+  await recorder.getByRole("textbox", { name: "First stroke" }).press(reboundShortcut);
+  await recorder.getByRole("button", { name: "OK", exact: true }).click();
+  await expect(recorder).toBeHidden();
+  await row.click({ button: "right" });
+  await page.getByRole("menuitem", { name: "Remove ⌘L", exact: true }).click();
+  await settings.getByRole("button", { name: "OK", exact: true }).click();
+  await expect(settings).toBeHidden();
+  const history = conversation(page);
+  await history.click({ position: { x: 12, y: 20 } });
+  await expect(history).toBeFocused();
+  await page.keyboard.press("Meta+L");
+  await expect(history).toBeFocused();
+  await expect(box).not.toBeFocused();
+  await page.keyboard.press(reboundShortcut);
+  await expect(box).toBeFocused();
+  await expect(box).toHaveText(draft);
+  await expect.poll(() => selection(box)).toEqual(expected);
+  await expect(page.locator("html")).toHaveAttribute("data-agent-prompt-count", "0");
+});
+
+test("modals and conversation popups keep keyboard focus", async ({ workbench: page }) => {
+  await seedTasks(page, "editor");
+  const box = messageBox(page);
+  await box.fill(draft);
+  await page.keyboard.press("Meta+,");
+  const settings = page.getByRole("dialog", { name: "Settings", exact: true });
+  const search = settings.getByRole("textbox", { name: "Search settings", exact: true });
+  await search.fill("keymap");
+  await page.keyboard.press("Meta+L");
+  await expect(search).toBeFocused();
+  await expect(search).toHaveValue("keymap");
+  await expect(box).not.toBeFocused();
+  await settings.getByRole("button", { name: "Cancel", exact: true }).click();
+  await expect(settings).toBeHidden();
+  const reply = conversation(page).getByText("Reply 0", { exact: true });
+  await reply.dblclick();
+  await reply.click({ button: "right" });
+  const menu = page.getByRole("menu");
+  await expect(menu).toBeVisible();
+  const firstItem = menu.getByRole("menuitem").first();
+  await expect(firstItem).toBeFocused();
+  await page.keyboard.press("Meta+L");
+  await expect(menu).toBeVisible();
+  await expect(firstItem).toBeFocused();
+  await expect(box).not.toBeFocused();
+  await page.keyboard.press("Escape");
+  await expect(box).toHaveText(draft);
+});
+
+test("archived tasks do not focus their disabled composer", async ({ workbench: page }) => {
+  await seedTasks(page, "editor", "archived");
+  await expect(
+    page.getByText("This task is archived. Unarchive it to continue the conversation.", { exact: true }),
+  ).toBeVisible();
+  const history = conversation(page);
+  await history.click({ position: { x: 12, y: 20 } });
+  await expect(history).toBeFocused();
+  await page.keyboard.press("Meta+L");
+  await expect(history).toBeFocused();
+  await expect(messageBox(page)).not.toBeFocused();
+});
+
+test("subagent conversations do not focus the hidden parent composer", async ({ workbench: page }) => {
+  await seedTasks(page, "editor");
+  await messageBox(page).fill(draft);
+  await page.getByTitle("Open the subagent's conversation", { exact: true }).click();
+  await expect(page.getByRole("navigation", { name: "Subagent", exact: true })).toBeVisible();
+  const history = conversation(page);
+  await history.click({ position: { x: 12, y: 20 } });
+  await expect(history).toBeFocused();
+  await page.keyboard.press("Meta+L");
+  await expect(history).toBeFocused();
+  await expect(messageBox(page)).toHaveCount(0);
+  await page
+    .getByRole("navigation", { name: "Subagent", exact: true })
+    .getByRole("button", { name: firstTask.title, exact: true })
+    .click();
+  await expect(messageBox(page)).toHaveText(draft);
+  await conversation(page).click({ position: { x: 12, y: 20 } });
+  await page.keyboard.press("Meta+L");
+  await expect(messageBox(page)).toBeFocused();
+});
+
+test("editor Go to Line stays available while a docked agent conversation is visible", async ({ workbench: page }) => {
+  const editor = await openFromTree(page, "README.md");
+  await seedTasks(page, "toolWindow");
+  await messageBox(page).fill(draft);
+  const content = editor.locator(".cm-content");
+  await content.click();
+  await page.keyboard.press("Meta+L");
+  const dialog = page.getByRole("dialog", { name: "Go to Line:Column", exact: true });
+  const line = dialog.getByRole("textbox", { name: "Line and column", exact: true });
+  await expect(line).toBeFocused();
+  await expect(messageBox(page)).not.toBeFocused();
+  await line.fill("2:1");
+  await dialog.getByRole("button", { name: "OK", exact: true }).click();
+  await expect(dialog).toBeHidden();
+  await expect(content).toBeFocused();
+  await expect(messageBox(page)).toHaveText(draft);
+});
+
+for (const preset of ["intellij-windows", "vscode-windows", "eclipse-windows"]) {
+  test(`${preset} uses Ctrl+L to focus the task message`, async ({ workbench: page }) => {
+    await seedTasks(page, "editor");
+    const box = messageBox(page);
+    const expected = await selectDraft(box, true);
+    await page.evaluate(async (preset) => {
+      // Load the keymap in the browser where keyboard dispatch runs.
+      const keymapPath = "/src/platform/keymap.ts";
+      (await import(keymapPath)).applyKeymapSettings(preset, {});
+    }, preset);
+    const history = conversation(page);
+    await history.click({ position: { x: 12, y: 20 } });
+    await expect(history).toBeFocused();
+    await page.keyboard.press("Control+L");
+    await expect(box).toBeFocused();
+    await expect(box).toHaveText(draft);
+    await expect.poll(() => selection(box)).toEqual(expected);
+    await expect(page.locator("html")).toHaveAttribute("data-agent-prompt-count", "0");
+  });
+}
+
+test("Find Action focuses the current task input after closing its popup", async ({ workbench: page }) => {
+  await seedTasks(page, "editor");
+  const box = messageBox(page);
+  const expected = await selectDraft(box, true);
+  await conversation(page).click({ position: { x: 12, y: 20 } });
+  await page.keyboard.press("Meta+Shift+A");
+  const search = page.getByRole("dialog", { name: "Search Everywhere", exact: true });
+  const query = search.getByRole("combobox");
+  await query.fill("Focus Agent Input");
+  await expect(search.getByRole("option", { name: /Focus Agent Input/ })).toBeVisible();
+  await query.press("Enter");
+  await expect(search).toBeHidden();
+  await expect(box).toBeFocused();
+  await expect(box).toHaveText(draft);
+  await expect.poll(() => selection(box)).toEqual(expected);
+});
+
+test("docked Changes view returns to the task input without losing its selection", async ({ workbench: page }) => {
+  await seedTasks(page, "toolWindow");
+  const box = messageBox(page);
+  const expected = await selectDraft(box, true);
+  await page.evaluate(async (id) => {
+    // Seed the store in the browser realm; a static import would run in Node.
+    const storePath = "/src/features/agents/store.ts";
+    (await import(storePath)).useAgents.setState({
+      changes: new Map([
+        [
+          id,
+          [
+            {
+              path: "/dev/acme-api/file.ts",
+              relPath: "file.ts",
+              kind: "modified",
+              added: 1,
+              removed: 0,
+              oldPath: null,
+            },
+          ],
+        ],
+      ]),
+    });
+  }, firstTask.id);
+  await page.getByRole("button", { name: /1 changed file/ }).click();
+  const changes = page.getByRole("complementary", { name: "Changes", exact: true });
+  await expect(changes).toBeVisible();
+  await expect(box).toHaveCount(0);
+  await changes.getByRole("button", { name: "Back to conversation", exact: true }).focus();
+  await page.keyboard.press("Meta+L");
+  await expect(changes).toBeHidden();
+  await expect(box).toBeFocused();
+  await expect(box).toHaveText(draft);
+  await expect.poll(() => selection(box)).toEqual(expected);
+});

src-tauri/src/commands/agent.rs

@@ -4,8 +4,8 @@ use crate::state::AppState;
 use ide_agent::registry::AgentRegistry;
 use ide_agent::{
     AcpImportOutcome, AgentAcceptOutcome, AgentChange, AgentChanges, AgentChangesView, AgentCommand, AgentEntry,
-    AgentEvent, AgentProbe, AgentPrompt, AgentProvider, AgentQueued, AgentTask, CustomAgentInput, ExternalSession,
-    McpServer, McpServerInput, NewAgentTask,
+    AgentEvent, AgentModelCatalog, AgentProbe, AgentPrompt, AgentProvider, AgentQueued, AgentTask, CustomAgentInput,
+    ExternalSession, McpServer, McpServerInput, NewAgentTask,
 };
 use ide_core::{IdeResult, IpcPath, RequestId};
 use ide_host::ops::agent;
@@ -37,6 +37,18 @@ pub fn agent_providers(window: Window, state: State<'_, AppState>) -> IdeResult<
     agent::providers(&state.host, window.label())
 }
 
+/// Refreshes the model catalog; force bypasses freshness, not the cooldown.
+#[tauri::command]
+#[specta::specta]
+pub fn agent_refresh_models(
+    window: Window,
+    state: State<'_, AppState>,
+    provider: String,
+    force: bool,
+) -> IdeResult<AgentModelCatalog> {
+    agent::refresh_models(&state.host, window.label(), provider, force)
+}
+
 /// Overrides built-in agent `id`'s command with `command` (its agent file keeps the
 /// built-in's driver and arguments), or returns it to auto-detection with `None`.
 #[tauri::command]

src-tauri/src/commands/debug.rs

@@ -244,6 +244,18 @@ pub async fn debug_restart_frame(state: State<'_, AppState>, session: DebugSessi
     ide_host::ops::debug::debug_restart_frame(&state.host, "", session, frame_id).await
 }
 
+/// The responses a debugged page gets in place of the server's, by a part of the URL; none
+/// switches the replacing off.
+#[tauri::command]
+#[specta::specta]
+pub async fn debug_js_response_overrides(
+    state: State<'_, AppState>,
+    session: DebugSessionId,
+    rules: Vec<ide_dap::JsResponseRule>,
+) -> IdeResult<()> {
+    ide_host::ops::debug::debug_js_response_overrides(&state.host, "", session, rules).await
+}
+
 /// The body of a response a debugged page received.
 #[tauri::command]
 #[specta::specta]
@@ -267,6 +279,23 @@ pub async fn debug_js_custom_breakpoints(
     ide_host::ops::debug::debug_js_custom_breakpoints(&state.host, "", session, ids, xhr).await
 }
 
+/// Starts recording a debugged page's CPU profile.
+#[tauri::command]
+#[specta::specta]
+pub async fn debug_js_start_profile(state: State<'_, AppState>, session: DebugSessionId) -> IdeResult<()> {
+    ide_host::ops::debug::debug_js_start_profile(&state.host, "", session).await
+}
+
+/// Ends the recording: a directory holding the profile as `page.cpuprofile`.
+#[tauri::command]
+#[specta::specta]
+pub async fn debug_js_stop_profile(
+    state: State<'_, AppState>,
+    session: DebugSessionId,
+) -> IdeResult<ide_core::IpcPath> {
+    ide_host::ops::debug::debug_js_stop_profile(&state.host, "", session).await
+}
+
 #[tauri::command]
 #[specta::specta]
 pub fn debug_capabilities(state: State<'_, AppState>, session: DebugSessionId) -> IdeResult<DebugCapabilities> {

src-tauri/src/commands/doc.rs

@@ -134,6 +134,17 @@ pub async fn doc_outline(window: Window, state: State<'_, AppState>, doc: DocId)
     ide_host::ops::doc::doc_outline(&state.host, window.label(), doc).await
 }
 
+/// Python class facts for the inheritance inspections: tree-sitter, no language server.
+#[tauri::command]
+#[specta::specta]
+pub async fn doc_python_facts(
+    window: Window,
+    state: State<'_, AppState>,
+    doc: DocId,
+) -> IdeResult<ide_language::PythonFacts> {
+    ide_host::ops::doc::doc_python_facts(&state.host, window.label(), doc).await
+}
+
 #[tauri::command]
 #[specta::specta]
 pub async fn doc_folding(window: Window, state: State<'_, AppState>, doc: DocId) -> IdeResult<Vec<FoldRange>> {

src-tauri/src/commands/mod.rs

@@ -123,6 +123,7 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         app::log_frontend,
         agent::agent_subscribe,
         agent::agent_providers,
+        agent::agent_refresh_models,
         agent::agent_set_command,
         agent::agent_set_env,
         agent::agent_custom_save,
@@ -208,6 +209,7 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         doc::doc_set_bom,
         doc::doc_set_line_ending,
         doc::doc_outline,
+        doc::doc_python_facts,
         doc::doc_folding,
         doc::doc_highlights,
         doc::doc_selection_ranges,
@@ -476,6 +478,8 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         sdk::sdk_python_interpreter,
         sdk::sdk_python_effective,
         sdk::sdk_php_effective,
+        sdk::sdk_container_python,
+        sdk::sdk_container_python_refresh,
         sdk::sdk_php_xdebug,
         sdk::sdk_php_language_level,
         sdk::sdk_php_composer_install,
@@ -530,6 +534,9 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         debug::debug_capabilities,
         debug::debug_js_custom_breakpoints,
         debug::debug_js_response_body,
+        debug::debug_js_response_overrides,
+        debug::debug_js_start_profile,
+        debug::debug_js_stop_profile,
         debug::debug_set_function_breakpoints,
         debug::debug_set_data_breakpoints,
         debug::debug_data_breakpoint_info,

src-tauri/src/commands/sdk.rs

@@ -38,6 +38,26 @@ pub fn sdk_python_effective(
     ide_host::ops::sdk::sdk_python_effective(&state.host, window.label(), near)
 }
 
+/// The project interpreter when it is a Docker or Compose run target's, with its snapshot.
+#[tauri::command]
+#[specta::specta]
+pub fn sdk_container_python(
+    window: Window,
+    state: State<'_, AppState>,
+) -> IdeResult<Option<ide_host::ops::sdk::ContainerPython>> {
+    ide_host::ops::sdk::sdk_container_python(&state.host, window.label())
+}
+
+/// Copies the container's Python libraries again (after the image changed).
+#[tauri::command]
+#[specta::specta]
+pub async fn sdk_container_python_refresh(
+    window: Window,
+    state: State<'_, AppState>,
+) -> IdeResult<Option<ide_host::ops::sdk::ContainerPython>> {
+    ide_host::ops::sdk::sdk_container_python_refresh(&state.host, window.label()).await
+}
+
 /// The PHP interpreter chosen in Settings › Languages & Frameworks › PHP; `None`: the `php` on `PATH`.
 #[tauri::command]
 #[specta::specta]

src-tauri/src/menu.rs

@@ -799,6 +799,9 @@ pub fn spec(os: Os) -> Vec<Entry> {
             "toolWindowLayouts",
             "Tool Window Layouts",
             vec![
+                act("layout.saveCurrent", "Save Changes in Current Layout"),
+                act("layout.restoreCurrent", "Restore Current Layout"),
+                SEP,
                 act("layout.save", "Save Current Layout as…"),
                 act("layout.restoreDefault", "Restore Default Layout"),
                 SEP,
@@ -2318,6 +2321,8 @@ mod tests {
                 "view.quickSwitchScheme",
                 "code.cleanup",
                 "runAnything.show",
+                "layout.saveCurrent",
+                "layout.restoreCurrent",
                 "layout.save",
                 "layout.restoreDefault",
                 "layout.rename",

src/bindings.ts

@@ -136,6 +136,8 @@ export const commands = {
 	/**  Streams the project's agent events to this window; returns every task. */
 	agentSubscribe: (onEvent: Channel<AgentEvent>) => typedError<AgentTask[], IdeError>(__TAURI_INVOKE("agent_subscribe", { onEvent })),
 	agentProviders: () => typedError<AgentProvider[], IdeError>(__TAURI_INVOKE("agent_providers")),
+	/**  Refreshes the model catalog; force bypasses freshness, not the cooldown. */
+	agentRefreshModels: (provider: string, force: boolean) => typedError<AgentModelCatalog, IdeError>(__TAURI_INVOKE("agent_refresh_models", { provider, force })),
 	/**
 	 *  Overrides built-in agent `id`'s command with `command` (its agent file keeps the
 	 *  built-in's driver and arguments), or returns it to auto-detection with `None`.
@@ -349,6 +351,8 @@ export const commands = {
 	 *  re-parse); large documents get no syntax structure.
 	 */
 	docOutline: (doc: DocId) => typedError<OutlineItem[], IdeError>(__TAURI_INVOKE("doc_outline", { doc })),
+	/**  Python class facts for the inheritance inspections: tree-sitter, no language server. */
+	docPythonFacts: (doc: DocId) => typedError<PythonFacts, IdeError>(__TAURI_INVOKE("doc_python_facts", { doc })),
 	docFolding: (doc: DocId) => typedError<FoldRange[], IdeError>(__TAURI_INVOKE("doc_folding", { doc })),
 	/**
 	 *  Tree-sitter highlighting for languages the UI has no CodeMirror mode for;
@@ -1036,6 +1040,40 @@ export const commands = {
 	sdkPythonEffective: (near: string | null) => typedError<string | null, IdeError>(__TAURI_INVOKE("sdk_python_effective", { near })),
 	/**  The PHP interpreter chosen in Settings › Languages & Frameworks › PHP; `None`: the `php` on `PATH`. */
 	sdkPhpEffective: () => typedError<string | null, IdeError>(__TAURI_INVOKE("sdk_php_effective")),
+	/**  The project interpreter when it is a Docker or Compose run target's, with its snapshot. */
+	sdkContainerPython: () => typedError<{
+	/**  The run target's id. */
+	target: string,
+	/**  Its name; empty when no run target has the id. */
+	name: string,
+	/**  The Python version of the snapshot in use; `None`: no snapshot yet. */
+	version: string | null,
+	/**  The image the snapshot was copied from. */
+	image: string | null,
+	/**  The copied library folders on this machine. */
+	folders: IpcPath[],
+	/**  Packages of the snapshot (read-only). */
+	packages: PythonPackage[],
+	/**  A snapshot is being taken. */
+	updating: boolean,
+} | null, IdeError>(__TAURI_INVOKE("sdk_container_python")),
+	/**  Copies the container's Python libraries again (after the image changed). */
+	sdkContainerPythonRefresh: () => typedError<{
+	/**  The run target's id. */
+	target: string,
+	/**  Its name; empty when no run target has the id. */
+	name: string,
+	/**  The Python version of the snapshot in use; `None`: no snapshot yet. */
+	version: string | null,
+	/**  The image the snapshot was copied from. */
+	image: string | null,
+	/**  The copied library folders on this machine. */
+	folders: IpcPath[],
+	/**  Packages of the snapshot (read-only). */
+	packages: PythonPackage[],
+	/**  A snapshot is being taken. */
+	updating: boolean,
+} | null, IdeError>(__TAURI_INVOKE("sdk_container_python_refresh")),
 	/**
 	 *  The version of the PHP interpreter `php` and of the Xdebug it loads, run in `cwd` (default: the
 	 *  project root).
@@ -1223,6 +1261,15 @@ export const commands = {
 	debugJsCustomBreakpoints: (session: DebugSessionId, ids: string[], xhr: string[]) => typedError<null, IdeError>(__TAURI_INVOKE("debug_js_custom_breakpoints", { session, ids, xhr })),
 	/**  The body of a response a debugged page received. */
 	debugJsResponseBody: (session: DebugSessionId, requestId: string) => typedError<JsResponseBody, IdeError>(__TAURI_INVOKE("debug_js_response_body", { session, requestId })),
+	/**
+	 *  The responses a debugged page gets in place of the server's, by a part of the URL; none
+	 *  switches the replacing off.
+	 */
+	debugJsResponseOverrides: (session: DebugSessionId, rules: JsResponseRule[]) => typedError<null, IdeError>(__TAURI_INVOKE("debug_js_response_overrides", { session, rules })),
+	/**  Starts recording a debugged page's CPU profile. */
+	debugJsStartProfile: (session: DebugSessionId) => typedError<null, IdeError>(__TAURI_INVOKE("debug_js_start_profile", { session })),
+	/**  Ends the recording: a directory holding the profile as `page.cpuprofile`. */
+	debugJsStopProfile: (session: DebugSessionId) => typedError<IpcPath, IdeError>(__TAURI_INVOKE("debug_js_stop_profile", { session })),
 	/**  Method breakpoints (all files); states aligned with `breakpoints`. */
 	debugSetFunctionBreakpoints: (breakpoints: FunctionBreakpoint[]) => typedError<BreakpointState[], IdeError>(__TAURI_INVOKE("debug_set_function_breakpoints", { breakpoints })),
 	/**  Field watchpoints; states aligned with `breakpoints`. */
@@ -1970,6 +2017,8 @@ export type AgentEvent =
 { type: "append"; task: string; subagent: string | null; index: number; from: number; text: string } | 
 /**  An agent reported the usage limits of its account (shared by every task of `provider`). */
 { type: "limits"; provider: string; limits: AgentLimit[] } | 
+/**  A model lookup started or completed, including unsuccessful lookups. */
+{ type: "modelCatalog"; catalog: AgentModelCatalog } | 
 /**  The installed or configured agent providers changed. */
 { type: "providers" };
 
@@ -2025,6 +2074,17 @@ export type AgentMcpServer_Serialize = {
 	agents?: string[],
 };
 
+/**  Authoritative choices for new tasks, independent of any running session's settings. */
+export type AgentModelCatalog = {
+	provider: string,
+	config: AgentConfigOption[],
+	thoughtLevels: { [key in string]: AgentConfigOption[] },
+	refreshing: boolean,
+	refreshedAtMs: number | null,
+	retryAtMs: number | null,
+	error: string | null,
+};
+
 export type AgentPermissionOption = {
 	id: string,
 	name: string,
@@ -2743,7 +2803,7 @@ export type BuildResult = {
 	messages: BuildMessage[],
 };
 
-export type BuildSystem = "maven" | "gradle" | "cargo" | "go" | "typescript" | "cmake";
+export type BuildSystem = "maven" | "gradle" | "cargo" | "go" | "typescript" | "cmake" | "dotnet";
 
 export type BuildTool = "maven" | "gradle";
 
@@ -3365,6 +3425,24 @@ export type ConsoleSettings = {
 
 export type ContainerOp = "start" | "stop" | "restart" | "pause" | "unpause" | "kill";
 
+/**  The project interpreter when it is a run target's. */
+export type ContainerPython = {
+	/**  The run target's id. */
+	target: string,
+	/**  Its name; empty when no run target has the id. */
+	name: string,
+	/**  The Python version of the snapshot in use; `None`: no snapshot yet. */
+	version: string | null,
+	/**  The image the snapshot was copied from. */
+	image: string | null,
+	/**  The copied library folders on this machine. */
+	folders: IpcPath[],
+	/**  Packages of the snapshot (read-only). */
+	packages: PythonPackage[],
+	/**  A snapshot is being taken. */
+	updating: boolean,
+};
+
 /**  ContentAction data exchanged with the IDE. */
 export type ContentAction = {
 	id: string,
@@ -4044,6 +4122,8 @@ export type DebuggerSettings = {
 	showOnBreakpoint?: boolean,
 	focusAppOnBreakpoint?: boolean,
 	hideOnTermination?: boolean,
+	/**  A breakpoint or exception hit brings the Debug tool window's Threads & Variables tab to the front. */
+	variablesOnBreakpoint?: boolean,
 	breakpointsAnyFile?: boolean,
 	/**  While suspended, hovering the start of a line shows a Run to Cursor button. */
 	runToCursorInlay?: boolean,
@@ -5977,7 +6057,9 @@ cancellable: boolean } |
 /**  Project indexing state changed (dumb mode on/off). */
 { type: "indexState"; indexing: boolean; files: number; symbols: number } | 
 /**  Git status / branch information should be refreshed. */
-{ type: "vcsChanged"; root: IpcPath } | { type: "languageServer"; server: ServerId; name: string; status: ServerStatus; message: string | null } | 
+{ type: "vcsChanged"; root: IpcPath } | { type: "languageServer"; server: ServerId; name: string; 
+/**  What the user sees as the server when another program serves in its place. */
+label?: string | null; status: ServerStatus; message: string | null } | 
 /**  A running server lacks a capability; the UI offers the managed tool as a replacement. */
 { type: "languageServerWarning"; name: string; message: string; installTool: string } | 
 /**
@@ -6498,6 +6580,14 @@ export type JsResponseBody = {
 	truncated: boolean,
 };
 
+/**  A response given in place of the server's to every request whose URL contains `url_contains`. */
+export type JsResponseRule = {
+	urlContains: string,
+	status: number,
+	contentType: string,
+	body: string,
+};
+
 /**  The backend that reads a debugged JVM's objects (instances, fields, referrers). */
 export type JvmBackendState = { kind: "ready" } | 
 /**  Turned off for the rest of the session: the debug adapter lacks what it needs. */
@@ -7479,6 +7569,15 @@ export type MergeVersions = {
 	merged: string | null,
 };
 
+/**  What a method body does, for the shapes a check can decide without guessing. */
+export type MethodBody = 
+/**  `pass`, `...`, a docstring, or nothing at all. */
+{ kind: "empty" } | 
+/**  Exactly one `super().name(args)` call, optionally `return`ed. */
+{ kind: "superCall"; returns: boolean; target: string; args: string[] } | 
+/**  Anything else. */
+{ kind: "other" };
+
 /**  Per-function totals (a recursive function's samples count once in `total`). */
 export type MethodStat = {
 	frame: number,
@@ -8688,19 +8787,54 @@ export type PullRequestSummary = {
 /**  Push dialog › Push tags: every tag, or only annotated tags on the pushed commits. */
 export type PushTags = "all" | "currentBranch";
 
+/**  A class definition and the methods it declares. */
+export type PythonClassFacts = {
+	name: string,
+	/**  The class name identifier (selection range). */
+	selection: Range,
+	/**  Base names as written, a qualified name reduced to its last segment. */
+	bases: string[],
+	methods: PythonMethodFacts[],
+};
+
 /**  Python Debugger (debugpy launch options). */
 export type PythonDebuggerSettings = {
 	attachSubprocess?: boolean,
 	gevent?: boolean,
 };
 
+/**  One Python module's classes, in source order. */
+export type PythonFacts = {
+	classes: PythonClassFacts[],
+};
+
+/**  A method definition the inspections can reason about. */
+export type PythonMethodFacts = {
+	name: string,
+	/**  The method name identifier (selection range). */
+	selection: Range,
+	/**
+	 *  Parameter names in order; `None` for a form whose forwarding cannot be compared
+	 *  (`*args`, `**kwargs`, keyword-only, positional-only).
+	 */
+	params: string[] | null,
+	/**  Decorated with `abstractmethod` (`abc.abstractmethod` included). */
+	abstractMethod: boolean,
+	/**  Decorated with `override` from `typing` / `typing_extensions`. */
+	overrideDecorated: boolean,
+	body: MethodBody,
+};
+
 export type PythonPackage = {
 	name: string,
 	version: string,
 };
 
 export type PythonSettings = {
-	/**  Project interpreter executable; empty = auto-detect (project venv, else `python3`). */
+	/**
+	 *  Project interpreter executable; empty = auto-detect (project venv, else `python3`);
+	 *  `target:<run-target-id>` = the Python of a Docker or Compose run target.
+	 */
 	interpreter?: string,
 	/**  Activate the interpreter's virtualenv in new terminal sessions. */
 	activateVirtualenv?: boolean,
@@ -9441,6 +9575,8 @@ export type ServerInfo = {
 	status: ServerStatus,
 	/**  OS process of the running instance (for memory attribution). */
 	pid: number | null,
+	/**  What the user sees as the server when another program serves in its place. */
+	label?: string | null,
 };
 
 export type ServerStatus = "starting" | "ready" | "busy" | "crashed" | "stopped" | "missing" | 

src/editor/core/view/EditorArea.tsx

@@ -220,7 +220,9 @@ function PaneView({ paneId }: { paneId: string }) {
           : undefined,
         italic: t.preview,
         modified: dirty[i],
-        closable: showCloseButton,
+        // IDEA: hiding the close button is visual only. Keep close gestures
+        // (middle click, Shift+click, Delete) alive when its position is None.
+        showCloseButton,
         color: colors[i] || undefined,
         tint: tints[i] || undefined,
         tooltip: virtualTooltip(t.input) ?? (showFullPathOnHover ? (t.input.path ?? name) : undefined),

src/editor/core/view/pinnedTabsRow.test.tsx

@@ -80,4 +80,15 @@ describe("pinned tabs in a separate row", () => {
     fireEvent.mouseDown(screen.getByRole("tab", { name: /f2/ }), { button: 1 });
     expect(closeTab).toHaveBeenCalledWith("p1", "t2");
   });
+
+  // Regression: Settings › Editor Tabs › "Close button position: None" hides the ×
+  // but must not disable middle-click. EditorArea used to pass closable:
+  // showCloseButton, so hiding the button made the tab unclosable.
+  it("middle click still closes when the close button is hidden (position None)", () => {
+    seed([false, false, false], { placement: "top", showCloseButton: false });
+    render(<EditorAreaView />);
+    expect(screen.queryByRole("button", { name: "Close Tab" })).toBeNull();
+    fireEvent.mouseDown(screen.getByRole("tab", { name: /f2/ }), { button: 1 });
+    expect(closeTab).toHaveBeenCalledWith("p1", "t2");
+  });
 });

src/editor/lsp/navigation.ts

@@ -71,7 +71,7 @@ import {
 import { showHint, showPendingHint } from "./hint";
 import { outsideProjectReason } from "./outsideProject";
 import { caretAnchor, openPopup, updatePopup, type ListPopupItem } from "./popupStore";
-import { readManyFileLines, targetLabel } from "./files";
+import { readManyFileLines, targetLabel, withDocument } from "./files";
 import {
   documentLinks,
   followReference,
@@ -85,6 +85,7 @@ import { featureBackoff } from "./availability";
 import { requestHover, showPhpConstructDocumentation } from "./hover";
 import { declarationSummary, renderCode } from "./markdown";
 import { enclosingType } from "@/editor/navigation/lineMarkers";
+import { projectPythonHierarchy, pythonImplementationTargets } from "@/editor/navigation/pythonHierarchy";
 import { editorPrefs } from "@/platform/editorSettings";
 import { isVirtualUri, virtualContainer } from "@/platform/virtualDocs";
 import { isAddCaretGesture } from "@/editor/core/cm/multiCaret";
@@ -370,6 +371,30 @@ async function onDeclarationName(view: EditorView, offset: number): Promise<bool
   return isDeclarationName(at);
 }
 
+/**
+ * Go to Implementation targets for Python from the IDE's inheritance graph: its servers
+ * declare no type hierarchy and analyse one root, so the graph also knows the attached
+ * dependency project's implementations.
+ */
+async function pythonImplementations(doc: EditorDocContext, pos: Pos): Promise<DeclarationTarget[]> {
+  if (doc.language !== "python") return [];
+  const outline = (path: string) =>
+    path === doc.path
+      ? lspRequest(() => commands.docOutline(doc.doc))
+      : withDocument(path, (d) => lspRequest(() => commands.docOutline(d)));
+  const hierarchy = await projectPythonHierarchy().catch(() => null);
+  if (!hierarchy) return [];
+  return pythonImplementationTargets(hierarchy, doc.path, pos, outline).catch(() => []);
+}
+
+/** `more` after `first`, without a target whose declaration line is already there. */
+function mergeTargets(first: readonly DeclarationTarget[], more: readonly DeclarationTarget[]): DeclarationTarget[] {
+  return dedupeLocations([
+    ...first,
+    ...more.filter((m) => !first.some((f) => f.path === m.path && f.range.start.line === m.range.start.line)),
+  ]);
+}
+
 async function gotoResolved(
   view: EditorView,
   kind: GotoKind,
@@ -419,6 +444,9 @@ async function gotoResolved(
       return;
     }
   }
+  // Python: its servers have no type hierarchy and see one root, so the IDE's inheritance
+  // graph answers implementations too (merged with the server's, not replacing them).
+  const graphTargets = kind === "implementation" ? pythonImplementations(doc, pos) : null;
   let serverDown = false;
   let streamed: ReturnType<typeof streamedImplementations> | null = null;
   try {
@@ -429,32 +457,38 @@ async function gotoResolved(
   } catch (e) {
     // The chooser shows the first ones: closing it cancelled the search, or the rest failed.
     if (streamed && (await streamed.opened())) {
-      await streamed.complete([]);
+      await streamed.complete(graphTargets ? await graphTargets : []);
       return;
     }
     if (superseded()) return;
-    if (isCancelled(e) || !declaration) {
-      reportLspError(view, e, true);
-      return;
-    }
-    // Web references and links need no server.
-    if (
-      (await gotoWebReference(view, doc, pos, offset, superseded)) ||
-      (await followReferenceAt(view, doc, offset, superseded))
-    )
-      return;
-    serverDown = isUnavailable(e);
-    // Dumb mode: the server is not ready / failing — answer from the syntax tree.
-    // An import path is not a name to look up: only its file matters.
-    const fb = moduleName ? null : await gotoFallback(view, doc, pos);
+    // Python: the graph answers implementations the server cannot (no type hierarchy).
+    const graph = graphTargets ? await graphTargets : [];
     if (superseded()) return;
-    if (!fb) {
+    if (graph.length) locs = graph;
+    else if (isCancelled(e) || !declaration) {
       reportLspError(view, e, true);
       return;
+    } else {
+      // Web references and links need no server.
+      if (
+        (await gotoWebReference(view, doc, pos, offset, superseded)) ||
+        (await followReferenceAt(view, doc, offset, superseded))
+      )
+        return;
+      serverDown = isUnavailable(e);
+      // Dumb mode: the server is not ready / failing — answer from the syntax tree.
+      // An import path is not a name to look up: only its file matters.
+      const fb = moduleName ? null : await gotoFallback(view, doc, pos);
+      if (superseded()) return;
+      if (!fb) {
+        reportLspError(view, e, true);
+        return;
+      }
+      locs = fb;
+      fromSyntax = true;
     }
-    locs = fb;
-    fromSyntax = true;
   }
+  if (graphTargets) locs = mergeTargets(locs, await graphTargets);
   if (streamed && (await streamed.opened())) {
     await streamed.complete(locs);
     return;

src/editor/lsp/navigationImplementations.test.ts

@@ -0,0 +1,128 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { EditorState } from "@codemirror/state";
+import { EditorView } from "@codemirror/view";
+import type { commands, Location, OutlineItem } from "@/platform/ipc";
+
+// Python has no type hierarchy server: the IDE's inheritance graph answers implementations.
+const graph = vi.hoisted(() => [
+  { path: "/p/order.py", line: 0, col: 6, name: "Order", bases: [] },
+  { path: "/p/online.py", line: 0, col: 6, name: "OnlineOrder", bases: ["Order"] },
+]);
+// The project index is the production entry: build one from the graph above so the
+// tests never reach the IPC the real fetch needs.
+vi.mock("@/editor/navigation/inheritanceGraph", async (orig) => {
+  const real = await orig<typeof import("@/editor/navigation/inheritanceGraph")>();
+  const index = real.inheritanceIndex(graph, { readFiles: async () => new Map() });
+  const subclasses = await real.subclassMap(index);
+  return {
+    ...real,
+    pythonInheritanceGraph: async () => graph,
+    projectPythonIndex: async () => ({ classes: graph, index, subclasses: async () => subclasses }),
+  };
+});
+
+const { lspGotoImplementation, docOutline, fsReadText } = vi.hoisted(() => ({
+  lspGotoImplementation: vi.fn<typeof commands.lspGotoImplementation>(),
+  docOutline: vi.fn<typeof commands.docOutline>(),
+  fsReadText: vi.fn<typeof commands.fsReadText>(async () => ({
+    status: "error",
+    error: { kind: "notFound", message: "not found" },
+  })),
+}));
+vi.mock("@/platform/ipc", async (orig) => {
+  const real = await orig<typeof import("@/platform/ipc")>();
+  return {
+    ...real,
+    isTauri: () => true,
+    commands: { ...real.commands, lspGotoImplementation, docOutline, fsReadText },
+  };
+});
+vi.mock("@tauri-apps/api/core", async (orig) => ({
+  ...(await orig<object>()),
+  Channel: class {
+    onmessage = () => {};
+  },
+}));
+
+const { gotoTargets } = await import("./navigation");
+const { lspDoc } = await import("./lsp");
+const { useLspPopup, closePopup } = await import("./popupStore");
+const { provideEditorService } = await import("@/workbench/contributions");
+const openFile = vi.fn(async () => {});
+provideEditorService({ openFile } as never);
+
+const range = (line: number, col: number) => ({ start: { line, col }, end: { line, col } });
+const at = (path: string, line: number): Location => ({
+  path,
+  range: { start: { line, col: 0 }, end: { line, col: 1 } },
+});
+
+// class Order:
+//     def save(self):
+const OUTLINE: OutlineItem[] = [
+  {
+    name: "Order",
+    detail: null,
+    kind: "class",
+    range: { start: { line: 0, col: 0 }, end: { line: 2, col: 8 } },
+    selection_range: range(0, 6),
+    children: [
+      {
+        name: "save",
+        detail: null,
+        kind: "method",
+        range: { start: { line: 1, col: 4 }, end: { line: 2, col: 8 } },
+        selection_range: range(1, 8),
+        children: [],
+      },
+    ],
+  },
+];
+
+let view: EditorView;
+beforeEach(() => {
+  vi.clearAllMocks();
+  docOutline.mockResolvedValue({ status: "ok", data: OUTLINE });
+  lspGotoImplementation.mockResolvedValue({ status: "ok", data: [] });
+  view = new EditorView({
+    state: EditorState.create({
+      doc: "class Order:\n    def save(self):\n        pass\n",
+      extensions: [lspDoc.of({ doc: 1, path: "/p/order.py", language: "python", uiMode: "Python", readOnly: false })],
+    }),
+    parent: document.body,
+  });
+  view.dispatch({ selection: { anchor: 6 } });
+});
+afterEach(() => {
+  closePopup();
+  view.destroy();
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
+
+describe("Go to Implementation on Python", () => {
+  it("answers from the IDE's inheritance graph when the server finds none", async () => {
+    await gotoTargets(view, "implementation");
+    expect(openFile).toHaveBeenCalledWith("/p/online.py", { selection: { line: 0, col: 6 }, focus: true });
+    expect(lspGotoImplementation).toHaveBeenCalledOnce();
+  });
+
+  it("merges the graph's implementations with the server's answer", async () => {
+    lspGotoImplementation.mockResolvedValue({ status: "ok", data: [at("/p/other.py", 3)] });
+    await gotoTargets(view, "implementation");
+    const popup = useLspPopup.getState().popup;
+    expect(popup?.kind).toBe("list");
+    expect(popup?.kind === "list" ? popup.items : []).toHaveLength(2);
+    expect(popup?.kind === "list" ? popup.title : null).toBe("Choose Implementation of Order (2 found)");
+    expect(openFile).not.toHaveBeenCalled();
+  });
+
+  it("falls back to the graph when the server has no type hierarchy", async () => {
+    lspGotoImplementation.mockResolvedValue({
+      status: "error",
+      error: { kind: "unavailable", message: "no type hierarchy" },
+    });
+    await gotoTargets(view, "implementation");
+    expect(openFile).toHaveBeenCalledWith("/p/online.py", { selection: { line: 0, col: 6 }, focus: true });
+  });
+});

src/editor/navigation/implementationGutter.ts

@@ -50,7 +50,16 @@ import {
   type MarkerCandidate,
   type MarkerGroup,
 } from "./lineMarkers";
-import { baseName, overridersInType, superMethodTargets, type SuperDeps, type SuperMethod } from "./structureNav";
+import { overridersInType, superMethodTargets, type SuperDeps, type SuperMethod } from "./structureNav";
+import {
+  classLocation,
+  declarationKey,
+  forgetInheritanceGraph,
+  inheritanceIndex,
+  methodInOutline,
+  pythonInheritanceGraph,
+  type InheritanceIndex,
+} from "./inheritanceGraph";
 import styles from "./LineMarkers.module.css";
 
 /** Lines above / below the viewport that are asked with it. */
@@ -93,30 +102,6 @@ export function affectsMarkers(paths: readonly string[]): boolean {
  * it again for each edit would walk every Python file again. Dropped when other files
  * change or a server settles (the index may have moved on).
  */
-let inheritanceGraphCache: { root: string; promise: Promise<ClassInheritance[]> } | null = null;
-
-/** The project whose graph is cached; `""` for no project (a loose file). */
-function projectRoot(): string {
-  return useProject.getState().project?.root ?? "";
-}
-
-/** Forgets the cached graph (files changed, a server settled, or tests). */
-export function forgetInheritanceGraph() {
-  inheritanceGraphCache = null;
-}
-
-function inheritanceGraph(): Promise<ClassInheritance[]> {
-  const root = projectRoot();
-  if (!inheritanceGraphCache || inheritanceGraphCache.root !== root) {
-    inheritanceGraphCache = { root, promise: lspRequest(() => commands.navInheritance()) };
-    // A failed request must not stick: the next pass retries it.
-    inheritanceGraphCache.promise.catch(() => {
-      if (inheritanceGraphCache?.root === root) inheritanceGraphCache = null;
-    });
-  }
-  return inheritanceGraphCache.promise;
-}
-
 /** Subscribes once per window and stays subscribed, so the settle echo guard survives remounts. */
 function watchChanges() {
   if (watching) return;
@@ -173,6 +158,11 @@ export interface MarkerDeps {
    * Absent for languages whose servers do provide one (Java, Go, ...).
    */
   inheritance?: () => Promise<ClassInheritance[]>;
+  /**
+   * The file a Python `import` path names (`from a.b import X`), `.x` resolved
+   * relative to `from`. Disambiguates a base name two files both declare.
+   */
+  moduleFile?: (module: string, from: string) => Promise<string | null>;
 }
 
 interface CacheEntry {
@@ -262,14 +252,18 @@ export async function fillMarkers(
   }
   // Python without a type-hierarchy provider: the IDE's inheritance graph holds every
   // `class X(A)` of the project, so ↑/↓ are computed from it instead.
-  const byName = new Map<string, ClassInheritance[]>();
-  if (graph) for (const cls of graph) byName.set(cls.name, [...(byName.get(cls.name) ?? []), cls]);
+  const resolver: InheritanceIndex | null = graph ? inheritanceIndex(graph, deps) : null;
+  const byName = resolver?.byName ?? new Map<string, ClassInheritance[]>();
   // The inheritance graph's direct subclasses, keyed by the *declaration* each base
   // resolves to (path + position), so classes sharing a bare name never mix up.
   const subclassesOf = new Map<string, ClassInheritance[]>();
   for (const cls of graph ?? []) {
     for (const base of new Set(cls.bases)) {
-      for (const decl of resolveBase(byName, base, cls.path)) {
+      // Only this file's classes are looked up below: read another file's imports only
+      // when its base may name one of them, not for every shared or library base name.
+      const exact = resolver ? resolver.exact(base, cls.path) : [];
+      const named = exact.length || !byName.get(base)?.some((c) => c.path === path) ? exact : null;
+      for (const decl of named ?? (await resolver!.resolve(base, cls.path))) {
         const key = declarationKey(decl);
         subclassesOf.set(key, [...(subclassesOf.get(key) ?? []), cls]);
       }
@@ -317,11 +311,11 @@ export async function fillMarkers(
       const c = up[i]!;
       const self = classOf(c);
       if (!self) continue;
-      const found = await superMethodsFrom(byName, self.name, c.symbol, deps);
+      const found = resolver ? await superMethodsFrom(resolver, self.name, c.symbol, deps) : [];
       if (!found.length) continue;
       const known = supers[i]!;
       // Same merge rule as ↓: add the graph's super methods to what the server answered.
-      const extra = found.map((f) => f.location).filter((l) => !known.some((s) => sameLocation(s.location, l)));
+      const extra = found.map((f) => f.location).filter((l) => !known.some((s) => sameDeclarationLine(s.location, l)));
       const owners = [...new Set(found.map((f) => f.owner))].sort((a, b) => a.localeCompare(b));
       entry(c).supers = {
         kind: "overriding",
@@ -360,57 +354,21 @@ export async function fillMarkers(
 
 // One entry per declaration line: the server and the graph may point at the same
 // declaration with different columns (the name vs the whole statement).
-const sameLocation = (a: Location, b: Location) => a.path === b.path && a.range.start.line === b.range.start.line;
+const sameDeclarationLine = (a: Location, b: Location) =>
+  a.path === b.path && a.range.start.line === b.range.start.line;
 
 /** `first`, then the locations of `more` not already in it. */
 function mergeLocations(first: readonly Location[], more: readonly Location[]): Location[] {
-  return [...first, ...more.filter((l) => !first.some((f) => sameLocation(f, l)))];
+  return [...first, ...more.filter((l) => !first.some((f) => sameDeclarationLine(f, l)))];
 }
 
 /** Identifies one class declaration in the inheritance graph. */
-function declarationKey(cls: ClassInheritance): string {
-  return `${cls.path}:${cls.line}:${cls.col}`;
-}
-
-/**
- * The classes a base name names. A bare name is only trusted when it is unique in the
- * project, or names a class in the subclass's own file: a `Config` declared in hundreds
- * of modules must not make every one of them a subclass of every other.
- */
-function resolveBase(byName: ReadonlyMap<string, ClassInheritance[]>, name: string, from: string): ClassInheritance[] {
-  const found = byName.get(name) ?? [];
-  if (found.length <= 1) return found;
-  return found.filter((c) => c.path === from);
-}
-
-/** The class declaration itself as a navigation target (its name identifier). */
-function classLocation(cls: ClassInheritance): Location {
-  const start = { line: cls.line, col: cls.col };
-  return { path: cls.path, range: { start, end: start } };
-}
-
-/** The method `method` (bare name) directly inside the class at `cls`'s position. */
-function methodInOutline(outline: readonly OutlineItem[], cls: ClassInheritance, method: string): OutlineItem | null {
-  const at = cls;
-  const find = (items: readonly OutlineItem[]): OutlineItem | null => {
-    for (const it of items) {
-      if (it.kind === "class" && it.selection_range.start.line === at.line && it.selection_range.start.col === at.col) {
-        return it.children.find((ch) => ch.kind === "method" && baseName(ch.name) === method) ?? null;
-      }
-      const deeper = find(it.children);
-      if (deeper) return deeper;
-    }
-    return null;
-  };
-  return find(outline);
-}
-
 /**
  * Super methods of `method` declared by a class in `byName`, walking the inheritance
  * graph's bases up to a few levels. Empty when no base declares the method.
  */
 async function superMethodsFrom(
-  byName: ReadonlyMap<string, ClassInheritance[]>,
+  resolver: InheritanceIndex,
   start: string,
   method: string,
   deps: MarkerDeps,
@@ -423,11 +381,11 @@ async function superMethodsFrom(
     const next: string[] = [];
     const found: { location: Location; owner: string }[] = [];
     for (const name of level) {
-      for (const cls of byName.get(name) ?? []) {
+      for (const cls of resolver.byName.get(name) ?? []) {
         for (const base of cls.bases) {
           if (!seen.add(base)) continue;
-          // Same rule as the graph: only a base that names one class is followed.
-          const declarations = resolveBase(byName, base, cls.path);
+          // Same rule as the graph: a base the imports name, else a unique one.
+          const declarations = await resolver.resolve(base, cls.path);
           let answered = false;
           for (const baseCls of declarations) {
             const outline = await deps.supers.outline(baseCls.path).catch(() => [] as OutlineItem[]);
@@ -793,7 +751,10 @@ function markerDeps(ctx: EditorDocContext, items: OutlineItem[], request: Reques
     readFiles: readManyFileLines,
     // Python servers answer no type hierarchy (basedpyright, pyrefly): the IDE's
     // own index knows every `class X(Base)` of the project, attached roots included.
-    inheritance: ctx.language === "python" ? inheritanceGraph : undefined,
+    inheritance: ctx.language === "python" ? pythonInheritanceGraph : undefined,
+    // A base name several modules declare is resolved through the file's imports.
+    moduleFile:
+      ctx.language === "python" ? (name, from) => lspRequest(() => commands.navResolveModule(name, from)) : undefined,
   };
 }
 

src/editor/navigation/index.ts

@@ -19,7 +19,8 @@ import { isVirtualUri } from "@/platform/virtualDocs";
 import { editorService } from "@/workbench/contributions";
 import { fileIconName } from "@/ui";
 import { gotoTestOrSubject, type TestNavDeps } from "./gotoTest";
-import { baseName, memberAt, methodStop, superMethods } from "./structureNav";
+import { projectPythonHierarchy, pythonSuperDeps } from "./pythonHierarchy";
+import { baseName, memberAt, methodStop, superMethods, type SuperDeps } from "./structureNav";
 import { tx } from "@/platform/i18n";
 
 const EDITOR_WHEN = "textEditorActive && (editorFocus || !toolWindowFocus)";
@@ -71,17 +72,27 @@ async function superFallback(ctx: EditorDocContext, pos: Pos): Promise<Location[
   return dedupeLocations(locs).filter((l) => !(l.path === ctx.path && l.range.start.line === pos.line));
 }
 
+/** Super Method deps: Python answers them from the IDE's inheritance graph (its servers have no type hierarchy). */
+async function superDeps(ctx: EditorDocContext): Promise<SuperDeps> {
+  const outline = (path: string) => withDoc(path, outlineOf);
+  if (ctx.language === "python") {
+    const hierarchy = await projectPythonHierarchy().catch(() => null);
+    if (hierarchy) return pythonSuperDeps(hierarchy, outline);
+  }
+  return {
+    supertypes: (path: string, pos: Pos) =>
+      withDoc(path, (doc) => lspRequest(() => commands.lspTypeHierarchy(doc, pos, "incoming"))),
+    outline,
+  };
+}
+
 async function superMethod(view: EditorView) {
   const ctx = docOf(view);
   if (!ctx) return;
   const at = await caretOutline(view, ctx);
   if (!at) return;
   const { method, type } = memberAt(at.outline, at.caret);
-  const deps = {
-    supertypes: (path: string, pos: Pos) =>
-      withDoc(path, (doc) => lspRequest(() => commands.lspTypeHierarchy(doc, pos, "incoming"))),
-    outline: (path: string) => withDoc(path, outlineOf),
-  };
+  const deps = await superDeps(ctx);
   let locs: Location[] = [];
   if (method && type) locs = await superMethods(ctx.path, type.selection_range.start, method.name, deps);
   else if (type) {

src/editor/navigation/inheritanceGraph.ts

@@ -0,0 +1,337 @@
+/**
+ * The Python inheritance graph of the project, shared by every feature that needs it
+ * (gutter markers, type hierarchy, structure view, inspections).
+ *
+ * A language server's `typeHierarchy` is not used: basedpyright and pyrefly declare no
+ * `typeHierarchyProvider`, and a server analyses a single root, so an attached
+ * dependency project's classes would be invisible anyway. The IDE index knows every
+ * `class X(Base)` of every content root, which is the whole answer this needs.
+ */
+import { commands, type ClassInheritance, type Location, type OutlineItem } from "@/platform/ipc";
+import { lspRequest } from "@/editor/lsp/lsp";
+import { useProject } from "@/platform/project";
+import { readManyFileLines } from "@/editor/lsp/files";
+import { baseName } from "./structureNav";
+
+/**
+ * The graph of the open project, shared across documents and kept across edits: it is a
+ * whole-project index answer, not a per-document one. Dropped when other files change or
+ * a server settles (the index may have moved on).
+ */
+let cache: { root: string; promise: Promise<ClassInheritance[]> } | null = null;
+
+/** Forgets the cached graph and everything derived from it (files changed, a server settled, or tests). */
+export function forgetInheritanceGraph() {
+  cache = null;
+  indexCache = null;
+}
+
+/** The project's classes and their base names, fetched once per project and invalidation. */
+export function pythonInheritanceGraph(): Promise<ClassInheritance[]> {
+  const root = useProject.getState().project?.root ?? "";
+  if (!cache || cache.root !== root) {
+    cache = { root, promise: lspRequest(() => commands.navInheritance()) };
+    // A failed request must not stick: the next caller retries it.
+    cache.promise.catch(() => {
+      if (cache?.root === root) cache = null;
+    });
+  }
+  return cache.promise;
+}
+
+/** Where a name written in a file comes from: the module of a `from` import and the name it is declared under there. */
+export interface ImportBinding {
+  module: string;
+  name: string;
+}
+
+/**
+ * The local name -> declaration bindings of a file's `from` imports:
+ * `from a.b import X as Y` binds `Y` to (`a.b`, `X`). Plain `import a.b` statements are
+ * skipped: a base written through them keeps its qualifier, which the graph does not store.
+ */
+export function importBindings(lines: readonly string[]): Map<string, ImportBinding> {
+  const out = new Map<string, ImportBinding>();
+  for (let i = 0; i < lines.length; i++) {
+    const line = (lines[i] ?? "").replace(/#.*$/, "");
+    const from = /^\s*from\s+(\.*[\w.]*)\s+import\s+(.*)$/.exec(line);
+    if (!from) continue;
+    let body = from[2]!.trim();
+    if (body.startsWith("(")) {
+      // The names may span lines inside the parentheses.
+      let text = body.slice(1);
+      while (!text.includes(")") && i + 1 < lines.length) text += ` ${(lines[++i] ?? "").replace(/#.*$/, "")}`;
+      body = text.slice(0, text.indexOf(")") < 0 ? undefined : text.indexOf(")"));
+    }
+    for (const part of body.split(",")) {
+      const [name, alias] = part.trim().split(/\s+as\s+/);
+      const declared = (name ?? "").trim();
+      if (!declared || declared === "*" || !/^\w+$/.test(declared)) continue;
+      const local = (alias ?? declared).trim();
+      if (!/^\w+$/.test(local)) continue;
+      out.set(local, { module: from[1]!, name: declared });
+    }
+  }
+  return out;
+}
+
+/** What an index needs from the editor: a file's lines, and a module's file. */
+export interface InheritanceDeps {
+  readFiles: (paths: readonly string[]) => Promise<Map<string, string[] | null>>;
+  /** `from a.b import X`: the file `a.b` names, `.x` resolved relative to `from`. */
+  moduleFile?: (module: string, from: string) => Promise<string | null>;
+}
+
+/** Resolves the base names the graph stores to class declarations. */
+export interface InheritanceIndex {
+  /** The graph's classes by name. */
+  byName: ReadonlyMap<string, ClassInheritance[]>;
+  /** A base that names one class, or a class of the subclass's own file. */
+  exact(name: string, from: string): ClassInheritance[];
+  /** `exact`, else the declaration the file's imports point at (empty when unknown). */
+  resolve(name: string, from: string): Promise<ClassInheritance[]>;
+  /** Reads the imports of `paths` in one batch, ahead of the `resolve` calls that need them. */
+  readImports(paths: readonly string[]): Promise<void>;
+}
+
+/**
+ * Index a graph for lookups. A base name is only trusted when it names one class in the
+ * project or a class of the subclass's own file: a `Config` declared in hundreds of
+ * modules must not make every one of them a subclass of every other. When several files
+ * declare it, the subclass file's own imports decide (`from x.y import Config`).
+ */
+export function inheritanceIndex(graph: readonly ClassInheritance[], deps: InheritanceDeps): InheritanceIndex {
+  const byName = new Map<string, ClassInheritance[]>();
+  for (const cls of graph) byName.set(cls.name, [...(byName.get(cls.name) ?? []), cls]);
+  const imports = new Map<string, Promise<Map<string, ImportBinding> | null>>();
+  const answers = new Map<string, Promise<ClassInheritance[]>>();
+  const exact = (name: string, from: string): ClassInheritance[] => {
+    const found = byName.get(name) ?? [];
+    return found.length <= 1 ? found : found.filter((c) => c.path === from);
+  };
+  const bindingsOf = (from: string): Promise<Map<string, ImportBinding> | null> => {
+    let pending = imports.get(from);
+    if (!pending) {
+      pending = deps
+        .readFiles([from])
+        .then((files) => {
+          const lines = files.get(from);
+          return lines ? importBindings(lines) : null;
+        })
+        .catch(() => null);
+      imports.set(from, pending);
+    }
+    return pending;
+  };
+  return {
+    byName,
+    exact,
+    readImports: async (paths) => {
+      // Without a module lookup an import never resolves a base: nothing to read for it.
+      const unread = deps.moduleFile ? [...new Set(paths)].filter((p) => !imports.has(p)) : [];
+      if (!unread.length) return;
+      const files = deps.readFiles(unread).catch(() => new Map<string, string[] | null>());
+      for (const p of unread) {
+        imports.set(
+          p,
+          files.then((f) => {
+            const lines = f.get(p);
+            return lines ? importBindings(lines) : null;
+          }),
+        );
+      }
+      await files;
+    },
+    resolve: (name, from) => {
+      const found = exact(name, from);
+      if (found.length || !deps.moduleFile) return Promise.resolve(found);
+      const moduleFile = deps.moduleFile;
+      // No class of that name at all: it may be an import alias (`import X as Y`).
+      const key = `${from}\u0000${name}`;
+      let pending = answers.get(key);
+      if (!pending) {
+        pending = (async () => {
+          const binding = (await bindingsOf(from))?.get(name);
+          // The graph has no class under the imported name: no module lookup can find one.
+          if (!binding || !byName.get(binding.name)?.length) return [];
+          // `from . import X` names the package itself: resolve its `__init__`.
+          const module = binding.module;
+          const named = /^\.+$/.test(module) ? `${module.endsWith(".") ? module : `${module}.`}__init__` : module;
+          const file = await moduleFile(named, from).catch(() => null);
+          // The declaration carries the imported (pre-alias) name.
+          return file ? (byName.get(binding.name) ?? []).filter((c) => c.path === file) : [];
+        })();
+        answers.set(key, pending);
+      }
+      return pending;
+    },
+  };
+}
+
+/** The graph indexed once per project, with what every consumer derives from it. */
+export interface PythonIndex {
+  classes: readonly ClassInheritance[];
+  index: InheritanceIndex;
+  /**
+   * Direct subclasses, keyed by [`declarationKey`] of the base they write. Built on first use:
+   * it resolves every base of the project, which supertype lookups never need.
+   */
+  subclasses: () => Promise<Map<string, ClassInheritance[]>>;
+}
+
+let indexCache: { source: Promise<ClassInheritance[]>; pending: Promise<PythonIndex> } | null = null;
+
+/**
+ * The project's graph indexed once, shared by every consumer: the gutter, the type
+ * hierarchy and the inspections all need the same name map, resolver and subclass map,
+ * and rebuilding them per call (or per feature) would walk the graph again.
+ */
+/** What the project index reads: file lines and the file a module names. */
+const PROJECT_DEPS: InheritanceDeps = {
+  readFiles: readManyFileLines,
+  moduleFile: (module, from) => lspRequest(() => commands.navResolveModule(module, from)),
+};
+
+export function projectPythonIndex(): Promise<PythonIndex> {
+  const source = pythonInheritanceGraph();
+  if (!indexCache || indexCache.source !== source) {
+    const pending = source.then(async (graph) => {
+      const index = inheritanceIndex(graph, PROJECT_DEPS);
+      let subclasses: Promise<Map<string, ClassInheritance[]>> | null = null;
+      return { classes: graph, index, subclasses: () => (subclasses ??= subclassMap(index)) };
+    });
+    indexCache = { source, pending };
+    pending.catch(() => {
+      if (indexCache?.pending === pending) indexCache = null;
+    });
+  }
+  return indexCache.pending;
+}
+
+/** Identifies one class declaration in the graph. */
+export function declarationKey(cls: ClassInheritance): string {
+  return `${cls.path}:${cls.line}:${cls.col}`;
+}
+
+/** The class declaration itself as a navigation target (its name identifier). */
+export function classLocation(cls: ClassInheritance): Location {
+  const start = { line: cls.line, col: cls.col };
+  return { path: cls.path, range: { start, end: start } };
+}
+
+/** The method `method` (bare name) directly inside the class at `cls`'s position. */
+export function methodInOutline(
+  outline: readonly OutlineItem[],
+  cls: ClassInheritance,
+  method: string,
+): OutlineItem | null {
+  const find = (items: readonly OutlineItem[]): OutlineItem | null => {
+    for (const it of items) {
+      if (
+        it.kind === "class" &&
+        it.selection_range.start.line === cls.line &&
+        it.selection_range.start.col === cls.col
+      ) {
+        return it.children.find((ch) => ch.kind === "method" && baseName(ch.name) === method) ?? null;
+      }
+      const deeper = find(it.children);
+      if (deeper) return deeper;
+    }
+    return null;
+  };
+  return find(outline);
+}
+
+/** Direct subclasses, keyed by [`declarationKey`] of the base they write. */
+export async function subclassMap(index: InheritanceIndex): Promise<Map<string, ClassInheritance[]>> {
+  const pairs: Array<[ClassInheritance, string]> = [];
+  for (const sameNamed of index.byName.values()) {
+    for (const cls of sameNamed) for (const base of new Set(cls.bases)) pairs.push([cls, base]);
+  }
+  // The files whose imports decide a base: read together, not one request per class.
+  await index.readImports(pairs.filter(([cls, base]) => !index.exact(base, cls.path).length).map(([cls]) => cls.path));
+  const resolved = await Promise.all(pairs.map(([cls, base]) => index.resolve(base, cls.path)));
+  const out = new Map<string, ClassInheritance[]>();
+  pairs.forEach(([cls], i) => {
+    for (const decl of resolved[i]!) {
+      const key = declarationKey(decl);
+      out.set(key, [...(out.get(key) ?? []), cls]);
+    }
+  });
+  return out;
+}
+
+/** The declarations `cls` directly inherits from, in the order it writes them. */
+export async function baseDeclarations(index: InheritanceIndex, cls: ClassInheritance): Promise<ClassInheritance[]> {
+  const out: ClassInheritance[] = [];
+  for (const base of cls.bases) out.push(...(await index.resolve(base, cls.path)));
+  return out;
+}
+
+/**
+ * Standard bases that declare no method a project class could override or implement (only
+ * dunders), so a chain ending in them is still fully known: `class Shape(ABC)`.
+ */
+const EMPTY_BASES: ReadonlySet<string> = new Set(["object", "ABC", "Generic", "Protocol"]);
+
+/** One class `cls` inherits from, and how far up it sits (its direct bases are depth 1). */
+export interface AncestorNode {
+  decl: ClassInheritance;
+  depth: number;
+}
+
+/** Ancestors of `cls`, and how deep the first base the project does not declare sits. */
+export interface AncestryResolution {
+  /** The declarations `cls` inherits from, nearest first. */
+  ancestors: AncestorNode[];
+  /**
+   * Depth of the shallowest base name that names no class of the project (`dict`, a library
+   * class), or `Infinity` when the chain resolved completely. A rule may trust the chain up
+   * to that depth only: a foreign base can declare or implement anything.
+   */
+  firstUnresolvedDepth: number;
+}
+
+/**
+ * Walks `cls`'s ancestry nearest first (breadth-first, each declaration once) and reports
+ * at which depth the chain leaves the project. A rule that reasons about an ancestor at
+ * depth `d` is sound exactly while `firstUnresolvedDepth > d`.
+ */
+export async function ancestryResolution(
+  index: InheritanceIndex,
+  cls: ClassInheritance,
+  depth = 8,
+): Promise<AncestryResolution> {
+  const seen = new Set<string>([declarationKey(cls)]);
+  const out: AncestorNode[] = [];
+  let firstUnresolvedDepth = Infinity;
+  let level: ClassInheritance[] = [cls];
+  for (let d = 1; d <= depth && level.length; d++) {
+    const next: ClassInheritance[] = [];
+    for (const current of level) {
+      for (const base of current.bases) {
+        const found = await index.resolve(base, current.path);
+        if (!found.length) {
+          if (!EMPTY_BASES.has(base)) firstUnresolvedDepth = Math.min(firstUnresolvedDepth, d);
+          continue;
+        }
+        for (const parent of found) {
+          if (!seen.add(declarationKey(parent))) continue;
+          out.push({ decl: parent, depth: d });
+          next.push(parent);
+        }
+      }
+    }
+    level = next;
+  }
+  return { ancestors: out, firstUnresolvedDepth };
+}
+
+/** Every ancestor of `cls`, nearest first, up to `depth` levels. */
+export async function ancestors(
+  index: InheritanceIndex,
+  cls: ClassInheritance,
+  depth = 8,
+): Promise<ClassInheritance[]> {
+  return (await ancestryResolution(index, cls, depth)).ancestors.map((node) => node.decl);
+}

src/editor/navigation/lineMarkers.test.ts

@@ -34,6 +34,7 @@ import {
   openMarkerTargets,
   type MarkerDeps,
 } from "./implementationGutter";
+import { importBindings } from "./inheritanceGraph";
 
 const ALL = enabledGroups({ showGutterIcons: true, gutterIconsDisabled: [] });
 
@@ -247,8 +248,13 @@ function server(
 }
 
 /** A Python project: the server answers neither implementations nor a type hierarchy. */
-function pythonServer(inheritance: ClassInheritance[], outlines: Record<string, OutlineItem[]>) {
-  const calls = { implementations: 0, inheritance: 0 };
+function pythonServer(
+  inheritance: ClassInheritance[],
+  outlines: Record<string, OutlineItem[]>,
+  files: Record<string, string[]> = {},
+  modules: Record<string, string> = {},
+) {
+  const calls = { implementations: 0, inheritance: 0, modules: [] as string[] };
   const deps = (): MarkerDeps => ({
     implementations: async () => {
       calls.implementations++;
@@ -260,7 +266,11 @@ function pythonServer(inheritance: ClassInheritance[], outlines: Record<string,
       },
       outline: async (p) => outlines[p] ?? [],
     },
-    readFiles: async () => new Map(),
+    readFiles: async (paths) => new Map(paths.map((p) => [p, files[p] ?? null])),
+    moduleFile: async (module, from) => {
+      calls.modules.push(`${module}@${from}`);
+      return modules[`${module}@${from}`] ?? null;
+    },
     inheritance: async () => {
       calls.inheritance++;
       return inheritance;
@@ -755,6 +765,119 @@ describe("python inheritance fallback", () => {
     expect(cachedMarkers(candidates, ALL, cache).map((m) => [m.line, m.kind])).toEqual([[0, "overridden"]]);
   });
 
+  it("resolves an ambiguous base name through the subclass file's imports", async () => {
+    // Two modules declare `Config`; `from pkg.b import Config` picks one of them, so
+    // only b.py's Config is marked as subclassed.
+    const child = [item("Child", "class", 3, 4, [], 6)];
+    const parentOutline = [item("Config", "class", 0, 1, [], 6)];
+    const graph: ClassInheritance[] = [
+      { path: "/p/a.py", line: 0, col: 6, name: "Config", bases: [] },
+      { path: "/p/b.py", line: 0, col: 6, name: "Config", bases: [] },
+      { path: "/p/c.py", line: 3, col: 6, name: "Child", bases: ["Config"] },
+    ];
+    const files = { "/p/c.py": ["from pkg.b import Config", "", "", "class Child(Config):"] };
+    const modules = { "pkg.b@/p/c.py": "/p/b.py" };
+    const { deps, calls } = pythonServer(graph, { "/p/c.py": child, "/p/b.py": parentOutline }, files, modules);
+    const candidates = markerCandidates(parentOutline, () => "");
+    const cache = emptyCache();
+    await fillMarkers("/p/b.py", candidates, ALL, deps(), cache);
+    expect(calls.modules).toEqual(["pkg.b@/p/c.py"]);
+    expect(cachedMarkers(candidates, ALL, cache).map((m) => [m.line, m.kind, m.targets.map((t) => t.path)])).toEqual([
+      [0, "overridden", ["/p/c.py"]],
+    ]);
+  });
+
+  it("resolves a base through an aliased import", async () => {
+    // c.py: `class Child(Cfg)` (line 3) with `m` (line 4); b.py's Config declares `m` too.
+    const outline = [item("Child", "class", 3, 5, [item("m", "method", 4, 4)], 6)];
+    const graph: ClassInheritance[] = [
+      { path: "/p/a.py", line: 0, col: 6, name: "Config", bases: [] },
+      { path: "/p/b.py", line: 0, col: 6, name: "Config", bases: [] },
+      { path: "/p/c.py", line: 3, col: 6, name: "Child", bases: ["Cfg"] },
+    ];
+    const files = {
+      "/p/c.py": ["from pkg.b import Config as Cfg", "", "", "class Child(Cfg):", "    def m(self): ..."],
+    };
+    const outlines = {
+      "/p/c.py": outline,
+      "/p/a.py": [item("Config", "class", 0, 2, [item("m", "method", 1, 1)], 6)],
+      "/p/b.py": [item("Config", "class", 0, 2, [item("m", "method", 1, 1)], 6)],
+    };
+    const { deps } = pythonServer(graph, outlines, files, { "pkg.b@/p/c.py": "/p/b.py" });
+    const candidates = markerCandidates(outline, () => "");
+    const cache = emptyCache();
+    await fillMarkers("/p/c.py", candidates, ALL, deps(), cache);
+    expect(cachedMarkers(candidates, ALL, cache).map((m) => [m.line, m.kind, m.targets.map((t) => t.path)])).toEqual([
+      [4, "overriding", ["/p/b.py"]],
+    ]);
+  });
+
+  it("reads no other file's imports for a shared base this file does not declare", async () => {
+    const outline = [item("Other", "class", 0, 1, [], 6)];
+    const graph: ClassInheritance[] = [
+      { path: "/p/a.py", line: 0, col: 6, name: "Config", bases: [] },
+      { path: "/p/b.py", line: 0, col: 6, name: "Config", bases: [] },
+      { path: "/p/c.py", line: 3, col: 6, name: "Child", bases: ["Config", "BaseModel"] },
+      { path: "/p/d.py", line: 0, col: 6, name: "Other", bases: [] },
+    ];
+    const files = { "/p/c.py": ["from pkg.b import Config", "", "", "class Child(Config, BaseModel):"] };
+    const { deps, calls } = pythonServer(graph, { "/p/d.py": outline }, files, { "pkg.b@/p/c.py": "/p/b.py" });
+    const cache = emptyCache();
+    await fillMarkers(
+      "/p/d.py",
+      markerCandidates(outline, () => ""),
+      ALL,
+      deps(),
+      cache,
+    );
+    expect(calls.modules).toEqual([]);
+  });
+
+  it("keeps ignoring a shared base name when no import names it", async () => {
+    const outline = [item("Child", "class", 0, 2, [], 6)];
+    const graph: ClassInheritance[] = [
+      { path: "/p/a.py", line: 0, col: 6, name: "Config", bases: [] },
+      { path: "/p/b.py", line: 0, col: 6, name: "Config", bases: [] },
+      { path: "/p/c.py", line: 0, col: 6, name: "Child", bases: ["Config"] },
+    ];
+    // No import of `Config`: the name stays ambiguous and no edge is invented.
+    const files = { "/p/c.py": ["import os", "", "class Child(Config):"] };
+    const { deps } = pythonServer(graph, { "/p/c.py": outline }, files);
+    const cache = emptyCache();
+    await fillMarkers(
+      "/p/c.py",
+      markerCandidates(outline, () => ""),
+      ALL,
+      deps(),
+      cache,
+    );
+    expect(
+      cachedMarkers(
+        markerCandidates(outline, () => ""),
+        ALL,
+        cache,
+      ),
+    ).toEqual([]);
+  });
+
+  it("reads plain, aliased and parenthesized imports", () => {
+    const bindings = importBindings([
+      "from pkg.mod import A, B as Bee",
+      "from pkg import (",
+      "    C,",
+      "    D as Dee,",
+      ")",
+      "import x.y as xy",
+      "if TYPE_CHECKING:",
+    ]);
+    expect(Object.fromEntries(bindings)).toEqual({
+      A: { module: "pkg.mod", name: "A" },
+      Bee: { module: "pkg.mod", name: "B" },
+      C: { module: "pkg", name: "C" },
+      Dee: { module: "pkg", name: "D" },
+    });
+  });
+
   it("keeps the existing server path when no inheritance graph is injected", async () => {
     const { deps } = server({}, {});
     const candidates = markerCandidates([item("Foo", "class", 0, 2, [item("m", "method", 1, 1)], 6)], () => "");

src/editor/navigation/pythonHierarchy.test.ts

@@ -0,0 +1,160 @@
+import { describe, expect, it } from "vitest";
+import type { ClassInheritance, OutlineItem } from "@/platform/ipc";
+import { superMethods } from "./structureNav";
+import { inheritanceIndex, subclassMap } from "./inheritanceGraph";
+import {
+  classAt,
+  classItem,
+  isPythonPath,
+  pythonAncestors,
+  pythonDescendants,
+  pythonHierarchy,
+  pythonImplementationTargets,
+  pythonSuperDeps,
+  pythonSupertypes,
+} from "./pythonHierarchy";
+
+const cls = (path: string, line: number, name: string, bases: string[] = []): ClassInheritance => ({
+  path,
+  line,
+  col: 6,
+  name,
+  bases,
+});
+
+// `from .animal import Base` in dog.py: two modules declare a `Base`, the import picks one.
+const GRAPH = [
+  cls("/p/animal.py", 0, "Base"),
+  cls("/p/other.py", 0, "Base"),
+  cls("/p/living.py", 0, "Living"),
+  cls("/p/dog.py", 2, "Dog", ["Base"]),
+  cls("/p/puppy.py", 4, "Puppy", ["Dog"]),
+];
+const FILES: Record<string, string[]> = {
+  "/p/dog.py": ["from .animal import Base", "", "class Dog(Base):", "    def bark(self):\n", "        pass\n"],
+};
+
+const hierarchy = pythonHierarchy(GRAPH, {
+  readFiles: async (paths) => new Map(paths.map((p) => [p, FILES[p] ?? null])),
+  // `.animal` names the animal module, as the backend's module resolver would.
+  moduleFile: async (module) => (module === ".animal" ? "/p/animal.py" : null),
+});
+
+const item = (name: string, kind: OutlineItem["kind"], start: number, end: number, children: OutlineItem[] = []) => ({
+  name,
+  detail: null,
+  kind,
+  range: { start: { line: start, col: 0 }, end: { line: end, col: 1 } },
+  selection_range: { start: { line: start, col: 6 }, end: { line: start, col: 6 + name.length } },
+  children,
+});
+
+const OUTLINES: Record<string, OutlineItem[]> = {
+  "/p/dog.py": [item("Dog", "class", 2, 6, [item("bark", "method", 3, 4)])],
+  "/p/animal.py": [item("Base", "class", 0, 5, [item("bark", "method", 1, 2), item("eat", "method", 3, 4)])],
+  "/p/living.py": [item("Living", "class", 0, 5, [item("age", "field", 1, 2)])],
+  "/p/puppy.py": [item("Puppy", "class", 4, 9, [item("bark", "method", 5, 6)])],
+};
+const outlineOf = async (path: string) => OUTLINES[path] ?? [];
+
+describe("Python inheritance graph helpers", () => {
+  it("knows Python sources and finds the class declared at a position", () => {
+    expect(isPythonPath("/p/dog.py")).toBe(true);
+    expect(isPythonPath("/p/dog.pyi")).toBe(true);
+    expect(isPythonPath("/p/Dog.java")).toBe(false);
+    expect(classAt(hierarchy, "/p/dog.py", { line: 2, col: 6 })?.name).toBe("Dog");
+    expect(classAt(hierarchy, "/p/dog.py", { line: 2, col: 0 })?.name).toBe("Dog");
+    expect(classAt(hierarchy, "/p/dog.py", { line: 7, col: 6 })).toBeNull();
+  });
+
+  it("resolves an ambiguous base name through the file's imports", async () => {
+    const dog = classAt(hierarchy, "/p/dog.py", { line: 2, col: 6 })!;
+    expect((await pythonSupertypes(hierarchy, dog)).map((c) => c.path)).toEqual(["/p/animal.py"]);
+    expect((await pythonAncestors(hierarchy, dog)).map((c) => c.name)).toEqual(["Base"]);
+    // A Base in another module is no supertype of Dog.
+    const other = classAt(hierarchy, "/p/other.py", { line: 0, col: 6 })!;
+    expect(await pythonDescendants(hierarchy, other)).toEqual([]);
+  });
+
+  it("lists every descendant level by level", async () => {
+    const base = classAt(hierarchy, "/p/animal.py", { line: 0, col: 6 })!;
+    expect((await pythonDescendants(hierarchy, base)).map((c) => c.name)).toEqual(["Dog", "Puppy"]);
+  });
+
+  it("shapes graph classes as hierarchy items at their name", () => {
+    const dog = classAt(hierarchy, "/p/dog.py", { line: 2, col: 6 })!;
+    expect(classItem(dog)).toMatchObject({
+      name: "Dog",
+      kind: "class",
+      path: "/p/dog.py",
+      selectionRange: { start: { line: 2, col: 6 }, end: { line: 2, col: 9 } },
+    });
+  });
+});
+
+describe("Python Super Method", () => {
+  it("finds the nearest super method through the graph's supertypes", async () => {
+    const deps = pythonSuperDeps(hierarchy, outlineOf);
+    const locs = await superMethods("/p/dog.py", { line: 2, col: 6 }, "bark", deps);
+    // Dog inherits from Base, which declares bark.
+    expect(locs.map((l) => `${l.path}:${l.range.start.line}`)).toEqual(["/p/animal.py:1"]);
+  });
+
+  it("answers the super class of a type with no method at the caret", async () => {
+    const items = await pythonSuperDeps(hierarchy, outlineOf).supertypes("/p/dog.py", { line: 2, col: 6 });
+    expect(items.map((i) => i.name)).toEqual(["Base"]);
+  });
+});
+
+describe("Python Go to Implementation", () => {
+  it("targets every descendant class of the class at the caret", async () => {
+    const targets = await pythonImplementationTargets(hierarchy, "/p/dog.py", { line: 2, col: 6 }, outlineOf);
+    expect(targets.map((l) => `${l.path}:${l.range.start.line}`)).toEqual(["/p/puppy.py:4"]);
+  });
+
+  it("targets the overriding methods of a method at the caret", async () => {
+    const targets = await pythonImplementationTargets(hierarchy, "/p/dog.py", { line: 3, col: 8 }, outlineOf);
+    expect(targets.map((l) => `${l.path}:${l.range.start.line}`)).toEqual(["/p/puppy.py:5"]);
+  });
+
+  it("keeps the server's answer useful when the project graph knows nothing", async () => {
+    // The graph's own answer: a class without descendants has no implementation.
+    const targets = await pythonImplementationTargets(hierarchy, "/p/puppy.py", { line: 4, col: 6 }, outlineOf);
+    expect(targets).toEqual([]);
+  });
+});
+
+describe("the project's subclass map", () => {
+  it("reads the deciding imports in one batch and looks up only modules that can name a class", async () => {
+    const graph = [
+      cls("/p/a.py", 0, "Base"),
+      cls("/p/b.py", 0, "Base"),
+      cls("/p/c.py", 0, "Child", ["Base"]),
+      cls("/p/d.py", 0, "Model", ["BaseModel"]),
+      cls("/p/e.py", 0, "Other", ["Base"]),
+    ];
+    const files: Record<string, string[]> = {
+      "/p/c.py": ["from .a import Base"],
+      "/p/d.py": ["from pydantic import BaseModel"],
+      "/p/e.py": ["from .b import Base"],
+    };
+    const reads: string[][] = [];
+    const lookups: string[] = [];
+    const index = inheritanceIndex(graph, {
+      readFiles: async (paths) => {
+        reads.push([...paths]);
+        return new Map(paths.map((p) => [p, files[p] ?? null]));
+      },
+      moduleFile: async (module) => {
+        lookups.push(module);
+        return module === ".a" ? "/p/a.py" : module === ".b" ? "/p/b.py" : null;
+      },
+    });
+    const map = await subclassMap(index);
+    expect(reads).toEqual([["/p/c.py", "/p/d.py", "/p/e.py"]]);
+    // pydantic's BaseModel is no class of the project: its module is never looked up.
+    expect(lookups.sort()).toEqual([".a", ".b"]);
+    expect(map.get("/p/a.py:0:6")?.map((c) => c.name)).toEqual(["Child"]);
+    expect(map.get("/p/b.py:0:6")?.map((c) => c.name)).toEqual(["Other"]);
+  });
+});

src/editor/navigation/pythonHierarchy.ts

@@ -0,0 +1,177 @@
+/**
+ * Type hierarchy, super methods and implementations for Python from the IDE's inheritance
+ * graph. basedpyright and pyrefly declare no `typeHierarchyProvider` and analyse a single
+ * root, so those features cannot be answered by the server; the graph knows every
+ * `class X(Base)` of the project, attached dependency roots included.
+ */
+import { type ClassInheritance, type HierarchyItem, type Location, type OutlineItem, type Pos } from "@/platform/ipc";
+import {
+  ancestors,
+  baseDeclarations,
+  classLocation,
+  declarationKey,
+  inheritanceIndex,
+  methodInOutline,
+  projectPythonIndex,
+  subclassMap,
+  type InheritanceDeps,
+  type InheritanceIndex,
+} from "./inheritanceGraph";
+import { baseName, memberAt, type SuperDeps } from "./structureNav";
+
+/** The project's classes with their base names, indexed for lookups. */
+export interface PythonHierarchy {
+  index: InheritanceIndex;
+  /** Classes by `path:line`, so a position lookup does not scan the whole project graph. */
+  byLine: ReadonlyMap<string, ClassInheritance[]>;
+  /** Direct subclasses by [`declarationKey`] of the base they write (from the shared index). */
+  subclasses?: () => Promise<ReadonlyMap<string, ClassInheritance[]>>;
+}
+
+/** Indexes `classes`; `deps` reads the files an ambiguous base name's imports point at. */
+export function pythonHierarchy(classes: readonly ClassInheritance[], deps: InheritanceDeps): PythonHierarchy {
+  const byLine = new Map<string, ClassInheritance[]>();
+  for (const cls of classes) {
+    const key = `${cls.path}:${cls.line}`;
+    byLine.set(key, [...(byLine.get(key) ?? []), cls]);
+  }
+  return { index: inheritanceIndex(classes, deps), byLine };
+}
+
+/** Whether `path` is a Python source the inheritance graph covers. */
+export const isPythonPath = (path: string) => /\.pyi?$/.test(path);
+
+let cache: { classes: readonly ClassInheritance[]; byLine: Map<string, ClassInheritance[]> } | null = null;
+
+/** The open project's graph, indexed once and shared with the gutter and the inspections. */
+export async function projectPythonHierarchy(): Promise<PythonHierarchy> {
+  const project = await projectPythonIndex();
+  if (cache?.classes !== project.classes) {
+    const byLine = new Map<string, ClassInheritance[]>();
+    for (const cls of project.classes) {
+      const key = `${cls.path}:${cls.line}`;
+      byLine.set(key, [...(byLine.get(key) ?? []), cls]);
+    }
+    cache = { classes: project.classes, byLine };
+  }
+  return { index: project.index, byLine: cache.byLine, subclasses: project.subclasses };
+}
+
+/** The graph's class declared on `pos`'s line in `path` (the column picks between two on one line). */
+export function classAt(hierarchy: PythonHierarchy, path: string, pos: Pos): ClassInheritance | null {
+  const onLine = hierarchy.byLine.get(`${path}:${pos.line}`) ?? [];
+  return onLine.find((c) => c.col === pos.col) ?? (onLine.length === 1 ? onLine[0]! : null);
+}
+
+/** A graph class as the type-hierarchy / supertype item a language server would return. */
+export function classItem(cls: ClassInheritance): HierarchyItem {
+  const range = { start: { line: cls.line, col: cls.col }, end: { line: cls.line, col: cls.col + cls.name.length } };
+  return {
+    name: cls.name,
+    kind: "class",
+    detail: null,
+    path: cls.path,
+    range,
+    selectionRange: range,
+    fromRanges: [],
+  };
+}
+
+/** The declarations `cls` directly inherits from, in the order it writes them. */
+export const pythonSupertypes = (hierarchy: PythonHierarchy, cls: ClassInheritance) =>
+  baseDeclarations(hierarchy.index, cls);
+
+/** The Python supertypes of the type at `pos` in `path`, as hierarchy items. */
+export async function pythonSupertypeItems(
+  hierarchy: PythonHierarchy,
+  path: string,
+  pos: Pos,
+): Promise<HierarchyItem[]> {
+  const cls = classAt(hierarchy, path, pos);
+  return cls ? (await pythonSupertypes(hierarchy, cls)).map(classItem) : [];
+}
+
+const subclassMaps = new WeakMap<PythonHierarchy, Promise<Map<string, ClassInheritance[]>>>();
+
+/** Direct subclasses: the shared index's map, or one derived for a hand-built hierarchy. */
+function subclassesOf(hierarchy: PythonHierarchy): Promise<ReadonlyMap<string, ClassInheritance[]>> {
+  if (hierarchy.subclasses) return hierarchy.subclasses();
+  let map = subclassMaps.get(hierarchy);
+  if (!map) subclassMaps.set(hierarchy, (map = subclassMap(hierarchy.index)));
+  return map;
+}
+
+/** The declarations directly inheriting from `cls`. */
+export async function pythonSubtypes(hierarchy: PythonHierarchy, cls: ClassInheritance): Promise<ClassInheritance[]> {
+  return (await subclassesOf(hierarchy)).get(declarationKey(cls)) ?? [];
+}
+
+/** Every ancestor of `cls`, nearest first. */
+export const pythonAncestors = (hierarchy: PythonHierarchy, cls: ClassInheritance) => ancestors(hierarchy.index, cls);
+
+/** Every descendant of `cls`, nearest level first, each declaration once. */
+export async function pythonDescendants(
+  hierarchy: PythonHierarchy,
+  cls: ClassInheritance,
+  depth = 8,
+): Promise<ClassInheritance[]> {
+  const subclasses = await subclassesOf(hierarchy);
+  const seen = new Set<string>([declarationKey(cls)]);
+  const out: ClassInheritance[] = [];
+  let level = [cls];
+  for (let d = 0; d < depth && level.length; d++) {
+    const next: ClassInheritance[] = [];
+    for (const parent of level) {
+      for (const sub of subclasses.get(declarationKey(parent)) ?? []) {
+        if (!seen.add(declarationKey(sub))) continue;
+        out.push(sub);
+        next.push(sub);
+      }
+    }
+    level = next;
+  }
+  return out;
+}
+
+/** Super Method (⌘U) deps backed by the graph, for a language server without a type hierarchy. */
+export function pythonSuperDeps(
+  hierarchy: PythonHierarchy,
+  outline: (path: string) => Promise<OutlineItem[]>,
+): SuperDeps {
+  return {
+    supertypes: (path, pos) => pythonSupertypeItems(hierarchy, path, pos),
+    outline,
+  };
+}
+
+/**
+ * Go to Implementation targets of the Python class or method at `pos` in `path`: the classes
+ * inheriting from it, or the methods overriding it, anywhere below it in the graph.
+ */
+export async function pythonImplementationTargets(
+  hierarchy: PythonHierarchy,
+  path: string,
+  pos: Pos,
+  outline: (path: string) => Promise<OutlineItem[]>,
+  depth = 8,
+): Promise<Location[]> {
+  const outlines = new Map<string, Promise<OutlineItem[]>>();
+  const outlineOf = (p: string) => {
+    let o = outlines.get(p);
+    if (!o) outlines.set(p, (o = outline(p).catch(() => [] as OutlineItem[])));
+    return o;
+  };
+  const member = memberAt(await outlineOf(path), pos);
+  if (!member.type) return [];
+  const cls = classAt(hierarchy, path, member.type.selection_range.start);
+  if (!cls) return [];
+  const descendants = await pythonDescendants(hierarchy, cls, depth);
+  if (!member.method) return descendants.map(classLocation);
+  const name = baseName(member.method.name);
+  const targets: Location[] = [];
+  for (const sub of descendants) {
+    const method = methodInOutline(await outlineOf(sub.path), sub, name);
+    if (method) targets.push({ path: sub.path, range: method.selection_range });
+  }
+  return targets;
+}

src/features/agents/Composer.module.css

@@ -189,6 +189,40 @@
 .modelEffortPopup .modelList {
   max-height: 216px;
 }
+.catalogFooter {
+  margin-top: 6px;
+  padding: 8px 12px 2px;
+  border-top: 1px solid var(--border);
+}
+.catalogNote,
+.catalogError {
+  margin: 0;
+  padding: 6px 12px;
+  color: var(--fg-muted);
+  font-size: var(--fs-small);
+  overflow-wrap: anywhere;
+}
+.catalogError {
+  color: var(--danger);
+}
+.catalogFooter .catalogError {
+  padding: 0 0 8px;
+}
+.refreshModels {
+  padding: 4px 0;
+  border: 0;
+  background: transparent;
+  color: var(--fg);
+  font: inherit;
+  cursor: pointer;
+}
+.refreshModels:hover:not(:disabled) {
+  color: var(--fg-strong);
+}
+.refreshModels:disabled {
+  color: var(--fg-muted);
+  cursor: default;
+}
 .effortHeader {
   display: flex;
   align-items: baseline;

src/features/agents/Composer.tsx

@@ -133,6 +133,8 @@ export interface ComposerProps {
   onSubmit: (now: boolean) => void;
   disabled?: boolean;
   autoFocus?: boolean;
+  /** A request from this host to focus its input without changing the selection. */
+  focusRequest?: number;
   /** Left of the bottom row: agent / model / mode pickers. */
   toolbar?: ReactNode;
   /** Right of the bottom row: send / stop buttons. */
@@ -346,6 +348,16 @@ export function Composer(props: ComposerProps) {
     });
   }, [focus]);
 
+  const previousFocusRequest = useRef(props.focusRequest);
+  useEffect(() => {
+    if (previousFocusRequest.current === props.focusRequest) return;
+    previousFocusRequest.current = props.focusRequest;
+    const view = viewRef.current;
+    if (!props.focusRequest || props.disabled || !view) return;
+    view.focus();
+    view.dispatch({ scrollIntoView: true });
+  }, [props.focusRequest, props.disabled]);
+
   // `@` completion: project file search, mapped into the task's directory.
   useEffect(() => {
     if (completion?.kind !== "file") return;

src/features/agents/ConfigPickers.tsx

@@ -4,7 +4,7 @@
  * list and an effort slider; with a mode and an on/off permissions option (Allow All),
  * the mode menu carries the switch. Names and descriptions are the agent's own.
  */
-import { useRef, useState, type CSSProperties } from "react";
+import { useEffect, useRef, useState, type CSSProperties } from "react";
 import clsx from "clsx";
 import type { AgentConfigOption } from "@/bindings";
 import { useTx } from "@/platform/i18n";
@@ -48,25 +48,45 @@ function switchValues(option: AgentConfigOption): { on: string; off: string } |
 const selected = (option: AgentConfigOption, value: string | null) =>
   option.values.find((v) => v.value === value) ?? null;
 
+interface ModelRefresh {
+  refreshing: boolean;
+  retryAtMs: number | null;
+  error: string | null;
+  onRefresh: () => void;
+}
+
 export function ConfigPickers({
   config,
   values,
   onChange,
+  modelRefresh,
 }: {
   config: readonly AgentConfigOption[];
   /** Chosen values that override `current`, by option id. */
   values?: Record<string, string>;
   onChange: (option: string, value: string) => void;
+  /** Only New Task supplies catalog discovery; session pickers retain their own settings. */
+  modelRefresh?: ModelRefresh;
 }) {
   const tx = useTx();
   const [open, setOpen] = useState(false);
   const anchor = useRef<HTMLButtonElement>(null);
   const options = mainOptions(config);
+  if (modelRefresh && !options.some((o) => o.category === "model"))
+    options.unshift({
+      id: "model",
+      name: "Model",
+      category: "model",
+      description: null,
+      current: null,
+      values: [],
+      via: "option",
+    });
   const valueOf = (o: AgentConfigOption) => values?.[o.id] ?? o.current ?? null;
   const model = options.find((o) => o.category === "model");
   const effort = config.find((o) => o.category === "thought_level" && o.values.length > 0);
   const modelConfigs = modelConfigOptions(config);
-  const combinedModel = model && (effort || modelConfigs.length > 0);
+  const combinedModel = model && (modelRefresh || effort || modelConfigs.length > 0);
   const tuckedModelConfig = new Set(modelConfigs.map((o) => o.id));
   const mode = options.find((o) => o.category === "mode");
   const allowAll = mode && options.find((o) => switchValues(o));
@@ -92,6 +112,7 @@ export function ConfigPickers({
               modelConfigs={modelConfigs}
               valueOf={valueOf}
               onChange={onChange}
+              modelRefresh={modelRefresh}
             />
           ) : o === mode && allowAll ? (
             <ModePicker
@@ -206,6 +227,7 @@ function ModelEffortPicker({
   modelConfigs,
   valueOf,
   onChange,
+  modelRefresh,
 }: {
   model: AgentConfigOption;
   modelValue: string | null;
@@ -214,11 +236,15 @@ function ModelEffortPicker({
   modelConfigs: AgentConfigOption[];
   valueOf: (o: AgentConfigOption) => string | null;
   onChange: (option: string, value: string) => void;
+  modelRefresh?: ModelRefresh;
 }) {
   const tx = useTx();
   const [open, setOpen] = useState(false);
   const anchor = useRef<HTMLButtonElement>(null);
-  const modelName = selected(model, modelValue)?.name ?? tx("Default");
+  const unavailable = modelRefresh && modelValue !== null && !selected(model, modelValue);
+  const modelName = unavailable
+    ? tx`${modelValue} (unavailable)`
+    : (selected(model, modelValue)?.name ?? tx("Default"));
   const effortName = effort ? (selected(effort, effortValue)?.name ?? tx("Default")) : null;
   const modelConfigSummary = modelConfigs
     .map((o) => {
@@ -266,6 +292,11 @@ function ModelEffortPicker({
         aria-label={tx("Model & effort settings")}
         className={styles.modelEffortPopup}
       >
+        {unavailable && (
+          <p className={styles.catalogError} role="alert">
+            <T>Choose another model before starting.</T>
+          </p>
+        )}
         {effort && (
           <div className={styles.effortBlock}>
             <div className={styles.effortHeader}>
@@ -281,19 +312,50 @@ function ModelEffortPicker({
             <ConfigPicker option={o} value={valueOf(o)} onChange={onChange} framed />
           </div>
         ))}
-        <SelectListbox
-          aria-label={tx(model.name)}
-          value={modelValue}
-          options={configPickerOptions(model)}
-          searchable
-          listClassName={styles.modelList}
-          onChoose={(v) => onChange(model.id, v)}
-        />
+        {model.values.length > 0 || !modelRefresh ? (
+          <SelectListbox
+            aria-label={tx(model.name)}
+            value={modelValue}
+            options={configPickerOptions(model)}
+            searchable
+            listClassName={styles.modelList}
+            onChoose={(v) => onChange(model.id, v)}
+          />
+        ) : (
+          <p className={styles.catalogNote} role="status">
+            {modelRefresh?.refreshing ? <T>Loading models…</T> : <T>No models reported by this agent.</T>}
+          </p>
+        )}
+        {modelRefresh && <ModelRefreshFooter key={modelRefresh.retryAtMs} {...modelRefresh} />}
       </Popup>
     </>
   );
 }
 
+function ModelRefreshFooter({ refreshing, retryAtMs, error, onRefresh }: ModelRefresh) {
+  const tx = useTx();
+  const [now, setNow] = useState(Date.now);
+  const remaining = retryAtMs == null ? 0 : Math.max(0, Math.ceil((retryAtMs - now) / 1000));
+  const coolingDown = remaining > 0;
+  useEffect(() => {
+    if (!coolingDown) return;
+    const timer = window.setInterval(() => setNow(Date.now()), 1000);
+    return () => window.clearInterval(timer);
+  }, [retryAtMs, coolingDown]);
+  return (
+    <div className={styles.catalogFooter}>
+      {error && (
+        <p className={styles.catalogError} role="alert">
+          {tx`Could not refresh models: ${error}`}
+        </p>
+      )}
+      <button type="button" className={styles.refreshModels} disabled={refreshing || coolingDown} onClick={onRefresh}>
+        {refreshing ? tx("Refreshing…") : coolingDown ? tx`Refresh in ${remaining}s` : tx("Refresh models")}
+      </button>
+    </div>
+  );
+}
+
 /** A stepped slider over the agent's effort levels, in the order the agent lists them. */
 function EffortSlider({
   option,

src/features/agents/HomeEditor.test.tsx

@@ -3,7 +3,7 @@ import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import type { AgentConfigOption, AgentProvider, NewAgentTask } from "@/bindings";
 import { useProject } from "@/platform/project";
 import { HomeEditor } from "./HomeEditor";
-import { HOME, savedDraft, updateComposer, useAgents } from "./store";
+import { HOME, disconnect, savedDraft, updateComposer, useAgents } from "./store";
 
 const backend = vi.hoisted(() => ({ providers: [] as AgentProvider[], create: vi.fn() }));
 const ok = <T,>(data: T) => Promise.resolve({ status: "ok", data });
@@ -11,6 +11,16 @@ vi.mock("@/platform/ipc", async (original) => ({
   ...(await original<typeof import("@/platform/ipc")>()),
   commands: {
     agentProviders: () => ok(backend.providers),
+    agentRefreshModels: (provider: string) =>
+      ok({
+        provider,
+        config: backend.providers.find((p) => p.id === provider)?.config ?? [],
+        thoughtLevels: backend.providers.find((p) => p.id === provider)?.thoughtLevels ?? {},
+        refreshing: false,
+        refreshedAtMs: Date.now(),
+        retryAtMs: null,
+        error: null,
+      }),
     agentProbe: () => ok(null),
     vcsBranchInfo: () => ok({ head: "main" }),
     vcsBranches: () => ok([]),
@@ -34,6 +44,7 @@ const option = (id: string, category: string, values: string[], current: string)
 });
 
 beforeEach(() => {
+  disconnect();
   backend.create.mockReset().mockImplementation((req: NewAgentTask) => ok({ id: "new", config: req.config }));
   backend.providers = [
     {
@@ -95,7 +106,7 @@ it("switches model-specific levels and restores each draft effort before startin
 it.each(["plain", "unknown"])("hides effort for %s models and sends no stale effort", async (model) => {
   render(<HomeEditor />);
   await chooseModel(model);
-  expect(screen.getByRole("button", { name: "Model" })).toHaveAttribute("aria-haspopup", "listbox");
+  expect(screen.getByRole("button", { name: "Model" })).toHaveAttribute("aria-haspopup", "dialog");
   fireEvent.click(screen.getByRole("button", { name: "Start" }));
   await waitFor(() => expect(backend.create).toHaveBeenCalled());
   expect(backend.create.mock.calls[0]![0].config).toEqual([{ id: "model", value: model }]);

src/features/agents/HomeEditor.tsx

@@ -20,6 +20,7 @@ import {
   NO_COMMANDS,
   draftConfig,
   refreshProviders,
+  refreshModels,
   setDraftOption,
   startTask,
   updateDraft,
@@ -81,6 +82,24 @@ export function HomeEditor({ docked = false }: { docked?: boolean; input?: Edito
 
   const provider = providers.find((p) => p.id === draft.provider) ?? providers[0];
   const probe = useProbe(provider?.installed ? provider.id : null, provider?.command);
+  const catalog = useAgents((s) => s.modelCatalogs.get(provider?.id ?? ""));
+  const requestingModels = useAgents((s) => s.modelRequests.has(provider?.id ?? ""));
+  const launch = provider && JSON.stringify([provider.program, provider.args, provider.env, provider.command]);
+  useEffect(() => {
+    if (!provider?.installed) return;
+    const refresh = () => void refreshModels(provider.id, false);
+    refresh();
+    window.addEventListener("focus", refresh);
+    return () => window.removeEventListener("focus", refresh);
+  }, [provider?.id, provider?.installed, launch, project?.root]);
+  const defaults = useAgentSettings().defaults;
+  const config = draftConfig(provider, draft, (provider && defaults[provider.id]) || {});
+  const unavailableModel = config.some(
+    (o) =>
+      o.category === "model" &&
+      draft.config[o.id] !== undefined &&
+      !o.values.some((v) => v.value === draft.config[o.id]),
+  );
   const agentCommands = useAgentCommands(provider?.id, null, provider?.commands ?? NO_COMMANDS);
   const providerOptions: SelectOption[] = agentOptions(providers, tx, providerIcon);
   // Without git under the project there are no worktrees: force the local checkout.
@@ -88,7 +107,11 @@ export function HomeEditor({ docked = false }: { docked?: boolean; input?: Edito
   const isolation = isGit ? draft.isolation : "local";
   const base = draft.base ?? current;
   const canStart =
-    canSend(composer) && !!provider?.installed && !starting && (!project?.workspace || repoState?.root === root);
+    canSend(composer) &&
+    !!provider?.installed &&
+    !unavailableModel &&
+    !starting &&
+    (!project?.workspace || repoState?.root === root);
 
   const start = () => {
     if (!canStart) return;
@@ -98,8 +121,6 @@ export function HomeEditor({ docked = false }: { docked?: boolean; input?: Edito
       .catch((e: unknown) => setError(e instanceof Error ? e.message : String(e)))
       .finally(() => setStarting(false));
   };
-  const defaults = useAgentSettings().defaults;
-  const config = draftConfig(provider, draft, (provider && defaults[provider.id]) || {});
 
   return (
     <div className={clsx(styles.home, docked && styles.docked)}>
@@ -209,7 +230,21 @@ export function HomeEditor({ docked = false }: { docked?: boolean; input?: Edito
                   id === ADD_AGENT ? void executeAction("agents.addAgent") : updateDraft({ provider: id, config: {} })
                 }
               />
-              <ConfigPickers config={config} onChange={setDraftOption} />
+              <ConfigPickers
+                key={provider?.id}
+                config={config}
+                onChange={setDraftOption}
+                modelRefresh={
+                  provider?.installed
+                    ? {
+                        refreshing: requestingModels || (catalog?.refreshing ?? false),
+                        retryAtMs: catalog?.retryAtMs ?? null,
+                        error: catalog?.error ?? null,
+                        onRefresh: () => void executeAction("agents.refreshModels"),
+                      }
+                    : undefined
+                }
+              />
             </>
           }
           actions={
@@ -223,6 +258,11 @@ export function HomeEditor({ docked = false }: { docked?: boolean; input?: Edito
         />
         {/* Notes under the box don't take part in centring, so the box stays put as they come and go. */}
         <div className={styles.notes}>
+          {unavailableModel && (
+            <p className={styles.warning} role="alert">
+              <T>Choose another model before starting.</T>
+            </p>
+          )}
           {probe && (!docked || probe.error) && (
             <p className={probe.error ? styles.warning : styles.note}>
               {probe.error
@@ -230,17 +270,12 @@ export function HomeEditor({ docked = false }: { docked?: boolean; input?: Edito
                 : [probe.name, probe.version, probe.protocol].filter(Boolean).join(" · ")}
             </p>
           )}
-          {(error || (provider && !provider.installed) || (provider && !provider.config.length)) && (
+          {(error || (provider && !provider.installed)) && (
             <p
               className={error || !provider?.installed ? styles.warning : styles.note}
               role={error ? "alert" : undefined}
             >
-              {error ??
-                (provider && !provider.installed ? (
-                  txTemplate(`${provider.command} was not found on PATH`)
-                ) : (
-                  <T>Models and modes appear after this agent's first task.</T>
-                ))}
+              {error ?? txTemplate(`${provider?.command ?? ""} was not found on PATH`)}
             </p>
           )}
         </div>

src/features/agents/SessionEditor.tsx

@@ -201,23 +201,36 @@ function TaskSession({ id, docked }: { id: string; docked: boolean }) {
   const openSubagent = useCallback((sub: string) => setPath((p) => [...p, sub]), []);
   const [finding, setFinding] = useState(false);
   const [findFocus, setFindFocus] = useState(0);
-  const [session] = useState<FocusedSession>(() => ({
-    openFind: () => {
-      setFinding(true);
-      setFindFocus((n) => n + 1);
-    },
-  }));
-  useEffect(
-    () => () => {
-      if (focusedSession() === session) setFocusedSession(null);
-    },
-    [session],
+  const [inputFocus, setInputFocus] = useState(0);
+  const sessionRoot = useRef<HTMLDivElement>(null);
+  const canFocusInput = shown && !!task && task.status !== "archived" && !view;
+  const session = useMemo<FocusedSession>(
+    () => ({
+      openFind: () => {
+        setFinding(true);
+        setFindFocus((n) => n + 1);
+      },
+      focusInput: canFocusInput
+        ? () => {
+            if (docked) setChangesOpen(false);
+            setInputFocus((n) => n + 1);
+          }
+        : undefined,
+    }),
+    [canFocusInput, docked, setChangesOpen],
   );
+  useLayoutEffect(() => {
+    if (shown && sessionRoot.current?.contains(document.activeElement)) setFocusedSession(session);
+    return () => {
+      if (focusedSession() === session) setFocusedSession(null);
+    };
+  }, [session, shown]);
   if (!task) return <EmptyState title="This agent task no longer exists" />;
   return (
     <div
+      ref={sessionRoot}
       className={clsx(styles.session, docked && styles.docked)}
-      onFocusCapture={() => setFocusedSession(session)}
+      onFocusCapture={() => shown && setFocusedSession(session)}
       onBlurCapture={(e) => {
         if (!e.currentTarget.contains(e.relatedTarget as Node | null) && focusedSession() === session) {
           setFocusedSession(null);
@@ -248,6 +261,7 @@ function TaskSession({ id, docked }: { id: string; docked: boolean }) {
             <QuestionCard task={task} entries={entries ?? null} />
             <SessionComposer
               task={task}
+              focusRequest={inputFocus}
               entries={entries ?? null}
               head={head}
               changes={changes ?? null}
@@ -2680,6 +2694,7 @@ function PendingPermission({ task, entry }: { task: AgentTask; entry: Permission
 
 function SessionComposer({
   task,
+  focusRequest,
   entries,
   head,
   changes,
@@ -2689,6 +2704,7 @@ function SessionComposer({
   onOpenSubagent,
 }: {
   task: AgentTask;
+  focusRequest: number;
   entries: AgentEntry[] | null;
   head: string | null;
   changes: AgentChange[] | null;
@@ -2766,6 +2782,7 @@ function SessionComposer({
       </Tray>
       <Composer
         id={task.id}
+        focusRequest={focusRequest}
         placeholder={
           !busy
             ? "Reply to the agent"
@@ -2906,15 +2923,18 @@ function useChangesOpen(
     open: docked ? false : loadChangesOpen()[task],
   }));
   const chosen = state.task === task ? state.open : docked ? false : loadChangesOpen()[task];
-  const set = (open: boolean) => {
-    setState({ task, open });
-    if (docked) return;
-    try {
-      globalThis.localStorage?.setItem(CHANGES_OPEN_KEY, JSON.stringify({ ...loadChangesOpen(), [task]: open }));
-    } catch {
-      /* storage unavailable */
-    }
-  };
+  const set = useCallback(
+    (open: boolean) => {
+      setState({ task, open });
+      if (docked) return;
+      try {
+        globalThis.localStorage?.setItem(CHANGES_OPEN_KEY, JSON.stringify({ ...loadChangesOpen(), [task]: open }));
+      } catch {
+        /* storage unavailable */
+      }
+    },
+    [task, docked],
+  );
   return [chosen ?? (changes?.length ?? 0) > 0, set];
 }
 

src/features/agents/composerCommands.test.tsx

@@ -20,6 +20,18 @@ vi.mock("@/platform/ipc", async (importOriginal) => {
       ...real.commands,
       agentCommands: (provider: string, task: string | null) => agentCommands(provider, task),
       agentCreate: (request: unknown) => agentCreate(request),
+      agentRefreshModels: async (provider: string) => ({
+        status: "ok",
+        data: {
+          provider,
+          config: [],
+          thoughtLevels: {},
+          refreshing: false,
+          refreshedAtMs: Date.now(),
+          retryAtMs: null,
+          error: null,
+        },
+      }),
       clipboardImage: () => clipboardImage(),
       vcsBranchInfo: (root: string | null) => vcsBranchInfo(root),
       vcsBranches: (root: string | null) => vcsBranches(root),

src/features/agents/composerSubmission.test.tsx

@@ -40,6 +40,18 @@ vi.mock("@/platform/ipc", async (original) => ({
     agentPrompt: backend.prompt,
     agentSubscribe: async () => ({ status: "ok", data: [] }),
     agentProviders: async () => ({ status: "ok", data: [provider] }),
+    agentRefreshModels: async (id: string) => ({
+      status: "ok",
+      data: {
+        provider: id,
+        config: provider.config,
+        thoughtLevels: {},
+        refreshing: false,
+        refreshedAtMs: Date.now(),
+        retryAtMs: null,
+        error: null,
+      },
+    }),
     agentProbe: async () => ({ status: "ok", data: null }),
     agentEntries: async () => ({ status: "ok", data: [] }),
     agentChanges: async () => ({ status: "ok", data: [] }),

src/features/agents/index.ts

@@ -35,7 +35,16 @@ import {
 } from "./model";
 import { sendPaths, sendSelection, trackEditorCopies } from "./references";
 import { focusedSession } from "./sessionFocus";
-import { closeActiveTask, closeAndNewTask, connect, disconnect, openHome, refreshProviders, useAgents } from "./store";
+import {
+  closeActiveTask,
+  closeAndNewTask,
+  connect,
+  disconnect,
+  openHome,
+  refreshModels,
+  refreshProviders,
+  useAgents,
+} from "./store";
 import { TaskStatusMark } from "./TaskStatusMark";
 import { taskActions, useAgentsHeaderMenu } from "./taskActions";
 import { replyActions } from "./replyActions";
@@ -191,6 +200,15 @@ export function activate(): () => void {
         when: "agentSessionFocus",
         run: () => focusedSession()?.openFind(),
       },
+      {
+        id: "agents.focusInput",
+        title: "Focus Agent Input",
+        description: "Focuses the message input of the current agent task without moving the caret.",
+        category: "Agents",
+        when: "agentSessionFocus && agentInputAvailable",
+        keyWhen: "agentSessionFocus && !popupOpen",
+        run: () => focusedSession()?.focusInput?.(),
+      },
       {
         id: "agents.newTask",
         title: "New Agent Task",
@@ -201,6 +219,13 @@ export function activate(): () => void {
         keywords: ["agent", "claude", "codex", "gemini", "ai"],
         run: ({ arg }) => openHome(typeof arg === "string" ? arg : undefined),
       },
+      {
+        id: "agents.refreshModels",
+        title: "Refresh models",
+        category: "Agents",
+        when: "projectOpen",
+        run: () => refreshModels(),
+      },
       {
         id: "agents.closeTask",
         title: "Close Agent Task",

src/features/agents/modelRefresh.test.tsx

@@ -0,0 +1,348 @@
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import { act, cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { clearMocks, mockIPC, mockWindows } from "@tauri-apps/api/mocks";
+import type {
+  AgentConfigOption,
+  AgentEvent,
+  AgentModelCatalog,
+  AgentProvider,
+  NewAgentTask,
+  ProjectInfo,
+} from "@/bindings";
+import { executeAction } from "@/platform/actions";
+import { setContext } from "@/platform/context";
+import { useProject } from "@/platform/project";
+import { HomeEditor } from "./HomeEditor";
+import { activate } from "./index";
+import { HOME, connect, savedDraft, updateComposer, useAgents } from "./store";
+
+const backend = vi.hoisted(() => ({
+  providers: [] as AgentProvider[],
+  channel: null as { onmessage: (event: AgentEvent) => void } | null,
+  refresh: vi.fn(),
+  create: vi.fn(),
+  notify: vi.fn(),
+}));
+const ok = <T,>(data: T) => ({ status: "ok" as const, data });
+vi.mock("@tauri-apps/api/core", async (original) => ({
+  ...(await original<typeof import("@tauri-apps/api/core")>()),
+  Channel: class {
+    onmessage = () => {};
+  },
+}));
+vi.mock("@/platform/ipc", async (original) => ({
+  ...(await original<typeof import("@/platform/ipc")>()),
+  isTauri: () => true,
+  commands: {
+    agentSubscribe: async (channel: typeof backend.channel) => {
+      backend.channel = channel;
+      return ok([]);
+    },
+    agentProviders: async () => ok(backend.providers),
+    agentRefreshModels: (provider: string, force: boolean) => backend.refresh(provider, force),
+    agentProbe: async () => ok(null),
+    agentCommands: async () => ok([]),
+    vcsBranchInfo: async () => ok({ head: "main" }),
+    vcsBranches: async () => ok([]),
+    agentCreate: (request: NewAgentTask) => backend.create(request),
+  },
+}));
+vi.mock("@/workbench/contributions", async (original) => ({
+  ...(await original<typeof import("@/workbench/contributions")>()),
+  maybeEditorService: () => ({ activePath: () => null }),
+  editorService: () => ({
+    activePath: () => null,
+    activeInput: () => null,
+    openTabs: () => [],
+    closeInput: () => false,
+  }),
+  notifications: () => ({ notify: backend.notify }),
+}));
+
+const option = (id: string, category: string, values: string[], current = values[0] ?? null): AgentConfigOption => ({
+  id,
+  name: id === "model" ? "Model" : "Reasoning",
+  description: null,
+  category,
+  current,
+  via: "option",
+  values: values.map((value) => ({ value, name: value, description: null })),
+});
+const provider = (id: string): AgentProvider => ({
+  id,
+  name: id,
+  command: id,
+  program: id,
+  args: [],
+  defaultProgram: null,
+  defaultArgs: [],
+  loginHint: null,
+  commandOverridden: false,
+  commandEditable: true,
+  commandReadOnlyReason: null,
+  installed: true,
+  env: {},
+  commands: [],
+  source: { kind: "custom" },
+  config: [option("model", "model", ["big", "small"])],
+  thoughtLevels: { big: [option("effort", "thought_level", ["low", "high"], "high")] },
+});
+function catalog(id = "first", patch: Partial<AgentModelCatalog> = {}): AgentModelCatalog {
+  const offered = backend.providers.find((p) => p.id === id)!;
+  return {
+    provider: id,
+    config: offered.config,
+    thoughtLevels: offered.thoughtLevels ?? {},
+    refreshing: false,
+    refreshedAtMs: Date.now(),
+    retryAtMs: null,
+    error: null,
+    ...patch,
+  };
+}
+type CatalogReply = { status: "ok"; data: AgentModelCatalog };
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((done) => {
+    resolve = done;
+  });
+  return { promise, resolve };
+}
+const emit = (snapshot: AgentModelCatalog) =>
+  act(() => backend.channel!.onmessage({ type: "modelCatalog", catalog: snapshot }));
+let dispose: () => void;
+let previousProject: ProjectInfo | null;
+
+beforeEach(async () => {
+  vi.clearAllMocks();
+  mockWindows("main");
+  mockIPC(() => undefined, { shouldMockEvents: true });
+  previousProject = useProject.getState().project;
+  useProject.setState({ project: { root: "/models", trusted: true } as ProjectInfo });
+  setContext("projectOpen", true);
+  backend.providers = [provider("first"), provider("second")];
+  backend.refresh.mockReset().mockImplementation(async (id: string) => ok(catalog(id)));
+  backend.create
+    .mockReset()
+    .mockImplementation(async (request: NewAgentTask) => ok({ id: "new", config: request.config }));
+  dispose = activate();
+  await connect();
+  useAgents.setState({ draft: savedDraft({ provider: "first", config: {} }) });
+  updateComposer(HOME, { text: "Check the project" });
+});
+afterEach(async () => {
+  await vi.dynamicImportSettled();
+  cleanup();
+  dispose();
+  useProject.setState({ project: previousProject });
+  setContext("projectOpen", false);
+  vi.useRealTimers();
+  await vi.dynamicImportSettled();
+  clearMocks();
+});
+
+it("keeps cached choices usable while refreshing and shares the completion/cooldown from another window", async () => {
+  backend.refresh.mockImplementation(async (id: string) => ok(catalog(id, { refreshing: true })));
+  render(<HomeEditor />);
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  expect(screen.getByRole("button", { name: "Refreshing…" })).toBeDisabled();
+  fireEvent.click(screen.getByRole("option", { name: "small" }));
+  expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("small");
+  expect(screen.getByRole("button", { name: "Start" })).toBeEnabled();
+  await waitFor(() => expect(useAgents.getState().modelRequests.size).toBe(0));
+  emit(catalog("first", { retryAtMs: Date.now() + 30_000 }));
+  expect(screen.getByRole("button", { name: /Refresh in \d+s/ })).toBeDisabled();
+  expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("small");
+  fireEvent.click(screen.getByRole("button", { name: "Start" }));
+  await waitFor(() => expect(backend.create).toHaveBeenCalled());
+  expect(backend.create.mock.calls[0]![0].config).toEqual([{ id: "model", value: "small" }]);
+});
+
+it("uses the same popup for model-only agents and coalesces repeated manual action invocations", async () => {
+  backend.providers[0]!.thoughtLevels = {};
+  await connect();
+  render(<HomeEditor />);
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  await screen.findByRole("button", { name: "Refresh models" });
+  expect(backend.refresh).toHaveBeenCalledExactlyOnceWith("first", false);
+  const pending = deferred<CatalogReply>();
+  backend.refresh.mockReturnValueOnce(pending.promise);
+  fireEvent.click(screen.getByRole("button", { name: "Refresh models" }));
+  expect(screen.getByRole("button", { name: "Refreshing…" })).toBeDisabled();
+  await act(async () => {
+    await executeAction("agents.refreshModels");
+    await executeAction("agents.refreshModels");
+  });
+  expect(backend.refresh).toHaveBeenCalledTimes(2);
+  expect(backend.refresh).toHaveBeenLastCalledWith("first", true);
+  await act(async () => pending.resolve(ok(catalog("first", { refreshing: true }))));
+  await act(async () => executeAction("agents.refreshModels"));
+  expect(backend.refresh).toHaveBeenCalledTimes(2);
+  emit(catalog("first", { retryAtMs: Date.now() + 30_000 }));
+  await act(async () => executeAction("agents.refreshModels"));
+  expect(backend.refresh).toHaveBeenCalledTimes(2);
+  expect(screen.getByRole("button", { name: /Refresh in \d+s/ })).toBeDisabled();
+});
+
+it("shows initial loading and inline discovery failure/retry without blocking a model-less agent", async () => {
+  backend.providers[0]!.config = [];
+  backend.providers[0]!.thoughtLevels = {};
+  await connect();
+  backend.refresh.mockImplementation(async (id: string) => ok(catalog(id, { refreshing: true })));
+  render(<HomeEditor />);
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  expect(screen.getByText("Loading models…")).toBeVisible();
+  expect(screen.getByRole("button", { name: "Start" })).toBeEnabled();
+  await waitFor(() => expect(useAgents.getState().modelRequests.size).toBe(0));
+  emit(catalog("first", { error: "offline" }));
+  expect(screen.getByRole("alert")).toHaveTextContent("Could not refresh models: offline");
+  expect(screen.getByText("No models reported by this agent.")).toBeVisible();
+  expect(screen.getByRole("button", { name: "Refresh models" })).toBeEnabled();
+  fireEvent.click(screen.getByRole("button", { name: "Refresh models" }));
+  expect(backend.refresh).toHaveBeenLastCalledWith("first", true);
+  expect(screen.getByRole("button", { name: "Refreshing…" })).toBeDisabled();
+  fireEvent.click(screen.getByRole("button", { name: "Start" }));
+  await waitFor(() => expect(backend.create).toHaveBeenCalled());
+  expect(backend.notify).not.toHaveBeenCalled();
+});
+
+it("retains cached model and effort choices after a command failure and retries inline", async () => {
+  backend.refresh.mockRejectedValueOnce(new Error("connection lost"));
+  useAgents.setState({
+    draft: savedDraft({ provider: "first", config: { model: "big" }, thoughtLevels: { big: { effort: "low" } } }),
+  });
+  render(<HomeEditor />);
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  expect(await screen.findByRole("alert")).toHaveTextContent("connection lost");
+  expect(screen.getByRole("slider", { name: "Reasoning" })).toHaveAttribute("aria-valuetext", "low");
+  fireEvent.click(screen.getByRole("option", { name: "small" }));
+  expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("small");
+  fireEvent.click(screen.getByRole("button", { name: "Refresh models" }));
+  await waitFor(() => expect(screen.queryByRole("alert")).not.toBeInTheDocument());
+  expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("small");
+  expect(backend.notify).not.toHaveBeenCalled();
+});
+
+it("preserves a valid remembered model and effort when discovery changes the defaults", async () => {
+  useAgents.setState({
+    draft: savedDraft({ provider: "first", config: { model: "big" }, thoughtLevels: { big: { effort: "low" } } }),
+  });
+  backend.refresh.mockResolvedValueOnce(
+    ok(
+      catalog("first", {
+        config: [option("model", "model", ["small", "big", "new"])],
+        thoughtLevels: { big: [option("effort", "thought_level", ["low", "high", "max"], "max")] },
+      }),
+    ),
+  );
+  render(<HomeEditor />);
+  await waitFor(() => expect(useAgents.getState().modelRequests.size).toBe(0));
+  expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("biglow");
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  expect(screen.getByRole("option", { name: "new" })).toBeVisible();
+  expect(screen.getByRole("slider", { name: "Reasoning" })).toHaveAttribute("aria-valuetext", "low");
+  fireEvent.click(screen.getByRole("button", { name: "Start" }));
+  await waitFor(() => expect(backend.create).toHaveBeenCalled());
+  expect(backend.create.mock.calls[0]![0].config).toEqual([
+    { id: "model", value: "big" },
+    { id: "effort", value: "low" },
+  ]);
+});
+
+it("keeps a removed explicit model visibly unavailable until another model is chosen", async () => {
+  useAgents.setState({ draft: savedDraft({ provider: "first", config: { model: "big" } }) });
+  render(<HomeEditor />);
+  await waitFor(() => expect(useAgents.getState().modelRequests.size).toBe(0));
+  emit(catalog("first", { config: [option("model", "model", ["small"])], thoughtLevels: {} }));
+  expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("big (unavailable)");
+  expect(screen.getByRole("button", { name: "Start" })).toBeDisabled();
+  expect(screen.getByRole("alert")).toHaveTextContent("Choose another model before starting.");
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  fireEvent.click(screen.getByRole("option", { name: "small" }));
+  expect(screen.getByRole("button", { name: "Start" })).toBeEnabled();
+  expect(screen.queryByRole("alert")).not.toBeInTheDocument();
+  fireEvent.click(screen.getByRole("button", { name: "Start" }));
+  await waitFor(() => expect(backend.create).toHaveBeenCalled());
+  expect(backend.create.mock.calls[0]![0].config).toEqual([{ id: "model", value: "small" }]);
+});
+
+it("keeps the unavailable selection when the agent stops advertising models altogether", async () => {
+  useAgents.setState({ draft: savedDraft({ provider: "first", config: { model: "big" } }) });
+  render(<HomeEditor />);
+  await waitFor(() => expect(useAgents.getState().modelRequests.size).toBe(0));
+  emit(catalog("first", { config: [], thoughtLevels: {} }));
+  backend.providers[0]!.config = [];
+  await act(async () => backend.channel!.onmessage({ type: "providers" }));
+  expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("big (unavailable)");
+  expect(screen.getByRole("button", { name: "Start" })).toBeDisabled();
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  expect(screen.getByText("No models reported by this agent.")).toBeVisible();
+  expect(screen.getByRole("button", { name: "Refresh models" })).toBeEnabled();
+});
+
+it("ignores a delayed refresh after switching agents and preserves the new draft", async () => {
+  const pending = deferred<CatalogReply>();
+  backend.refresh.mockReturnValueOnce(pending.promise);
+  render(<HomeEditor />);
+  fireEvent.click(screen.getByRole("button", { name: "Agent" }));
+  fireEvent.click(screen.getByRole("option", { name: "second" }));
+  await waitFor(() => expect(backend.refresh).toHaveBeenLastCalledWith("second", false));
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  fireEvent.click(screen.getByRole("option", { name: "small" }));
+  await act(async () => pending.resolve(ok(catalog("first", { config: [option("model", "model", ["obsolete"])] }))));
+  expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("small");
+  expect(screen.queryByRole("option", { name: "obsolete" })).not.toBeInTheDocument();
+  expect(useAgents.getState().modelCatalogs.has("first")).toBe(false);
+  expect(screen.getByRole("button", { name: "Start" })).toBeEnabled();
+});
+
+it("ignores old project responses and events when the project connection changes", async () => {
+  const pending = deferred<CatalogReply>();
+  backend.refresh.mockReturnValueOnce(pending.promise);
+  render(<HomeEditor />);
+  const oldChannel = backend.channel!;
+  await act(async () => {
+    useProject.setState({ project: { root: "/another", trusted: true } as ProjectInfo });
+    await connect();
+    pending.resolve(ok(catalog("first", { config: [option("model", "model", ["old-project"])] })));
+  });
+  act(() => oldChannel.onmessage({ type: "modelCatalog", catalog: catalog("first", { error: "old error" }) }));
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  expect(screen.queryByRole("option", { name: "old-project" })).not.toBeInTheDocument();
+  expect(screen.queryByText(/old error/)).not.toBeInTheDocument();
+  expect(screen.getByRole("option", { name: "small" })).toBeVisible();
+});
+
+it("does not let a delayed command snapshot replace a newer catalog event", async () => {
+  const pending = deferred<CatalogReply>();
+  backend.refresh.mockReturnValueOnce(pending.promise);
+  render(<HomeEditor />);
+  emit(catalog("first", { config: [option("model", "model", ["latest"])] }));
+  await act(async () => pending.resolve(ok(catalog("first", { refreshing: true }))));
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  expect(screen.getByRole("option", { name: "latest" })).toBeVisible();
+  expect(screen.getByRole("button", { name: "Refresh models" })).toBeEnabled();
+  backend.providers[0]!.config = [option("model", "model", ["older-session"])];
+  await act(async () => backend.channel!.onmessage({ type: "providers" }));
+  expect(screen.getByRole("option", { name: "latest" })).toBeVisible();
+  expect(screen.queryByRole("option", { name: "older-session" })).not.toBeInTheDocument();
+});
+
+it("requests freshness on focus without a retry timer, and counts down only the displayed cooldown", async () => {
+  render(<HomeEditor />);
+  await waitFor(() => expect(useAgents.getState().modelRequests.size).toBe(0));
+  fireEvent.focus(window);
+  await waitFor(() => expect(backend.refresh).toHaveBeenCalledTimes(2));
+  await waitFor(() => expect(useAgents.getState().modelRequests.size).toBe(0));
+  fireEvent.click(screen.getByRole("button", { name: "Model" }));
+  vi.useFakeTimers();
+  emit(catalog("first", { retryAtMs: Date.now() + 2_000, error: "offline" }));
+  expect(screen.getByRole("button", { name: "Refresh in 2s" })).toBeDisabled();
+  act(() => vi.advanceTimersByTime(1_000));
+  expect(screen.getByRole("button", { name: "Refresh in 1s" })).toBeDisabled();
+  act(() => vi.advanceTimersByTime(1_000));
+  expect(screen.getByRole("button", { name: "Refresh models" })).toBeEnabled();
+  act(() => vi.advanceTimersByTime(60_000));
+  expect(backend.refresh).toHaveBeenCalledTimes(2);
+});

src/features/agents/sessionFocus.ts

@@ -1,8 +1,9 @@
-/** The agent session tab holding focus, for actions that act on it (Find in Conversation). */
+/** The agent session holding focus, for actions scoped to that task view. */
 import { setContext } from "@/platform/context";
 
 export interface FocusedSession {
   openFind(): void;
+  focusInput?: () => void;
 }
 
 let focused: FocusedSession | null = null;
@@ -10,6 +11,7 @@ let focused: FocusedSession | null = null;
 export function setFocusedSession(session: FocusedSession | null) {
   focused = session;
   setContext("agentSessionFocus", !!session);
+  setContext("agentInputAvailable", !!session?.focusInput);
 }
 
 export const focusedSession = () => focused;

src/features/agents/sessionState.test.tsx

@@ -24,7 +24,7 @@ import { replyActions } from "./replyActions";
 import { focusedSession } from "./sessionFocus";
 import styles from "./Session.module.css";
 import chipStyles from "./ReferenceChip.module.css";
-import { textOf, typeIn } from "./composerTesting";
+import { caretOf, textOf, typeIn } from "./composerTesting";
 
 const backend = vi.hoisted(() => ({
   entries: new Map<string, AgentEntry[]>(),
@@ -1564,6 +1564,31 @@ describe("conversation loading", () => {
 });
 
 describe("session state across tasks and hosts", () => {
+  it("updates input focus availability while the task changes status without losing its draft caret", async () => {
+    render(<SessionEditor input={input("A")} />);
+    await screen.findByText("Answer A");
+    const message = screen.getByRole("textbox", { name: "Message" });
+    typeIn(message, "Draft to keep", 3);
+    const conversation = stream();
+    act(() => conversation.focus());
+    act(() =>
+      useAgents.setState((s) => ({
+        tasks: new Map(s.tasks).set("A", { ...s.tasks.get("A")!, status: "archived" }),
+      })),
+    );
+    act(() => focusedSession()?.focusInput?.());
+    expect(conversation).toHaveFocus();
+    act(() =>
+      useAgents.setState((s) => ({
+        tasks: new Map(s.tasks).set("A", { ...s.tasks.get("A")!, status: "running" }),
+      })),
+    );
+    act(() => focusedSession()?.focusInput?.());
+    await waitFor(() => expect(message).toHaveFocus());
+    expect(textOf(message)).toBe("Draft to keep");
+    expect(caretOf(message)).toBe(3);
+  });
+
   it("leaves a task unread while its kept-alive tab is hidden, and reads it once shown", () => {
     vi.spyOn(document, "hasFocus").mockReturnValue(true);
     useAgents.setState({ unread: new Set(["A"]) });

src/features/agents/store.ts

@@ -13,6 +13,7 @@ import type {
   AgentEvent,
   AgentImage,
   AgentLimit,
+  AgentModelCatalog,
   AgentProvider,
   AgentTask,
   ExternalSession,
@@ -93,6 +94,8 @@ interface AgentsState {
   /** Scroll position and follow-output preference by conversation, shared by both hosts. */
   scrollPositions: Map<string, { top: number; stick: boolean }>;
   providers: AgentProvider[];
+  modelCatalogs: Map<string, AgentModelCatalog>;
+  modelRequests: Set<string>;
   /** The usage limits each agent last reported for its account, by provider. */
   limits: Map<string, AgentLimit[]>;
   draft: Draft;
@@ -171,6 +174,8 @@ export const useAgents = create<AgentsState>(() => ({
   groupedChanges: new Map(),
   providers: [],
   limits: new Map(),
+  modelCatalogs: new Map(),
+  modelRequests: new Set(),
   draft: savedDraft(load<Partial<Draft>>(DRAFT_KEY, {})),
   composers: new Map(),
   lastComposer: HOME,
@@ -191,6 +196,7 @@ export const useAgents = create<AgentsState>(() => ({
 
 export function updateDraft(patch: Partial<Draft>) {
   const current = useAgents.getState().draft;
+  if (patch.provider && patch.provider !== current.provider) draftGeneration++;
   const draft = {
     ...current,
     ...(patch.provider && patch.provider !== current.provider ? { thoughtLevels: {} } : {}),
@@ -205,27 +211,40 @@ export const providerDefaults = (provider: string | undefined): Record<string, s
   (provider && useProject.getState().settings?.agents?.defaults?.[provider]) || {};
 
 /**
- * Config for the selected model, with only supported choices applied: the draft's, else
- * the agent's defaults from Settings › Agents.
+ * New Task settings use the authoritative catalog, retaining an explicitly selected
+ * model even if it disappears so the user must choose its replacement.
  */
 export function draftConfig(
   provider: AgentProvider | undefined,
   draft: Draft,
   defaults: Record<string, string> = providerDefaults(provider?.id),
 ): AgentConfigOption[] {
-  const config = (provider?.config ?? [])
+  const catalog = provider && useAgents.getState().modelCatalogs.get(provider.id);
+  const offered = catalog?.config ?? provider?.config ?? [];
+  const priorModel = provider?.config.find((o) => o.category === "model");
+  const source =
+    priorModel && draft.config[priorModel.id] !== undefined && !offered.some((o) => o.category === "model")
+      ? [...offered, { ...priorModel, values: [] }]
+      : offered;
+  const config = source
     .filter((o) => o.category !== "thought_level")
     .map((o) => {
-      const choice = draft.config[o.id] ?? defaults[o.id];
+      const explicit = draft.config[o.id];
+      const choice = explicit ?? defaults[o.id];
       return {
         ...o,
-        current: choice !== undefined && o.values.some((v) => v.value === choice) ? choice : o.current,
+        current:
+          o.category === "model" && explicit !== undefined
+            ? explicit
+            : choice !== undefined && o.values.some((v) => v.value === choice)
+              ? choice
+              : o.current,
       };
     });
   const model = config.find((o) => o.category === "model")?.current;
   if (model) {
     config.push(
-      ...(provider?.thoughtLevels?.[model] ?? []).map((o) => {
+      ...((catalog ?? provider)?.thoughtLevels?.[model] ?? []).map((o) => {
         const choice = draft.thoughtLevels?.[model]?.[o.id] ?? defaults[o.id];
         return {
           ...o,
@@ -314,6 +333,84 @@ export function markVisible(task: string): () => void {
 }
 
 let generation = 0;
+let draftGeneration = 0;
+const modelFlights = new Map<string, { launch: string; generation: number; draftGeneration: number }>();
+
+const selectedProvider = () => {
+  const { providers, draft } = useAgents.getState();
+  return providers.find((p) => p.id === draft.provider) ?? providers[0];
+};
+
+const launchKey = (provider: AgentProvider) =>
+  JSON.stringify([provider.program, provider.args, provider.env, provider.installed]);
+
+function applyModelCatalog(catalog: AgentModelCatalog) {
+  useAgents.setState((s) => {
+    const previous = s.modelCatalogs.get(catalog.provider);
+    const model = (previous?.config ?? s.providers.find((p) => p.id === catalog.provider)?.config)?.find(
+      (o) => o.category === "model",
+    );
+    const config =
+      model && !catalog.config.some((o) => o.category === "model")
+        ? [...catalog.config, { ...model, current: null, values: [] }]
+        : catalog.config;
+    return { modelCatalogs: new Map(s.modelCatalogs).set(catalog.provider, { ...catalog, config }) };
+  });
+}
+
+/** Refreshes only the New Task agent; discovery failures stay beside the cached choices. */
+export async function refreshModels(provider = selectedProvider()?.id, force = true): Promise<void> {
+  const selected = selectedProvider();
+  if (!provider || !selected?.installed || selected.id !== provider || useProject.getState().project?.trusted === false)
+    return;
+  const state = useAgents.getState();
+  const catalog = state.modelCatalogs.get(provider);
+  const launch = launchKey(selected);
+  const pending = modelFlights.get(provider);
+  if (
+    (pending?.launch === launch && pending.generation === generation && pending.draftGeneration === draftGeneration) ||
+    catalog?.refreshing ||
+    (force && catalog?.retryAtMs != null && catalog.retryAtMs > Date.now())
+  )
+    return;
+  const gen = generation;
+  const draftGen = draftGeneration;
+  const root = useProject.getState().project?.root;
+  const flight = { launch, generation: gen, draftGeneration: draftGen };
+  modelFlights.set(provider, flight);
+  useAgents.setState((s) => ({ modelRequests: new Set(s.modelRequests).add(provider) }));
+  const current = () =>
+    gen === generation &&
+    root === useProject.getState().project?.root &&
+    draftGen === draftGeneration &&
+    selectedProvider()?.id === provider &&
+    launchKey(selectedProvider()!) === launch;
+  try {
+    const result = await call(commands.agentRefreshModels(provider, force));
+    // A streamed status/completion is newer than the snapshot returned by the command.
+    if (current() && useAgents.getState().modelCatalogs.get(provider) === catalog) applyModelCatalog(result);
+  } catch (e) {
+    if (current() && useAgents.getState().modelCatalogs.get(provider) === catalog)
+      applyModelCatalog({
+        provider,
+        config: catalog?.config ?? selected.config,
+        thoughtLevels: catalog?.thoughtLevels ?? selected.thoughtLevels ?? {},
+        refreshedAtMs: catalog?.refreshedAtMs ?? null,
+        retryAtMs: catalog?.retryAtMs ?? null,
+        refreshing: false,
+        error: e instanceof Error ? e.message : String(e),
+      });
+  } finally {
+    if (modelFlights.get(provider) === flight) {
+      modelFlights.delete(provider);
+      useAgents.setState((s) => {
+        const modelRequests = new Set(s.modelRequests);
+        modelRequests.delete(provider);
+        return { modelRequests };
+      });
+    }
+  }
+}
 
 /** Subscribes this window to the project's agents (again after the project changed). */
 export async function connect(): Promise<void> {
@@ -403,6 +500,7 @@ export function disconnect() {
   generation++;
   arrivedWhileLoading.clear();
   streamingReply.clear();
+  modelFlights.clear();
   useAgents.setState({
     loaded: false,
     error: null,
@@ -412,6 +510,8 @@ export function disconnect() {
     entryLoads: new Map(),
     changes: new Map(),
     groupedChanges: new Map(),
+    modelCatalogs: new Map(),
+    modelRequests: new Set(),
     organize: EMPTY_ORGANIZE,
     organizeRoot: null,
     docked: null,
@@ -470,6 +570,10 @@ function onEvent(e: AgentEvent) {
       scheduleChanges(e.task);
       break;
     }
+    case "modelCatalog": {
+      if (s.providers.some((p) => p.id === e.catalog.provider)) applyModelCatalog(e.catalog);
+      break;
+    }
     case "providers": {
       void refreshProviders();
       break;
@@ -637,8 +741,19 @@ export function scheduleChanges(task: string) {
 
 /** Reloads the agent list (custom and registry agents are re-read). */
 export async function refreshProviders() {
+  const gen = generation;
+  const root = useProject.getState().project?.root;
   const providers = await call(commands.agentProviders()).catch(() => null);
-  if (providers) useAgents.setState({ providers });
+  if (!providers || gen !== generation || root !== useProject.getState().project?.root) return;
+  useAgents.setState((s) => {
+    const modelCatalogs = new Map(s.modelCatalogs);
+    for (const [id] of modelCatalogs) {
+      const previous = s.providers.find((p) => p.id === id);
+      const provider = providers.find((p) => p.id === id);
+      if (!provider || (previous && launchKey(previous) !== launchKey(provider))) modelCatalogs.delete(id);
+    }
+    return { providers, modelCatalogs };
+  });
 }
 
 export const NO_COMMANDS: readonly AgentCommand[] = [];
@@ -801,6 +916,15 @@ export async function startTask(
     providers.find((p) => p.id === draft.provider),
     draft,
   );
+  if (
+    options.some(
+      (o) =>
+        o.category === "model" &&
+        draft.config[o.id] !== undefined &&
+        !o.values.some((v) => v.value === draft.config[o.id]),
+    )
+  )
+    return;
   const askForApprovals = useProject.getState().settings?.agents?.newTaskApprovals === "ask";
   const defaults = {
     ...cursorModelDefaults(draft.provider, options),

src/features/analysis/index.ts

@@ -1,7 +1,9 @@
 /**
  * Code analysis: Inspect Code (batch language-server diagnostics), Locate
- * Duplicates and Search / Replace Structurally.
+ * Duplicates and Search / Replace Structurally, and the Python inheritance
+ * inspections the IDE computes from its own graph.
  */
+import { registerEditorContribution } from "@/editor/api";
 import { registerActions } from "@/platform/actions";
 import { useProject } from "@/platform/project";
 import { registerOverlay, registerToolWindow } from "@/workbench/contributions";
@@ -14,12 +16,14 @@ import {
 import { AnalysisDialogHost } from "./dialogs";
 import { resetDuplicates } from "./duplicates";
 import { DuplicatesHeaderActions, DuplicatesView } from "./DuplicatesView";
+import { pythonInheritanceExtension } from "./inheritanceInspections";
 import { installInspectionProfileSync, resetInspection, runInspection } from "./inspect";
 import { defaultScope } from "./scope";
 import { InspectionHeaderActions, InspectionView, useInspectionHeaderMenu } from "./InspectionView";
 
 export function activate(): () => void {
   const disposers = [
+    registerEditorContribution({ id: "analysis.python-inheritance", extensions: pythonInheritanceExtension }),
     installInspectionProfileSync(),
     useProject.subscribe((s, prev) => {
       if (s.project?.root === prev.project?.root) return;

src/features/analysis/inheritanceInspections.test.ts

@@ -0,0 +1,366 @@
+import { expect, it } from "vitest";
+import type {
+  ClassInheritance,
+  Diagnostic,
+  MethodBody,
+  OutlineItem,
+  PythonClassFacts,
+  PythonFacts,
+  PythonMethodFacts,
+  Range,
+} from "@/platform/ipc";
+import { inheritanceIndex } from "@/editor/navigation/inheritanceGraph";
+import { inheritanceDiagnostics, pythonInheritanceExtension } from "./inheritanceInspections";
+
+interface MethodSpec {
+  name: string;
+  line: number;
+  col?: number;
+  params?: string[] | null;
+  abstract?: boolean;
+  override?: boolean;
+  body?: MethodBody;
+}
+
+interface ClassSpec {
+  name: string;
+  line: number;
+  col?: number;
+  /** The bases the *index* saw (defaults to `bases`). */
+  indexedBases?: string[];
+  bases: string[];
+  methods?: MethodSpec[];
+  /** Extra members (fields, properties, nested classes) the class declares. */
+  members?: string[];
+}
+
+const range = (line: number, col: number): Range => ({ start: { line, col }, end: { line, col: col + 1 } });
+const EMPTY: MethodBody = { kind: "empty" };
+const OTHER: MethodBody = { kind: "other" };
+const forward = (target: string, args: string[], returns = false): MethodBody => ({
+  kind: "superCall",
+  returns,
+  target,
+  args,
+});
+
+const methodFacts = (spec: MethodSpec): PythonMethodFacts => ({
+  name: spec.name,
+  selection: range(spec.line, spec.col ?? 8),
+  params: spec.params === undefined ? ["self"] : spec.params,
+  abstractMethod: spec.abstract ?? false,
+  overrideDecorated: spec.override ?? false,
+  body: spec.body ?? EMPTY,
+});
+
+const classItem = (spec: ClassSpec, col: number, methods: PythonMethodFacts[]): OutlineItem => ({
+  name: spec.name,
+  detail: null,
+  kind: "class",
+  range: range(spec.line, 0),
+  selection_range: range(spec.line, col),
+  children: [
+    ...methods.map((m): OutlineItem => ({
+      name: m.name,
+      detail: null,
+      kind: "method",
+      range: m.selection,
+      selection_range: m.selection,
+      children: [],
+      visibility: null,
+    })),
+    ...(spec.members ?? []).map((name): OutlineItem => ({
+      name,
+      detail: null,
+      kind: "field",
+      range: range(spec.line, 0),
+      selection_range: range(spec.line, 0),
+      children: [],
+      visibility: null,
+    })),
+  ],
+  visibility: null,
+});
+
+/** A project held as the facts, outlines and graph the inspections read. */
+class Fixture {
+  private facts = new Map<string, PythonFacts>();
+  private outlines = new Map<string, OutlineItem[]>();
+  private graph: ClassInheritance[] = [];
+
+  constructor(private readonly current: string) {}
+
+  add(path: string, classes: readonly ClassSpec[]): this {
+    const classFacts: PythonClassFacts[] = [];
+    for (const spec of classes) {
+      const col = spec.col ?? 6;
+      const methods = (spec.methods ?? []).map(methodFacts);
+      classFacts.push({ name: spec.name, selection: range(spec.line, col), bases: spec.bases, methods });
+      this.graph.push({ path, line: spec.line, col, name: spec.name, bases: spec.indexedBases ?? spec.bases });
+      this.outlines.set(path, [...(this.outlines.get(path) ?? []), classItem(spec, col, methods)]);
+    }
+    this.facts.set(path, { classes: [...(this.facts.get(path)?.classes ?? []), ...classFacts] });
+    return this;
+  }
+
+  async run(enabled?: ReadonlySet<string>): Promise<Diagnostic[]> {
+    const facts = this.facts.get(this.current);
+    if (!facts) throw new Error(`no fixture for ${this.current}`);
+    return inheritanceDiagnostics({
+      path: this.current,
+      outline: this.outlines.get(this.current) ?? [],
+      facts,
+      index: inheritanceIndex(this.graph, { readFiles: async () => new Map() }),
+      factsOf: async (path) => this.facts.get(path) ?? null,
+      outlineOf: async (path) => this.outlines.get(path) ?? [],
+      enabled,
+    });
+  }
+}
+
+const codes = (diagnostics: readonly Diagnostic[]) => diagnostics.map((d) => [d.code, d.severity, d.range.start.line]);
+
+/** `/p/base.py` declares the bases; `/p/a.py` holds the class under test. */
+const withBase = (child: ClassSpec, base: ClassSpec[], basePath = "/p/base.py") =>
+  new Fixture("/p/a.py").add(basePath, base).add("/p/a.py", [child]);
+
+it("reports circular inheritance", async () => {
+  const project = new Fixture("/p/a.py").add("/p/a.py", [
+    { name: "First", line: 0, bases: ["Second"] },
+    { name: "Second", line: 4, bases: ["First"] },
+  ]);
+  expect(codes(await project.run())).toEqual([
+    ["builtin:python-circular-bases", "error", 0],
+    ["builtin:python-circular-bases", "error", 4],
+  ]);
+});
+
+it("accepts a legal diamond", async () => {
+  const project = new Fixture("/p/a.py")
+    .add("/p/base.py", [
+      { name: "Root", line: 0, bases: [] },
+      { name: "Left", line: 3, bases: ["Root"] },
+      { name: "Right", line: 6, bases: ["Root"] },
+    ])
+    .add("/p/a.py", [{ name: "Leaf", line: 0, bases: ["Left", "Right"] }]);
+  expect(await project.run()).toEqual([]);
+});
+
+it("reports an @override no ancestor declares", async () => {
+  const project = withBase(
+    { name: "C", line: 0, bases: ["Base"], methods: [{ name: "run", line: 1, override: true }] },
+    [{ name: "Base", line: 0, bases: [], methods: [{ name: "other", line: 1 }] }],
+  );
+  expect(codes(await project.run())).toEqual([["builtin:python-override", "warning", 1]]);
+});
+
+it("accepts an @override of a method, a field or a property", async () => {
+  const project = withBase(
+    {
+      name: "C",
+      line: 0,
+      bases: ["Base"],
+      methods: [
+        { name: "run", line: 1, override: true, body: OTHER },
+        { name: "limit", line: 3, override: true },
+        { name: "label", line: 5, override: true },
+      ],
+    },
+    [{ name: "Base", line: 0, bases: [], methods: [{ name: "run", line: 1 }], members: ["limit", "label"] }],
+  );
+  expect(await project.run()).toEqual([]);
+});
+
+it("never reports @override on a dunder", async () => {
+  const project = withBase(
+    { name: "C", line: 0, bases: ["Base"], methods: [{ name: "__eq__", line: 1, override: true }] },
+    [{ name: "Base", line: 0, bases: [] }],
+  );
+  expect(await project.run()).toEqual([]);
+});
+
+it("stays silent when a base is outside the project", async () => {
+  // `dict` is not in the graph: it may declare or implement anything.
+  const project = withBase(
+    {
+      name: "C",
+      line: 0,
+      bases: ["dict"],
+      methods: [
+        { name: "run", line: 1, override: true },
+        { name: "go", line: 3, abstract: true },
+      ],
+    },
+    [],
+  );
+  expect(await project.run()).toEqual([]);
+});
+
+it("knows a chain that ends in ABC or object", async () => {
+  // `ABC` declares nothing a method could override, so `@override` on a method no class of
+  // the chain declares is still a mistake.
+  const project = withBase(
+    { name: "Circle", line: 0, bases: ["Shape"], methods: [{ name: "describ", line: 1, override: true }] },
+    [{ name: "Shape", line: 0, bases: ["ABC", "object"], methods: [{ name: "describe", line: 1 }] }],
+  );
+  expect(codes(await project.run())).toEqual([["builtin:python-override", "warning", 1]]);
+});
+
+it("reports an unimplemented abstract method", async () => {
+  const project = withBase({ name: "Half", line: 0, bases: ["Base"] }, [
+    { name: "Base", line: 0, bases: [], methods: [{ name: "dispatch", line: 1, abstract: true }] },
+  ]);
+  expect(codes(await project.run())).toEqual([["builtin:python-abstract-method", "warning", 0]]);
+});
+
+it("still reports an abstract method whose declarer has a foreign base", async () => {
+  // `class TokenDispatcher(ABC)` in an attached project: `ABC` is outside the graph, but
+  // that cannot hide the abstract method the declarer does define.
+  const project = withBase({ name: "Half", line: 0, bases: ["Base"] }, [
+    { name: "Base", line: 0, bases: ["ABC"], methods: [{ name: "dispatch", line: 1, abstract: true }] },
+  ]);
+  expect(codes(await project.run())).toEqual([["builtin:python-abstract-method", "warning", 0]]);
+});
+
+it("accepts a class that is itself abstract", async () => {
+  const base = { name: "Base", line: 0, bases: [], methods: [{ name: "dispatch", line: 1, abstract: true }] };
+  const declaresOwn = withBase(
+    { name: "Middle", line: 0, bases: ["Base"], methods: [{ name: "sides", line: 1, abstract: true }] },
+    [base],
+  );
+  expect(await declaresOwn.run()).toEqual([]);
+  expect(await withBase({ name: "Middle", line: 0, bases: ["Base", "ABC"] }, [base]).run()).toEqual([]);
+});
+
+it("accepts a class that implements the abstract method", async () => {
+  const project = withBase({ name: "Done", line: 0, bases: ["Base"], methods: [{ name: "dispatch", line: 1 }] }, [
+    { name: "Base", line: 0, bases: [], methods: [{ name: "dispatch", line: 1, abstract: true }] },
+  ]);
+  expect(await project.run()).toEqual([]);
+});
+
+it("accepts a property that implements the abstract method", async () => {
+  const project = withBase({ name: "Done", line: 0, bases: ["Base"], members: ["dispatch"] }, [
+    { name: "Base", line: 0, bases: [], methods: [{ name: "dispatch", line: 1, abstract: true }] },
+  ]);
+  expect(await project.run()).toEqual([]);
+});
+
+it("accepts an abstract method an intermediate ancestor implements", async () => {
+  const project = new Fixture("/p/a.py")
+    .add("/p/base.py", [{ name: "Base", line: 0, bases: [], methods: [{ name: "run", line: 1, abstract: true }] }])
+    .add("/p/mid.py", [{ name: "Mid", line: 0, bases: ["Base"], methods: [{ name: "run", line: 1 }] }])
+    .add("/p/a.py", [{ name: "Leaf", line: 0, bases: ["Mid"] }]);
+  expect(await project.run()).toEqual([]);
+});
+
+it("reports a redundant pass over a pass", async () => {
+  const project = withBase({ name: "C", line: 0, bases: ["Base"], methods: [{ name: "run", line: 1 }] }, [
+    { name: "Base", line: 0, bases: [], methods: [{ name: "run", line: 1 }] },
+  ]);
+  expect(codes(await project.run())).toEqual([["builtin:python-redundant-override", "info", 1]]);
+});
+
+it("reports a redundant returned super() forward with the same arguments", async () => {
+  const project = withBase(
+    {
+      name: "C",
+      line: 0,
+      bases: ["Base"],
+      methods: [{ name: "run", line: 1, params: ["self", "speed"], body: forward("run", ["speed"], true) }],
+    },
+    [{ name: "Base", line: 0, bases: [], methods: [{ name: "run", line: 1, params: ["self", "speed"], body: OTHER }] }],
+  );
+  expect(codes(await project.run())).toEqual([["builtin:python-redundant-override", "info", 1]]);
+});
+
+it("still reports a redundant forward whose declarer has a foreign base", async () => {
+  // The declarer inherits from `ABC` outside the graph; it still decides what runs.
+  const project = withBase(
+    {
+      name: "C",
+      line: 0,
+      bases: ["Base"],
+      methods: [{ name: "run", line: 1, params: ["self", "x"], body: forward("run", ["x"], true) }],
+    },
+    [
+      {
+        name: "Base",
+        line: 0,
+        bases: ["ABC"],
+        methods: [{ name: "run", line: 1, params: ["self", "x"] }],
+      },
+    ],
+  );
+  expect(codes(await project.run())).toEqual([["builtin:python-redundant-override", "info", 1]]);
+});
+
+it("keeps a bare super() forward over a base that returns a value", async () => {
+  // Dropping the override would return the base's value instead of None.
+  const project = withBase(
+    {
+      name: "C",
+      line: 0,
+      bases: ["Base"],
+      methods: [{ name: "run", line: 1, params: ["self", "speed"], body: forward("run", ["speed"]) }],
+    },
+    [{ name: "Base", line: 0, bases: [], methods: [{ name: "run", line: 1, params: ["self", "speed"], body: OTHER }] }],
+  );
+  expect(await project.run()).toEqual([]);
+});
+
+it("accepts a bare super() forward over a base that returns nothing", async () => {
+  const project = withBase(
+    {
+      name: "C",
+      line: 0,
+      bases: ["Base"],
+      methods: [{ name: "run", line: 1, params: ["self", "speed"], body: forward("run", ["speed"]) }],
+    },
+    [{ name: "Base", line: 0, bases: [], methods: [{ name: "run", line: 1, params: ["self", "speed"] }] }],
+  );
+  expect(codes(await project.run())).toEqual([["builtin:python-redundant-override", "info", 1]]);
+});
+
+it("keeps an override whose base method does other work", async () => {
+  const project = withBase({ name: "C", line: 0, bases: ["Base"], methods: [{ name: "run", line: 1, body: OTHER }] }, [
+    { name: "Base", line: 0, bases: [], methods: [{ name: "run", line: 1, body: OTHER }] },
+  ]);
+  expect(await project.run()).toEqual([]);
+});
+
+it("keeps an override that changes the arguments it forwards", async () => {
+  const project = withBase(
+    {
+      name: "C",
+      line: 0,
+      bases: ["Base"],
+      methods: [{ name: "run", line: 1, params: ["self", "speed"], body: forward("run", ["speed", "1"], true) }],
+    },
+    [{ name: "Base", line: 0, bases: [], methods: [{ name: "run", line: 1, params: ["self", "speed"], body: OTHER }] }],
+  );
+  expect(await project.run()).toEqual([]);
+});
+
+it("skips a class whose header no longer matches the indexed graph", async () => {
+  // The graph was indexed when the class read `Base`; the document now reads `Other`.
+  const project = withBase({ name: "C", line: 0, bases: ["Other"], indexedBases: ["Base"] }, [
+    { name: "Base", line: 0, bases: [] },
+  ]);
+  expect(await project.run()).toEqual([]);
+});
+
+it("runs only the producers that are enabled", async () => {
+  const project = new Fixture("/p/a.py").add("/p/a.py", [
+    { name: "First", line: 0, bases: ["Second"] },
+    { name: "Second", line: 4, bases: ["First"] },
+  ]);
+  expect(await project.run(new Set())).toEqual([]);
+  expect((await project.run()).length).toBe(2);
+});
+
+it("installs the inspections for Python documents only", () => {
+  const ctx = (language: string) => ({ doc: 1, path: "/p/a.py", language, uiMode: null, readOnly: false });
+  expect(pythonInheritanceExtension(ctx("typescript"))).toEqual([]);
+  expect(pythonInheritanceExtension(ctx("python"))).not.toEqual([]);
+});