Merge pull request #71 from nikomatsakis/main

cleanup in prep for next release

Author: nikomatsakis

Cargo.lock

@@ -5,7 +5,6 @@ members = [
     "ci",
     "src/symposium-acp-proxy",
     "src/symposium-acp-agent",
-    "src/symposium-crate-sources-proxy",
     "src/symposium-ferris",
     "src/symposium-math",
     "src/cli-agent-util",
@@ -14,14 +13,14 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-sacp = "10.0.0-alpha.2"
-sacp-tokio = "10.0.0-alpha.2"
-sacp-conductor = "10.0.0-alpha.2"
-sacp-rmcp = "10.0.0-alpha.2"
-sacp-tee = "10.0.0-alpha.2"
-sacp-test = "10.0.0-alpha.2"
-yopo = "10.0.0-alpha.2"
-elizacp = "10.0.0-alpha.2"
+sacp = "10.0.0-alpha.3"
+sacp-tokio = "10.0.0-alpha.3"
+sacp-conductor = "10.0.0-alpha.3"
+sacp-rmcp = "10.0.0-alpha.3"
+sacp-tee = "10.0.0-alpha.3"
+sacp-test = "10.0.0-alpha.3"
+yopo = "10.0.0-alpha.3"
+elizacp = "10.0.0-alpha.3"
 jsonrpcmsg = "0.1.2"
 
 # Core async runtime
@@ -49,7 +48,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 rmcp = { version = "0.12", features = ["server", "transport-io", "schemars"] }
 
 # Sparkle integration
-sparkle = { package = "sparkle-mcp", version = "0.3.0" }
+sparkle = { package = "sparkle-mcp", version = "0.4.0" }
 
 # CLI parsing
 clap = { version = "4.0", features = ["derive"] }

Cargo.toml

@@ -24,3 +24,4 @@ clap = { workspace = true }
 
 # Symposium components
 symposium-acp-proxy = { path = "../symposium-acp-proxy", version = "1.0.0-alpha.1" }
+symposium-ferris = { path = "../symposium-ferris", version = "1.0.0-alpha.1" }

src/symposium-acp-agent/Cargo.toml

@@ -25,13 +25,19 @@ use std::path::PathBuf;
                   and it provides Symposium's capabilities on top of the underlying agent."
 )]
 struct Cli {
-    /// Disable Sparkle integration
-    #[arg(long, default_value = "false")]
-    no_sparkle: bool,
+    /// Enable or disable Sparkle integration (default: yes)
+    #[arg(long, default_value = "yes", value_parser = parse_yes_no)]
+    sparkle: bool,
 
-    /// Disable the crate researcher
-    #[arg(long, default_value = "false")]
-    no_crate_researcher: bool,
+    /// Enable or disable Ferris tools (default: yes)
+    #[arg(long, default_value = "yes", value_parser = parse_yes_no)]
+    ferris: bool,
+
+    /// Comma-separated list of Ferris tools to enable.
+    /// Available tools: crate_source, rust_researcher
+    /// Default: crate_source
+    #[arg(long, default_value = "crate_source", value_delimiter = ',')]
+    ferris_tools: Vec<String>,
 
     /// Enable trace logging to the specified directory.
     /// Traces are written as timestamped .jsons files viewable with sacp-trace-viewer.
@@ -47,6 +53,29 @@ struct Cli {
     agent: Vec<String>,
 }
 
+fn parse_yes_no(s: &str) -> Result<bool, String> {
+    match s.to_lowercase().as_str() {
+        "yes" | "true" | "1" => Ok(true),
+        "no" | "false" | "0" => Ok(false),
+        _ => Err(format!("expected 'yes' or 'no', got '{}'", s)),
+    }
+}
+
+fn build_ferris_config(enabled: bool, tools: &[String]) -> Option<symposium_ferris::Ferris> {
+    if !enabled {
+        return None;
+    }
+
+    let crate_sources = tools.iter().any(|t| t == "crate_source");
+    let rust_researcher = tools.iter().any(|t| t == "rust_researcher");
+
+    Some(
+        symposium_ferris::Ferris::new()
+            .crate_sources(crate_sources)
+            .rust_researcher(rust_researcher),
+    )
+}
+
 #[tokio::main]
 async fn main() -> Result<()> {
     let cli = Cli::parse();
@@ -65,9 +94,11 @@ async fn main() -> Result<()> {
     tracing::debug!("agent: {:?}", agent.server());
 
     // Run Symposium with the agent as the downstream component
+    let ferris_config = build_ferris_config(cli.ferris, &cli.ferris_tools);
+
     let mut symposium = symposium_acp_proxy::Symposium::new()
-        .sparkle(!cli.no_sparkle)
-        .crate_sources_proxy(!cli.no_crate_researcher);
+        .sparkle(cli.sparkle)
+        .ferris(ferris_config);
 
     if let Some(trace_dir) = cli.trace_dir {
         symposium = symposium.trace_dir(trace_dir);

src/symposium-acp-agent/src/main.rs

@@ -34,6 +34,6 @@ chrono = "0.4"
 tokio-util = { version = "0.7", features = ["compat"] }
 
 # Proxy components
-symposium-crate-sources-proxy = { path = "../symposium-crate-sources-proxy", version = "1.0.0-alpha.1" }
+symposium-ferris = { path = "../symposium-ferris", version = "1.0.0-alpha.1" }
 sacp-tee.workspace = true
 sparkle.workspace = true

src/symposium-acp-proxy/Cargo.toml

@@ -23,7 +23,7 @@ use std::path::PathBuf;
 
 /// Shared configuration for Symposium proxy chains.
 struct SymposiumConfig {
-    crate_sources_proxy: bool,
+    ferris: Option<symposium_ferris::Ferris>,
     sparkle: bool,
     trace_dir: Option<PathBuf>,
 }
@@ -32,7 +32,7 @@ impl SymposiumConfig {
     fn new() -> Self {
         SymposiumConfig {
             sparkle: true,
-            crate_sources_proxy: true,
+            ferris: Some(symposium_ferris::Ferris::default()),
             trace_dir: None,
         }
     }
@@ -58,8 +58,9 @@ impl Symposium {
         self
     }
 
-    pub fn crate_sources_proxy(mut self, enable: bool) -> Self {
-        self.config.crate_sources_proxy = enable;
+    /// Configure Ferris tools. Pass `None` to disable Ferris entirely.
+    pub fn ferris(mut self, config: Option<symposium_ferris::Ferris>) -> Self {
+        self.config.ferris = config;
         self
     }
 
@@ -82,7 +83,7 @@ impl Component<ProxyToConductor> for Symposium {
         tracing::debug!("Symposium::serve starting (proxy mode)");
         let Self { config } = self;
 
-        let crate_sources_proxy = config.crate_sources_proxy;
+        let ferris = config.ferris;
         let sparkle = config.sparkle;
         let trace_dir = config.trace_dir;
 
@@ -94,10 +95,10 @@ impl Component<ProxyToConductor> for Symposium {
 
                 let mut proxies: Vec<DynComponent<ProxyToConductor>> = vec![];
 
-                if crate_sources_proxy {
-                    proxies.push(DynComponent::new(
-                        symposium_crate_sources_proxy::CrateSourcesProxy {},
-                    ));
+                if let Some(ferris_config) = ferris {
+                    proxies.push(DynComponent::new(symposium_ferris::FerrisComponent::new(
+                        ferris_config,
+                    )));
                 }
 
                 if sparkle {
@@ -151,7 +152,7 @@ impl Component<AgentToClient> for SymposiumAgent {
         tracing::debug!("SymposiumAgent::serve starting (agent mode)");
         let Self { config, agent } = self;
 
-        let crate_sources_proxy = config.crate_sources_proxy;
+        let ferris = config.ferris;
         let sparkle = config.sparkle;
         let trace_dir = config.trace_dir;
 
@@ -163,10 +164,10 @@ impl Component<AgentToClient> for SymposiumAgent {
 
                 let mut proxies: Vec<DynComponent<ProxyToConductor>> = vec![];
 
-                if crate_sources_proxy {
-                    proxies.push(DynComponent::new(
-                        symposium_crate_sources_proxy::CrateSourcesProxy {},
-                    ));
+                if let Some(ferris_config) = ferris {
+                    proxies.push(DynComponent::new(symposium_ferris::FerrisComponent::new(
+                        ferris_config,
+                    )));
                 }
 
                 if sparkle {

src/symposium-acp-proxy/src/lib.rs

@@ -1,11 +1,92 @@
 //! Symposium ACP Proxy - Main entry point
+//!
+//! A proxy that sits between an editor and an existing agent, enriching the
+//! connection with Symposium's capabilities.
+//!
+//! Usage:
+//!   symposium-acp-proxy [OPTIONS]
 
+use anyhow::Result;
+use clap::Parser;
 use sacp::Component;
+use std::path::PathBuf;
+
+#[derive(Parser, Debug)]
+#[command(name = "symposium-acp-proxy")]
+#[command(about = "Symposium ACP proxy - enriches editor-agent connections")]
+struct Cli {
+    /// Enable or disable Sparkle integration (default: yes)
+    #[arg(long, default_value = "yes", value_parser = parse_yes_no)]
+    sparkle: bool,
+
+    /// Enable or disable Ferris tools (default: yes)
+    #[arg(long, default_value = "yes", value_parser = parse_yes_no)]
+    ferris: bool,
+
+    /// Comma-separated list of Ferris tools to enable.
+    /// Available tools: crate_source, rust_researcher
+    /// Default: crate_source
+    #[arg(long, default_value = "crate_source", value_delimiter = ',')]
+    ferris_tools: Vec<String>,
+
+    /// Enable trace logging to the specified directory.
+    /// Traces are written as timestamped .jsons files viewable with sacp-trace-viewer.
+    #[arg(long)]
+    trace_dir: Option<PathBuf>,
+
+    /// Enable logging to stderr at the specified level (error, warn, info, debug, trace).
+    #[arg(long)]
+    log: Option<tracing::Level>,
+}
+
+fn parse_yes_no(s: &str) -> Result<bool, String> {
+    match s.to_lowercase().as_str() {
+        "yes" | "true" | "1" => Ok(true),
+        "no" | "false" | "0" => Ok(false),
+        _ => Err(format!("expected 'yes' or 'no', got '{}'", s)),
+    }
+}
+
+fn build_ferris_config(enabled: bool, tools: &[String]) -> Option<symposium_ferris::Ferris> {
+    if !enabled {
+        return None;
+    }
+
+    let crate_sources = tools.iter().any(|t| t == "crate_source");
+    let rust_researcher = tools.iter().any(|t| t == "rust_researcher");
+
+    Some(
+        symposium_ferris::Ferris::new()
+            .crate_sources(crate_sources)
+            .rust_researcher(rust_researcher),
+    )
+}
 
 #[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    symposium_acp_proxy::Symposium::new()
-        .serve(sacp_tokio::Stdio::new())
-        .await?;
+async fn main() -> Result<()> {
+    let cli = Cli::parse();
+
+    // Set up logging if requested
+    if let Some(level) = cli.log {
+        use tracing_subscriber::EnvFilter;
+        tracing_subscriber::fmt()
+            .with_env_filter(EnvFilter::new(level.to_string()))
+            .with_writer(std::io::stderr)
+            .init();
+    }
+
+    // Run Symposium as a proxy
+    let ferris_config = build_ferris_config(cli.ferris, &cli.ferris_tools);
+
+    let mut symposium = symposium_acp_proxy::Symposium::new()
+        .sparkle(cli.sparkle)
+        .ferris(ferris_config);
+
+    if let Some(trace_dir) = cli.trace_dir {
+        symposium = symposium.trace_dir(trace_dir);
+    }
+
+    symposium.serve(sacp_tokio::Stdio::new()).await?;
+
     Ok(())
 }

src/symposium-acp-proxy/src/main.rs

@@ -7,7 +7,7 @@ publish = false
 [dependencies]
 # Symposium components
 symposium-acp-proxy = { path = "../symposium-acp-proxy" }
-symposium-crate-sources-proxy = { path = "../symposium-crate-sources-proxy" }
+symposium-ferris = { path = "../symposium-ferris" }
 
 # ACP framework
 sacp.workspace = true