diff --git a/Cargo.toml b/Cargo.toml
index 2474178be5f7a9512aa989037297aa3daccc14f7..efbbd9f7f3f631a6d79dd8393559f07a9553e5ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -477,7 +477,7 @@ ztracing_macro = { path = "crates/ztracing_macro" }
 # External crates
 #
 
-agent-client-protocol-core = { git = "https://github.com/agentclientprotocol/rust-sdk", rev = "9fa32bb04e301f4be968a372eb5085dc3a86ef3c", features = ["unstable"] }
+agent-client-protocol = { package = "agent-client-protocol-core", git = "https://github.com/agentclientprotocol/rust-sdk", rev = "9fa32bb04e301f4be968a372eb5085dc3a86ef3c", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty", rev = "9d9640d4" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index 9b1e0a9b64855c65e1108ec97d95530236e08f0e..7ef53bc522708680e64cfcc9ce2860990bfd7d13 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -17,7 +17,7 @@ test-support = ["gpui/test-support", "project/test-support", "dep:parking_lot",
 
 [dependencies]
 action_log.workspace = true
-agent-client-protocol-core.workspace = true
+agent-client-protocol.workspace = true
 base64.workspace = true
 anyhow.workspace = true
 buffer_diff.workspace = true
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 5746ca14bb962392dceab6666c6b2c22f263bf00..0d84196598bf7a21166e2a55b58e41ce2729a05d 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -3,7 +3,7 @@ mod diff;
 mod mention;
 mod terminal;
 use action_log::{ActionLog, ActionLogTelemetry};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::{Context as _, Result, anyhow};
 use collections::HashSet;
 pub use connection::*;
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 0835a05d6cb07ed40d6253b650b06379ce396c47..c365a36c203f08430384f37f11059e3b7d4f9562 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -1,5 +1,5 @@
 use crate::AcpThread;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::Result;
 use chrono::{DateTime, Utc};
 use collections::{HashMap, IndexMap};
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index b4928eb5edc102c1d7e50ed67e8ced3b5e1ef16e..b1eb42996af29c739b0b3a9e198d543850693d99 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::{Context as _, Result, bail};
 use file_icons::FileIcons;
 use prompt_store::{PromptId, UserPromptId};
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index 08fcf32e0d3da87551413153ade0802b7bc580fe..2fe769cb737b716acf495e561df826f6afa16d94 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::Result;
 use futures::{FutureExt as _, future::Shared};
 use gpui::{App, AppContext, AsyncApp, Context, Entity, Task};
diff --git a/crates/acp_tools/Cargo.toml b/crates/acp_tools/Cargo.toml
index 9124e0aa5503ddbe683e7c25d63d3c69a2e30565..15d928b664fd2612aa1c6f9b7253b406d0e70793 100644
--- a/crates/acp_tools/Cargo.toml
+++ b/crates/acp_tools/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/acp_tools.rs"
 doctest = false
 
 [dependencies]
-agent-client-protocol-core.workspace = true
+agent-client-protocol.workspace = true
 collections.workspace = true
 gpui.workspace = true
 language.workspace= true
diff --git a/crates/acp_tools/src/acp_tools.rs b/crates/acp_tools/src/acp_tools.rs
index 201750709e95247b34119d7d6d81dd5adf117143..d17b8346aa17332a1100bd4a55f373dd2ac5760d 100644
--- a/crates/acp_tools/src/acp_tools.rs
+++ b/crates/acp_tools/src/acp_tools.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashSet, fmt::Display, sync::Arc};
 
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use collections::HashMap;
 use gpui::{
     App, Empty, Entity, EventEmitter, FocusHandle, Focusable, Global, ListAlignment, ListState,
diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml
index 84e72c089628c3fa0ec3be1b4d2a824f58f8148b..a5a4c2742a444bf2e8b0a12b0bb233c6e51684f2 100644
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -19,7 +19,7 @@ workspace = true
 [dependencies]
 acp_thread.workspace = true
 action_log.workspace = true
-agent-client-protocol-core.workspace = true
+agent-client-protocol.workspace = true
 agent_servers.workspace = true
 agent_settings.workspace = true
 anyhow.workspace = true
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index 5d87f88e8ab4bdc1167f66a7a5cbe89dc1550606..3b88504e016327fcf16a55b04852ab64c0df0195 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -28,7 +28,7 @@ use acp_thread::{
     AcpThread, AgentModelSelector, AgentSessionInfo, AgentSessionList, AgentSessionListRequest,
     AgentSessionListResponse, TokenUsageRatio, UserMessageId,
 };
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::{Context as _, Result, anyhow};
 use chrono::{DateTime, Utc};
 use collections::{HashMap, HashSet, IndexMap};
diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index e8b0383addf09f293d05b79d5e72f48a58546961..0ed03ed51703b0141fad5de4154e4f3c1cdf23cc 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -1,6 +1,6 @@
 use crate::{AgentMessage, AgentMessageContent, UserMessage, UserMessageContent};
 use acp_thread::UserMessageId;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentProfileId;
 use anyhow::{Result, anyhow};
 use chrono::{DateTime, Utc};
diff --git a/crates/agent/src/native_agent_server.rs b/crates/agent/src/native_agent_server.rs
index a9b89fc518ddaa857713e24dfe6a59e732d3d2e3..c1c995b06babaede145f74afc4faef818789cac5 100644
--- a/crates/agent/src/native_agent_server.rs
+++ b/crates/agent/src/native_agent_server.rs
@@ -1,6 +1,6 @@
 use std::{any::Any, rc::Rc, sync::Arc};
 
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_servers::{AgentServer, AgentServerDelegate};
 use agent_settings::AgentSettings;
 use anyhow::Result;
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 54f3d5a5b0ae55fda9f0bdc0587d556c2c193710..49d2d050611e29357401791f49b10f3b0bd1df30 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -3,7 +3,7 @@ use acp_thread::{
     AgentConnection, AgentModelGroupName, AgentModelList, PermissionOptions, ThreadStatus,
     UserMessageId,
 };
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentProfileId;
 use anyhow::Result;
 use client::{Client, UserStore};
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 1d11372accc0902044a5dfea4c94db54fda3049c..479dcfc01b699151119bfa4ef66a94e9b63f8563 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -12,7 +12,7 @@ use feature_flags::{
     FeatureFlagAppExt as _, StreamingEditFileToolFeatureFlag, UpdatePlanToolFeatureFlag,
 };
 
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::{
     AgentProfileId, AgentSettings, SUMMARIZE_THREAD_DETAILED_PROMPT, SUMMARIZE_THREAD_PROMPT,
 };
@@ -3341,7 +3341,7 @@ where
         T::description()
     }
 
-    fn kind(&self) -> agent_client_protocol_core::schema::ToolKind {
+    fn kind(&self) -> acp::ToolKind {
         T::kind()
     }
 
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index a4aac074c48ca1fb29c7dfaf86f119c68613534d..f1367457d327d6f873f4c5cc7439759122e6be71 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -1,5 +1,5 @@
 use crate::{DbThread, DbThreadMetadata, ThreadsDatabase};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::{Result, anyhow};
 use gpui::{App, Context, Entity, Global, Task, prelude::*};
 use util::path_list::PathList;
diff --git a/crates/agent/src/tools/context_server_registry.rs b/crates/agent/src/tools/context_server_registry.rs
index b4d65189c0a6c2f30e8d522e35ff807b14d5c1d4..65b5df8abfe1c0686fbfde4f0fe8ce27489b0113 100644
--- a/crates/agent/src/tools/context_server_registry.rs
+++ b/crates/agent/src/tools/context_server_registry.rs
@@ -1,5 +1,5 @@
 use crate::{AgentToolOutput, AnyAgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol_core::schema::ToolKind;
+use agent_client_protocol::schema as acp;
 use anyhow::Result;
 use collections::{BTreeMap, HashMap};
 use context_server::{ContextServerId, client::NotificationSubscription};
@@ -304,8 +304,8 @@ impl AnyAgentTool for ContextServerTool {
         self.tool.description.clone().unwrap_or_default().into()
     }
 
-    fn kind(&self) -> ToolKind {
-        ToolKind::Other
+    fn kind(&self) -> acp::ToolKind {
+        acp::ToolKind::Other
     }
 
     fn initial_title(&self, _input: serde_json::Value, _cx: &mut App) -> SharedString {
diff --git a/crates/agent/src/tools/copy_path_tool.rs b/crates/agent/src/tools/copy_path_tool.rs
index 5e9d72b43fcd1cf8a325a9f959eedf21adfd73a9..32d48d2e1435b6e8b454557c337a4603857304c7 100644
--- a/crates/agent/src/tools/copy_path_tool.rs
+++ b/crates/agent/src/tools/copy_path_tool.rs
@@ -5,7 +5,7 @@ use super::tool_permissions::{
 use crate::{
     AgentTool, ToolCallEventStream, ToolInput, ToolPermissionDecision, decide_permission_for_paths,
 };
-use agent_client_protocol_core::schema::ToolKind;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use futures::FutureExt as _;
 use gpui::{App, Entity, Task};
@@ -61,8 +61,8 @@ impl AgentTool for CopyPathTool {
 
     const NAME: &'static str = "copy_path";
 
-    fn kind() -> ToolKind {
-        ToolKind::Move
+    fn kind() -> acp::ToolKind {
+        acp::ToolKind::Move
     }
 
     fn initial_title(
@@ -198,7 +198,6 @@ impl AgentTool for CopyPathTool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use agent_client_protocol_core::schema as acp;
     use fs::Fs as _;
     use gpui::TestAppContext;
     use project::{FakeFs, Project};
diff --git a/crates/agent/src/tools/create_directory_tool.rs b/crates/agent/src/tools/create_directory_tool.rs
index eb918dabeb4bcbcd70afb7bd6c4ba666ddbcc0aa..631870b4236af2f1140d6510ba7ae31e28c8e206 100644
--- a/crates/agent/src/tools/create_directory_tool.rs
+++ b/crates/agent/src/tools/create_directory_tool.rs
@@ -2,7 +2,7 @@ use super::tool_permissions::{
     SensitiveSettingsKind, authorize_symlink_access, canonicalize_worktree_roots,
     detect_symlink_escape, sensitive_settings_kind,
 };
-use agent_client_protocol_core::schema::ToolKind;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use futures::FutureExt as _;
 use gpui::{App, Entity, SharedString, Task};
@@ -52,8 +52,8 @@ impl AgentTool for CreateDirectoryTool {
 
     const NAME: &'static str = "create_directory";
 
-    fn kind() -> ToolKind {
-        ToolKind::Read
+    fn kind() -> acp::ToolKind {
+        acp::ToolKind::Read
     }
 
     fn initial_title(
@@ -169,7 +169,6 @@ impl AgentTool for CreateDirectoryTool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use agent_client_protocol_core::schema as acp;
     use fs::Fs as _;
     use gpui::TestAppContext;
     use project::{FakeFs, Project};
diff --git a/crates/agent/src/tools/delete_path_tool.rs b/crates/agent/src/tools/delete_path_tool.rs
index 59a2c67cce716442299f9d5f3cb37befc6af9218..3051ffc29eba8ed96929c002df2cbb81b1a20c2e 100644
--- a/crates/agent/src/tools/delete_path_tool.rs
+++ b/crates/agent/src/tools/delete_path_tool.rs
@@ -6,7 +6,7 @@ use crate::{
     AgentTool, ToolCallEventStream, ToolInput, ToolPermissionDecision, decide_permission_for_path,
 };
 use action_log::ActionLog;
-use agent_client_protocol_core::schema::ToolKind;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use futures::{FutureExt as _, SinkExt, StreamExt, channel::mpsc};
 use gpui::{App, AppContext, Entity, SharedString, Task};
@@ -55,8 +55,8 @@ impl AgentTool for DeletePathTool {
 
     const NAME: &'static str = "delete_path";
 
-    fn kind() -> ToolKind {
-        ToolKind::Delete
+    fn kind() -> acp::ToolKind {
+        acp::ToolKind::Delete
     }
 
     fn initial_title(
@@ -228,7 +228,6 @@ impl AgentTool for DeletePathTool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use agent_client_protocol_core::schema as acp;
     use fs::Fs as _;
     use gpui::TestAppContext;
     use project::{FakeFs, Project};
diff --git a/crates/agent/src/tools/diagnostics_tool.rs b/crates/agent/src/tools/diagnostics_tool.rs
index 7f995e3f2f18d9013ae2373a2689be460243d4b4..a59f61ae97a187fd36bc4c170d2e770262d74e9d 100644
--- a/crates/agent/src/tools/diagnostics_tool.rs
+++ b/crates/agent/src/tools/diagnostics_tool.rs
@@ -1,5 +1,5 @@
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::Result;
 use futures::FutureExt as _;
 use gpui::{App, Entity, Task};
diff --git a/crates/agent/src/tools/edit_file_tool.rs b/crates/agent/src/tools/edit_file_tool.rs
index f3b67cad2b993ce2518a1c285555beffebd80076..a43241a407bef97ce445431fc49275366232aa88 100644
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ b/crates/agent/src/tools/edit_file_tool.rs
@@ -6,7 +6,7 @@ use crate::{
     edit_agent::{EditAgent, EditAgentOutputEvent, EditFormat},
 };
 use acp_thread::Diff;
-use agent_client_protocol_core::schema::{self as acp, ToolCallLocation, ToolCallUpdateFields};
+use agent_client_protocol::schema::{self as acp, ToolCallLocation, ToolCallUpdateFields};
 use anyhow::{Context as _, Result};
 use collections::HashSet;
 use futures::{FutureExt as _, StreamExt as _};
diff --git a/crates/agent/src/tools/fetch_tool.rs b/crates/agent/src/tools/fetch_tool.rs
index 9fbd538ebaa4e28f77a10c6182043089d71fc5bd..8723a6d9882df2c27cfcf8f53f10fbfac2cae0f4 100644
--- a/crates/agent/src/tools/fetch_tool.rs
+++ b/crates/agent/src/tools/fetch_tool.rs
@@ -2,7 +2,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 use std::{borrow::Cow, cell::RefCell};
 
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result, bail};
 use futures::{AsyncReadExt as _, FutureExt as _};
diff --git a/crates/agent/src/tools/find_path_tool.rs b/crates/agent/src/tools/find_path_tool.rs
index 8afc9dab09e9d40d6d801a7a19e5f3a444cb490c..66d127e756ca838014e11f924c0d56545360c758 100644
--- a/crates/agent/src/tools/find_path_tool.rs
+++ b/crates/agent/src/tools/find_path_tool.rs
@@ -1,5 +1,5 @@
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::{Result, anyhow};
 use futures::FutureExt as _;
 use gpui::{App, AppContext, Entity, SharedString, Task};
diff --git a/crates/agent/src/tools/grep_tool.rs b/crates/agent/src/tools/grep_tool.rs
index 050e67e8241febf7caf6fb26081b60714f666c02..a56c793bb856b7a531631837288ac0c171c1a394 100644
--- a/crates/agent/src/tools/grep_tool.rs
+++ b/crates/agent/src/tools/grep_tool.rs
@@ -1,5 +1,5 @@
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::Result;
 use futures::{FutureExt as _, StreamExt};
 use gpui::{App, Entity, SharedString, Task};
diff --git a/crates/agent/src/tools/list_directory_tool.rs b/crates/agent/src/tools/list_directory_tool.rs
index 218412fe11115213fe6cb2052acd9d4c5e35b46d..be51fcf9188308bd7f15481ce3dc6db208e2c39b 100644
--- a/crates/agent/src/tools/list_directory_tool.rs
+++ b/crates/agent/src/tools/list_directory_tool.rs
@@ -3,7 +3,7 @@ use super::tool_permissions::{
     resolve_project_path,
 };
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol_core::schema::ToolKind;
+use agent_client_protocol::schema as acp;
 use anyhow::{Context as _, Result, anyhow};
 use gpui::{App, Entity, SharedString, Task};
 use project::{Project, ProjectPath, WorktreeSettings};
@@ -127,8 +127,8 @@ impl AgentTool for ListDirectoryTool {
 
     const NAME: &'static str = "list_directory";
 
-    fn kind() -> ToolKind {
-        ToolKind::Read
+    fn kind() -> acp::ToolKind {
+        acp::ToolKind::Read
     }
 
     fn initial_title(
@@ -267,7 +267,6 @@ impl AgentTool for ListDirectoryTool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use agent_client_protocol_core::schema as acp;
     use fs::Fs as _;
     use gpui::{TestAppContext, UpdateGlobal};
     use indoc::indoc;
diff --git a/crates/agent/src/tools/move_path_tool.rs b/crates/agent/src/tools/move_path_tool.rs
index d88e529081e805cc9cfefde6c5d7cf879b2ab13c..fcdbd3c59406c35968cab8e92116c17d6dd4d591 100644
--- a/crates/agent/src/tools/move_path_tool.rs
+++ b/crates/agent/src/tools/move_path_tool.rs
@@ -5,7 +5,7 @@ use super::tool_permissions::{
 use crate::{
     AgentTool, ToolCallEventStream, ToolInput, ToolPermissionDecision, decide_permission_for_paths,
 };
-use agent_client_protocol_core::schema::ToolKind;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use futures::FutureExt as _;
 use gpui::{App, Entity, SharedString, Task};
@@ -62,8 +62,8 @@ impl AgentTool for MovePathTool {
 
     const NAME: &'static str = "move_path";
 
-    fn kind() -> ToolKind {
-        ToolKind::Move
+    fn kind() -> acp::ToolKind {
+        acp::ToolKind::Move
     }
 
     fn initial_title(
@@ -205,7 +205,6 @@ impl AgentTool for MovePathTool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use agent_client_protocol_core::schema as acp;
     use fs::Fs as _;
     use gpui::TestAppContext;
     use project::{FakeFs, Project};
diff --git a/crates/agent/src/tools/now_tool.rs b/crates/agent/src/tools/now_tool.rs
index 1deeb6861802b8f96903eac5700a53a03d2b5dc4..04aba44ff3a1f47ec72606a8eb9763f1ff2cbc14 100644
--- a/crates/agent/src/tools/now_tool.rs
+++ b/crates/agent/src/tools/now_tool.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use chrono::{Local, Utc};
 use gpui::{App, SharedString, Task};
 use schemars::JsonSchema;
diff --git a/crates/agent/src/tools/open_tool.rs b/crates/agent/src/tools/open_tool.rs
index bae306c75898ac927360af7b9c50b214a025cdc5..dc72c758e36b049c9d9a865d5710e79f5c27befb 100644
--- a/crates/agent/src/tools/open_tool.rs
+++ b/crates/agent/src/tools/open_tool.rs
@@ -3,7 +3,7 @@ use super::tool_permissions::{
     resolve_project_path,
 };
 use crate::{AgentTool, ToolInput};
-use agent_client_protocol_core::schema::ToolKind;
+use agent_client_protocol::schema as acp;
 use futures::FutureExt as _;
 use gpui::{App, AppContext as _, Entity, SharedString, Task};
 use project::Project;
@@ -43,8 +43,8 @@ impl AgentTool for OpenTool {
 
     const NAME: &'static str = "open";
 
-    fn kind() -> ToolKind {
-        ToolKind::Execute
+    fn kind() -> acp::ToolKind {
+        acp::ToolKind::Execute
     }
 
     fn initial_title(
diff --git a/crates/agent/src/tools/read_file_tool.rs b/crates/agent/src/tools/read_file_tool.rs
index 96a44c443b63ebded8370b0ddeabb3257c8ab84c..e59e2e4db3a4ed0840d4ed8908df8b922939c145 100644
--- a/crates/agent/src/tools/read_file_tool.rs
+++ b/crates/agent/src/tools/read_file_tool.rs
@@ -1,5 +1,5 @@
 use action_log::ActionLog;
-use agent_client_protocol_core::schema::{self as acp, ToolCallUpdateFields};
+use agent_client_protocol::schema::{self as acp, ToolCallUpdateFields};
 use anyhow::{Context as _, Result, anyhow};
 use futures::FutureExt as _;
 use gpui::{App, Entity, SharedString, Task};
@@ -347,7 +347,7 @@ impl AgentTool for ReadFileTool {
 #[cfg(test)]
 mod test {
     use super::*;
-    use agent_client_protocol_core::schema as acp;
+    use agent_client_protocol::schema as acp;
     use fs::Fs as _;
     use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
     use project::{FakeFs, Project};
diff --git a/crates/agent/src/tools/restore_file_from_disk_tool.rs b/crates/agent/src/tools/restore_file_from_disk_tool.rs
index 1c9f398029eb5b8202fe2ad17a02a343f2324ca3..311ca664333453b4d439e56b194df30ca5cbd987 100644
--- a/crates/agent/src/tools/restore_file_from_disk_tool.rs
+++ b/crates/agent/src/tools/restore_file_from_disk_tool.rs
@@ -3,7 +3,7 @@ use super::tool_permissions::{
     canonicalize_worktree_roots, path_has_symlink_escape, resolve_project_path,
     sensitive_settings_kind,
 };
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use collections::FxHashSet;
 use futures::FutureExt as _;
diff --git a/crates/agent/src/tools/save_file_tool.rs b/crates/agent/src/tools/save_file_tool.rs
index 833f74e02fd4486467094150583fe41379c0f79c..7eeeea961f6e5076b60a5663d93f85fe8de816f0 100644
--- a/crates/agent/src/tools/save_file_tool.rs
+++ b/crates/agent/src/tools/save_file_tool.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use collections::FxHashSet;
 use futures::FutureExt as _;
diff --git a/crates/agent/src/tools/spawn_agent_tool.rs b/crates/agent/src/tools/spawn_agent_tool.rs
index 0639e2fa11b4de1591e2c7e3813401a37008096e..cdb36126f5763d22e8538b12b6b03610695fb982 100644
--- a/crates/agent/src/tools/spawn_agent_tool.rs
+++ b/crates/agent/src/tools/spawn_agent_tool.rs
@@ -1,5 +1,5 @@
 use acp_thread::{SUBAGENT_SESSION_INFO_META_KEY, SubagentSessionInfo};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::Result;
 use gpui::{App, SharedString, Task};
 use language_model::LanguageModelToolResultContent;
diff --git a/crates/agent/src/tools/streaming_edit_file_tool.rs b/crates/agent/src/tools/streaming_edit_file_tool.rs
index c185295d713ddd1dd4a6fd32204c2a3f031ce8cb..dfd3310f143d2ad5c8221a2af8d97a0b27c27e89 100644
--- a/crates/agent/src/tools/streaming_edit_file_tool.rs
+++ b/crates/agent/src/tools/streaming_edit_file_tool.rs
@@ -11,7 +11,7 @@ use crate::{
 };
 use acp_thread::Diff;
 use action_log::ActionLog;
-use agent_client_protocol_core::schema::{self as acp, ToolCallLocation, ToolCallUpdateFields};
+use agent_client_protocol::schema::{self as acp, ToolCallLocation, ToolCallUpdateFields};
 use anyhow::{Context as _, Result};
 use collections::HashSet;
 use futures::FutureExt as _;
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index b19323da2b6990407fcb26280de2ab98979080e9..4d17c0d91dc4d1bff384e89e29a59359151e6fc4 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use anyhow::Result;
 use futures::FutureExt as _;
diff --git a/crates/agent/src/tools/update_plan_tool.rs b/crates/agent/src/tools/update_plan_tool.rs
index af18f6409d0b1951eb72384c7baf00fabfd2d231..39e88590b1872ad959f82a432ab3eebb58759980 100644
--- a/crates/agent/src/tools/update_plan_tool.rs
+++ b/crates/agent/src/tools/update_plan_tool.rs
@@ -1,5 +1,5 @@
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use gpui::{App, SharedString, Task};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
diff --git a/crates/agent/src/tools/web_search_tool.rs b/crates/agent/src/tools/web_search_tool.rs
index 7d0a50a8c9c2d78b8a0fd982402590d06d3f4aea..8efff5ae52bc7890f6c4f2b9bfaf8b643b2408ef 100644
--- a/crates/agent/src/tools/web_search_tool.rs
+++ b/crates/agent/src/tools/web_search_tool.rs
@@ -4,7 +4,7 @@ use crate::{
     AgentTool, ToolCallEventStream, ToolInput, ToolPermissionDecision,
     decide_permission_from_settings,
 };
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use anyhow::Result;
 use cloud_llm_client::WebSearchResponse;
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 4caf08c7c0bb9d64b61a96e912f5e8a5fb010eca..1542466be35bbce80983a73a3fc2e0998799160c 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -20,7 +20,7 @@ doctest = false
 acp_tools.workspace = true
 acp_thread.workspace = true
 action_log.workspace = true
-agent-client-protocol-core.workspace = true
+agent-client-protocol.workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
 chrono.workspace = true
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 5e8b7aa59e189c10c19e54285c64cd527c56c3d7..b81de679982649cb4999462d62f9b3dc4ee5d766 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -4,8 +4,8 @@ use acp_thread::{
 };
 use acp_tools::{AcpConnectionRegistry, StreamMessage, StreamMessageDirection};
 use action_log::ActionLog;
-use agent_client_protocol_core::schema::{self as acp, ErrorCode};
-use agent_client_protocol_core::{ConnectionTo, Lines};
+use agent_client_protocol::schema::{self as acp, ErrorCode};
+use agent_client_protocol::{Agent, Client, ConnectionTo, JsonRpcResponse, Lines, Responder};
 use anyhow::anyhow;
 use collections::HashMap;
 use feature_flags::{AcpBetaFeatureFlag, FeatureFlagAppExt as _};
@@ -54,7 +54,7 @@ type ForegroundWork = Box<dyn FnOnce(&mut AsyncApp, &ClientContext) + Send>;
 pub struct AcpConnection {
     id: AgentId,
     telemetry_id: SharedString,
-    connection: ConnectionTo<agent_client_protocol_core::Agent>,
+    connection: ConnectionTo<Agent>,
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     auth_methods: Vec<acp::AuthMethod>,
     command: AgentServerCommand,
@@ -96,13 +96,13 @@ pub struct AcpSession {
 }
 
 pub struct AcpSessionList {
-    connection: ConnectionTo<agent_client_protocol_core::Agent>,
+    connection: ConnectionTo<Agent>,
     updates_tx: smol::channel::Sender<acp_thread::SessionListUpdate>,
     updates_rx: smol::channel::Receiver<acp_thread::SessionListUpdate>,
 }
 
 impl AcpSessionList {
-    fn new(connection: ConnectionTo<agent_client_protocol_core::Agent>) -> Self {
+    fn new(connection: ConnectionTo<Agent>) -> Self {
         let (tx, rx) = smol::channel::unbounded();
         Self {
             connection,
@@ -337,50 +337,50 @@ impl AcpConnection {
         // All handlers forward work to the foreground dispatch channel.
         let connection_future = {
             let dispatch_tx = dispatch_tx.clone();
-            agent_client_protocol_core::Client
+            Client
                 .builder()
                 .name("zed")
                 // --- Request handlers (agent→client) ---
                 .on_receive_request(
                     dispatch_request_handler!(dispatch_tx, handle_request_permission),
-                    agent_client_protocol_core::on_receive_request!(),
+                    agent_client_protocol::on_receive_request!(),
                 )
                 .on_receive_request(
                     dispatch_request_handler!(dispatch_tx, handle_write_text_file),
-                    agent_client_protocol_core::on_receive_request!(),
+                    agent_client_protocol::on_receive_request!(),
                 )
                 .on_receive_request(
                     dispatch_request_handler!(dispatch_tx, handle_read_text_file),
-                    agent_client_protocol_core::on_receive_request!(),
+                    agent_client_protocol::on_receive_request!(),
                 )
                 .on_receive_request(
                     dispatch_request_handler!(dispatch_tx, handle_create_terminal),
-                    agent_client_protocol_core::on_receive_request!(),
+                    agent_client_protocol::on_receive_request!(),
                 )
                 .on_receive_request(
                     dispatch_request_handler!(dispatch_tx, handle_kill_terminal),
-                    agent_client_protocol_core::on_receive_request!(),
+                    agent_client_protocol::on_receive_request!(),
                 )
                 .on_receive_request(
                     dispatch_request_handler!(dispatch_tx, handle_release_terminal),
-                    agent_client_protocol_core::on_receive_request!(),
+                    agent_client_protocol::on_receive_request!(),
                 )
                 .on_receive_request(
                     dispatch_request_handler!(dispatch_tx, handle_terminal_output),
-                    agent_client_protocol_core::on_receive_request!(),
+                    agent_client_protocol::on_receive_request!(),
                 )
                 .on_receive_request(
                     dispatch_request_handler!(dispatch_tx, handle_wait_for_terminal_exit),
-                    agent_client_protocol_core::on_receive_request!(),
+                    agent_client_protocol::on_receive_request!(),
                 )
                 // --- Notification handlers (agent→client) ---
                 .on_receive_notification(
                     dispatch_notification_handler!(dispatch_tx, handle_session_notification),
-                    agent_client_protocol_core::on_receive_notification!(),
+                    agent_client_protocol::on_receive_notification!(),
                 )
                 .connect_with(
                     transport,
-                    move |connection: ConnectionTo<agent_client_protocol_core::Agent>| async move {
+                    move |connection: ConnectionTo<Agent>| async move {
                         connection_tx.send(connection.clone()).ok();
                         // Keep the connection alive until the transport closes.
                         futures::future::pending::<Result<(), acp::Error>>().await
@@ -396,7 +396,7 @@ impl AcpConnection {
         });
 
         // Wait for the ConnectionTo<Agent> handle.
-        let connection: ConnectionTo<agent_client_protocol_core::Agent> = connection_rx
+        let connection: ConnectionTo<Agent> = connection_rx
             .await
             .context("Failed to receive ACP connection handle")?;
 
@@ -1465,7 +1465,7 @@ fn config_state(
 
 struct AcpSessionModes {
     session_id: acp::SessionId,
-    connection: ConnectionTo<agent_client_protocol_core::Agent>,
+    connection: ConnectionTo<Agent>,
     state: Rc<RefCell<acp::SessionModeState>>,
 }
 
@@ -1507,14 +1507,14 @@ impl acp_thread::AgentSessionModes for AcpSessionModes {
 
 struct AcpModelSelector {
     session_id: acp::SessionId,
-    connection: ConnectionTo<agent_client_protocol_core::Agent>,
+    connection: ConnectionTo<Agent>,
     state: Rc<RefCell<acp::SessionModelState>>,
 }
 
 impl AcpModelSelector {
     fn new(
         session_id: acp::SessionId,
-        connection: ConnectionTo<agent_client_protocol_core::Agent>,
+        connection: ConnectionTo<Agent>,
         state: Rc<RefCell<acp::SessionModelState>>,
     ) -> Self {
         Self {
@@ -1580,7 +1580,7 @@ impl acp_thread::AgentModelSelector for AcpModelSelector {
 
 struct AcpSessionConfigOptions {
     session_id: acp::SessionId,
-    connection: ConnectionTo<agent_client_protocol_core::Agent>,
+    connection: ConnectionTo<Agent>,
     state: Rc<RefCell<Vec<acp::SessionConfigOption>>>,
     watch_tx: Rc<RefCell<watch::Sender<()>>>,
     watch_rx: watch::Receiver<()>,
@@ -1638,16 +1638,13 @@ fn session_thread(
         .ok_or_else(|| acp::Error::internal_error().data(format!("unknown session: {session_id}")))
 }
 
-fn respond_err<T: agent_client_protocol_core::JsonRpcResponse + Send + 'static>(
-    responder: agent_client_protocol_core::Responder<T>,
-    err: acp::Error,
-) {
+fn respond_err<T: JsonRpcResponse + Send + 'static>(responder: Responder<T>, err: acp::Error) {
     responder.respond_with_error(err).log_err();
 }
 
 fn handle_request_permission(
     args: acp::RequestPermissionRequest,
-    responder: agent_client_protocol_core::Responder<acp::RequestPermissionResponse>,
+    responder: Responder<acp::RequestPermissionResponse>,
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
@@ -1686,7 +1683,7 @@ fn handle_request_permission(
 
 fn handle_write_text_file(
     args: acp::WriteTextFileRequest,
-    responder: agent_client_protocol_core::Responder<acp::WriteTextFileResponse>,
+    responder: Responder<acp::WriteTextFileResponse>,
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
@@ -1721,7 +1718,7 @@ fn handle_write_text_file(
 
 fn handle_read_text_file(
     args: acp::ReadTextFileRequest,
-    responder: agent_client_protocol_core::Responder<acp::ReadTextFileResponse>,
+    responder: Responder<acp::ReadTextFileResponse>,
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
@@ -1903,7 +1900,7 @@ fn handle_session_notification(
 
 fn handle_create_terminal(
     args: acp::CreateTerminalRequest,
-    responder: agent_client_protocol_core::Responder<acp::CreateTerminalResponse>,
+    responder: Responder<acp::CreateTerminalResponse>,
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
@@ -1966,7 +1963,7 @@ fn handle_create_terminal(
 
 fn handle_kill_terminal(
     args: acp::KillTerminalRequest,
-    responder: agent_client_protocol_core::Responder<acp::KillTerminalResponse>,
+    responder: Responder<acp::KillTerminalResponse>,
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
@@ -1991,7 +1988,7 @@ fn handle_kill_terminal(
 
 fn handle_release_terminal(
     args: acp::ReleaseTerminalRequest,
-    responder: agent_client_protocol_core::Responder<acp::ReleaseTerminalResponse>,
+    responder: Responder<acp::ReleaseTerminalResponse>,
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
@@ -2018,7 +2015,7 @@ fn handle_release_terminal(
 
 fn handle_terminal_output(
     args: acp::TerminalOutputRequest,
-    responder: agent_client_protocol_core::Responder<acp::TerminalOutputResponse>,
+    responder: Responder<acp::TerminalOutputResponse>,
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
@@ -2047,7 +2044,7 @@ fn handle_terminal_output(
 
 fn handle_wait_for_terminal_exit(
     args: acp::WaitForTerminalExitRequest,
-    responder: agent_client_protocol_core::Responder<acp::WaitForTerminalExitResponse>,
+    responder: Responder<acp::WaitForTerminalExitResponse>,
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 9bba14dea302b3803334492373830a82820196c4..37e77c80c79683a231c8766a914651e1b78c2896 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -12,7 +12,7 @@ use http_client::read_no_proxy_from_env;
 use project::{AgentId, Project, agent_server_store::AgentServerStore};
 
 use acp_thread::AgentConnection;
-use agent_client_protocol_core::schema::{
+use agent_client_protocol::schema::{
     ModelId, SessionConfigId, SessionConfigValueId, SessionModeId,
 };
 use anyhow::Result;
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index 91f39b25b8cb7a477b78c291222b250094f2ab1a..b07bd4a09a2e8d75402c2fedfd4fe817154d2c2a 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -1,6 +1,6 @@
 use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
 use acp_thread::AgentConnection;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::{Context as _, Result};
 use collections::HashSet;
 use credentials_provider::CredentialsProvider;
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index 3f3c77f740eb4c1f249a772bc5f704fa53de2bc5..c388569a2c705b91db9511a204a0894cf8158b63 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -1,6 +1,6 @@
 use crate::{AgentServer, AgentServerDelegate};
 use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use futures::{FutureExt, StreamExt, channel::mpsc, select};
 use gpui::AppContext;
 use gpui::{Entity, TestAppContext};
@@ -378,7 +378,7 @@ macro_rules! common_e2e_tests {
             async fn tool_call_with_permission(cx: &mut ::gpui::TestAppContext) {
                 $crate::e2e_tests::test_tool_call_with_permission(
                     $server,
-                    ::agent_client_protocol_core::schema::PermissionOptionId::new($allow_option_id),
+                    ::agent_client_protocol::schema::PermissionOptionId::new($allow_option_id),
                     cx,
                 )
                 .await;
diff --git a/crates/agent_settings/Cargo.toml b/crates/agent_settings/Cargo.toml
index 942e54c37b97b493ddde90767465e68966b88e7b..b2db5677dcfdc0994e7ce7a03c9c1dd850eb8514 100644
--- a/crates/agent_settings/Cargo.toml
+++ b/crates/agent_settings/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
 path = "src/agent_settings.rs"
 
 [dependencies]
-agent-client-protocol-core.workspace = true
+agent-client-protocol.workspace = true
 anyhow.workspace = true
 collections.workspace = true
 convert_case.workspace = true
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 9b2a8673bb545467ed0099bc0aedf508db696f21..c131a686ce10df6c9984ab45bc25a7092cba9295 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -3,7 +3,7 @@ mod agent_profile;
 use std::path::{Component, Path};
 use std::sync::{Arc, LazyLock};
 
-use agent_client_protocol_core::schema::ModelId;
+use agent_client_protocol::schema as acp;
 use collections::{HashSet, IndexMap};
 use fs::Fs;
 use gpui::{App, Pixels, px};
@@ -214,10 +214,10 @@ impl AgentSettings {
         self.message_editor_min_lines * 2
     }
 
-    pub fn favorite_model_ids(&self) -> HashSet<ModelId> {
+    pub fn favorite_model_ids(&self) -> HashSet<acp::ModelId> {
         self.favorite_models
             .iter()
-            .map(|sel| ModelId::new(format!("{}/{}", sel.provider.0, sel.model)))
+            .map(|sel| acp::ModelId::new(format!("{}/{}", sel.provider.0, sel.model)))
             .collect()
     }
 
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index ce03c3ddc67add55bfd0ca2ef1162ab33687050d..e505a124b6898953db9751ddfc8ab98cb7f496f0 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -28,7 +28,7 @@ unit-eval = []
 [dependencies]
 acp_thread.workspace = true
 action_log.workspace = true
-agent-client-protocol-core.workspace = true
+agent-client-protocol.workspace = true
 agent.workspace = true
 agent_servers.workspace = true
 agent_settings.workspace = true
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index dd1594430c7ce512929a84344cc0fb89ef92289c..4792e0dfebb7e854dc99912b88d3f4bd321b4780 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -10,7 +10,7 @@ use std::{
 
 use acp_thread::{AcpThread, MentionUri, ThreadStatus};
 use agent::{ContextServerRegistry, SharedThread, ThreadStore};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_servers::AgentServer;
 use collections::HashSet;
 use db::kvp::{Dismissable, KeyValueStore};
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 45620b4c26a17ac45419a8b4a07b029f9fd1966a..0c831b04a98540ca9461efa7a3875e1ece4b4054 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -39,7 +39,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use ::ui::IconName;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::{AgentProfileId, AgentSettings};
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::{AgentV2FeatureFlag, FeatureFlagAppExt as _};
@@ -232,7 +232,7 @@ pub struct NewExternalAgentThread {
 #[action(namespace = agent)]
 #[serde(deny_unknown_fields)]
 pub struct NewNativeAgentThreadFromSummary {
-    from_session_id: agent_client_protocol_core::schema::SessionId,
+    from_session_id: acp::SessionId,
 }
 
 #[derive(Debug, Default, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, JsonSchema)]
@@ -317,7 +317,7 @@ pub enum AgentInitialContent {
         title: Option<SharedString>,
     },
     ContentBlock {
-        blocks: Vec<agent_client_protocol_core::schema::ContentBlock>,
+        blocks: Vec<acp::ContentBlock>,
         auto_submit: bool,
     },
     FromExternalSource(ExternalSourcePrompt),
diff --git a/crates/agent_ui/src/completion_provider.rs b/crates/agent_ui/src/completion_provider.rs
index 7ee3b60f95c1c08de98bd809a384e6608d110fa3..d618cd2369f4d59834ef838638ae4f3b40de8d02 100644
--- a/crates/agent_ui/src/completion_provider.rs
+++ b/crates/agent_ui/src/completion_provider.rs
@@ -7,7 +7,7 @@ use std::sync::atomic::AtomicBool;
 use crate::DEFAULT_THREAD_TITLE;
 use crate::ThreadHistory;
 use acp_thread::MentionUri;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::Result;
 use editor::{CompletionProvider, Editor, code_context_menus::COMPLETION_MENU_MAX_WIDTH};
 use futures::FutureExt as _;
diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index a1d1158e8e1c23ccfca93b50ee94f66ebcc20fbe..7945a76e1994cd406c74da59bdf703fabad561ca 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -1,7 +1,7 @@
 use std::{cmp::Reverse, rc::Rc, sync::Arc};
 
 use acp_thread::AgentSessionConfigOptions;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_servers::AgentServer;
 use agent_settings::AgentSettings;
 use collections::HashSet;
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index c3a17a06c958a879bdb672e4b60edc5a0ab3eee4..73196e8c01a9196bc6e13d86ffe840cc59e04cae 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -7,7 +7,7 @@ use acp_thread::{
 use acp_thread::{AgentConnection, Plan};
 use action_log::{ActionLog, ActionLogTelemetry, DiffStats};
 use agent::{NativeAgentServer, NativeAgentSessionList, SharedThread, ThreadStore};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 #[cfg(test)]
 use agent_servers::AgentServerDelegate;
 use agent_servers::{AgentServer, GEMINI_TERMINAL_AUTH_METHOD_ID};
@@ -2745,12 +2745,12 @@ fn plan_label_markdown_style(
 
 #[cfg(test)]
 pub(crate) mod tests {
+    use acp::SessionId;
     use acp_thread::{
         AgentSessionList, AgentSessionListRequest, AgentSessionListResponse, StubAgentConnection,
     };
     use action_log::ActionLog;
     use agent::{AgentTool, EditFileTool, FetchTool, TerminalTool, ToolPermissionContext};
-    use agent_client_protocol_core::schema::SessionId;
     use editor::MultiBufferOffset;
     use fs::FakeFs;
     use gpui::{EventEmitter, TestAppContext, VisualTestContext};
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 4926a7337431c74c327f1d69e6047496c6b680e1..e6fdb9a381c05c6563a8539ec7ea2c87262f87da 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -2,6 +2,7 @@ use crate::{
     DEFAULT_THREAD_TITLE, SelectPermissionGranularity,
     agent_configuration::configure_context_server_modal::default_markdown_style,
 };
+use agent_client_protocol::schema as acp;
 use std::cell::RefCell;
 
 use acp_thread::{ContentBlock, PlanEntry};
@@ -249,13 +250,12 @@ pub struct ThreadView {
     pub session_capabilities: SharedSessionCapabilities,
     /// Tracks which tool calls have their content/output expanded.
     /// Used for showing/hiding tool call results, terminal output, etc.
-    pub expanded_tool_calls: HashSet<agent_client_protocol_core::schema::ToolCallId>,
-    pub expanded_tool_call_raw_inputs: HashSet<agent_client_protocol_core::schema::ToolCallId>,
+    pub expanded_tool_calls: HashSet<acp::ToolCallId>,
+    pub expanded_tool_call_raw_inputs: HashSet<acp::ToolCallId>,
     pub expanded_thinking_blocks: HashSet<(usize, usize)>,
     auto_expanded_thinking_block: Option<(usize, usize)>,
     user_toggled_thinking_blocks: HashSet<(usize, usize)>,
-    pub subagent_scroll_handles:
-        RefCell<HashMap<agent_client_protocol_core::schema::SessionId, ScrollHandle>>,
+    pub subagent_scroll_handles: RefCell<HashMap<acp::SessionId, ScrollHandle>>,
     pub edits_expanded: bool,
     pub plan_expanded: bool,
     pub queue_expanded: bool,
@@ -267,12 +267,11 @@ pub struct ThreadView {
     pub queued_message_editor_subscriptions: Vec<Subscription>,
     pub last_synced_queue_length: usize,
     pub turn_fields: TurnFields,
-    pub discarded_partial_edits: HashSet<agent_client_protocol_core::schema::ToolCallId>,
+    pub discarded_partial_edits: HashSet<acp::ToolCallId>,
     pub is_loading_contents: bool,
     pub new_server_version_available: Option<SharedString>,
     pub resumed_without_history: bool,
-    pub(crate) permission_selections:
-        HashMap<agent_client_protocol_core::schema::ToolCallId, PermissionSelection>,
+    pub(crate) permission_selections: HashMap<acp::ToolCallId, PermissionSelection>,
     pub resume_thread_metadata: Option<AgentSessionInfo>,
     pub _cancel_task: Option<Task<()>>,
     _save_task: Option<Task<()>>,
diff --git a/crates/agent_ui/src/entry_view_state.rs b/crates/agent_ui/src/entry_view_state.rs
index 4cd34ceb38af52732af94550ac289895fc1a5a1a..584776eb613503f43d2e6ab912ba2d7bdc184cbf 100644
--- a/crates/agent_ui/src/entry_view_state.rs
+++ b/crates/agent_ui/src/entry_view_state.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use super::thread_history::ThreadHistory;
 use acp_thread::{AcpThread, AgentThreadEntry};
 use agent::ThreadStore;
-use agent_client_protocol_core::schema::ToolCallId;
+use agent_client_protocol::schema as acp;
 use collections::HashMap;
 use editor::{Editor, EditorEvent, EditorMode, MinimapVisibility, SizingBehavior};
 use gpui::{
@@ -286,9 +286,9 @@ pub struct EntryViewEvent {
 }
 
 pub enum ViewEvent {
-    NewDiff(ToolCallId),
-    NewTerminal(ToolCallId),
-    TerminalMovedToBackground(ToolCallId),
+    NewDiff(acp::ToolCallId),
+    NewTerminal(acp::ToolCallId),
+    TerminalMovedToBackground(acp::ToolCallId),
     MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
     OpenDiffLocation {
         path: String,
@@ -465,7 +465,7 @@ mod tests {
     use std::sync::Arc;
 
     use acp_thread::{AgentConnection, StubAgentConnection};
-    use agent_client_protocol_core::schema as acp;
+    use agent_client_protocol::schema as acp;
     use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
     use editor::RowInfo;
     use fs::FakeFs;
diff --git a/crates/agent_ui/src/mention_set.rs b/crates/agent_ui/src/mention_set.rs
index 2e150527e01a848a275917f9e4adcb2aa189c7c9..1bf524c454ecbca86af9573a77937d2466c36de9 100644
--- a/crates/agent_ui/src/mention_set.rs
+++ b/crates/agent_ui/src/mention_set.rs
@@ -1,7 +1,7 @@
 use crate::diagnostics::{DiagnosticsOptions, codeblock_fence_for_path, collect_diagnostics};
 use acp_thread::{MentionUri, selection_name};
 use agent::{ThreadStore, outline};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_servers::{AgentServer, AgentServerDelegate};
 use anyhow::{Context as _, Result, anyhow};
 use collections::{HashMap, HashSet};
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index a925553a2ef0c9a68ba3e9e2b36f36f1bda957e5..0edca0ad52b9846f2c4ad28ad3b2bea18d8dd08b 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -11,7 +11,7 @@ use crate::{
 };
 use acp_thread::MentionUri;
 use agent::ThreadStore;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::{Result, anyhow};
 use editor::{
     Addon, AnchorRangeExt, ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode,
@@ -1905,7 +1905,7 @@ mod tests {
 
     use acp_thread::MentionUri;
     use agent::{ThreadStore, outline};
-    use agent_client_protocol_core::schema as acp;
+    use agent_client_protocol::schema as acp;
     use base64::Engine as _;
     use editor::{
         AnchorRangeExt as _, Editor, EditorMode, MultiBufferOffset, SelectionEffects,
diff --git a/crates/agent_ui/src/mode_selector.rs b/crates/agent_ui/src/mode_selector.rs
index c619940387b9fcb65dfa7f169120e2d1dd7b787f..c45e368739c05e520b8010ea1416f9b4a5d89c4f 100644
--- a/crates/agent_ui/src/mode_selector.rs
+++ b/crates/agent_ui/src/mode_selector.rs
@@ -1,5 +1,5 @@
 use acp_thread::AgentSessionModes;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_servers::AgentServer;
 use agent_settings::AgentSettings;
 use fs::Fs;
diff --git a/crates/agent_ui/src/model_selector.rs b/crates/agent_ui/src/model_selector.rs
index 805c1b7188d1c8e975cb960969631fa41f3e43ee..1e65cc6992dee0bcfb0f972813595ebb8b4fc27c 100644
--- a/crates/agent_ui/src/model_selector.rs
+++ b/crates/agent_ui/src/model_selector.rs
@@ -1,7 +1,7 @@
 use std::{cmp::Reverse, rc::Rc, sync::Arc};
 
 use acp_thread::{AgentModelIcon, AgentModelInfo, AgentModelList, AgentModelSelector};
-use agent_client_protocol_core::schema::ModelId;
+use agent_client_protocol::schema as acp;
 use agent_servers::AgentServer;
 use agent_settings::AgentSettings;
 use anyhow::Result;
@@ -54,7 +54,7 @@ pub struct ModelPickerDelegate {
     selected_index: usize,
     selected_description: Option<(usize, SharedString, bool)>,
     selected_model: Option<AgentModelInfo>,
-    favorites: HashSet<ModelId>,
+    favorites: HashSet<acp::ModelId>,
     _refresh_models_task: Task<()>,
     _settings_subscription: Subscription,
     focus_handle: FocusHandle,
@@ -427,7 +427,7 @@ impl PickerDelegate for ModelPickerDelegate {
 
 fn info_list_to_picker_entries(
     model_list: AgentModelList,
-    favorites: &HashSet<ModelId>,
+    favorites: &HashSet<acp::ModelId>,
 ) -> Vec<ModelPickerEntry> {
     let mut entries = Vec::new();
 
@@ -533,7 +533,6 @@ async fn fuzzy_search(
 
 #[cfg(test)]
 mod tests {
-    use agent_client_protocol_core::schema as acp;
     use gpui::TestAppContext;
 
     use super::*;
@@ -595,10 +594,10 @@ mod tests {
         }
     }
 
-    fn create_favorites(models: Vec<&str>) -> HashSet<ModelId> {
+    fn create_favorites(models: Vec<&str>) -> HashSet<acp::ModelId> {
         models
             .into_iter()
-            .map(|m| ModelId::new(m.to_string()))
+            .map(|m| acp::ModelId::new(m.to_string()))
             .collect()
     }
 
@@ -794,7 +793,7 @@ mod tests {
 
     #[gpui::test]
     fn test_favorites_count_returns_correct_count(_cx: &mut TestAppContext) {
-        let empty_favorites: HashSet<ModelId> = HashSet::default();
+        let empty_favorites: HashSet<acp::ModelId> = HashSet::default();
         assert_eq!(empty_favorites.len(), 0);
 
         let one_favorite = create_favorites(vec!["model-a"]);
diff --git a/crates/agent_ui/src/test_support.rs b/crates/agent_ui/src/test_support.rs
index 2ffac1635836b253c7819d395580af777aba962e..f151d23c88f0f6dd9459f9da43a3da288211d42b 100644
--- a/crates/agent_ui/src/test_support.rs
+++ b/crates/agent_ui/src/test_support.rs
@@ -1,5 +1,5 @@
 use acp_thread::{AgentConnection, StubAgentConnection};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_servers::{AgentServer, AgentServerDelegate};
 use gpui::{Entity, Task, TestAppContext, VisualTestContext};
 use project::AgentId;
diff --git a/crates/agent_ui/src/thread_history.rs b/crates/agent_ui/src/thread_history.rs
index 29e8cdd94c7da32d0bf49d851210fd7089f488ef..58b954eab6b8edb000b45d58675ee96669627bc4 100644
--- a/crates/agent_ui/src/thread_history.rs
+++ b/crates/agent_ui/src/thread_history.rs
@@ -1,5 +1,5 @@
 use acp_thread::{AgentSessionInfo, AgentSessionList, AgentSessionListRequest, SessionListUpdate};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use gpui::{App, Task};
 use std::rc::Rc;
 use ui::prelude::*;
diff --git a/crates/agent_ui/src/thread_import.rs b/crates/agent_ui/src/thread_import.rs
index 4e5c4f7131ac41ebff0d9908677391b414bdbeb0..d1d488164c2451a4568cfe1be4129a1057f54651 100644
--- a/crates/agent_ui/src/thread_import.rs
+++ b/crates/agent_ui/src/thread_import.rs
@@ -1,6 +1,6 @@
 use acp_thread::AgentSessionListRequest;
 use agent::ThreadStore;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use chrono::Utc;
 use collections::HashSet;
 use db::kvp::Dismissable;
diff --git a/crates/agent_ui/src/thread_metadata_store.rs b/crates/agent_ui/src/thread_metadata_store.rs
index 9696e09d7d969e02841ee8aff9333d7f2a288918..0adfc8014b9bec98fc1cbcf91cb56fc5804d6319 100644
--- a/crates/agent_ui/src/thread_metadata_store.rs
+++ b/crates/agent_ui/src/thread_metadata_store.rs
@@ -2,7 +2,7 @@ use std::{path::Path, sync::Arc};
 
 use acp_thread::AcpThreadEvent;
 use agent::{ThreadStore, ZED_AGENT_ID};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::Context as _;
 use chrono::{DateTime, Utc};
 use collections::{HashMap, HashSet};
@@ -791,7 +791,7 @@ mod tests {
     use acp_thread::{AgentConnection, StubAgentConnection};
     use action_log::ActionLog;
     use agent::DbThread;
-    use agent_client_protocol_core::schema as acp;
+    use agent_client_protocol::schema as acp;
     use feature_flags::FeatureFlagAppExt;
     use gpui::TestAppContext;
     use project::FakeFs;
diff --git a/crates/agent_ui/src/threads_archive_view.rs b/crates/agent_ui/src/threads_archive_view.rs
index cd43d6627ce40197e2ebadd9238f9cc59e375a66..c67049d4d58e62b7b63c3acbad07ac9920568d1d 100644
--- a/crates/agent_ui/src/threads_archive_view.rs
+++ b/crates/agent_ui/src/threads_archive_view.rs
@@ -7,7 +7,7 @@ use crate::thread_metadata_store::{ThreadMetadata, ThreadMetadataStore};
 use crate::{Agent, RemoveSelectedThread};
 
 use agent::ThreadStore;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use chrono::{DateTime, Datelike as _, Local, NaiveDate, TimeDelta, Utc};
 use editor::Editor;
diff --git a/crates/agent_ui/src/ui/mention_crease.rs b/crates/agent_ui/src/ui/mention_crease.rs
index 3b58b04f2d46f139ef1cfd529651f29d94cc786e..b13f8b6395dc19e8f4b073f40b5c5577d38ee42e 100644
--- a/crates/agent_ui/src/ui/mention_crease.rs
+++ b/crates/agent_ui/src/ui/mention_crease.rs
@@ -1,7 +1,7 @@
 use std::{ops::RangeInclusive, path::PathBuf, time::Duration};
 
 use acp_thread::MentionUri;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use editor::{Editor, SelectionEffects, scroll::Autoscroll};
 use gpui::{
     Animation, AnimationExt, AnyView, Context, IntoElement, WeakEntity, Window, pulsating_between,
diff --git a/crates/eval_cli/Cargo.toml b/crates/eval_cli/Cargo.toml
index b68ebfdd0ffb8cff721abd93c24b2dc4769846ee..cac5dc6aa28fa9dfa9b7d41caf0db125daf596dc 100644
--- a/crates/eval_cli/Cargo.toml
+++ b/crates/eval_cli/Cargo.toml
@@ -15,7 +15,7 @@ path = "src/main.rs"
 [dependencies]
 acp_thread.workspace = true
 agent.workspace = true
-agent-client-protocol-core.workspace = true
+agent-client-protocol.workspace = true
 agent_ui.workspace = true
 anyhow.workspace = true
 clap.workspace = true
diff --git a/crates/eval_cli/src/main.rs b/crates/eval_cli/src/main.rs
index 1c2d4b7e86357811a28a9e38a8747e5e66b0612d..bb6cbc883e1b6d775d818b8c27f3faabdc924684 100644
--- a/crates/eval_cli/src/main.rs
+++ b/crates/eval_cli/src/main.rs
@@ -40,7 +40,7 @@ use std::time::{Duration, Instant};
 
 use acp_thread::AgentConnection as _;
 use agent::{NativeAgent, NativeAgentConnection, Templates, ThreadStore};
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use anyhow::{Context, Result};
 use clap::Parser;
 use feature_flags::FeatureFlagAppExt as _;
diff --git a/crates/sidebar/Cargo.toml b/crates/sidebar/Cargo.toml
index c40ee1cf802e45b0b3fdb7076e4eaab6e50d6357..04ed8808a14d4c6853b08669523d55a2ebba4482 100644
--- a/crates/sidebar/Cargo.toml
+++ b/crates/sidebar/Cargo.toml
@@ -18,7 +18,7 @@ default = []
 acp_thread.workspace = true
 action_log.workspace = true
 agent.workspace = true
-agent-client-protocol-core.workspace = true
+agent-client-protocol.workspace = true
 agent_settings.workspace = true
 agent_ui = { workspace = true, features = ["audio"] }
 anyhow.workspace = true
diff --git a/crates/sidebar/src/sidebar.rs b/crates/sidebar/src/sidebar.rs
index 78e305df4c55a46362df713fad99afaf5c928920..515da09c843f23947dfaca55f799134c5ce46d53 100644
--- a/crates/sidebar/src/sidebar.rs
+++ b/crates/sidebar/src/sidebar.rs
@@ -2,7 +2,7 @@ mod thread_switcher;
 
 use acp_thread::ThreadStatus;
 use action_log::DiffStats;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_settings::AgentSettings;
 use agent_ui::thread_metadata_store::{ThreadMetadata, ThreadMetadataStore};
 use agent_ui::threads_archive_view::{
diff --git a/crates/sidebar/src/thread_switcher.rs b/crates/sidebar/src/thread_switcher.rs
index 2794d3417a10cb6924e6d50f0b7a6f7716af432e..19f982edaabf25418affcea4bc652db09ce917bd 100644
--- a/crates/sidebar/src/thread_switcher.rs
+++ b/crates/sidebar/src/thread_switcher.rs
@@ -1,5 +1,5 @@
 use action_log::DiffStats;
-use agent_client_protocol_core::schema as acp;
+use agent_client_protocol::schema as acp;
 use agent_ui::thread_metadata_store::ThreadMetadata;
 use gpui::{
     Action as _, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Modifiers,
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 49d7698b8d0bb3ebeaa36bf7596411d84acf6316..9feaa59c9762208e4e4e85748f21a7a3e0afc3db 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -66,7 +66,7 @@ required-features = ["visual-tests"]
 acp_tools.workspace = true
 activity_indicator.workspace = true
 agent.workspace = true
-agent-client-protocol-core.workspace = true
+agent-client-protocol.workspace = true
 agent_settings.workspace = true
 agent_ui = { workspace = true, features = ["audio"] }
 anyhow.workspace = true
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 5f809ade7fb5645e1b2cba9158cb523fcdc622b0..f29e1dd4feecb432c01235762ae7ba251a75f624 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -5,6 +5,7 @@ mod reliability;
 mod zed;
 
 use agent::{SharedThread, ThreadStore};
+use agent_client_protocol::schema as acp;
 use agent_ui::AgentPanel;
 use anyhow::{Context as _, Error, Result};
 use clap::Parser;
@@ -977,7 +978,7 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
 
                     let shared_thread = SharedThread::from_bytes(&response.thread_data)?;
                     let db_thread = shared_thread.to_db_thread();
-                    let session_id = agent_client_protocol_core::schema::SessionId::new(session_id);
+                    let session_id = acp::SessionId::new(session_id);
 
                     let save_session_id = session_id.clone();
 
diff --git a/crates/zed/src/visual_test_runner.rs b/crates/zed/src/visual_test_runner.rs
index 6d89da27c3945fc88005eb11913c63dd582bb818..3cb384b87abc83f7e53e5249b790c01243c2d558 100644
--- a/crates/zed/src/visual_test_runner.rs
+++ b/crates/zed/src/visual_test_runner.rs
@@ -95,7 +95,7 @@ fn main() {
 #[cfg(target_os = "macos")]
 use {
     acp_thread::{AgentConnection, StubAgentConnection},
-    agent_client_protocol_core::schema as acp,
+    agent_client_protocol::schema as acp,
     agent_servers::{AgentServer, AgentServerDelegate},
     anyhow::{Context as _, Result},
     assets::Assets,