Skip to content

armgit / zed

Public Imported from GitHub
0

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 elicitation values (#65248)

Ben Brandt73be6ac6b197
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 77f4deae8c7..ef1bb58dc2b 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -4,6 +4,7 @@ pub mod config_options;
mod connection;
pub mod content;
mod diff;
+pub mod elicitation;
mod mention;
pub mod notices;
pub mod prompt_capabilities;
@@ -495,14 +496,14 @@ pub struct ElicitationEntryId(pub Arc<str>);
#[derive(Debug)]
pub struct Elicitation {
pub id: ElicitationEntryId,
- pub request: acp_v1::CreateElicitationRequest,
+ pub request: acp_v2::CreateElicitationRequest,
pub status: ElicitationStatus,
}
#[derive(Debug)]
pub enum ElicitationStatus {
Pending {
- respond_tx: oneshot::Sender<acp_v1::CreateElicitationResponse>,
+ respond_tx: oneshot::Sender<acp_v2::CreateElicitationResponse>,
},
Accepted,
Declined,
@@ -535,19 +536,19 @@ impl ElicitationStore {
&self.elicitations
}
- fn validate_request(request: &acp_v1::CreateElicitationRequest) -> Result<(), acp_v1::Error> {
+ fn validate_request(request: &acp_v2::CreateElicitationRequest) -> Result<(), acp_v2::Error> {
match &request.mode {
- acp_v1::ElicitationMode::Form(_) => {}
- acp_v1::ElicitationMode::Url(mode) => {
+ acp_v2::ElicitationMode::Form(_) => {}
+ acp_v2::ElicitationMode::Url(mode) => {
let url = url::Url::parse(&mode.url)
- .map_err(|_| acp_v1::Error::invalid_params().data("invalid elicitation URL"))?;
+ .map_err(|_| acp_v2::Error::invalid_params().data("invalid elicitation URL"))?;
if !matches!(url.scheme(), "http" | "https") || url.host_str().is_none() {
- return Err(acp_v1::Error::invalid_params()
+ return Err(acp_v2::Error::invalid_params()
.data("elicitation URL must use HTTP or HTTPS and include a host"));
}
}
_ => {
- return Err(acp_v1::Error::invalid_params().data("unsupported elicitation mode"));
+ return Err(acp_v2::Error::invalid_params().data("unsupported elicitation mode"));
}
}
@@ -556,10 +557,10 @@ impl ElicitationStore {
fn insert_pending_elicitation(
&mut self,
- request: acp_v1::CreateElicitationRequest,
+ request: acp_v2::CreateElicitationRequest,
) -> (
ElicitationEntryId,
- oneshot::Receiver<acp_v1::CreateElicitationResponse>,
+ oneshot::Receiver<acp_v2::CreateElicitationResponse>,
) {
let (respond_tx, response_rx) = oneshot::channel();
let id = ElicitationEntryId(Uuid::new_v4().to_string().into());
@@ -572,12 +573,12 @@ impl ElicitationStore {
}
fn response_task(
- response_rx: oneshot::Receiver<acp_v1::CreateElicitationResponse>,
+ response_rx: oneshot::Receiver<acp_v2::CreateElicitationResponse>,
cx: &App,
- ) -> Task<acp_v1::CreateElicitationResponse> {
+ ) -> Task<acp_v2::CreateElicitationResponse> {
cx.foreground_executor().spawn(async move {
response_rx.await.unwrap_or_else(|oneshot::Canceled| {
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Cancel)
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Cancel)
})
})
}
@@ -591,7 +592,7 @@ impl ElicitationStore {
fn respond_to_elicitation_entry(
elicitation: &mut Elicitation,
- response: acp_v1::CreateElicitationResponse,
+ response: acp_v2::CreateElicitationResponse,
) -> bool {
if !matches!(elicitation.status, ElicitationStatus::Pending { .. }) {
return false;
@@ -626,8 +627,8 @@ impl ElicitationStore {
match mem::replace(&mut elicitation.status, ElicitationStatus::Canceled) {
ElicitationStatus::Pending { respond_tx } => {
if respond_tx
- .send(acp_v1::CreateElicitationResponse::new(
- acp_v1::ElicitationAction::Cancel,
+ .send(acp_v2::CreateElicitationResponse::new(
+ acp_v2::ElicitationAction::Cancel,
))
.is_err()
{
@@ -636,7 +637,7 @@ impl ElicitationStore {
Some(ElicitationChange::Responded)
}
ElicitationStatus::Accepted
- if matches!(&elicitation.request.mode, acp_v1::ElicitationMode::Url(_)) =>
+ if matches!(&elicitation.request.mode, acp_v2::ElicitationMode::Url(_)) =>
{
Some(ElicitationChange::Updated)
}
@@ -650,7 +651,7 @@ impl ElicitationStore {
fn respond_to_elicitation_by_id(
&mut self,
id: &ElicitationEntryId,
- response: acp_v1::CreateElicitationResponse,
+ response: acp_v2::CreateElicitationResponse,
) -> bool {
let Some((_, elicitation)) = self.elicitation_mut(id) else {
return false;
@@ -672,18 +673,18 @@ impl ElicitationStore {
pub fn request_elicitation(
&mut self,
- request: acp_v1::CreateElicitationRequest,
+ request: acp_v2::CreateElicitationRequest,
cx: &mut Context<Self>,
- ) -> Result<Task<acp_v1::CreateElicitationResponse>, acp_v1::Error> {
+ ) -> Result<Task<acp_v2::CreateElicitationResponse>, acp_v2::Error> {
self.request_elicitation_with_id(request, cx)
.map(|(_, task)| task)
}
pub fn request_elicitation_with_id(
&mut self,
- request: acp_v1::CreateElicitationRequest,
+ request: acp_v2::CreateElicitationRequest,
cx: &mut Context<Self>,
- ) -> Result<(ElicitationEntryId, Task<acp_v1::CreateElicitationResponse>), acp_v1::Error> {
+ ) -> Result<(ElicitationEntryId, Task<acp_v2::CreateElicitationResponse>), acp_v2::Error> {
Self::validate_request(&request)?;
let (id, response_rx) = self.insert_pending_elicitation(request);
cx.emit(ElicitationStoreEvent::ElicitationRequested(id.clone()));
@@ -696,7 +697,7 @@ impl ElicitationStore {
pub fn respond_to_elicitation(
&mut self,
id: &ElicitationEntryId,
- response: acp_v1::CreateElicitationResponse,
+ response: acp_v2::CreateElicitationResponse,
cx: &mut Context<Self>,
) {
if !self.respond_to_elicitation_by_id(id, response) {
@@ -709,7 +710,7 @@ impl ElicitationStore {
pub fn complete_url_elicitation(
&mut self,
- elicitation_id: &acp_v1::ElicitationId,
+ elicitation_id: &acp_v2::ElicitationId,
cx: &mut Context<Self>,
) {
let Some(entry_id) = self.entry_id_for_url_elicitation(elicitation_id) else {
@@ -754,7 +755,7 @@ impl ElicitationStore {
let keep = matches!(
(&elicitation.status, &elicitation.request.mode),
(ElicitationStatus::Pending { .. }, _)
- | (ElicitationStatus::Accepted, acp_v1::ElicitationMode::Url(_))
+ | (ElicitationStatus::Accepted, acp_v2::ElicitationMode::Url(_))
);
if !keep {
cleared_ids.push(elicitation.id.clone());
@@ -772,11 +773,11 @@ impl ElicitationStore {
cleared_ids
}
- pub fn cancel_request(&mut self, request_id: &acp_v1::RequestId, cx: &mut Context<Self>) {
+ pub fn cancel_request(&mut self, request_id: &acp_v2::RequestId, cx: &mut Context<Self>) {
let changes = self.cancel_pending(|elicitation| {
matches!(
elicitation.request.scope(),
- acp_v1::ElicitationScope::Request(scope) if &scope.request_id == request_id
+ acp_v2::ElicitationScope::Request(scope) if &scope.request_id == request_id
)
});
for (id, change) in changes {
@@ -797,10 +798,10 @@ impl ElicitationStore {
fn entry_id_for_url_elicitation(
&self,
- elicitation_id: &acp_v1::ElicitationId,
+ elicitation_id: &acp_v2::ElicitationId,
) -> Option<ElicitationEntryId> {
self.elicitations.iter().rev().find_map(|elicitation| {
- if let acp_v1::ElicitationMode::Url(mode) = &elicitation.request.mode
+ if let acp_v2::ElicitationMode::Url(mode) = &elicitation.request.mode
&& &mode.elicitation_id == elicitation_id
{
Some(elicitation.id.clone())
@@ -1907,12 +1908,12 @@ impl Display for ToolCallStatus {
}
fn elicitation_status_for_response(
- response: &acp_v1::CreateElicitationResponse,
+ response: &acp_v2::CreateElicitationResponse,
) -> ElicitationStatus {
match &response.action {
- acp_v1::ElicitationAction::Accept(_) => ElicitationStatus::Accepted,
- acp_v1::ElicitationAction::Decline => ElicitationStatus::Declined,
- acp_v1::ElicitationAction::Cancel => ElicitationStatus::Canceled,
+ acp_v2::ElicitationAction::Accept(_) => ElicitationStatus::Accepted,
+ acp_v2::ElicitationAction::Decline => ElicitationStatus::Declined,
+ acp_v2::ElicitationAction::Cancel => ElicitationStatus::Canceled,
_ => ElicitationStatus::Canceled,
}
}
@@ -5859,18 +5860,18 @@ impl AcpThread {
pub fn request_elicitation(
&mut self,
- request: acp_v1::CreateElicitationRequest,
+ request: acp_v2::CreateElicitationRequest,
cx: &mut Context<Self>,
- ) -> Result<Task<acp_v1::CreateElicitationResponse>, acp_v1::Error> {
+ ) -> Result<Task<acp_v2::CreateElicitationResponse>, acp_v2::Error> {
self.request_elicitation_with_id(request, cx)
.map(|(_, task)| task)
}
pub fn request_elicitation_with_id(
&mut self,
- request: acp_v1::CreateElicitationRequest,
+ request: acp_v2::CreateElicitationRequest,
cx: &mut Context<Self>,
- ) -> Result<(ElicitationEntryId, Task<acp_v1::CreateElicitationResponse>), acp_v1::Error> {
+ ) -> Result<(ElicitationEntryId, Task<acp_v2::CreateElicitationResponse>), acp_v2::Error> {
ElicitationStore::validate_request(&request)?;
let (id, response_rx) = self.elicitations.insert_pending_elicitation(request);
@@ -5896,7 +5897,7 @@ impl AcpThread {
pub fn respond_to_elicitation(
&mut self,
id: &ElicitationEntryId,
- response: acp_v1::CreateElicitationResponse,
+ response: acp_v2::CreateElicitationResponse,
cx: &mut Context<Self>,
) {
let Some(ix) = self.elicitation_entry_ix(id) else {
@@ -5911,7 +5912,7 @@ impl AcpThread {
pub fn complete_url_elicitation(
&mut self,
- elicitation_id: &acp_v1::ElicitationId,
+ elicitation_id: &acp_v2::ElicitationId,
cx: &mut Context<Self>,
) {
let Some(entry_id) = self
@@ -15699,10 +15700,10 @@ mod tests {
let result = thread.update(cx, |thread, cx| {
thread.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(session_id.0)),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -15725,16 +15726,18 @@ mod tests {
enable_acp_beta(cx);
let thread = new_test_thread(cx).await;
let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
- let tool_call_id = acp_v1::ToolCallId::new("tool-1");
+ let tool_call_id = acp_v2::ToolCallId::new("tool-1");
let response_task = thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(session_id.clone())
- .tool_call_id(tool_call_id.clone()),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0.clone(),
+ ))
+ .tool_call_id(tool_call_id.clone()),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -15745,7 +15748,7 @@ mod tests {
let elicitation_id = thread.read_with(cx, |thread, _| {
let (elicitation_id, elicitation) = only_thread_elicitation(thread);
- let acp_v1::ElicitationScope::Session(scope) = elicitation.request.scope() else {
+ let acp_v2::ElicitationScope::Session(scope) = elicitation.request.scope() else {
panic!("expected session-scoped elicitation");
};
assert_eq!(scope.tool_call_id.as_ref(), Some(&tool_call_id));
@@ -15754,13 +15757,13 @@ mod tests {
let expected_content = std::collections::BTreeMap::from([(
"name".to_string(),
- acp_v1::ElicitationContentValue::from("Ada"),
+ acp_v2::ElicitationContentValue::from("Ada"),
)]);
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new().content(expected_content.clone()),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new().content(expected_content.clone()),
)),
cx,
);
@@ -15769,8 +15772,8 @@ mod tests {
let response = response_task.await;
assert_eq!(
response.action,
- acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new().content(expected_content)
+ acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new().content(expected_content)
)
);
thread.read_with(cx, |thread, _| {
@@ -15787,14 +15790,16 @@ mod tests {
enable_acp_beta(cx);
let thread = new_test_thread(cx).await;
let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
- let url_elicitation_id = acp_v1::ElicitationId::new("url-1");
+ let url_elicitation_id = acp_v2::ElicitationId::new("url-1");
let response_task = thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationUrlMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationUrlMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0,
+ )),
url_elicitation_id.clone(),
"https://example.com/complete",
),
@@ -15825,15 +15830,15 @@ mod tests {
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&entry_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
});
assert!(matches!(
response_task.await.action,
- acp_v1::ElicitationAction::Accept(_)
+ acp_v2::ElicitationAction::Accept(_)
));
thread.update(cx, |thread, cx| {
thread.complete_url_elicitation(&url_elicitation_id, cx);
@@ -15852,14 +15857,16 @@ mod tests {
enable_acp_beta(cx);
let thread = new_test_thread(cx).await;
let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
- let url_elicitation_id = acp_v1::ElicitationId::new("url-1");
+ let url_elicitation_id = acp_v2::ElicitationId::new("url-1");
let response_task = thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationUrlMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationUrlMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0,
+ )),
url_elicitation_id.clone(),
"https://example.com/complete",
),
@@ -15878,15 +15885,15 @@ mod tests {
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&entry_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
});
assert!(matches!(
response_task.await.action,
- acp_v1::ElicitationAction::Accept(_)
+ acp_v2::ElicitationAction::Accept(_)
));
thread.update(cx, |thread, cx| {
@@ -15916,14 +15923,16 @@ mod tests {
enable_acp_beta(cx);
let thread = new_test_thread(cx).await;
let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
- let url_elicitation_id = acp_v1::ElicitationId::new("url-1");
+ let url_elicitation_id = acp_v2::ElicitationId::new("url-1");
let response_task = thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationUrlMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationUrlMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0,
+ )),
url_elicitation_id.clone(),
"https://example.com/complete",
),
@@ -15942,15 +15951,15 @@ mod tests {
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&entry_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
});
assert!(matches!(
response_task.await.action,
- acp_v1::ElicitationAction::Accept(_)
+ acp_v2::ElicitationAction::Accept(_)
));
thread.read_with(cx, |thread, _| {
let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
@@ -16024,13 +16033,15 @@ mod tests {
);
let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
- let url_elicitation_id = acp_v1::ElicitationId::new("url-1");
+ let url_elicitation_id = acp_v2::ElicitationId::new("url-1");
let response_task = thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationUrlMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationUrlMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0,
+ )),
url_elicitation_id.clone(),
"https://example.com/complete",
),
@@ -16049,15 +16060,15 @@ mod tests {
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&entry_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
});
assert!(matches!(
response_task.await.action,
- acp_v1::ElicitationAction::Accept(_)
+ acp_v2::ElicitationAction::Accept(_)
));
let response = thread
@@ -16092,20 +16103,30 @@ mod tests {
init_test(cx);
enable_acp_beta(cx);
let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+ let request: acp_v2::CreateElicitationRequest = serde_json::from_value(serde_json::json!({
+ "mode": "form",
+ "requestId": "0001",
+ "message": "Provide details",
+ "_meta": {"request": {"opaque": [1, null]}},
+ "requestedSchema": {
+ "type": "object",
+ "required": ["future"],
+ "_meta": {"schema": {}},
+ "properties": {
+ "future": {"type": "_location", "nested": {"precision": "city"},
+ "_meta": {"property": [null]}},
+ "formatted": {"type": "string", "format": "_future",
+ "_meta": {"format": true}},
+ "items": {"type": "array",
+ "items": {"type": "_token", "values": ["b", "a"],
+ "_meta": {"items": {}}}}
+ }
+ }
+ }))
+ .unwrap();
let response_task = store.update(cx, |store, cx| {
- store
- .request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
- acp_v1::ElicitationSchema::new().string("name", true),
- ),
- "Provide a name",
- ),
- cx,
- )
- .unwrap()
+ store.request_elicitation(request.clone(), cx).unwrap()
});
let elicitation_id = store.read_with(cx, |store, _| {
@@ -16115,30 +16136,41 @@ mod tests {
store.elicitations()
);
};
- let acp_v1::ElicitationScope::Request(scope) = elicitation.request.scope() else {
+ let acp_v2::ElicitationScope::Request(scope) = elicitation.request.scope() else {
panic!("expected request-scoped elicitation");
};
- assert_eq!(scope.request_id, acp_v1::RequestId::Number(1));
+ assert_eq!(scope.request_id, acp_v2::RequestId::Str("0001".into()));
+ assert_eq!(elicitation.request, request);
elicitation.id.clone()
});
+ let response = acp_v2::CreateElicitationResponse::new(acp_v2::OtherElicitationAction::new(
+ "_defer",
+ std::collections::BTreeMap::from([(
+ "reason".to_string(),
+ serde_json::json!({"opaque": [1, null]}),
+ )]),
+ ))
+ .meta(serde_json::Map::from_iter([(
+ "response".to_string(),
+ serde_json::json!({"nested": {}}),
+ )]));
store.update(cx, |store, cx| {
+ store.respond_to_elicitation(&elicitation_id, response.clone(), cx);
store.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Decline),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAcceptAction::new()),
cx,
);
});
- assert_eq!(
- response_task.await.action,
- acp_v1::ElicitationAction::Decline
- );
+ assert_eq!(response_task.await, response);
store.read_with(cx, |store, _| {
let Some((_, elicitation)) = store.elicitation(&elicitation_id) else {
panic!("missing elicitation entry");
};
- assert!(matches!(elicitation.status, ElicitationStatus::Declined));
+ assert_eq!(elicitation.request, request);
+ assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
});
}
@@ -16160,10 +16192,10 @@ mod tests {
let response_task = store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16185,13 +16217,13 @@ mod tests {
store.update(cx, |store, cx| {
store.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Decline),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Decline),
cx,
);
store.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
@@ -16199,7 +16231,7 @@ mod tests {
assert_eq!(
response_task.await.action,
- acp_v1::ElicitationAction::Decline
+ acp_v2::ElicitationAction::Decline
);
assert_eq!(
responded_ids.borrow().as_slice(),
@@ -16223,10 +16255,12 @@ mod tests {
let (elicitation_id, response_task) = thread.update(cx, |thread, cx| {
thread
.request_elicitation_with_id(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0,
+ )),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16241,7 +16275,7 @@ mod tests {
assert_eq!(
response_task.await.action,
- acp_v1::ElicitationAction::Cancel
+ acp_v2::ElicitationAction::Cancel
);
thread.read_with(cx, |thread, _| {
let Some((_, elicitation)) = thread.elicitation(&elicitation_id) else {
@@ -16261,10 +16295,12 @@ mod tests {
let response_task = thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0,
+ )),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16284,7 +16320,7 @@ mod tests {
assert_eq!(
response_task.await.action,
- acp_v1::ElicitationAction::Cancel
+ acp_v2::ElicitationAction::Cancel
);
thread.read_with(cx, |thread, _| {
let Some((_, elicitation)) = thread.elicitation(&elicitation_id) else {
@@ -16298,15 +16334,14 @@ mod tests {
thread: WeakEntity<AcpThread>,
session_id: acp_v2::SessionId,
cx: &mut AsyncApp,
- ) -> Result<Task<acp_v1::CreateElicitationResponse>> {
- let session_id = acp_v1::SessionId::new(session_id.0);
+ ) -> Result<Task<acp_v2::CreateElicitationResponse>> {
thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(session_id),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16356,7 +16391,7 @@ mod tests {
cx.run_until_parked();
assert_eq!(
*elicitation_action.borrow(),
- Some(acp_v1::ElicitationAction::Cancel)
+ Some(acp_v2::ElicitationAction::Cancel)
);
thread.read_with(cx, |thread, _| {
let Some(elicitation) = thread.entries().iter().find_map(|entry| match entry {
@@ -16411,7 +16446,7 @@ mod tests {
cx.run_until_parked();
assert_eq!(
*elicitation_action.borrow(),
- Some(acp_v1::ElicitationAction::Cancel)
+ Some(acp_v2::ElicitationAction::Cancel)
);
thread.read_with(cx, |thread, _| {
let Some(elicitation) = thread.entries().iter().find_map(|entry| match entry {
@@ -16435,10 +16470,10 @@ mod tests {
let (elicitation_id, response_task) = store.update(cx, |store, cx| {
store
.request_elicitation_with_id(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16453,7 +16488,7 @@ mod tests {
assert_eq!(
response_task.await.action,
- acp_v1::ElicitationAction::Cancel
+ acp_v2::ElicitationAction::Cancel
);
store.read_with(cx, |store, _| {
let Some((_, elicitation)) = store.elicitation(&elicitation_id) else {
@@ -16483,10 +16518,10 @@ mod tests {
let (elicitation_id, response_task) = store.update(cx, |store, cx| {
store
.request_elicitation_with_id(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(request_id.clone()),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(request_id.clone()),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16519,10 +16554,10 @@ mod tests {
let response_task = store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16537,7 +16572,7 @@ mod tests {
assert_eq!(
response_task.await.action,
- acp_v1::ElicitationAction::Cancel
+ acp_v2::ElicitationAction::Cancel
);
}
@@ -16552,10 +16587,10 @@ mod tests {
let first_response_task = store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16566,10 +16601,10 @@ mod tests {
let second_response_task = store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(2)),
- acp_v1::ElicitationSchema::new().string("account", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(2)),
+ acp_v2::ElicitationSchema::new().string("account", true),
),
"Provide an account",
),
@@ -16588,7 +16623,7 @@ mod tests {
store.update(cx, |store, cx| {
store.respond_to_elicitation(
&first_elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Decline),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Decline),
cx,
);
store.clear(cx);
@@ -16596,11 +16631,11 @@ mod tests {
assert_eq!(
first_response_task.await.action,
- acp_v1::ElicitationAction::Decline
+ acp_v2::ElicitationAction::Decline
);
assert_eq!(
second_response_task.await.action,
- acp_v1::ElicitationAction::Cancel
+ acp_v2::ElicitationAction::Cancel
);
store.read_with(cx, |store, _| assert!(store.elicitations().is_empty()));
}
@@ -16612,15 +16647,15 @@ mod tests {
init_test(cx);
enable_acp_beta(cx);
let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
- let url_elicitation_id = acp_v1::ElicitationId::new("url-1");
+ let url_elicitation_id = acp_v2::ElicitationId::new("url-1");
let accepted_response_task = store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16631,10 +16666,10 @@ mod tests {
let pending_response_task = store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(2)),
- acp_v1::ElicitationSchema::new().string("account", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(2)),
+ acp_v2::ElicitationSchema::new().string("account", true),
),
"Provide an account",
),
@@ -16645,9 +16680,9 @@ mod tests {
let accepted_url_response_task = store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationUrlMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(3)),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationUrlMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(3)),
url_elicitation_id,
"https://example.com/complete",
),
@@ -16675,26 +16710,26 @@ mod tests {
store.update(cx, |store, cx| {
store.respond_to_elicitation(
&accepted_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
store.respond_to_elicitation(
&accepted_url_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
});
assert!(matches!(
accepted_response_task.await.action,
- acp_v1::ElicitationAction::Accept(_)
+ acp_v2::ElicitationAction::Accept(_)
));
assert!(matches!(
accepted_url_response_task.await.action,
- acp_v1::ElicitationAction::Accept(_)
+ acp_v2::ElicitationAction::Accept(_)
));
let cleared_ids = store.update(cx, |store, cx| store.clear_resolved(cx));
@@ -16715,7 +16750,7 @@ mod tests {
store.update(cx, |store, cx| store.clear(cx));
assert_eq!(
pending_response_task.await.action,
- acp_v1::ElicitationAction::Cancel
+ acp_v2::ElicitationAction::Cancel
);
}
@@ -16724,14 +16759,14 @@ mod tests {
init_test(cx);
enable_acp_beta(cx);
let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
- let url_elicitation_id = acp_v1::ElicitationId::new("url-1");
+ let url_elicitation_id = acp_v2::ElicitationId::new("url-1");
let response_task = store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationUrlMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationUrlMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
url_elicitation_id.clone(),
"https://example.com/complete",
),
@@ -16767,15 +16802,15 @@ mod tests {
store.update(cx, |store, cx| {
store.respond_to_elicitation(
&entry_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
});
assert!(matches!(
response_task.await.action,
- acp_v1::ElicitationAction::Accept(_)
+ acp_v2::ElicitationAction::Accept(_)
));
store.update(cx, |store, cx| {
store.complete_url_elicitation(&url_elicitation_id, cx);
@@ -16795,7 +16830,7 @@ mod tests {
init_test(cx);
enable_acp_beta(cx);
let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
- let url_elicitation_id = acp_v1::ElicitationId::new("url-1");
+ let url_elicitation_id = acp_v2::ElicitationId::new("url-1");
let responded_ids = Rc::new(RefCell::new(Vec::new()));
let _subscription = cx.update(|cx| {
let responded_ids = responded_ids.clone();
@@ -16809,9 +16844,9 @@ mod tests {
let response_task = store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationUrlMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationUrlMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
url_elicitation_id.clone(),
"https://example.com/complete",
),
@@ -16835,15 +16870,15 @@ mod tests {
store.update(cx, |store, cx| {
store.respond_to_elicitation(
&entry_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
});
assert!(matches!(
response_task.await.action,
- acp_v1::ElicitationAction::Accept(_)
+ acp_v2::ElicitationAction::Accept(_)
));
assert_eq!(
responded_ids.borrow().as_slice(),
@@ -16886,10 +16921,12 @@ mod tests {
let response_task = thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0,
+ )),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16906,7 +16943,7 @@ mod tests {
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Decline),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Decline),
cx,
);
thread.cancel(cx).detach();
@@ -16914,7 +16951,7 @@ mod tests {
assert_eq!(
response_task.await.action,
- acp_v1::ElicitationAction::Decline
+ acp_v2::ElicitationAction::Decline
);
thread.read_with(cx, |thread, _| {
let Some((_, elicitation)) = thread.elicitation(&elicitation_id) else {
@@ -16934,10 +16971,12 @@ mod tests {
let response_task = thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0,
+ )),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -16954,13 +16993,13 @@ mod tests {
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Decline),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Decline),
cx,
);
thread.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
@@ -16968,7 +17007,7 @@ mod tests {
assert_eq!(
response_task.await.action,
- acp_v1::ElicitationAction::Decline
+ acp_v2::ElicitationAction::Decline
);
thread.read_with(cx, |thread, _| {
let Some((_, elicitation)) = thread.elicitation(&elicitation_id) else {
@@ -16994,9 +17033,11 @@ mod tests {
] {
let result = thread.update(cx, |thread, cx| {
thread.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationUrlMode::new(
- acp_v1::ElicitationSessionScope::new(session_id.clone()),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationUrlMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0.clone(),
+ )),
"url-1",
invalid_url,
),
@@ -17009,7 +17050,7 @@ mod tests {
let Err(error) = result else {
panic!("{invalid_url} should not be accepted for URL elicitation");
};
- assert_eq!(error.code, acp_v1::ErrorCode::InvalidParams);
+ assert_eq!(error.code, acp_v2::ErrorCode::InvalidParams);
}
thread.read_with(cx, |thread, _| assert!(thread.entries().is_empty()));
}
@@ -17022,10 +17063,10 @@ mod tests {
let result = thread.update(cx, |thread, cx| {
thread.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::OtherElicitationMode::new(
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::OtherElicitationMode::new(
"future",
- acp_v1::ElicitationSessionScope::new(session_id),
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(session_id.0)),
std::collections::BTreeMap::new(),
),
"Use a future input mode",
@@ -17037,7 +17078,7 @@ mod tests {
let Err(error) = result else {
panic!("unadvertised elicitation mode should be rejected");
};
- assert_eq!(error.code, acp_v1::ErrorCode::InvalidParams);
+ assert_eq!(error.code, acp_v2::ErrorCode::InvalidParams);
thread.read_with(cx, |thread, _| assert!(thread.entries().is_empty()));
}
@@ -17048,10 +17089,10 @@ mod tests {
let result = store.update(cx, |store, cx| {
store.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::OtherElicitationMode::new(
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::OtherElicitationMode::new(
"future",
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
std::collections::BTreeMap::new(),
),
"Use a future input mode",
@@ -17063,7 +17104,7 @@ mod tests {
let Err(error) = result else {
panic!("unadvertised elicitation mode should be rejected");
};
- assert_eq!(error.code, acp_v1::ErrorCode::InvalidParams);
+ assert_eq!(error.code, acp_v2::ErrorCode::InvalidParams);
store.read_with(cx, |store, _| assert!(store.elicitations().is_empty()));
}
@@ -19431,13 +19472,13 @@ mod tests {
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Decline),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Decline),
cx,
);
});
assert_eq!(
elicitation_response.await.action,
- acp_v1::ElicitationAction::Decline
+ acp_v2::ElicitationAction::Decline
);
cx.run_until_parked();
assert!(thread.read_with(cx, |thread, _| thread.is_waiting_for_confirmation()));
@@ -19618,9 +19659,9 @@ mod tests {
assert_eq!(cx.active_idle_sleep_preventions(), 1);
for action in [
- acp_v1::ElicitationAction::Accept(acp_v1::ElicitationAcceptAction::new()),
- acp_v1::ElicitationAction::Decline,
- acp_v1::ElicitationAction::Cancel,
+ acp_v2::ElicitationAction::Accept(acp_v2::ElicitationAcceptAction::new()),
+ acp_v2::ElicitationAction::Decline,
+ acp_v2::ElicitationAction::Cancel,
] {
let (elicitation_id, response) = request_test_form_elicitation(&thread, cx);
cx.run_until_parked();
@@ -19633,7 +19674,7 @@ mod tests {
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(action.clone()),
+ acp_v2::CreateElicitationResponse::new(action.clone()),
cx,
);
});
@@ -19645,7 +19686,7 @@ mod tests {
thread.update(cx, |thread, cx| {
thread.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Cancel),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Cancel),
cx,
);
});
@@ -19669,13 +19710,15 @@ mod tests {
assert_eq!(cx.active_idle_sleep_preventions(), 1);
for (url_id, accept) in [("accepted", true), ("canceled", false)] {
- let url_id = acp_v1::ElicitationId::new(url_id);
+ let url_id = acp_v2::ElicitationId::new(url_id);
let (entry_id, response) = thread.update(cx, |thread, cx| {
thread
.request_elicitation_with_id(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationUrlMode::new(
- acp_v1::ElicitationSessionScope::new(thread.session_id().clone()),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationUrlMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ thread.session_id().0.clone(),
+ )),
url_id.clone(),
"https://example.com/complete",
),
@@ -19694,15 +19737,15 @@ mod tests {
assert_eq!(cx.active_idle_sleep_preventions(), 0);
let expected_action = if accept {
- acp_v1::ElicitationAction::Accept(acp_v1::ElicitationAcceptAction::new())
+ acp_v2::ElicitationAction::Accept(acp_v2::ElicitationAcceptAction::new())
} else {
- acp_v1::ElicitationAction::Cancel
+ acp_v2::ElicitationAction::Cancel
};
thread.update(cx, |thread, cx| {
if accept {
thread.respond_to_elicitation(
&entry_id,
- acp_v1::CreateElicitationResponse::new(expected_action.clone()),
+ acp_v2::CreateElicitationResponse::new(expected_action.clone()),
cx,
);
} else {
@@ -19764,7 +19807,7 @@ mod tests {
));
assert_eq!(
elicitation_response.await.action,
- acp_v1::ElicitationAction::Cancel
+ acp_v2::ElicitationAction::Cancel
);
thread.update(cx, |thread, cx| {
thread.authorize_tool_call(
@@ -19777,8 +19820,8 @@ mod tests {
);
thread.respond_to_elicitation(
&elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
@@ -21448,14 +21491,16 @@ mod tests {
fn request_test_form_elicitation(
thread: &Entity<AcpThread>,
cx: &mut TestAppContext,
- ) -> (ElicitationEntryId, Task<acp_v1::CreateElicitationResponse>) {
+ ) -> (ElicitationEntryId, Task<acp_v2::CreateElicitationResponse>) {
thread.update(cx, |thread, cx| {
thread
.request_elicitation_with_id(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(thread.session_id().clone()),
- acp_v1::ElicitationSchema::new().string("name", false),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ thread.session_id().0.clone(),
+ )),
+ acp_v2::ElicitationSchema::new().string("name", false),
),
"Provide a name",
),
diff --git a/crates/acp_thread/src/elicitation.rs b/crates/acp_thread/src/elicitation.rs
new file mode 100644
index 00000000000..8e023c18e8e
--- /dev/null
+++ b/crates/acp_thread/src/elicitation.rs
@@ -0,0 +1,406 @@
+use agent_client_protocol::schema::{v1, v2};
+use anyhow::{Result, bail};
+use std::collections::BTreeMap;
+
+pub fn request_from_v1(
+ request: v1::CreateElicitationRequest,
+) -> Result<v2::CreateElicitationRequest> {
+ let mode = match request.mode {
+ v1::ElicitationMode::Form(mode) => v2::ElicitationMode::Form(v2::ElicitationFormMode::new(
+ scope_from_v1(mode.scope)?,
+ schema_from_v1(mode.requested_schema)?,
+ )),
+ v1::ElicitationMode::Url(mode) => v2::ElicitationMode::Url(v2::ElicitationUrlMode::new(
+ scope_from_v1(mode.scope)?,
+ v2::ElicitationId::new(mode.elicitation_id.0),
+ mode.url,
+ )),
+ v1::ElicitationMode::Other(mode) => {
+ let mut converted = v2::OtherElicitationMode::new(
+ mode.mode,
+ scope_from_v1(mode.scope)?,
+ BTreeMap::new(),
+ );
+ converted.fields = mode.fields;
+ v2::ElicitationMode::Other(converted)
+ }
+ _ => bail!("unsupported v1 elicitation mode"),
+ };
+ Ok(v2::CreateElicitationRequest::new(mode, request.message).meta(request.meta))
+}
+
+pub fn response_to_v1(
+ response: v2::CreateElicitationResponse,
+) -> Result<v1::CreateElicitationResponse> {
+ let action = match response.action {
+ v2::ElicitationAction::Accept(action) => {
+ let content = action
+ .content
+ .map(|content| {
+ content
+ .into_iter()
+ .map(|(name, value)| Ok((name, content_value_to_v1(value)?)))
+ .collect::<Result<BTreeMap<_, _>>>()
+ })
+ .transpose()?;
+ v1::ElicitationAction::Accept(v1::ElicitationAcceptAction::new().content(content))
+ }
+ v2::ElicitationAction::Decline => v1::ElicitationAction::Decline,
+ v2::ElicitationAction::Cancel => v1::ElicitationAction::Cancel,
+ v2::ElicitationAction::Other(action) => {
+ let mut converted = v1::OtherElicitationAction::new(action.action, BTreeMap::new());
+ converted.fields = action.fields;
+ v1::ElicitationAction::Other(converted)
+ }
+ _ => bail!("unsupported v2 elicitation action"),
+ };
+ Ok(v1::CreateElicitationResponse::new(action).meta(response.meta))
+}
+
+pub fn error_to_v1(error: v2::Error) -> v1::Error {
+ v1::Error::new(error.code.into(), error.message).data(error.data)
+}
+
+fn scope_from_v1(scope: v1::ElicitationScope) -> Result<v2::ElicitationScope> {
+ Ok(match scope {
+ v1::ElicitationScope::Session(scope) => {
+ v2::ElicitationSessionScope::new(v2::SessionId::new(scope.session_id.0))
+ .tool_call_id(scope.tool_call_id.map(|id| v2::ToolCallId::new(id.0)))
+ .into()
+ }
+ v1::ElicitationScope::Request(scope) => {
+ v2::ElicitationRequestScope::new(scope.request_id).into()
+ }
+ _ => bail!("unsupported v1 elicitation scope"),
+ })
+}
+
+fn schema_from_v1(schema: v1::ElicitationSchema) -> Result<v2::ElicitationSchema> {
+ let mut converted = v2::ElicitationSchema::new();
+ converted.type_ = match schema.type_ {
+ v1::ElicitationSchemaType::Object => v2::ElicitationSchemaType::Object,
+ _ => bail!("unsupported v1 elicitation schema type"),
+ };
+ converted.title = schema.title;
+ converted.properties = schema
+ .properties
+ .into_iter()
+ .map(|(name, property)| Ok((name, property_from_v1(property)?)))
+ .collect::<Result<_>>()?;
+ converted.required = schema.required;
+ converted.description = schema.description;
+ converted.meta = schema.meta;
+ Ok(converted)
+}
+
+fn property_from_v1(
+ property: v1::ElicitationPropertySchema,
+) -> Result<v2::ElicitationPropertySchema> {
+ Ok(match property {
+ v1::ElicitationPropertySchema::String(property) => {
+ let mut converted = v2::StringPropertySchema::new();
+ converted.title = property.title;
+ converted.description = property.description;
+ converted.min_length = property.min_length;
+ converted.max_length = property.max_length;
+ converted.pattern = property.pattern;
+ converted.format = property.format.map(string_format_from_v1).transpose()?;
+ converted.default = property.default;
+ converted.enum_values = property.enum_values;
+ converted.one_of = property
+ .one_of
+ .map(|options| options.into_iter().map(enum_option_from_v1).collect());
+ converted.meta = property.meta;
+ v2::ElicitationPropertySchema::String(converted)
+ }
+ v1::ElicitationPropertySchema::Number(property) => {
+ let mut converted = v2::NumberPropertySchema::new();
+ converted.title = property.title;
+ converted.description = property.description;
+ converted.minimum = property.minimum;
+ converted.maximum = property.maximum;
+ converted.default = property.default;
+ converted.meta = property.meta;
+ v2::ElicitationPropertySchema::Number(converted)
+ }
+ v1::ElicitationPropertySchema::Integer(property) => {
+ let mut converted = v2::IntegerPropertySchema::new();
+ converted.title = property.title;
+ converted.description = property.description;
+ converted.minimum = property.minimum;
+ converted.maximum = property.maximum;
+ converted.default = property.default;
+ converted.meta = property.meta;
+ v2::ElicitationPropertySchema::Integer(converted)
+ }
+ v1::ElicitationPropertySchema::Boolean(property) => {
+ let mut converted = v2::BooleanPropertySchema::new();
+ converted.title = property.title;
+ converted.description = property.description;
+ converted.default = property.default;
+ converted.meta = property.meta;
+ v2::ElicitationPropertySchema::Boolean(converted)
+ }
+ v1::ElicitationPropertySchema::Array(property) => {
+ let mut converted = v2::MultiSelectPropertySchema::new(Vec::new());
+ converted.title = property.title;
+ converted.description = property.description;
+ converted.min_items = property.min_items;
+ converted.max_items = property.max_items;
+ converted.items = items_from_v1(property.items)?;
+ converted.default = property.default;
+ converted.meta = property.meta;
+ v2::ElicitationPropertySchema::Array(converted)
+ }
+ v1::ElicitationPropertySchema::Other(property) => {
+ let mut converted =
+ v2::OtherElicitationPropertySchema::new(property.type_, BTreeMap::new());
+ converted.fields = property.fields;
+ v2::ElicitationPropertySchema::Other(converted)
+ }
+ _ => bail!("unsupported v1 elicitation property schema"),
+ })
+}
+
+fn string_format_from_v1(format: v1::StringFormat) -> Result<v2::StringFormat> {
+ Ok(match format {
+ v1::StringFormat::Email => v2::StringFormat::Email,
+ v1::StringFormat::Uri => v2::StringFormat::Uri,
+ v1::StringFormat::Date => v2::StringFormat::Date,
+ v1::StringFormat::DateTime => v2::StringFormat::DateTime,
+ _ => bail!("unsupported v1 elicitation string format"),
+ })
+}
+
+fn enum_option_from_v1(option: v1::EnumOption) -> v2::EnumOption {
+ v2::EnumOption::new(option.value, option.title)
+ .description(option.description)
+ .meta(option.meta)
+}
+
+fn items_from_v1(items: v1::MultiSelectItems) -> Result<v2::MultiSelectItems> {
+ Ok(match items {
+ v1::MultiSelectItems::String(items) => v2::MultiSelectItems::String(
+ v2::StringMultiSelectItems::new(items.values).meta(items.meta),
+ ),
+ v1::MultiSelectItems::Titled(items) => v2::MultiSelectItems::Titled(
+ v2::TitledMultiSelectItems::new(
+ items.options.into_iter().map(enum_option_from_v1).collect(),
+ )
+ .meta(items.meta),
+ ),
+ v1::MultiSelectItems::Other(items) => {
+ let mut converted = v2::OtherMultiSelectItems::new(items.type_, BTreeMap::new());
+ converted.fields = items.fields;
+ v2::MultiSelectItems::Other(converted)
+ }
+ _ => bail!("unsupported v1 elicitation multi-select items"),
+ })
+}
+
+fn content_value_to_v1(value: v2::ElicitationContentValue) -> Result<v1::ElicitationContentValue> {
+ Ok(match value {
+ v2::ElicitationContentValue::String(value) => v1::ElicitationContentValue::String(value),
+ v2::ElicitationContentValue::Integer(value) => v1::ElicitationContentValue::Integer(value),
+ v2::ElicitationContentValue::Number(value) => v1::ElicitationContentValue::Number(value),
+ v2::ElicitationContentValue::Boolean(value) => v1::ElicitationContentValue::Boolean(value),
+ v2::ElicitationContentValue::StringArray(value) => {
+ v1::ElicitationContentValue::StringArray(value)
+ }
+ _ => bail!("unsupported v2 elicitation content value"),
+ })
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use serde_json::json;
+
+ #[test]
+ fn elicitation_request_adapter_preserves_schema_scopes_and_extensions() -> Result<()> {
+ let fixture = json!({
+ "mode": "form",
+ "sessionId": "session-01",
+ "toolCallId": "tool-01",
+ "message": "Provide details",
+ "_meta": {"request": {"opaque": [null, 1, "value"]}},
+ "requestedSchema": {
+ "type": "object",
+ "title": "Details",
+ "description": "Complete this form",
+ "required": ["unknown", "name", "choices", "name"],
+ "_meta": {"schema": {}},
+ "properties": {
+ "name": {
+ "type": "string", "title": "Name", "description": "Display name",
+ "minLength": 1, "maxLength": 64, "pattern": "^[a-z]+$",
+ "format": "email", "default": "ada", "enum": ["ada", "grace"],
+ "oneOf": [
+ {"const": "grace", "title": "Grace", "description": "Second",
+ "_meta": {"option": [2, 1]}},
+ {"const": "ada", "title": "Ada", "_meta": {}}
+ ],
+ "_meta": {"property": {"nested": true}}
+ },
+ "uri": {"type": "string", "format": "uri"},
+ "date": {"type": "string", "format": "date"},
+ "time": {"type": "string", "format": "date-time"},
+ "rating": {
+ "type": "number", "title": "Rating", "description": "Score",
+ "minimum": -1.5, "maximum": 9.5, "default": 2.5, "_meta": {}
+ },
+ "count": {
+ "type": "integer", "title": "Count", "description": "Quantity",
+ "minimum": -4, "maximum": 20, "default": 3, "_meta": {"integer": null}
+ },
+ "enabled": {
+ "type": "boolean", "title": "Enabled", "description": "Toggle",
+ "default": false, "_meta": {"boolean": true}
+ },
+ "choices": {
+ "type": "array", "title": "Choices", "description": "Pick several",
+ "minItems": 1, "maxItems": 3, "default": ["b", "a"],
+ "items": {"type": "string", "enum": ["b", "a", "c"],
+ "_meta": {"items": [3, 2, 1]}},
+ "_meta": {}
+ },
+ "titled": {
+ "type": "array",
+ "items": {"anyOf": [
+ {"const": "b", "title": "B", "description": "First",
+ "_meta": {"option": true}},
+ {"const": "a", "title": "A"}
+ ], "_meta": {}},
+ "default": []
+ },
+ "unknown_items": {
+ "type": "array", "minItems": 0, "maxItems": 4,
+ "items": {"type": "_token", "$schema": "https://example.com/items",
+ "additionalProperties": false, "_meta": {"raw": null},
+ "nested": {"anyOf": [{"const": "a", "title": "A"}]}}
+ },
+ "unknown": {
+ "type": "_location", "$schema": "https://example.com/location",
+ "required": ["longitude", "latitude"], "additionalProperties": true,
+ "nested": {"precision": [1, null, "city"]}, "_meta": {"raw": {}}
+ }
+ }
+ }
+ });
+ let request: v1::CreateElicitationRequest = serde_json::from_value(fixture.clone())?;
+ let converted = request_from_v1(request)?;
+ assert_eq!(serde_json::to_value(&converted)?, fixture);
+ let v2::ElicitationMode::Form(mode) = converted.mode else {
+ bail!("expected form mode");
+ };
+ assert!(matches!(
+ mode.requested_schema.properties.get("unknown"),
+ Some(v2::ElicitationPropertySchema::Other(_))
+ ));
+
+ for request_id in [json!(9_007_199_254_740_993_i64), json!("0001")] {
+ let fixture = json!({
+ "mode": "url", "requestId": request_id,
+ "elicitationId": "elicitation-01", "url": "https://example.com/complete",
+ "message": "Complete setup", "_meta": {}
+ });
+ let request: v1::CreateElicitationRequest = serde_json::from_value(fixture.clone())?;
+ let request_id = match request.scope() {
+ v1::ElicitationScope::Request(scope) => scope.request_id.clone(),
+ _ => bail!("expected request scope"),
+ };
+ let converted = request_from_v1(request)?;
+ let v2::ElicitationScope::Request(scope) = converted.scope() else {
+ bail!("expected request scope");
+ };
+ assert_eq!(scope.request_id, request_id);
+ assert_eq!(serde_json::to_value(converted)?, fixture);
+ }
+
+ for scope in [
+ json!({"requestId": "0001"}),
+ json!({"sessionId": "session-01", "toolCallId": "tool-01"}),
+ ] {
+ let mut fixture = json!({
+ "mode": "_browser", "message": "Future request",
+ "target": {"url": "https://example.com", "options": [null, true]},
+ "requestedSchema": {"type": "_future", "additionalProperties": false},
+ "_meta": {"raw": [1, 2]}
+ });
+ fixture
+ .as_object_mut()
+ .ok_or_else(|| anyhow::anyhow!("expected fixture object"))?
+ .extend(
+ scope
+ .as_object()
+ .ok_or_else(|| anyhow::anyhow!("expected scope object"))?
+ .clone(),
+ );
+ let request: v1::CreateElicitationRequest = serde_json::from_value(fixture.clone())?;
+ let converted = request_from_v1(request)?;
+ assert!(matches!(converted.mode, v2::ElicitationMode::Other(_)));
+ assert_eq!(serde_json::to_value(converted)?, fixture);
+ }
+
+ let fixture = json!({
+ "mode": "form", "requestId": 0, "message": "",
+ "requestedSchema": {"type": "object", "properties": {}, "required": []}
+ });
+ assert_eq!(
+ serde_json::to_value(request_from_v1(serde_json::from_value(fixture.clone())?)?)?,
+ fixture
+ );
+ Ok(())
+ }
+
+ #[test]
+ fn elicitation_response_and_error_adapter_preserves_payloads() -> Result<()> {
+ for fixture in [
+ json!({
+ "action": "accept",
+ "content": {
+ "name": "Ada", "count": 9_007_199_254_740_993_i64, "score": 1.25,
+ "enabled": false, "choices": ["b", "a"], "empty": []
+ },
+ "_meta": {"response": {"nested": [null, true]}}
+ }),
+ json!({"action": "accept"}),
+ json!({"action": "accept", "content": {}, "_meta": {}}),
+ json!({"action": "decline", "_meta": {}}),
+ json!({"action": "cancel"}),
+ json!({
+ "action": "_defer", "content": {"future": {"nested": true}},
+ "reason": [null, "later"], "_meta": {"opaque": {}}
+ }),
+ ] {
+ let response: v2::CreateElicitationResponse = serde_json::from_value(fixture.clone())?;
+ let converted = response_to_v1(response)?;
+ if fixture["action"] == "_defer" {
+ assert!(matches!(converted.action, v1::ElicitationAction::Other(_)));
+ }
+ assert_eq!(serde_json::to_value(converted)?, fixture);
+ }
+
+ for (code, message, data) in [
+ (-32700, "Parse", None),
+ (-32600, "Invalid request", Some(json!(null))),
+ (-32601, "Missing method", Some(json!({}))),
+ (
+ -32602,
+ "Invalid parameters",
+ Some(json!({"parameter": [1, null]})),
+ ),
+ (-32603, "Internal", Some(json!("detail"))),
+ (-32800, "Canceled", None),
+ (-32000, "Authentication", None),
+ (-32002, "Missing resource", None),
+ (17, "", Some(json!({"opaque": {"nested": [false, 2]}}))),
+ ] {
+ let converted = error_to_v1(v2::Error::new(code, message).data(data.clone()));
+ assert_eq!(i32::from(converted.code), code);
+ assert_eq!(converted.message, message);
+ assert_eq!(converted.data, data);
+ }
+ Ok(())
+ }
+}
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index d09d22b083d..300535e896d 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -2360,12 +2360,12 @@ impl NativeAgentConnection {
response,
}) => {
let request_result = acp_thread.update(cx, |thread, cx| {
- let scope = acp_v1::ElicitationSessionScope::new(
- thread.session_id().clone(),
+ let scope = acp_v2::ElicitationSessionScope::new(
+ acp_v2::SessionId::new(thread.session_id().0.clone()),
)
.tool_call_id(tool_call_id);
- let request = acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(scope, schema),
+ let request = acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(scope, schema),
message,
);
thread.request_elicitation(request, cx)
@@ -2389,8 +2389,8 @@ impl NativeAgentConnection {
// doesn't hang waiting on a form that will
// never render.
response
- .send(acp_v1::CreateElicitationResponse::new(
- acp_v1::ElicitationAction::Cancel,
+ .send(acp_v2::CreateElicitationResponse::new(
+ acp_v2::ElicitationAction::Cancel,
))
.ok();
}
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index d1a0f3c796e..d41b9decad0 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1204,10 +1204,10 @@ fn ensure_tool_call_authorization_not_interrupted(
/// message to display.
#[derive(Debug)]
pub struct ElicitationRequest {
- pub tool_call_id: acp::ToolCallId,
+ pub tool_call_id: acp_v2::ToolCallId,
pub message: String,
- pub schema: acp::ElicitationSchema,
- pub response: oneshot::Sender<acp::CreateElicitationResponse>,
+ pub schema: acp_v2::ElicitationSchema,
+ pub response: oneshot::Sender<acp_v2::CreateElicitationResponse>,
}
fn auto_resolve_permission_outcome(
@@ -6535,11 +6535,11 @@ impl ToolCallEventStream {
pub fn request_elicitation(
&self,
message: String,
- schema: acp::ElicitationSchema,
+ schema: acp_v2::ElicitationSchema,
cx: &mut App,
- ) -> Task<Result<acp::CreateElicitationResponse>> {
+ ) -> Task<Result<acp_v2::CreateElicitationResponse>> {
let stream = self.stream.clone();
- let tool_call_id = self.tool_call_id.clone();
+ let tool_call_id = acp_v2::ToolCallId::new(self.tool_call_id.0.clone());
cx.spawn(async move |_cx| {
let (response_tx, response_rx) = oneshot::channel();
if let Err(error) =
diff --git a/crates/agent/src/tools/ask_user_tool.rs b/crates/agent/src/tools/ask_user_tool.rs
index ef84fe3e954..69fc9d415f9 100644
--- a/crates/agent/src/tools/ask_user_tool.rs
+++ b/crates/agent/src/tools/ask_user_tool.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
use crate::{AgentTool, ToolCallEventStream, ToolInput};
use agent_client_protocol::schema::v1 as acp;
+use agent_client_protocol::schema::v2 as acp_v2;
use anyhow::Result;
use gpui::{App, SharedString, Task};
use language_model::LanguageModelToolResultContent;
@@ -121,7 +122,7 @@ impl AgentTool for AskUserTool {
})?;
let selected = match response.action {
- acp::ElicitationAction::Accept(accept) => {
+ acp_v2::ElicitationAction::Accept(accept) => {
let content = accept.content.unwrap_or_default();
// A typed answer takes precedence over a picked option.
string_field(&content, OTHER_FIELD)
@@ -131,12 +132,12 @@ impl AgentTool for AskUserTool {
.to_string(),
})?
}
- acp::ElicitationAction::Decline => {
+ acp_v2::ElicitationAction::Decline => {
return Err(AskUserToolOutput::Error {
error: "The user declined to answer the question.".to_string(),
});
}
- acp::ElicitationAction::Cancel => {
+ acp_v2::ElicitationAction::Cancel => {
return Err(AskUserToolOutput::Error {
error: "The user cancelled the question without answering.".to_string(),
});
@@ -163,17 +164,17 @@ impl AgentTool for AskUserTool {
/// unless free text is also allowed (in which case picking is optional).
/// - Allowing free text adds a text field, required only when there are no
/// options to choose from.
-fn build_schema(options: &[String], allow_free_text: bool) -> acp::ElicitationSchema {
- let mut schema = acp::ElicitationSchema::new();
+fn build_schema(options: &[String], allow_free_text: bool) -> acp_v2::ElicitationSchema {
+ let mut schema = acp_v2::ElicitationSchema::new();
if !options.is_empty() {
let enum_options = options
.iter()
- .map(|label| acp::EnumOption::new(label.clone(), label.clone()))
+ .map(|label| acp_v2::EnumOption::new(label.clone(), label.clone()))
.collect::<Vec<_>>();
schema = schema.property(
CHOICE_FIELD,
- acp::StringPropertySchema::new()
+ acp_v2::StringPropertySchema::new()
.title("Choose an option")
.one_of(enum_options),
!allow_free_text,
@@ -188,7 +189,7 @@ fn build_schema(options: &[String], allow_free_text: bool) -> acp::ElicitationSc
};
schema = schema.property(
OTHER_FIELD,
- acp::StringPropertySchema::new().title(title),
+ acp_v2::StringPropertySchema::new().title(title),
options.is_empty(),
);
}
@@ -198,11 +199,11 @@ fn build_schema(options: &[String], allow_free_text: bool) -> acp::ElicitationSc
/// Extracts a non-empty string value for `key` from an elicitation response.
fn string_field(
- content: &BTreeMap<String, acp::ElicitationContentValue>,
+ content: &BTreeMap<String, acp_v2::ElicitationContentValue>,
key: &str,
) -> Option<String> {
match content.get(key) {
- Some(acp::ElicitationContentValue::String(value)) if !value.is_empty() => {
+ Some(acp_v2::ElicitationContentValue::String(value)) if !value.is_empty() => {
Some(value.clone())
}
_ => None,
@@ -216,18 +217,18 @@ mod tests {
fn accept_with(
entries: impl IntoIterator<Item = (&'static str, &'static str)>,
- ) -> acp::CreateElicitationResponse {
- let content: BTreeMap<String, acp::ElicitationContentValue> = entries
+ ) -> acp_v2::CreateElicitationResponse {
+ let content: BTreeMap<String, acp_v2::ElicitationContentValue> = entries
.into_iter()
.map(|(key, value)| {
(
key.to_string(),
- acp::ElicitationContentValue::String(value.to_string()),
+ acp_v2::ElicitationContentValue::String(value.to_string()),
)
})
.collect();
- acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
- acp::ElicitationAcceptAction::new().content(content),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new().content(content),
))
}
@@ -249,7 +250,8 @@ mod tests {
});
let request = event_rx.expect_elicitation().await;
- assert_eq!(request.tool_call_id, tool_call_id);
+ assert_eq!(request.tool_call_id.0, tool_call_id.0);
+ assert!(Arc::ptr_eq(&request.tool_call_id.0, &tool_call_id.0));
assert_eq!(request.message, "Which approach?");
assert!(request.schema.properties.contains_key(CHOICE_FIELD));
assert!(!request.schema.properties.contains_key(OTHER_FIELD));
@@ -346,8 +348,8 @@ mod tests {
let request = event_rx.expect_elicitation().await;
request
.response
- .send(acp::CreateElicitationResponse::new(
- acp::ElicitationAction::Decline,
+ .send(acp_v2::CreateElicitationResponse::new(
+ acp_v2::ElicitationAction::Decline,
))
.unwrap();
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 9b16b06ee4d..ea544cf5fdf 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -3248,19 +3248,33 @@ mod tests {
let project = project::Project::test(fs, [std::path::Path::new("/a")], cx).await;
let request_id = acp::RequestId::Number(1);
+ let request = acp::CreateElicitationRequest::new(
+ acp::ElicitationFormMode::new(
+ acp::ElicitationRequestScope::new(request_id.clone()),
+ acp::ElicitationSchema::new()
+ .property(
+ "name",
+ acp::StringPropertySchema::new().meta(acp::Meta::from_iter([(
+ "property".into(),
+ serde_json::json!({"nested": [null, true]}),
+ )])),
+ true,
+ )
+ .meta(acp::Meta::from_iter([(
+ "schema".into(),
+ serde_json::json!({"nested": [1, "retained"]}),
+ )])),
+ ),
+ "Provide a name",
+ )
+ .meta(acp::Meta::from_iter([(
+ "request".into(),
+ serde_json::json!({"nested": [null, {"value": "retained"}]}),
+ )]));
+ let expected_request = serde_json::to_value(&request).expect("legacy request");
let (harness, response_rx) =
- test_support::connect_fake_acp_connection_with_auth_elicitation(
- project,
- acp::CreateElicitationRequest::new(
- acp::ElicitationFormMode::new(
- acp::ElicitationRequestScope::new(request_id.clone()),
- acp::ElicitationSchema::new().string("name", true),
- ),
- "Provide a name",
- ),
- cx,
- )
- .await;
+ test_support::connect_fake_acp_connection_with_auth_elicitation(project, request, cx)
+ .await;
let connection = harness.connection.clone();
let auth_task =
cx.update(|cx| connection.authenticate(acp_v2::AuthMethodId::new("login"), cx));
@@ -3276,7 +3290,11 @@ mod tests {
store.elicitations()
);
};
- let acp::ElicitationScope::Request(scope) = elicitation.request.scope() else {
+ assert_eq!(
+ serde_json::to_value(&elicitation.request).expect("shared request"),
+ expected_request
+ );
+ let acp_v2::ElicitationScope::Request(scope) = elicitation.request.scope() else {
panic!("expected request-scoped elicitation");
};
assert_eq!(scope.request_id, request_id);
@@ -3291,12 +3309,22 @@ mod tests {
"name".to_string(),
acp::ElicitationContentValue::from("Ada"),
)]);
+ let response_metadata = acp_v2::Meta::from_iter([(
+ "response".into(),
+ serde_json::json!({"nested": [null, {"value": "retained"}]}),
+ )]);
store.update(cx, |store, cx| {
store.respond_to_elicitation(
&elicitation_id,
- acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
- acp::ElicitationAcceptAction::new().content(expected_content.clone()),
- )),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new().content(
+ std::collections::BTreeMap::from([(
+ "name".to_string(),
+ acp_v2::ElicitationContentValue::from("Ada"),
+ )]),
+ ),
+ ))
+ .meta(response_metadata.clone()),
cx,
);
});
@@ -3305,6 +3333,7 @@ mod tests {
.recv()
.await
.expect("fake auth flow should receive elicitation response");
+ assert_eq!(response.meta.as_ref(), Some(&response_metadata));
assert_eq!(
response.action,
acp::ElicitationAction::Accept(
@@ -3367,7 +3396,7 @@ mod tests {
store.elicitations()
);
};
- let acp::ElicitationScope::Request(scope) = elicitation.request.scope() else {
+ let acp_v2::ElicitationScope::Request(scope) = elicitation.request.scope() else {
panic!("expected request-scoped elicitation");
};
assert_eq!(scope.request_id, request_id);
@@ -3381,8 +3410,8 @@ mod tests {
store.update(cx, |store, cx| {
store.respond_to_elicitation(
&entry_id,
- acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
- acp::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
@@ -3481,7 +3510,7 @@ mod tests {
store.elicitations()
);
};
- let acp::ElicitationScope::Request(scope) = elicitation.request.scope() else {
+ let acp_v2::ElicitationScope::Request(scope) = elicitation.request.scope() else {
panic!("expected request-scoped elicitation");
};
assert_eq!(scope.request_id, request_id);
@@ -3503,7 +3532,7 @@ mod tests {
store.update(cx, |store, cx| {
store.respond_to_elicitation(
&elicitation_id,
- acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Decline),
cx,
);
});
@@ -6486,16 +6515,23 @@ fn handle_create_elicitation(
cx: &mut AsyncApp,
ctx: &ClientContext,
) {
+ let args = match acp_thread::elicitation::request_from_v1(args) {
+ Ok(args) => args,
+ Err(error) => return respond_err(responder, acp::Error::from(error)),
+ };
match args.scope() {
- acp::ElicitationScope::Session(scope) => {
- let thread = match session_thread(ctx, &scope.session_id) {
+ acp_v2::ElicitationScope::Session(scope) => {
+ let thread = match session_thread(ctx, &acp::SessionId::new(scope.session_id.0.clone()))
+ {
Ok(t) => t,
Err(e) => return respond_err(responder, e),
};
let (elicitation_id, task) = match thread
.update(cx, |thread, cx| {
- thread.request_elicitation_with_id(args, cx)
+ thread
+ .request_elicitation_with_id(args, cx)
+ .map_err(acp_thread::elicitation::error_to_v1)
})
.flatten_acp()
{
@@ -6506,7 +6542,10 @@ fn handle_create_elicitation(
let cancellation = responder.cancellation();
cx.spawn(async move |cx| {
let result: Result<_, acp::Error> = cancellation
- .run_until_cancelled(async { Ok(task.await) })
+ .run_until_cancelled(async {
+ acp_thread::elicitation::response_to_v1(task.await)
+ .map_err(acp::Error::from)
+ })
.await;
match result {
@@ -6527,19 +6566,25 @@ fn handle_create_elicitation(
})
.detach();
}
- acp::ElicitationScope::Request(_) => {
+ acp_v2::ElicitationScope::Request(_) => {
let store = ctx.request_elicitations.clone();
- let (elicitation_id, task) =
- match store.update(cx, |store, cx| store.request_elicitation_with_id(args, cx)) {
- Ok(task) => task,
- Err(e) => return respond_err(responder, e),
- };
+ let (elicitation_id, task) = match store.update(cx, |store, cx| {
+ store
+ .request_elicitation_with_id(args, cx)
+ .map_err(acp_thread::elicitation::error_to_v1)
+ }) {
+ Ok(task) => task,
+ Err(e) => return respond_err(responder, e),
+ };
let store = store.downgrade();
let cancellation = responder.cancellation();
cx.spawn(async move |cx| {
let result: Result<_, acp::Error> = cancellation
- .run_until_cancelled(async { Ok(task.await) })
+ .run_until_cancelled(async {
+ acp_thread::elicitation::response_to_v1(task.await)
+ .map_err(acp::Error::from)
+ })
.await;
match result {
@@ -6581,7 +6626,7 @@ fn handle_complete_elicitation(
.map(|session| session.thread.clone())
.collect::<Vec<_>>();
let request_elicitations = ctx.request_elicitations.clone();
- let elicitation_id = args.elicitation_id;
+ let elicitation_id = acp_v2::ElicitationId::new(args.elicitation_id.0);
cx.spawn(async move |cx| {
for thread in threads {
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index af83b86bc0e..336ce607c1a 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -540,7 +540,7 @@ impl Conversation {
&mut self,
session_id: acp_v1::SessionId,
elicitation_id: ElicitationEntryId,
- response: acp_v1::CreateElicitationResponse,
+ response: acp_v2::CreateElicitationResponse,
cx: &mut Context<Self>,
) -> Option<()> {
let thread = self.threads.get(&session_id)?.clone();
@@ -2634,7 +2634,7 @@ impl ConversationView {
.map(|elicitation| {
let is_pending = matches!(elicitation.status, ElicitationStatus::Pending { .. });
let schema = match &elicitation.request.mode {
- acp_v1::ElicitationMode::Form(mode) => Some(mode.requested_schema.clone()),
+ acp_v2::ElicitationMode::Form(mode) => Some(mode.requested_schema.clone()),
_ => None,
};
(elicitation.id.clone(), is_pending, schema)
@@ -2814,7 +2814,7 @@ impl ConversationView {
};
match mode {
- acp_v1::ElicitationMode::Form(mode) => {
+ acp_v2::ElicitationMode::Form(mode) => {
let Some(state) = self
.request_elicitation_form_states
.get_mut(&elicitation_id)
@@ -2847,9 +2847,9 @@ impl ConversationView {
Ok(content) => {
this.respond_to_request_elicitation(
elicitation_id,
- acp_v1::CreateElicitationResponse::new(
- acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new().content(content),
+ acp_v2::CreateElicitationResponse::new(
+ acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new().content(content),
),
),
cx,
@@ -2868,11 +2868,11 @@ impl ConversationView {
})
.detach();
}
- acp_v1::ElicitationMode::Url(_) => {
+ acp_v2::ElicitationMode::Url(_) => {
self.respond_to_request_elicitation(
elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
@@ -2889,7 +2889,7 @@ impl ConversationView {
) {
self.respond_to_request_elicitation(
elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Decline),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Decline),
cx,
);
}
@@ -2902,7 +2902,7 @@ impl ConversationView {
) {
self.respond_to_request_elicitation(
elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Cancel),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Cancel),
cx,
);
}
@@ -2924,7 +2924,7 @@ impl ConversationView {
fn respond_to_request_elicitation(
&mut self,
elicitation_id: ElicitationEntryId,
- response: acp_v1::CreateElicitationResponse,
+ response: acp_v2::CreateElicitationResponse,
cx: &mut Context<Self>,
) {
self.request_elicitation_form_states.remove(&elicitation_id);
@@ -4143,7 +4143,7 @@ pub(crate) mod tests {
cx.run_until_parked();
assert!(matches!(
response.lock().as_ref(),
- Some(acp_v1::ElicitationAction::Cancel)
+ Some(acp_v2::ElicitationAction::Cancel)
));
}
@@ -4198,7 +4198,7 @@ pub(crate) mod tests {
cx.run_until_parked();
assert!(matches!(
response.lock().as_ref(),
- Some(acp_v1::ElicitationAction::Cancel)
+ Some(acp_v2::ElicitationAction::Cancel)
));
}
@@ -4230,7 +4230,7 @@ pub(crate) mod tests {
.elicitations()
.iter()
.find_map(|elicitation| {
- let acp_v1::ElicitationScope::Request(scope) = elicitation.request.scope()
+ let acp_v2::ElicitationScope::Request(scope) = elicitation.request.scope()
else {
return None;
};
@@ -4242,8 +4242,8 @@ pub(crate) mod tests {
store.update(cx, |store, cx| {
store.respond_to_elicitation(
&first_elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
@@ -4252,7 +4252,7 @@ pub(crate) mod tests {
assert!(matches!(
response.lock().as_ref(),
- Some(acp_v1::ElicitationAction::Accept(_))
+ Some(acp_v2::ElicitationAction::Accept(_))
));
conversation_view.read_with(cx, |view, _cx| {
let connected = view
@@ -4270,7 +4270,7 @@ pub(crate) mod tests {
store.elicitations()
);
};
- let acp_v1::ElicitationScope::Request(scope) = remaining.request.scope() else {
+ let acp_v2::ElicitationScope::Request(scope) = remaining.request.scope() else {
panic!("expected request-scoped elicitation");
};
assert_eq!(scope.request_id, second_request_id);
@@ -8111,10 +8111,12 @@ pub(crate) mod tests {
thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(session_id),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0,
+ )),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -8165,7 +8167,7 @@ pub(crate) mod tests {
struct SessionCreationRequestElicitationServer {
store: Entity<ElicitationStore>,
- response: Arc<Mutex<Option<acp_v1::ElicitationAction>>>,
+ response: Arc<Mutex<Option<acp_v2::ElicitationAction>>>,
}
impl AgentServer for SessionCreationRequestElicitationServer {
@@ -8197,7 +8199,7 @@ pub(crate) mod tests {
struct SessionCreationRequestElicitationConnection {
store: Entity<ElicitationStore>,
- response: Arc<Mutex<Option<acp_v1::ElicitationAction>>>,
+ response: Arc<Mutex<Option<acp_v2::ElicitationAction>>>,
}
impl AgentConnection for SessionCreationRequestElicitationConnection {
@@ -8225,10 +8227,10 @@ pub(crate) mod tests {
let first_response_task = self.store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
@@ -8240,12 +8242,12 @@ pub(crate) mod tests {
.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(
acp_v1::RequestId::Number(2),
),
- acp_v1::ElicitationSchema::new().string("account", true),
+ acp_v2::ElicitationSchema::new().string("account", true),
),
"Provide an account",
),
@@ -8295,7 +8297,7 @@ pub(crate) mod tests {
}
struct ReleaseRequestElicitationServer {
- response: Arc<Mutex<Option<acp_v1::ElicitationAction>>>,
+ response: Arc<Mutex<Option<acp_v2::ElicitationAction>>>,
}
impl AgentServer for ReleaseRequestElicitationServer {
@@ -8327,7 +8329,7 @@ pub(crate) mod tests {
struct ReleaseRequestElicitationConnection {
store: Entity<ElicitationStore>,
- response: Arc<Mutex<Option<acp_v1::ElicitationAction>>>,
+ response: Arc<Mutex<Option<acp_v2::ElicitationAction>>>,
}
impl AgentConnection for ReleaseRequestElicitationConnection {
@@ -8355,10 +8357,10 @@ pub(crate) mod tests {
let response_task = self.store.update(cx, |store, cx| {
store
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationRequestScope::new(acp_v1::RequestId::Number(1)),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),
diff --git a/crates/agent_ui/src/conversation_view/elicitation.rs b/crates/agent_ui/src/conversation_view/elicitation.rs
index f98dc34fd26..796cea0828f 100644
--- a/crates/agent_ui/src/conversation_view/elicitation.rs
+++ b/crates/agent_ui/src/conversation_view/elicitation.rs
@@ -1,5 +1,5 @@
use acp_thread::{Elicitation, ElicitationEntryId, ElicitationStatus};
-use agent_client_protocol::schema::v1 as acp;
+use agent_client_protocol::schema::v2 as acp;
use collections::{HashMap, HashSet};
use component::{Component, ComponentScope, example_group_with_title, single_example};
use editor::Editor;
@@ -722,6 +722,23 @@ mod tests {
.to_string(),
"Email must be an email address"
);
+
+ let format = acp::StringFormat::Other("future-email".into());
+ assert_eq!(string_format_json_name(&format), None);
+ assert_eq!(string_format_label(&format), None);
+ let schema = acp::StringPropertySchema::new().format(format);
+ validate_string_value("Email".into(), &schema, "not-an-email")
+ .expect("unknown formats should be annotations");
+
+ let schema = schema.pattern("^prod-[0-9]+$");
+ validate_string_value("Email".into(), &schema, "prod-42")
+ .expect("known constraints should still apply alongside unknown formats");
+ assert_eq!(
+ validate_string_value("Email".into(), &schema, "not-an-email")
+ .expect_err("unknown formats should not bypass known constraints")
+ .to_string(),
+ "Email does not match the requested pattern"
+ );
}
#[test]
@@ -957,31 +974,118 @@ mod tests {
}
#[gpui::test]
- fn form_state_preserves_string_whitespace(cx: &mut TestAppContext) {
+ async fn form_state_preserves_string_whitespace(cx: &mut TestAppContext) {
crate::conversation_view::tests::init_test(cx);
- cx.add_window(|window, cx| {
- let schema = acp::ElicitationSchema::new().property(
+ let metadata = |level: &str| {
+ serde_json::Map::from_iter([(
+ "fixture".into(),
+ serde_json::json!({"level": level, "nested": [null, {"enabled": true}]}),
+ )])
+ };
+ let mut scopes = acp::MultiSelectPropertySchema::titled(vec![
+ acp::EnumOption::new("repository", "Repository")
+ .description("Read repositories")
+ .meta(metadata("item-choice")),
+ ])
+ .default_value(vec!["repository".into()])
+ .meta(metadata("array-property"));
+ let acp::MultiSelectItems::Titled(items) = &mut scopes.items else {
+ panic!("expected titled items");
+ };
+ items.meta = Some(metadata("items"));
+ let schema = acp::ElicitationSchema::new()
+ .meta(metadata("schema"))
+ .property(
"token",
acp::StringPropertySchema::new()
.title("Token")
- .default_value(" secret "),
+ .default_value(" secret ")
+ .format(acp::StringFormat::Other("future-token".into()))
+ .meta(metadata("string-property")),
true,
- );
- let form_state = ElicitationFormState::new(&schema, window, cx);
- let content = form_state
- .collect(&schema, cx)
- .expect("string with whitespace should be submitted");
+ )
+ .property(
+ "environment",
+ acp::StringPropertySchema::new()
+ .one_of(vec![
+ acp::EnumOption::new("production", "Production")
+ .description("Use live resources")
+ .meta(metadata("choice")),
+ ])
+ .meta(metadata("select-property")),
+ true,
+ )
+ .property("scopes", scopes, true);
+ let request = acp::CreateElicitationRequest::new(
+ acp::ElicitationFormMode::new(preview_request_scope(0), schema),
+ "Provide a token and access choices",
+ )
+ .meta(metadata("request"));
+ let expected_content = BTreeMap::from([
+ (
+ "token".into(),
+ acp::ElicitationContentValue::from(" secret "),
+ ),
+ (
+ "environment".into(),
+ acp::ElicitationContentValue::from("production"),
+ ),
+ (
+ "scopes".into(),
+ acp::ElicitationContentValue::from(vec!["repository".to_string()]),
+ ),
+ ]);
+ let store = cx.update(|cx| cx.new(|_| acp_thread::ElicitationStore::default()));
+ let (elicitation_id, response_task) = store.update(cx, |store, cx| {
+ store
+ .request_elicitation_with_id(request.clone(), cx)
+ .expect("form request should be accepted")
+ });
- assert_eq!(
- content.get("token"),
- Some(&acp::ElicitationContentValue::String(
- " secret ".to_string()
- ))
- );
+ cx.add_window(|window, cx| {
+ let schema = store.read_with(cx, |store, _cx| {
+ let (_, elicitation) = store.elicitation(&elicitation_id).expect("stored form");
+ assert_eq!(elicitation.request, request);
+ let acp::ElicitationMode::Form(mode) = &elicitation.request.mode else {
+ panic!("expected form mode");
+ };
+ mode.requested_schema.clone()
+ });
+ let mut form_state = ElicitationFormState::new(&schema, window, cx);
+ assert!(matches!(
+ form_state.fields.get("token"),
+ Some(ElicitationFieldState::Text(_))
+ ));
+ let submission = form_state
+ .begin_submission(cx)
+ .expect("submission should start");
+ let content = submission
+ .validate(&schema)
+ .expect("unknown format annotations should not reject valid existing fields");
+ assert!(form_state.validation_matches_current_values(&submission, cx));
+ assert_eq!(content, expected_content);
+ store.update(cx, |store, cx| {
+ store.respond_to_elicitation(
+ &elicitation_id,
+ acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+ acp::ElicitationAcceptAction::new().content(content),
+ )),
+ cx,
+ );
+ let (_, elicitation) = store.elicitation(&elicitation_id).expect("submitted form");
+ assert_eq!(elicitation.request, request);
+ assert!(matches!(elicitation.status, ElicitationStatus::Accepted));
+ });
Editor::single_line(window, cx)
});
+ assert_eq!(
+ response_task.await,
+ acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+ acp::ElicitationAcceptAction::new().content(expected_content),
+ ))
+ );
}
#[gpui::test]
@@ -1538,7 +1642,13 @@ fn validate_string_pattern_and_format(
schema: &acp::StringPropertySchema,
value: &str,
) -> Result<(), SharedString> {
- if schema.pattern.is_none() && schema.format.and_then(string_format_json_name).is_none() {
+ if schema.pattern.is_none()
+ && schema
+ .format
+ .as_ref()
+ .and_then(string_format_json_name)
+ .is_none()
+ {
return Ok(());
}
if schema
@@ -1563,7 +1673,7 @@ fn validate_string_pattern_and_format(
serde_json::Value::String(pattern.clone()),
);
}
- if let Some(format) = schema.format.and_then(string_format_json_name) {
+ if let Some(format) = schema.format.as_ref().and_then(string_format_json_name) {
validation_schema.insert(
"format".to_string(),
serde_json::Value::String(format.into()),
@@ -1601,7 +1711,7 @@ fn validate_string_pattern_and_format(
match (
schema.pattern.is_some(),
- schema.format.and_then(string_format_label),
+ schema.format.as_ref().and_then(string_format_label),
) {
(true, Some(_)) => Err(format!("{title} does not match the requested constraints").into()),
(true, None) => Err(format!("{title} does not match the requested pattern").into()),
@@ -1610,7 +1720,7 @@ fn validate_string_pattern_and_format(
}
}
-fn string_format_json_name(format: acp::StringFormat) -> Option<&'static str> {
+fn string_format_json_name(format: &acp::StringFormat) -> Option<&'static str> {
match format {
acp::StringFormat::Email => Some("email"),
acp::StringFormat::Uri => Some("uri"),
@@ -1620,7 +1730,7 @@ fn string_format_json_name(format: acp::StringFormat) -> Option<&'static str> {
}
}
-fn string_format_label(format: acp::StringFormat) -> Option<&'static str> {
+fn string_format_label(format: &acp::StringFormat) -> Option<&'static str> {
match format {
acp::StringFormat::Email => Some("an email address"),
acp::StringFormat::Uri => Some("a URI"),
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 2a40aa87367..5ad381bf402 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -3056,7 +3056,7 @@ impl ThreadView {
elicitation_id.clone(),
matches!(elicitation.status, ElicitationStatus::Pending { .. }),
match &elicitation.request.mode {
- acp_v1::ElicitationMode::Form(mode) => Some(mode.requested_schema.clone()),
+ acp_v2::ElicitationMode::Form(mode) => Some(mode.requested_schema.clone()),
_ => None,
},
)
@@ -3106,7 +3106,7 @@ impl ThreadView {
};
match mode {
- acp_v1::ElicitationMode::Form(mode) => {
+ acp_v2::ElicitationMode::Form(mode) => {
let Some(state) = self.elicitation_form_states.get_mut(&elicitation_id) else {
return;
};
@@ -3136,9 +3136,9 @@ impl ThreadView {
Ok(content) => {
this.respond_to_elicitation(
elicitation_id,
- acp_v1::CreateElicitationResponse::new(
- acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new().content(content),
+ acp_v2::CreateElicitationResponse::new(
+ acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new().content(content),
),
),
cx,
@@ -3158,11 +3158,11 @@ impl ThreadView {
})
.detach();
}
- acp_v1::ElicitationMode::Url(_) => {
+ acp_v2::ElicitationMode::Url(_) => {
self.respond_to_elicitation(
elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Accept(
- acp_v1::ElicitationAcceptAction::new(),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Accept(
+ acp_v2::ElicitationAcceptAction::new(),
)),
cx,
);
@@ -3179,7 +3179,7 @@ impl ThreadView {
) {
self.respond_to_elicitation(
elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Decline),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Decline),
cx,
);
}
@@ -3192,7 +3192,7 @@ impl ThreadView {
) {
self.respond_to_elicitation(
elicitation_id,
- acp_v1::CreateElicitationResponse::new(acp_v1::ElicitationAction::Cancel),
+ acp_v2::CreateElicitationResponse::new(acp_v2::ElicitationAction::Cancel),
cx,
);
}
@@ -3213,7 +3213,7 @@ impl ThreadView {
fn respond_to_elicitation(
&mut self,
elicitation_id: ElicitationEntryId,
- response: acp_v1::CreateElicitationResponse,
+ response: acp_v2::CreateElicitationResponse,
cx: &mut Context<Self>,
) {
let session_id = self.session_id.clone();
diff --git a/crates/agent_ui/src/entry_view_state.rs b/crates/agent_ui/src/entry_view_state.rs
index afdb13d5507..18338022156 100644
--- a/crates/agent_ui/src/entry_view_state.rs
+++ b/crates/agent_ui/src/entry_view_state.rs
@@ -811,7 +811,7 @@ mod tests {
use std::sync::Arc;
use acp_thread::{AgentConnection, StubAgentConnection};
- use agent_client_protocol::schema::v1 as acp_v1;
+ use agent_client_protocol::schema::{v1 as acp_v1, v2 as acp_v2};
use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
use editor::RowInfo;
use fs::FakeFs;
@@ -978,10 +978,12 @@ mod tests {
let _response_task = thread.update(cx, |thread, cx| {
thread
.request_elicitation(
- acp_v1::CreateElicitationRequest::new(
- acp_v1::ElicitationFormMode::new(
- acp_v1::ElicitationSessionScope::new(session_id.clone()),
- acp_v1::ElicitationSchema::new().string("name", true),
+ acp_v2::CreateElicitationRequest::new(
+ acp_v2::ElicitationFormMode::new(
+ acp_v2::ElicitationSessionScope::new(acp_v2::SessionId::new(
+ session_id.0.clone(),
+ )),
+ acp_v2::ElicitationSchema::new().string("name", true),
),
"Provide a name",
),