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: Use v2 metadata spelling in shared APIs (#65521)

Ben Brandtdd85cf367756
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 38a711270cf..108d8eae098 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -77,7 +77,7 @@ impl std::error::Error for MaxOutputTokensError {}
pub const TOOL_NAME_META_KEY: &str = "tool_name";
/// Extracts a tool name from the legacy ACP metadata field.
-pub fn tool_name_from_meta(meta: &Option<acp_v1::Meta>) -> Option<SharedString> {
+pub fn tool_name_from_meta(meta: &Option<acp_v2::Meta>) -> Option<SharedString> {
meta.as_ref()
.and_then(|meta| meta.get(TOOL_NAME_META_KEY))
.and_then(|value| value.as_str())
@@ -85,8 +85,8 @@ pub fn tool_name_from_meta(meta: &Option<acp_v1::Meta>) -> Option<SharedString>
}
/// Creates ACP metadata containing the legacy tool-name field.
-pub fn meta_with_tool_name(tool_name: &str) -> acp_v1::Meta {
- acp_v1::Meta::from_iter([(TOOL_NAME_META_KEY.into(), tool_name.into())])
+pub fn meta_with_tool_name(tool_name: &str) -> acp_v2::Meta {
+ acp_v2::Meta::from_iter([(TOOL_NAME_META_KEY.into(), tool_name.into())])
}
/// Key used in ACP `AvailableCommand` meta to record which source produced a
@@ -205,15 +205,15 @@ pub struct SandboxAuthorizationDetails {
pub reason: String,
}
-pub fn meta_with_sandbox_authorization(details: SandboxAuthorizationDetails) -> acp_v1::Meta {
- acp_v1::Meta::from_iter([(
+pub fn meta_with_sandbox_authorization(details: SandboxAuthorizationDetails) -> acp_v2::Meta {
+ acp_v2::Meta::from_iter([(
SANDBOX_AUTHORIZATION_META_KEY.into(),
serde_json::to_value(details).unwrap_or_default(),
)])
}
pub fn sandbox_authorization_details_from_meta(
- meta: &Option<acp_v1::Meta>,
+ meta: &Option<acp_v2::Meta>,
) -> Option<SandboxAuthorizationDetails> {
meta.as_ref()
.and_then(|m| m.get(SANDBOX_AUTHORIZATION_META_KEY))
@@ -249,15 +249,15 @@ pub struct SandboxFallbackAuthorizationDetails {
pub fn meta_with_sandbox_fallback_authorization(
details: SandboxFallbackAuthorizationDetails,
-) -> acp_v1::Meta {
- acp_v1::Meta::from_iter([(
+) -> acp_v2::Meta {
+ acp_v2::Meta::from_iter([(
SANDBOX_FALLBACK_AUTHORIZATION_META_KEY.into(),
serde_json::to_value(details).unwrap_or_default(),
)])
}
pub fn sandbox_fallback_authorization_details_from_meta(
- meta: &Option<acp_v1::Meta>,
+ meta: &Option<acp_v2::Meta>,
) -> Option<SandboxFallbackAuthorizationDetails> {
meta.as_ref()
.and_then(|m| m.get(SANDBOX_FALLBACK_AUTHORIZATION_META_KEY))
@@ -270,15 +270,15 @@ pub fn sandbox_fallback_authorization_details_from_meta(
/// used to explain the situation to both the user and the agent.
pub const SANDBOX_NOT_APPLIED_META_KEY: &str = "sandbox_not_applied";
-pub fn meta_with_sandbox_not_applied(reason: &SandboxNotAppliedReason) -> acp_v1::Meta {
- acp_v1::Meta::from_iter([(
+pub fn meta_with_sandbox_not_applied(reason: &SandboxNotAppliedReason) -> acp_v2::Meta {
+ acp_v2::Meta::from_iter([(
SANDBOX_NOT_APPLIED_META_KEY.into(),
serde_json::to_value(reason).unwrap_or_default(),
)])
}
pub fn sandbox_not_applied_from_meta(
- meta: &Option<acp_v1::Meta>,
+ meta: &Option<acp_v2::Meta>,
) -> Option<SandboxNotAppliedReason> {
meta.as_ref()
.and_then(|m| m.get(SANDBOX_NOT_APPLIED_META_KEY))
@@ -297,7 +297,7 @@ pub struct SubagentSessionInfo {
}
/// Helper to extract subagent session id from ACP meta
-pub fn subagent_session_info_from_meta(meta: &Option<acp_v1::Meta>) -> Option<SubagentSessionInfo> {
+pub fn subagent_session_info_from_meta(meta: &Option<acp_v2::Meta>) -> Option<SubagentSessionInfo> {
meta.as_ref()
.and_then(|m| m.get(SUBAGENT_SESSION_INFO_META_KEY))
.and_then(|v| serde_json::from_value(v.clone()).ok())
@@ -3376,16 +3376,16 @@ pub struct RetryStatus {
pub max_attempts: usize,
pub started_at: Instant,
pub duration: Duration,
- pub meta: Option<acp_v1::Meta>,
+ pub meta: Option<acp_v2::Meta>,
}
pub const REFUSAL_FALLBACK_MODEL_META_KEY: &str = "refusal_fallback_model";
-pub fn meta_with_refusal_fallback(model_name: &str) -> acp_v1::Meta {
- acp_v1::Meta::from_iter([(REFUSAL_FALLBACK_MODEL_META_KEY.into(), model_name.into())])
+pub fn meta_with_refusal_fallback(model_name: &str) -> acp_v2::Meta {
+ acp_v2::Meta::from_iter([(REFUSAL_FALLBACK_MODEL_META_KEY.into(), model_name.into())])
}
-pub fn refusal_fallback_model_from_meta(meta: &Option<acp_v1::Meta>) -> Option<SharedString> {
+pub fn refusal_fallback_model_from_meta(meta: &Option<acp_v2::Meta>) -> Option<SharedString> {
meta.as_ref()
.and_then(|m| m.get(REFUSAL_FALLBACK_MODEL_META_KEY))
.and_then(|v| v.as_str())
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index e11df7c07f5..dbba02bb1ca 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -382,14 +382,14 @@ pub trait AgentSessionConfigOptions {
pub struct AgentSessionListRequest {
pub cwd: Option<PathBuf>,
pub cursor: Option<String>,
- pub meta: Option<acp_v1::Meta>,
+ pub meta: Option<acp_v2::Meta>,
}
#[derive(Debug, Clone)]
pub struct AgentSessionListResponse {
pub sessions: Vec<AgentSessionInfo>,
pub next_cursor: Option<String>,
- pub meta: Option<acp_v1::Meta>,
+ pub meta: Option<acp_v2::Meta>,
}
impl AgentSessionListResponse {