aether_cli/acp/
mod.rs

1pub(crate) mod agent;
2#[cfg(any(test, feature = "testing"))]
3pub(crate) mod fake_prompt_mcp;
4pub(crate) mod protocol;
5pub mod server;
6pub(crate) mod session;
7pub(crate) mod state;
8#[cfg(any(test, feature = "testing"))]
9pub mod testing;
10
11pub use protocol::map_mcp_prompt_to_available_command;
12
13use crate::acp::state::{AcpState, AcpStateConfig};
14use crate::credentials::oauth_credential_store_from_config;
15use crate::provider_connection_args::ProviderConnectionArgs;
16use crate::resolve::InitialSessionSelection;
17use crate::settings_args::{ConflictingSettingsSources, SettingsSourceArgs};
18use crate::telemetry::build_telemetry_runtime;
19use crate::workspace::WorkspaceManager;
20use acp_utils::agent::Stdio;
21use aether_project::AetherSettings;
22use aether_sessions::SessionStore;
23use aether_telemetry::{AgentTraceContext, TelemetryInitError};
24use agent_client_protocol as acp;
25use llm::catalog::{ReasoningEffortError, validate_reasoning_effort};
26use llm::{ProviderConnectionOverride, ProviderConnectionOverrides, ReasoningEffort};
27use std::collections::BTreeMap;
28use std::env::current_dir;
29use std::io;
30use std::sync::Arc;
31use std::{
32    fs::create_dir_all,
33    path::{Path, PathBuf},
34};
35use thiserror::Error;
36use tracing::{info, warn};
37use tracing_appender::rolling::daily;
38use tracing_subscriber::EnvFilter;
39
40use aether_auth::OAuthError;
41use aether_project::SettingsError;
42
43#[derive(clap::Args, Debug)]
44pub struct AcpArgs {
45    /// JSON object with ACP launch options. Intended for SDKs and other programmatic clients.
46    #[clap(
47        long = "options-json",
48        hide = true,
49        conflicts_with_all = ["log_dir", "agent", "model", "reasoning_effort", "providers", "settings_json", "settings_file"]
50    )]
51    pub options_json: Option<String>,
52
53    /// Path to log file directory (default: /tmp/aether-acp-logs)
54    #[clap(long)]
55    pub log_dir: Option<PathBuf>,
56
57    /// Initial agent (mode) to select for new sessions. Mutually exclusive with `--model` and `--reasoning-effort`.
58    #[clap(long, conflicts_with_all = ["model", "reasoning_effort"])]
59    pub agent: Option<String>,
60
61    /// Initial model id (e.g. `anthropic:claude-sonnet-4-5`) for new sessions.
62    /// Mutually exclusive with `--agent`.
63    #[clap(long, conflicts_with = "agent")]
64    pub model: Option<String>,
65
66    /// Initial reasoning effort for an explicit model session. Requires `--model` and is mutually exclusive with `--agent`.
67    #[clap(
68        long,
69        value_name = "default|disabled|minimal|low|medium|high|xhigh|max",
70        requires = "model",
71        conflicts_with = "agent"
72    )]
73    pub reasoning_effort: Option<ReasoningEffort>,
74
75    #[command(flatten)]
76    pub provider_connection: ProviderConnectionArgs,
77
78    #[command(flatten)]
79    pub settings_source: SettingsSourceArgs,
80}
81
82#[derive(Clone, Debug, Default, serde::Deserialize, schemars::JsonSchema)]
83#[serde(rename_all = "camelCase", deny_unknown_fields)]
84pub struct AcpOptions {
85    #[serde(default, skip_serializing_if = "Option::is_none")]
86    pub log_dir: Option<PathBuf>,
87    #[serde(default, skip_serializing_if = "Option::is_none")]
88    pub providers: Option<BTreeMap<String, ProviderConnectionOverride>>,
89    #[serde(default, skip_serializing_if = "Option::is_none")]
90    pub settings: Option<AetherSettings>,
91    #[serde(default, skip_serializing_if = "Option::is_none")]
92    pub settings_file: Option<PathBuf>,
93    #[serde(default, skip_serializing_if = "Option::is_none")]
94    pub agent: Option<String>,
95    #[serde(default, skip_serializing_if = "Option::is_none")]
96    pub model: Option<String>,
97    #[serde(default, skip_serializing_if = "Option::is_none")]
98    pub reasoning_effort: Option<ReasoningEffort>,
99    #[serde(default, skip_serializing_if = "Option::is_none")]
100    pub trace_context: Option<AgentTraceContext>,
101}
102
103/// Outcome of running the ACP server successfully.
104#[derive(Debug)]
105pub enum AcpRunOutcome {
106    /// The client disconnected cleanly (e.g. EOF on stdin).
107    CleanDisconnect,
108}
109
110/// Errors that terminate the ACP server run.
111#[derive(Debug, Error)]
112pub enum AcpRunError {
113    #[error("ACP protocol error: {0}")]
114    Protocol(#[from] acp::Error),
115
116    #[error("Invalid --options-json: {0}")]
117    OptionsJson(#[from] AcpOptionsJsonError),
118
119    #[error("Failed to load settings: {0}")]
120    Settings(#[from] SettingsError),
121
122    #[error("Failed to initialize OAuth credential store: {0}")]
123    CredentialStore(#[from] OAuthError),
124
125    #[error("Failed to initialize session store: {0}")]
126    SessionStore(#[source] aether_sessions::SessionStoreError),
127
128    #[error("Failed to initialize workspace manager: {0}")]
129    WorkspaceManager(#[source] io::Error),
130
131    #[error("Failed to initialize telemetry: {0}")]
132    Telemetry(#[source] TelemetryInitError),
133}
134
135#[derive(Debug, Error)]
136pub enum AcpOptionsJsonError {
137    #[error("{0}")]
138    Parse(#[from] serde_json::Error),
139    #[error(transparent)]
140    ConflictingSettingsSources(#[from] ConflictingSettingsSources),
141    #[error("agent and model cannot both be supplied")]
142    ConflictingAgentSelection,
143    #[error("reasoningEffort requires model")]
144    ReasoningEffortWithoutModel,
145    #[error("invalid reasoningEffort: {0}")]
146    UnsupportedReasoningEffort(#[from] ReasoningEffortError),
147}
148
149pub async fn run_acp(args: AcpArgs) -> Result<AcpRunOutcome, AcpRunError> {
150    info!("Starting Aether ACP server");
151
152    let cwd = current_dir().unwrap_or_else(|_| PathBuf::from("."));
153    let state = Arc::new(create_acp_state(args, &cwd)?);
154    let connect_result = state.serve(Stdio::new(), state.stop_token()).await;
155    state.shutdown_all().await;
156
157    match connect_result {
158        Ok(()) => Ok(AcpRunOutcome::CleanDisconnect),
159        Err(err) => Err(AcpRunError::Protocol(err)),
160    }
161}
162
163#[derive(Debug)]
164struct AcpRunConfig {
165    log_dir: PathBuf,
166    agent: Option<String>,
167    model: Option<String>,
168    reasoning_effort: Option<ReasoningEffort>,
169    trace_context: Option<AgentTraceContext>,
170    provider_connections: ProviderConnectionOverrides,
171    settings_source: SettingsSourceArgs,
172}
173
174impl AcpRunConfig {
175    fn from_args(args: AcpArgs) -> Result<Self, AcpOptionsJsonError> {
176        if let Some(json) = args.options_json {
177            return Self::from_options(serde_json::from_str(&json)?);
178        }
179
180        let config = Self {
181            log_dir: args.log_dir.unwrap_or_else(default_log_dir),
182            agent: args.agent,
183            model: args.model,
184            reasoning_effort: args.reasoning_effort,
185            trace_context: None,
186            provider_connections: args.provider_connection.into_overrides(),
187            settings_source: args.settings_source,
188        };
189        config.validate_reasoning_effort()?;
190        Ok(config)
191    }
192
193    fn from_options(options: AcpOptions) -> Result<Self, AcpOptionsJsonError> {
194        if options.agent.is_some() && options.model.is_some() {
195            return Err(AcpOptionsJsonError::ConflictingAgentSelection);
196        }
197        if options.reasoning_effort.is_some() && options.model.is_none() {
198            return Err(AcpOptionsJsonError::ReasoningEffortWithoutModel);
199        }
200
201        let settings_source = SettingsSourceArgs::from_json_options(options.settings, options.settings_file)?;
202
203        let config = Self {
204            log_dir: options.log_dir.unwrap_or_else(default_log_dir),
205            agent: options.agent,
206            model: options.model,
207            reasoning_effort: options.reasoning_effort,
208            trace_context: options.trace_context,
209            provider_connections: ProviderConnectionOverrides::new(options.providers.unwrap_or_default()),
210            settings_source,
211        };
212        config.validate_reasoning_effort()?;
213        Ok(config)
214    }
215
216    fn validate_reasoning_effort(&self) -> Result<(), AcpOptionsJsonError> {
217        if let Some(model) = self.model.as_deref() {
218            validate_reasoning_effort(model, self.reasoning_effort)?;
219        }
220        Ok(())
221    }
222}
223
224fn create_acp_state(args: AcpArgs, cwd: &Path) -> Result<AcpState, AcpRunError> {
225    let config = AcpRunConfig::from_args(args)?;
226    setup_logging(&config.log_dir);
227
228    let initial_selection = if let Some(agent) = config.agent.clone() {
229        InitialSessionSelection::agent(agent)
230    } else if let Some(model) = config.model.clone() {
231        InitialSessionSelection::model(model, config.reasoning_effort)
232    } else {
233        InitialSessionSelection::default()
234    };
235
236    let settings = config.settings_source.load_settings(cwd)?;
237    let telemetry = match build_telemetry_runtime(settings.telemetry.as_ref(), config.trace_context) {
238        Ok(telemetry) => telemetry,
239        Err(error @ TelemetryInitError::InvalidTraceContext(_)) => return Err(AcpRunError::Telemetry(error)),
240        Err(error) => {
241            warn!("Telemetry disabled: {error}");
242            None
243        }
244    };
245
246    Ok(AcpState::new(AcpStateConfig {
247        session_store: Arc::new(SessionStore::new().map_err(AcpRunError::SessionStore)?),
248        workspace_manager: Arc::new(WorkspaceManager::new().map_err(AcpRunError::WorkspaceManager)?),
249        oauth_credential_store: oauth_credential_store_from_config(settings.credentials_store)?,
250        initial_selection,
251        settings_source: config.settings_source,
252        provider_connections: config.provider_connections,
253        telemetry,
254        runtime_factory: None,
255        cwd: cwd.to_path_buf(),
256    }))
257}
258
259fn setup_logging(log_dir: &Path) {
260    create_dir_all(log_dir).ok();
261    tracing_subscriber::fmt()
262        .with_writer(daily(log_dir, "aether-acp.log"))
263        .with_ansi(false) // No ANSI colors in log files
264        .with_env_filter(EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("warn")))
265        .pretty()
266        .init();
267}
268
269fn default_log_dir() -> PathBuf {
270    PathBuf::from("/tmp/aether-acp-logs")
271}
272
273#[cfg(test)]
274mod tests {
275    use super::*;
276    use clap::Parser;
277
278    #[derive(Debug, Parser)]
279    struct TestCli {
280        #[command(flatten)]
281        args: AcpArgs,
282    }
283
284    #[test]
285    fn agent_conflicts_with_model() {
286        let err = TestCli::try_parse_from(["test", "--agent", "planner", "--model", "anthropic:claude-sonnet-4-5"])
287            .expect_err("agent and model should conflict");
288        assert_eq!(err.kind(), clap::error::ErrorKind::ArgumentConflict);
289    }
290
291    #[test]
292    fn agent_conflicts_with_reasoning_effort() {
293        let err = TestCli::try_parse_from(["test", "--agent", "planner", "--reasoning-effort", "high"])
294            .expect_err("agent and reasoning effort should conflict");
295        assert_eq!(err.kind(), clap::error::ErrorKind::ArgumentConflict);
296    }
297
298    #[test]
299    fn reasoning_effort_requires_model() {
300        let err = TestCli::try_parse_from(["test", "--reasoning-effort", "high"])
301            .expect_err("reasoning effort should require model");
302        assert_eq!(err.kind(), clap::error::ErrorKind::MissingRequiredArgument);
303    }
304
305    #[test]
306    fn reasoning_effort_with_model_is_allowed() {
307        let cli =
308            TestCli::try_parse_from(["test", "--model", "anthropic:claude-sonnet-4-5", "--reasoning-effort", "high"])
309                .expect("reasoning effort can configure an explicit model session");
310        assert_eq!(cli.args.reasoning_effort, Some(ReasoningEffort::High));
311    }
312
313    #[test]
314    fn options_json_conflicts_with_individual_flags() {
315        let err = TestCli::try_parse_from([
316            "test",
317            "--options-json",
318            r#"{"model":"anthropic:claude-sonnet-4-5"}"#,
319            "--model",
320            "anthropic:claude-sonnet-4-5",
321        ])
322        .expect_err("options JSON should conflict with individual ACP flags");
323        assert_eq!(err.kind(), clap::error::ErrorKind::ArgumentConflict);
324    }
325
326    #[test]
327    fn resolves_options_json() {
328        let cli = TestCli::try_parse_from([
329            "test",
330            "--options-json",
331            r#"{"logDir":"/tmp/custom-aether-logs","settings":{"agents":[]},"model":"anthropic:claude-sonnet-4-5","reasoningEffort":"high","providers":{"bedrock":{"url":"http://127.0.0.1:8787","auth":"none"}}}"#,
332        ])
333        .unwrap();
334
335        let config = AcpRunConfig::from_args(cli.args).unwrap();
336
337        assert_eq!(config.log_dir, PathBuf::from("/tmp/custom-aether-logs"));
338        assert_eq!(config.model.as_deref(), Some("anthropic:claude-sonnet-4-5"));
339        assert_eq!(config.reasoning_effort, Some(ReasoningEffort::High));
340        assert!(config.trace_context.is_none());
341        assert!(config.settings_source.settings_json.as_deref().unwrap().contains(r#""agents":[]"#));
342        let bedrock = config.provider_connections.config_for("bedrock");
343        assert_eq!(bedrock.base_url.as_deref(), Some("http://127.0.0.1:8787"));
344        assert_eq!(bedrock.auth_mode, llm::ProviderAuthMode::None);
345    }
346
347    #[test]
348    fn options_json_rejects_unsupported_reasoning_effort() {
349        let error = AcpRunConfig::from_options(AcpOptions {
350            model: Some("anthropic:claude-opus-4-6".to_string()),
351            reasoning_effort: Some(ReasoningEffort::Xhigh),
352            ..AcpOptions::default()
353        })
354        .unwrap_err();
355
356        assert!(matches!(error, AcpOptionsJsonError::UnsupportedReasoningEffort(_)));
357    }
358
359    #[test]
360    fn options_json_validates_selection_rules() {
361        let err = AcpRunConfig::from_options(AcpOptions {
362            reasoning_effort: Some(ReasoningEffort::High),
363            ..AcpOptions::default()
364        })
365        .unwrap_err();
366
367        assert!(matches!(err, AcpOptionsJsonError::ReasoningEffortWithoutModel));
368    }
369}
aether_cli/acp/mod.rs

aether_cli/acp/
mod.rs
