Merge pull request #9 from nikomatsakis/main

refactor the crate names, 1.0-alpha

Author: nikomatsakis

Cargo.lock

@@ -0,0 +1,19 @@
+# Release-plz configuration for symposium-acp workspace
+# See: https://release-plz.dev/docs/config
+
+[workspace]
+# Safer release strategy - only release when merging the release PR
+# (avoids race conditions with squash-merge)
+release_always = false
+
+# Keep dependencies updated in Cargo.lock
+dependencies_update = true
+
+# Tag release PRs for visibility
+pr_labels = ["release"]
+
+# Package-specific configurations
+[[package]]
+name = "sacp-doc-test"
+# Don't publish documentation test package to crates.io
+publish = false

release-plz.toml

@@ -1,6 +1,6 @@
 [package]
 name = "elizacp"
-version = "0.1.0"
+version = "1.0.0-alpha"
 edition = "2024"
 description = "Classic Eliza chatbot as an ACP agent for testing"
 license = "MIT OR Apache-2.0"
@@ -15,7 +15,7 @@ name = "elizacp"
 path = "src/main.rs"
 
 [dependencies]
-sacp = { version = "0.2.0", path = "../sacp" }
+sacp = { version = "1.0.0-alpha", path = "../sacp" }
 agent-client-protocol-schema.workspace = true
 anyhow.workspace = true
 clap.workspace = true

src/elizacp/Cargo.toml

@@ -39,11 +39,11 @@ mod eliza;
 use anyhow::Result;
 use clap::Parser;
 use eliza::Eliza;
-use sacp::{
+use sacp::JrConnection;
+use sacp::schema::{
     AgentCapabilities, ContentBlock, ContentChunk, InitializeRequest, InitializeResponse,
-    JrConnection, LoadSessionRequest, LoadSessionResponse, NewSessionRequest, NewSessionResponse,
-    PromptRequest, PromptResponse, SessionId, SessionNotification, SessionUpdate, StopReason,
-    TextContent,
+    LoadSessionRequest, LoadSessionResponse, NewSessionRequest, NewSessionResponse, PromptRequest,
+    PromptResponse, SessionId, SessionNotification, SessionUpdate, StopReason, TextContent,
 };
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};

src/elizacp/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "sacp-conductor"
-version = "0.2.0"
+version = "1.0.0-alpha"
 edition = "2024"
 description = "Conductor for orchestrating SACP proxy chains"
 license = "MIT OR Apache-2.0"
@@ -12,8 +12,8 @@ categories = ["development-tools"]
 test-support = []
 
 [dependencies]
-sacp = { version = "0.2.0", path = "../sacp" }
-sacp-proxy = { version = "0.1.2", path = "../sacp-proxy" }
+sacp = { version = "1.0.0-alpha", path = "../sacp" }
+sacp-proxy = { version = "1.0.0-alpha", path = "../sacp-proxy" }
 agent-client-protocol-schema.workspace = true
 anyhow.workspace = true
 clap.workspace = true

src/sacp-conductor/Cargo.toml

@@ -8,8 +8,8 @@ use sacp::JrConnectionCx;
 use tokio::process::Child;
 use tracing::debug;
 
-/// "Provider" used to spawn components. The [`CommandProvider`] is used from the CLI, but for testing
-/// or internal purposes, other comment providers may be created.
+/// "Provider" used to spawn components. The `CommandProvider` is used from the CLI, but for testing
+/// or internal purposes, other component providers may be created.
 pub trait ComponentProvider: Send {
     /// Create a component that will read/write ACP messages from the given streams.
     /// The `cx` can be used to spawn tasks running in the JSON RPC connection.

src/sacp-conductor/src/component.rs

@@ -63,15 +63,16 @@
 use std::{collections::HashMap, pin::Pin};
 
 use futures::{AsyncRead, AsyncWrite, SinkExt, StreamExt, channel::mpsc};
-use sacp::{InitializeRequest, InitializeResponse, NewSessionRequest, NewSessionResponse};
+use sacp::schema::{InitializeRequest, InitializeResponse, NewSessionRequest, NewSessionResponse};
 use sacp_proxy::{
     McpConnectRequest, McpConnectResponse, McpDisconnectNotification, McpOverAcpNotification,
     McpOverAcpRequest, SuccessorNotification, SuccessorRequest,
 };
 
+use sacp::handler::NullHandler;
 use sacp::{
     JrConnection, JrConnectionCx, JrNotification, JrRequest, JrRequestCx, JrResponse, MessageAndCx,
-    MetaCapabilityExt, NullHandler, Proxy, UntypedMessage,
+    MetaCapabilityExt, Proxy, UntypedMessage,
     util::{TypeNotification, TypeRequest},
 };
 use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
@@ -732,7 +733,7 @@ impl Conductor {
     async fn forward_session_new_request(
         &mut self,
         target_component_index: usize,
-        mut request: sacp::NewSessionRequest,
+        mut request: NewSessionRequest,
         conductor_tx: &mpsc::Sender<ConductorMessage>,
         request_cx: JrRequestCx<NewSessionResponse>,
     ) -> Result<(), sacp::Error> {

src/sacp-conductor/src/conductor.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, net::SocketAddr};
 
 use futures::{SinkExt, StreamExt as _, channel::mpsc};
 use sacp;
-use sacp::McpServer;
+use sacp::schema::McpServer;
 use sacp::{JrConnection, JrConnectionCx, MessageAndCx};
 use sacp_proxy::McpDisconnectNotification;
 use tokio::net::TcpStream;
@@ -51,7 +51,7 @@ impl McpBridgeListeners {
         conductor_tx: &mpsc::Sender<ConductorMessage>,
         conductor_command: &[String],
     ) -> Result<(), sacp::Error> {
-        use sacp::McpServer;
+        use sacp::schema::McpServer;
 
         let McpServer::Http { name, url, headers } = mcp_server else {
             return Ok(());

src/sacp-conductor/src/conductor/mcp_bridge.rs

@@ -7,8 +7,7 @@
 //! 4. Last component (agent) never receives proxy capability offer
 
 use futures::{AsyncRead, AsyncWrite};
-use sacp::AgentCapabilities;
-use sacp::{InitializeRequest, InitializeResponse};
+use sacp::schema::{AgentCapabilities, InitializeRequest, InitializeResponse};
 use sacp::{JrConnection, JrConnectionCx, MetaCapabilityExt, Proxy};
 use sacp_conductor::component::{Cleanup, ComponentProvider};
 use sacp_conductor::conductor::Conductor;

src/sacp-conductor/tests/initialization_sequence.rs

@@ -10,7 +10,7 @@ mod mcp_integration;
 use expect_test::expect;
 use futures::{SinkExt, StreamExt, channel::mpsc};
 use sacp::JrConnection;
-use sacp::{
+use sacp::schema::{
     ContentBlock, InitializeRequest, NewSessionRequest, PromptRequest, SessionNotification,
     TextContent,
 };