vrr/zed
2
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-10-19 02:54:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

agent: Publish native commands using ACP v2 (#65415)

Browse source 
Publish native slash commands directly as ACP v2 values through the
existing shared command updater, removing the internal v1
notification/conversion round trip.

Release Notes:

- N/A
This commit is contained in:
Ben Brandt 2026-10-09 19:40:41 +00:00 • committed by GitHub
parent 687d662a0b
commit f54e09c151
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
crates/agent/src/agent.rs
View file

@ -1583,14 +1583,7 @@ impl NativeAgent {
session session
.acp_thread .acp_thread
.update(cx, |thread, cx| { .update(cx, |thread, cx| {
thread thread.update_available_commands(available_commands.clone(), cx);
.handle_session_update(
acp_v1::SessionUpdate::AvailableCommandsUpdate(
acp_v1::AvailableCommandsUpdate::new(available_commands.clone()),
),
cx,
)
.log_err();
}) })
.ok(); .ok();
} }
@ -1599,11 +1592,11 @@ impl NativeAgent {
fn build_available_commands_for_project( fn build_available_commands_for_project(
project_state: Option<&ProjectState>, project_state: Option<&ProjectState>,
cx: &App, cx: &App,
) -> Vec<acp_v1::AvailableCommand> { ) -> Vec<acp_v2::AvailableCommand> {
let Some(state) = project_state else { let Some(state) = project_state else {
return Vec::new(); return Vec::new();
}; };
let compact_command = acp_v1::AvailableCommand::new( let compact_command = acp_v2::AvailableCommand::new(
COMPACT_COMMAND_NAME, COMPACT_COMMAND_NAME,
"Summarize the conversation so far to free up context", "Summarize the conversation so far to free up context",
) )
@ -1633,7 +1626,7 @@ impl NativeAgent {
}; };
let mut command = let mut command =
acp_v1::AvailableCommand::new(name, prompt.description.clone().unwrap_or_default()) acp_v2::AvailableCommand::new(name, prompt.description.clone().unwrap_or_default())
.meta(acp_thread::meta_with_command_category( .meta(acp_thread::meta_with_command_category(
acp_thread::CommandCategory::Mcp, acp_thread::CommandCategory::Mcp,
)); ));
@ -1642,8 +1635,8 @@ impl NativeAgent {
Some([arg]) => { Some([arg]) => {
let hint = format!("<{}>", arg.name); let hint = format!("<{}>", arg.name);
command = command.input(acp_v1::AvailableCommandInput::Unstructured( command = command.input(acp_v2::AvailableCommandInput::Text(
acp_v1::UnstructuredCommandInput::new(hint), acp_v2::TextCommandInput::new(hint),
)); ));
} }
Some([]) | None => {} Some([]) | None => {}
@ -4304,11 +4297,15 @@ mod internal_tests {
cx.update(|cx| { cx.update(|cx| {
let commands = acp_thread.read(cx).available_commands(); let commands = acp_thread.read(cx).available_commands();
let compact = commands.iter().find(|command| command.name == "compact");
let compact = compact.expect("compact command should be available");
assert_eq!( assert_eq!(
acp_thread::command_category_from_meta(&compact.meta), commands,
Some(acp_thread::CommandCategory::Native), &[acp_v2::AvailableCommand::new(
COMPACT_COMMAND_NAME,
"Summarize the conversation so far to free up context",
)
.meta(acp_thread::meta_with_command_category(
acp_thread::CommandCategory::Native,
))],
); );
}); });
} }
@ -6166,11 +6163,8 @@ mod internal_tests {
let project_id = project.entity_id(); let project_id = project.entity_id();
let session_id = acp_thread.read_with(cx, |thread, _cx| thread.session_id().clone()); let session_id = acp_thread.read_with(cx, |thread, _cx| thread.session_id().clone());
agent.read_with(cx, |agent, cx| { acp_thread.read_with(cx, |thread, _cx| {
let commands = NativeAgent::build_available_commands_for_project( let commands = thread.available_commands();
agent.projects.get(&project_id),
cx,
);
let names: Vec<&str> = commands.iter().map(|c| c.name.as_str()).collect(); let names: Vec<&str> = commands.iter().map(|c| c.name.as_str()).collect();
assert!( assert!(
!names.contains(&"visible-skill"), !names.contains(&"visible-skill"),
@ -6287,7 +6281,7 @@ mod internal_tests {
.map(|s| s.name.as_str()) .map(|s| s.name.as_str())
.collect::<Vec<_>>() .collect::<Vec<_>>()
); );
let commands = NativeAgent::build_available_commands_for_project(Some(state), cx); let commands = acp_thread.read(cx).available_commands();
let names: Vec<&str> = commands.iter().map(|c| c.name.as_str()).collect(); let names: Vec<&str> = commands.iter().map(|c| c.name.as_str()).collect();
assert!( assert!(
!names.contains(&"my-skill"), !names.contains(&"my-skill"),