Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
acp_thread: Share v2 prompt capabilities (#65230)
Ben Brandt403589312e50
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rsindex 4ae022157c9..c4a5a54d43b 100644--- a/crates/acp_thread/src/acp_thread.rs+++ b/crates/acp_thread/src/acp_thread.rs@@ -4,6 +4,7 @@ mod connection;pub mod content;mod diff;mod mention;+pub mod prompt_capabilities;mod submission;mod terminal;pub use ::terminal::HeadlessTerminal;@@ -3384,7 +3385,7 @@ pub struct AcpThread {activity: SessionActivity,token_usage: Option<TokenUsage>,cost: Option<SessionCost>,- prompt_capabilities: acp_v1::PromptCapabilities,+ prompt_capabilities: acp_v2::PromptCapabilities,available_commands: Vec<acp_v2::AvailableCommand>,_observe_prompt_capabilities: Task<anyhow::Result<()>>,_idle_sleep_subscriptions: Vec<Subscription>,@@ -3624,7 +3625,7 @@ impl AcpThread {project: Entity<Project>,action_log: Entity<ActionLog>,session_id: acp_v1::SessionId,- mut prompt_capabilities_rx: watch::Receiver<acp_v1::PromptCapabilities>,+ mut prompt_capabilities_rx: watch::Receiver<acp_v2::PromptCapabilities>,cx: &mut Context<Self>,) -> Self {let prompt_capabilities = prompt_capabilities_rx.borrow().clone();@@ -3739,8 +3740,8 @@ impl AcpThread {self.parent_session_id.as_ref()}- pub fn prompt_capabilities(&self) -> acp_v1::PromptCapabilities {- self.prompt_capabilities.clone()+ pub fn prompt_capabilities(&self) -> &acp_v2::PromptCapabilities {+ &self.prompt_capabilities}pub fn available_commands(&self) -> &[acp_v2::AvailableCommand] {@@ -17179,10 +17180,10 @@ mod tests {action_log,session_id.clone(),watch::Receiver::constant(- acp_v1::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),),cx,)@@ -19041,7 +19042,7 @@ mod tests {project,action_log,acp_v1::SessionId::new("subagent"),- watch::Receiver::constant(acp_v1::PromptCapabilities::new()),+ watch::Receiver::constant(acp_v2::PromptCapabilities::new()),cx,)})diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rsindex be204b5d3c5..2abc8fffd7e 100644--- a/crates/acp_thread/src/connection.rs+++ b/crates/acp_thread/src/connection.rs@@ -868,6 +868,7 @@ mod test_support {supports_set_title: bool,agent_id: AgentId,telemetry_id: SharedString,+ prompt_capabilities_rx: watch::Receiver<acp_v2::PromptCapabilities>,}struct Session {@@ -899,6 +900,12 @@ mod test_support {supports_set_title: true,agent_id: AgentId::new("stub"),telemetry_id: "stub".into(),+ prompt_capabilities_rx: watch::Receiver::constant(+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),+ ),}}@@ -964,6 +971,14 @@ mod test_support {self}+ pub fn with_prompt_capabilities(+ mut self,+ prompt_capabilities_rx: watch::Receiver<acp_v2::PromptCapabilities>,+ ) -> Self {+ self.prompt_capabilities_rx = prompt_capabilities_rx;+ self+ }+pub fn with_supports_session_additional_directories(mut self,supports_session_additional_directories: bool,@@ -1005,12 +1020,7 @@ mod test_support {project,action_log,session_id.clone(),- watch::Receiver::constant(- acp_v1::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),- ),+ self.prompt_capabilities_rx.clone(),cx,)});diff --git a/crates/acp_thread/src/prompt_capabilities.rs b/crates/acp_thread/src/prompt_capabilities.rsnew file mode 100644index 00000000000..b3abe7455c2--- /dev/null+++ b/crates/acp_thread/src/prompt_capabilities.rs@@ -0,0 +1,67 @@+use agent_client_protocol::schema::{v1 as acp_v1, v2 as acp_v2};++pub fn from_v1(capabilities: acp_v1::PromptCapabilities) -> acp_v2::PromptCapabilities {+ acp_v2::PromptCapabilities::new()+ .image(+ capabilities+ .image+ .then(acp_v2::PromptImageCapabilities::new),+ )+ .audio(+ capabilities+ .audio+ .then(acp_v2::PromptAudioCapabilities::new),+ )+ .embedded_context(+ capabilities+ .embedded_context+ .then(acp_v2::PromptEmbeddedContextCapabilities::new),+ )+ .meta(capabilities.meta)+}++#[cfg(test)]+mod tests {+ use super::*;+ use serde_json::json;++ #[test]+ fn legacy_flags_advertise_objects_without_losing_metadata() {+ for (legacy, expected) in [+ (acp_v1::PromptCapabilities::new(), json!({})),+ (+ acp_v1::PromptCapabilities::new()+ .image(true)+ .audio(true)+ .embedded_context(true),+ json!({"image": {}, "audio": {}, "embeddedContext": {}}),+ ),+ (+ acp_v1::PromptCapabilities::new()+ .image(true)+ .embedded_context(true)+ .meta(acp_v1::Meta::from_iter([(+ "extension".into(),+ json!({"nested": [1, {"value": "retained"}]}),+ )])),+ json!({+ "image": {},+ "embeddedContext": {},+ "_meta": {"extension": {"nested": [1, {"value": "retained"}]}}+ }),+ ),+ (+ acp_v1::PromptCapabilities::new()+ .audio(true)+ .meta(acp_v1::Meta::new()),+ json!({"audio": {}, "_meta": {}}),+ ),+ ] {+ let capabilities = from_v1(legacy);+ assert_eq!(+ serde_json::to_value(capabilities).expect("shared capabilities"),+ expected+ );+ }+ }+}diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rsindex 222387a2a39..d1a0f3c796e 100644--- a/crates/agent/src/thread.rs+++ b/crates/agent/src/thread.rs@@ -1312,8 +1312,8 @@ pub struct Thread {thinking_enabled: bool,thinking_effort: Option<String>,speed: Option<Speed>,- prompt_capabilities_tx: watch::Sender<acp::PromptCapabilities>,- pub(crate) prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,+ prompt_capabilities_tx: watch::Sender<acp_v2::PromptCapabilities>,+ pub(crate) prompt_capabilities_rx: watch::Receiver<acp_v2::PromptCapabilities>,pub(crate) project: Entity<Project>,pub(crate) action_log: Entity<ActionLog>,/// If this is a subagent thread, contains context about the parent@@ -1333,11 +1333,11 @@ pub struct Thread {}impl Thread {- fn prompt_capabilities(model: Option<&LanguageModel>) -> acp::PromptCapabilities {+ fn prompt_capabilities(model: Option<&LanguageModel>) -> acp_v2::PromptCapabilities {let image = model.map_or(true, |model| model.supports_images());- acp::PromptCapabilities::new()- .image(image)- .embedded_context(true)+ acp_v2::PromptCapabilities::new()+ .image(image.then(acp_v2::PromptImageCapabilities::new))+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new())}pub fn new_subagent(diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rsindex 7eca700a1bc..714d04af966 100644--- a/crates/agent_servers/src/acp.rs+++ b/crates/agent_servers/src/acp.rs@@ -976,8 +976,10 @@ impl AcpConnection {})}- pub fn prompt_capabilities(&self) -> &acp::PromptCapabilities {- &self.agent_capabilities.prompt_capabilities+ pub fn prompt_capabilities(&self) -> acp_v2::PromptCapabilities {+ acp_thread::prompt_capabilities::from_v1(+ self.agent_capabilities.prompt_capabilities.clone(),+ )}#[cfg(any(test, feature = "test-support"))]@@ -1195,7 +1197,7 @@ impl AcpConnection {project,action_log,session_id.clone(),- watch::Receiver::constant(self.agent_capabilities.prompt_capabilities.clone()),+ watch::Receiver::constant(self.prompt_capabilities()),cx,)});@@ -1687,9 +1689,7 @@ impl AgentConnection for AcpConnection {action_log,response.session_id.clone(),// ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.- watch::Receiver::constant(- self.agent_capabilities.prompt_capabilities.clone(),- ),+ watch::Receiver::constant(self.prompt_capabilities()),cx,)});diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rsindex d706aee7177..9be2911aca0 100644--- a/crates/agent_ui/src/agent_panel.rs+++ b/crates/agent_ui/src/agent_panel.rs@@ -7123,10 +7123,10 @@ mod tests {action_log,session_id,watch::Receiver::constant(- acp::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),),cx,)@@ -13982,10 +13982,10 @@ mod tests {action_log,session_id,watch::Receiver::constant(- acp::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),),cx,)diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rsindex 090d449128e..4b582aca150 100644--- a/crates/agent_ui/src/conversation_view.rs+++ b/crates/agent_ui/src/conversation_view.rs@@ -1452,7 +1452,7 @@ impl ConversationView {.map(|native_connection| native_available_skills(&native_connection, &session_id, cx)).unwrap_or_default();let session_capabilities = Arc::new(RwLock::new(SessionCapabilities::new(- thread.read(cx).prompt_capabilities(),+ thread.read(cx).prompt_capabilities().clone(),thread.read(cx).available_commands().to_vec(),available_skills,)));@@ -2072,10 +2072,9 @@ impl ConversationView {AcpThreadEvent::PromptCapabilitiesUpdated => {if let Some(active) = self.thread_view(&session_id) {active.update(cx, |active, _cx| {- active- .session_capabilities- .write()- .set_prompt_capabilities(thread.read(_cx).prompt_capabilities());+ active.session_capabilities.write().set_prompt_capabilities(+ thread.read(_cx).prompt_capabilities().clone(),+ );});}}@@ -7904,10 +7903,10 @@ pub(crate) mod tests {action_log,session_id,watch::Receiver::constant(- acp_v1::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),),cx,)@@ -8368,10 +8367,10 @@ pub(crate) mod tests {action_log,session_id,watch::Receiver::constant(- acp_v1::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),),cx,)@@ -8451,10 +8450,10 @@ pub(crate) mod tests {action_log,acp_v1::SessionId::new("test"),watch::Receiver::constant(- acp_v1::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),),cx,)@@ -8530,10 +8529,10 @@ pub(crate) mod tests {action_log,acp_v1::SessionId::new("new-session"),watch::Receiver::constant(- acp_v1::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),),cx,)@@ -8565,10 +8564,10 @@ pub(crate) mod tests {action_log,session_id,watch::Receiver::constant(- acp_v1::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),),cx,)@@ -14464,7 +14463,7 @@ pub(crate) mod tests {project,action_log,acp_v1::SessionId::new(session_id),- watch::Receiver::constant(acp_v1::PromptCapabilities::new()),+ watch::Receiver::constant(acp_v2::PromptCapabilities::new()),cx,)})@@ -16755,8 +16754,14 @@ pub(crate) mod tests {async fn test_paste_text_into_queued_message_promotes_to_main_editor(cx: &mut TestAppContext) {init_test(cx);- let (conversation_view, cx) =- paste_into_queued_message(cx, ClipboardItem::new_string("PASTED".to_string())).await;+ let (conversation_view, cx) = paste_into_queued_message(+ cx,+ ClipboardItem::new_string("PASTED".to_string()),+ watch::Receiver::constant(+ acp_v2::PromptCapabilities::new().image(acp_v2::PromptImageCapabilities::new()),+ ),+ )+ .await;let queue_len = active_thread(&conversation_view, cx).read_with(cx, |thread, _cx| thread.message_queue.len());@@ -16778,15 +16783,22 @@ pub(crate) mod tests {let mut image_file = tempfile::Builder::new().suffix(".png").tempfile().unwrap();image_file.write_all(&png_bytes).unwrap();- let (conversation_view, cx) = paste_into_queued_message(- cx,- ClipboardItem {- entries: vec![gpui::ClipboardEntry::ExternalPaths(gpui::ExternalPaths(- vec![image_file.path().to_path_buf()].into(),- ))],- },- )- .await;+ let initial_capabilities: acp_v2::PromptCapabilities = serde_json::from_value(json!({+ "image": {},+ "audio": {},+ "embeddedContext": {},+ "_meta": { "initial": ["preserved"] }+ }))+ .expect("valid advertised prompt capabilities");+ let (mut capabilities_sender, capabilities_receiver) =+ watch::channel(initial_capabilities.clone());+ let image_clipboard = ClipboardItem {+ entries: vec![gpui::ClipboardEntry::ExternalPaths(gpui::ExternalPaths(+ vec![image_file.path().to_path_buf()].into(),+ ))],+ };+ let (conversation_view, cx) =+ paste_into_queued_message(cx, image_clipboard.clone(), capabilities_receiver).await;let queue_len = active_thread(&conversation_view, cx).read_with(cx, |thread, _cx| thread.message_queue.len());@@ -16803,21 +16815,95 @@ pub(crate) mod tests {text,format!("queued [@{image_name}]({expected_uri}) message"),);++ let thread_view = active_thread(&conversation_view, cx);+ thread_view.read_with(cx, |view, cx| {+ let capabilities = view.session_capabilities.read();+ assert!(capabilities.supports_images());+ assert!(capabilities.supports_embedded_context());+ assert_eq!(capabilities.prompt_capabilities(), &initial_capabilities);+ assert_eq!(+ view.thread.read(cx).prompt_capabilities(),+ &initial_capabilities+ );+ });++ let replacement_payload = json!({+ "image": { "_meta": { "image": ["opaque", 1] } },+ "audio": { "_meta": { "audio": { "opaque": true } } },+ "embeddedContext": { "_meta": { "context": ["opaque", null] } },+ "_meta": { "replacement": { "opaque": [false, 2] } }+ });+ let replacement: acp_v2::PromptCapabilities =+ serde_json::from_value(replacement_payload.clone())+ .expect("valid replacement prompt capabilities");+ capabilities_sender+ .send(replacement)+ .expect("thread is observing prompt capabilities");+ cx.run_until_parked();+ thread_view.read_with(cx, |view, cx| {+ let capabilities = view.session_capabilities.read();+ assert!(capabilities.supports_images());+ assert!(capabilities.supports_embedded_context());+ assert_eq!(+ serde_json::to_value(capabilities.prompt_capabilities())+ .expect("serialize retained prompt capabilities"),+ replacement_payload+ );+ assert_eq!(+ capabilities.prompt_capabilities(),+ view.thread.read(cx).prompt_capabilities()+ );+ });++ let disabled_capabilities: acp_v2::PromptCapabilities = serde_json::from_value(json!({+ "image": null,+ "audio": null,+ "embeddedContext": null,+ "_meta": { "disabled": ["preserved"] }+ }))+ .expect("valid unadvertised prompt capabilities");+ capabilities_sender+ .send(disabled_capabilities.clone())+ .expect("thread is still observing prompt capabilities");+ cx.run_until_parked();+ thread_view.read_with(cx, |view, cx| {+ let capabilities = view.session_capabilities.read();+ assert!(!capabilities.supports_images());+ assert!(!capabilities.supports_embedded_context());+ assert_eq!(capabilities.prompt_capabilities(), &disabled_capabilities);+ assert_eq!(+ view.thread.read(cx).prompt_capabilities(),+ &disabled_capabilities+ );+ });++ let editor = message_editor(&conversation_view, cx);+ cx.write_to_clipboard(image_clipboard);+ editor.update_in(cx, |editor, window, cx| {+ editor.clear(window, cx);+ editor.paste(&Paste, window, cx);+ });+ cx.run_until_parked();+ editor.read_with(cx, |editor, cx| {+ assert!(+ editor.is_empty(cx),+ "disabled image support must prevent paste"+ );+ });}async fn paste_into_queued_message(cx: &mut TestAppContext,clipboard: ClipboardItem,+ prompt_capabilities: watch::Receiver<acp_v2::PromptCapabilities>,) -> (Entity<ConversationView>, &mut VisualTestContext) {+ let connection = StubAgentConnection::new().with_prompt_capabilities(prompt_capabilities);let (conversation_view, cx) =- setup_conversation_view(StubAgentServer::default_response(), cx).await;+ setup_conversation_view(StubAgentServer::new(connection), cx).await;add_to_workspace(conversation_view.clone(), cx);active_thread(&conversation_view, cx).update_in(cx, |thread, window, cx| {- thread- .session_capabilities- .write()- .set_prompt_capabilities(acp_v1::PromptCapabilities::new().image(true));thread.add_to_queue(vec![acp_v2::ContentBlock::Text(acp_v2::TextContent::new("queued message".to_string(),@@ -17029,10 +17115,10 @@ pub(crate) mod tests {action_log,acp_v1::SessionId::new("close-capable-session"),watch::Receiver::constant(- acp_v1::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),),cx,)diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rsindex 9746b4fac22..61792abd2b2 100644--- a/crates/agent_ui/src/message_editor.rs+++ b/crates/agent_ui/src/message_editor.rs@@ -47,14 +47,14 @@ use zed_actions::agent::{Chat, PasteRaw};#[derive(Default)]pub struct SessionCapabilities {- prompt_capabilities: acp_v1::PromptCapabilities,+ prompt_capabilities: acp_v2::PromptCapabilities,available_commands: Vec<acp_v2::AvailableCommand>,available_skills: Vec<AvailableSkill>,}impl SessionCapabilities {pub fn new(- prompt_capabilities: acp_v1::PromptCapabilities,+ prompt_capabilities: acp_v2::PromptCapabilities,available_commands: Vec<acp_v2::AvailableCommand>,available_skills: Vec<AvailableSkill>,) -> Self {@@ -66,18 +66,22 @@ impl SessionCapabilities {}pub fn from_acp_commands(- prompt_capabilities: acp_v1::PromptCapabilities,+ prompt_capabilities: acp_v2::PromptCapabilities,available_commands: Vec<acp_v2::AvailableCommand>,) -> Self {Self::new(prompt_capabilities, available_commands, Vec::new())}+ pub fn prompt_capabilities(&self) -> &acp_v2::PromptCapabilities {+ &self.prompt_capabilities+ }+pub fn supports_images(&self) -> bool {- self.prompt_capabilities.image+ self.prompt_capabilities.image.is_some()}pub fn supports_embedded_context(&self) -> bool {- self.prompt_capabilities.embedded_context+ self.prompt_capabilities.embedded_context.is_some()}pub fn available_commands(&self) -> &[acp_v2::AvailableCommand] {@@ -94,7 +98,7 @@ impl SessionCapabilities {fn supported_modes(&self, has_thread_store: bool) -> Vec<PromptContextType> {let mut supported = vec![PromptContextType::File, PromptContextType::Symbol];- if self.prompt_capabilities.embedded_context {+ if self.supports_embedded_context() {if has_thread_store {supported.push(PromptContextType::Thread);}@@ -128,7 +132,7 @@ impl SessionCapabilities {self.available_skills.clone()}- pub fn set_prompt_capabilities(&mut self, prompt_capabilities: acp_v1::PromptCapabilities) {+ pub fn set_prompt_capabilities(&mut self, prompt_capabilities: acp_v2::PromptCapabilities) {self.prompt_capabilities = prompt_capabilities;}@@ -2338,7 +2342,7 @@ mod tests {warning: None,};let session_capabilities = SessionCapabilities::new(- acp_v1::PromptCapabilities::default(),+ acp_v2::PromptCapabilities::default(),vec![acp_v2::AvailableCommand::new("help", "Get help")],vec![skill],);@@ -2353,7 +2357,7 @@ mod tests {#[test]fn test_completion_commands_derive_category_from_meta() {let session_capabilities = SessionCapabilities::new(- acp_v1::PromptCapabilities::default(),+ acp_v2::PromptCapabilities::default(),vec![acp_v2::AvailableCommand::new("compact", "Built-in").meta(acp_thread::meta_with_command_category(acp_thread::CommandCategory::Native),@@ -2681,7 +2685,7 @@ mod tests {let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;let thread_store = None;let session_capabilities = Arc::new(RwLock::new(SessionCapabilities::from_acp_commands(- acp_v1::PromptCapabilities::default(),+ acp_v2::PromptCapabilities::default(),vec![],)));@@ -2842,7 +2846,7 @@ mod tests {let thread_store = None;let session_capabilities = Arc::new(RwLock::new(SessionCapabilities::from_acp_commands(- acp_v1::PromptCapabilities::default(),+ acp_v2::PromptCapabilities::default(),vec![acp_v2::AvailableCommand::new("quick-math", "2 + 2 = 4 - 1 = 3"),acp_v2::AvailableCommand::new("say-hello", "Say hello to whoever you want").input(@@ -3011,7 +3015,7 @@ mod tests {let mut cx = VisualTestContext::from_window(window.into(), cx);let session_capabilities = Arc::new(RwLock::new(SessionCapabilities::from_acp_commands(- acp_v1::PromptCapabilities::default(),+ acp_v2::PromptCapabilities::default(),Vec::new(),)));@@ -3125,7 +3129,7 @@ mod tests {let mut cx = VisualTestContext::from_window(window.into(), cx);let session_capabilities = Arc::new(RwLock::new(SessionCapabilities::from_acp_commands(- acp_v1::PromptCapabilities::default(),+ acp_v2::PromptCapabilities::default(),vec![acp_v2::AvailableCommand::new("hello", "Say hello")],)));@@ -3279,7 +3283,7 @@ mod tests {let thread_store = cx.new(|cx| ThreadStore::new(cx));let session_capabilities = Arc::new(RwLock::new(SessionCapabilities::from_acp_commands(- acp_v1::PromptCapabilities::default(),+ acp_v2::PromptCapabilities::default(),vec![],)));@@ -3338,10 +3342,10 @@ mod tests {message_editor.update(&mut cx, |editor, _cx| {editor.session_capabilities.write().set_prompt_capabilities(- acp_v1::PromptCapabilities::new()- .image(true)- .audio(true)- .embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .image(acp_v2::PromptImageCapabilities::new())+ .audio(acp_v2::PromptAudioCapabilities::new())+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),);});@@ -3794,7 +3798,8 @@ mod tests {);// Enable embedded context so files are actually includededitor.session_capabilities.write().set_prompt_capabilities(- acp_v1::PromptCapabilities::new().embedded_context(true),+ acp_v2::PromptCapabilities::new()+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),);editor})@@ -4015,10 +4020,10 @@ mod tests {});message_editor.update(cx, |editor, _cx| {- editor- .session_capabilities- .write()- .set_prompt_capabilities(acp_v1::PromptCapabilities::new().embedded_context(true));+ editor.session_capabilities.write().set_prompt_capabilities(+ acp_v2::PromptCapabilities::new()+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),+ );});let supported_modes = {@@ -4071,10 +4076,10 @@ mod tests {});message_editor.update(cx, |editor, _cx| {- editor- .session_capabilities- .write()- .set_prompt_capabilities(acp_v1::PromptCapabilities::new().embedded_context(true));+ editor.session_capabilities.write().set_prompt_capabilities(+ acp_v2::PromptCapabilities::new()+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),+ );});let supported_modes = {@@ -4234,10 +4239,10 @@ mod tests {);message_editor.update(cx, |editor, _cx| {- editor- .session_capabilities- .write()- .set_prompt_capabilities(acp_v1::PromptCapabilities::new().embedded_context(true))+ editor.session_capabilities.write().set_prompt_capabilities(+ acp_v2::PromptCapabilities::new()+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),+ )});let content = message_editor@@ -4933,10 +4938,10 @@ mod tests {let (fixture, mut cx) = setup_selection_mention_fixture(cx).await;let blocks = fixture.message_editor.update(&mut cx, |editor, cx| {- editor- .session_capabilities- .write()- .set_prompt_capabilities(acp_v1::PromptCapabilities::new().embedded_context(true));+ editor.session_capabilities.write().set_prompt_capabilities(+ acp_v2::PromptCapabilities::new()+ .embedded_context(acp_v2::PromptEmbeddedContextCapabilities::new()),+ );editor.draft_content_blocks_snapshot(cx)});@@ -5365,7 +5370,9 @@ mod tests {message_editor.session_capabilities.write()- .set_prompt_capabilities(acp_v1::PromptCapabilities::new().image(true));+ .set_prompt_capabilities(+ acp_v2::PromptCapabilities::new().image(acp_v2::PromptImageCapabilities::new()),+ );});let temporary_image_path = write_test_png_file(None);diff --git a/crates/agent_ui/src/thread_metadata_store.rs b/crates/agent_ui/src/thread_metadata_store.rsindex eb840eb5791..4a406b43b81 100644--- a/crates/agent_ui/src/thread_metadata_store.rs+++ b/crates/agent_ui/src/thread_metadata_store.rs@@ -1824,7 +1824,7 @@ mod tests {use acp_thread::StubAgentConnection;use action_log::ActionLog;use agent::DbThread;- use agent_client_protocol::schema::v1 as acp;+ use agent_client_protocol::schema::{v1 as acp, v2 as acp_v2};use gpui::{TestAppContext, VisualTestContext};use project::FakeFs;use project::Project;@@ -2858,7 +2858,7 @@ mod tests {project.clone(),action_log,subagent_session_id.clone(),- watch::Receiver::constant(acp::PromptCapabilities::new()),+ watch::Receiver::constant(acp_v2::PromptCapabilities::new()),cx,)})