Merge pull request #4 from nikomatsakis/adopt-acp

Adopt acp

Author: nikomatsakis

.gitignore

@@ -1,2 +1,6 @@
 /target/
-Cargo.lock
+Cargo.lock
+.kiro
+.claude
+.agents
+

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "acpr"
-version = "0.1.0"
+version = "0.3.0"
 edition = "2024"
 description = "Run agents from the ACP registry"
 license = "MIT OR Apache-2.0"
@@ -23,8 +23,8 @@ name = "simple"
 path = "examples/simple.rs"
 
 [[example]]
-name = "sacp_integration"
-path = "examples/sacp_integration.rs"
+name = "acp_integration"
+path = "examples/acp_integration.rs"
 
 [[example]]
 name = "complete_interface"
@@ -44,8 +44,7 @@ clap = { version = "4", features = ["derive"] }
 dirs = "6.0.0"
 flate2 = "1.1.9"
 reqwest = { version = "0.13.2", features = ["json"] }
-sacp = "11.0.0"
-sacp-tokio = "11.0.0"
+agent-client-protocol = "0.11"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 tar = "0.4.45"

examples/sacp_integration.rs examples/acp_integration.rsexamples/sacp_integration.rs renamed to examples/acp_integration.rs

@@ -1,5 +1,5 @@
 use acpr::Acpr;
-use sacp::{Client, DynConnectTo};
+use agent_client_protocol::{Client, DynConnectTo};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

examples/bytestreams_integration.rs

@@ -1,5 +1,5 @@
 use acpr::Acpr;
-use sacp::ByteStreams;
+use agent_client_protocol::ByteStreams;
 use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 
 #[tokio::main]

examples/client_connection.rs

@@ -1,5 +1,5 @@
 use acpr::Acpr;
-use sacp::Client;
+use agent_client_protocol::Client;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

examples/complete_interface.rs

@@ -1,5 +1,5 @@
 use acpr::{self, Acpr};
-use sacp::{Client, DynConnectTo};
+use agent_client_protocol::{Client, DynConnectTo};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

fastagent.jsonl

@@ -0,0 +1,3 @@
+{"level":"WARNING","timestamp":"2026-04-27T21:30:41.464779","namespace":"fast_agent.skills.registry","message":"Failed to parse skill manifest","data":{"data":{"path":"/Users/nikomat/dev/acpr/.agents/skills/rust-best-practice/SKILL.md","error":"while parsing a block mapping\n  in \"<unicode string>\", line 2, column 1\ndid not find expected key\n  in \"<unicode string>\", line 3, column 25"}}}
+{"level":"WARNING","timestamp":"2026-04-27T21:30:41.465904","namespace":"fast_agent.skills.registry","message":"Failed to parse skill manifest","data":{"data":{"path":"/Users/nikomat/dev/acpr/.claude/skills/rust-best-practice/SKILL.md","error":"while parsing a block mapping\n  in \"<unicode string>\", line 2, column 1\ndid not find expected key\n  in \"<unicode string>\", line 3, column 25"}}}
+{"level":"WARNING","timestamp":"2026-04-27T21:30:41.465914","namespace":"fast_agent.skills.registry","message":"Duplicate skill manifest","data":{"data":{"warning":"Duplicate skill 'find-crate-source' from /Users/nikomat/dev/acpr/.claude/skills/find-crate-source/SKILL.md overrides /Users/nikomat/dev/acpr/.agents/skills/find-crate-source/SKILL.md"}}}

src/lib.rs

@@ -4,7 +4,7 @@ pub mod registry;
 pub use cli::*;
 pub use registry::*;
 
-use sacp::{Agent as SacpAgent, ByteStreams, Client, ConnectTo};
+use agent_client_protocol::{Agent as AcpAgent, ByteStreams, Client, ConnectTo};
 use std::path::PathBuf;
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 use tokio::process::Command;
@@ -209,7 +209,10 @@ impl Acpr {
 
 /// Implement ConnectTo<Client> so Acpr can act as an ACP agent
 impl ConnectTo<Client> for Acpr {
-    async fn connect_to(self, client: impl ConnectTo<SacpAgent>) -> Result<(), sacp::Error> {
+    async fn connect_to(
+        self,
+        client: impl ConnectTo<AcpAgent>,
+    ) -> Result<(), agent_client_protocol::Error> {
         debug!("ConnectTo: creating duplex streams");
         let (client_stdin, agent_stdin) = tokio::io::duplex(8192);
         let (agent_stdout, client_stdout) = tokio::io::duplex(8192);
@@ -223,7 +226,7 @@ impl ConnectTo<Client> for Acpr {
                 debug!("ConnectTo: starting agent process");
                 self.run_with_streams(agent_stdin, agent_stdout)
                     .await
-                    .map_err(|e| sacp::Error::internal_error().data(e.to_string()))
+                    .map_err(|e| agent_client_protocol::Error::internal_error().data(e.to_string()))
             },
             async {
                 debug!("ConnectTo: starting sacp client connection");

tests/integration_tests.rs

@@ -159,7 +159,7 @@ async fn test_agent_sacp_integration(agent_name: &str) -> Result<(), Box<dyn std
         .try_init();
 
     use acpr::Acpr;
-    use sacp::{
+    use agent_client_protocol::{
         Client,
         schema::{InitializeRequest, ProtocolVersion},
     };