mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-25 14:53:34 +00:00
* refactor: break up agent_loop.rs into four focused modules Split the monolithic 2835-line agent_loop.rs into: - agent_loop.rs (722L): Agent struct, event loop, message dispatch - dispatcher.rs (635L): Agentic tool loop, tool execution, auth detection - commands.rs (484L): System commands, job handlers, heartbeat, summarize - thread_ops.rs (1059L): Thread lifecycle, approval, undo/redo, persistence Each module gets its own impl Agent block. Agent fields changed to pub(super) so sibling modules in the agent package can access them. All 16 existing tests pass in their new locations. Inspired by ZeroClaw's agent module split (agent.rs, loop_.rs, dispatcher.rs, prompt.rs, memory_loader.rs). Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add cost caps and guardrails for autonomous agent spending Daily budget (MAX_COST_PER_DAY_CENTS) and hourly action rate (MAX_ACTIONS_PER_HOUR) limits prevent runaway agents from burning through API credits, especially in daemon/heartbeat modes. - CostGuard with pre-flight check and post-call recording - Sliding window for hourly rate, midnight-UTC daily reset - 80% threshold warning, atomic fast-path for exceeded budget - Wired into dispatcher loop (check before LLM call, record after) Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add circuit breaker on LLM providers Wraps LlmProvider with a Closed/Open/HalfOpen state machine that trips after consecutive transient failures, preventing request storms against a degraded backend. Automatically probes for recovery. - CircuitBreakerProvider implements LlmProvider (drop-in wrapper) - Transient error classification (server, rate-limit, network, auth infra) - Client errors (wrong model, context overflow) don't trip the breaker - Configurable via CIRCUIT_BREAKER_THRESHOLD and CIRCUIT_BREAKER_RECOVERY_SECS - Composes with existing FailoverProvider (circuit breaker wraps failover) - 12 tests covering full state machine and error classification Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add tunnel abstraction for remote access Trait-based tunnel system with lifecycle management (start/stop/health) for exposing the agent to the internet through external tunnel binaries. Five providers: - Cloudflare Tunnel (cloudflared, Zero Trust token auth) - Tailscale (serve for tailnet, funnel for public) - ngrok (with optional custom domain) - Custom (arbitrary command with {host}/{port} placeholders) - None (local-only, no external exposure) Config via TUNNEL_PROVIDER + provider-specific env vars. Extends existing TunnelConfig with optional managed provider alongside the static TUNNEL_URL path. Factory, shared process management, and 37 tests covering all providers and edge cases. Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add OS service management (launchd/systemd) Adds `ironclaw service {install,start,stop,status,uninstall}` for running the agent as a background daemon. macOS uses launchd plists under ~/Library/LaunchAgents, Linux uses systemd user units. Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add observability trait system with noop, log, and multi backends Introduces an Observer trait for recording agent lifecycle events and metrics, with pluggable backends. The noop backend compiles to zero overhead, log backend uses tracing, and multi fans out to multiple observers. Configured via OBSERVABILITY_BACKEND env var. Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add in-memory LLM response cache with TTL and LRU eviction CachedProvider wraps any LlmProvider and caches complete() responses keyed by SHA-256(model + messages). Tool-calling requests are never cached since they trigger side effects. Configurable via RESPONSE_CACHE_ENABLED, RESPONSE_CACHE_TTL_SECS, and RESPONSE_CACHE_MAX_ENTRIES env vars. Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add memory hygiene with cadence-gated daily log cleanup Adds workspace::hygiene module that automatically deletes daily log documents older than a configurable retention period (default 30 days). Runs on a 12-hour cadence tracked via a local state file to avoid redundant passes. Best-effort design: failures are logged, never fatal. Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add doctor diagnostics command for active health probing Probes external dependencies (Docker, cloudflared, ngrok, tailscale), validates NEAR AI session, checks database connectivity, and verifies workspace directory. Complements the passive `status` command. Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add structured TOML config file support Adds ~/.ironclaw/config.toml as a configuration layer between env vars and database settings. Priority: env var > TOML file > DB > defaults. - `ironclaw config init` generates a commented config.toml from current settings - `ironclaw --config path/to/config.toml` loads a custom config file - Settings.merge_from() only overlays non-default values from the TOML file - `ironclaw config path` now shows TOML file status Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: address codex review findings - apply_toml_overlay now returns Result and errors on explicit missing or invalid config paths (was log-only, violating the documented contract that explicit paths are fatal) - custom tunnel url_pattern is now used to filter extracted URLs, not just as a gate for scanning stdout - systemd ExecStart path is now quoted to handle spaces in paths Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: address PR review feedback - Cache key now includes max_tokens, temperature, and stop_sequences so different request parameters produce distinct keys - to_cents() uses .trunc() + parse::<u64> instead of f64 intermediary, avoiding precision loss for large values - Tailscale public URL no longer includes local port (serve/funnel expose on standard HTTPS port 443) Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: wire up tunnel lifecycle and fix audit findings Connect the tunnel module to the rest of the application so that setting TUNNEL_PROVIDER actually starts a managed tunnel at boot and stops it on shutdown. Previously create_tunnel() was never called outside tests. Changes: - Expand TunnelSettings with provider credential fields (settings.rs) - TunnelConfig::resolve() falls back to DB settings when env vars unset - Start tunnel at boot, stop on shutdown, show URL in boot screen - Setup wizard collects provider-specific credentials (ngrok, cloudflare, tailscale, custom, static URL) - Fix public_url() returning None under lock contention (SharedUrl) - Fix local_host parameter ignored by cloudflare/ngrok/tailscale - Fix tailscale silent fallback to "localhost" on bad JSON - Fix ngrok globally mutating config via add-authtoken (use env var) - Add 10s timeout to tailscale status --json Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: address PR review comments - Document split_whitespace limitation in CustomTunnel doc comment - Remove unnecessary quotes from systemd ExecStart directive Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: address PR review feedback (round 3) - doctor: missing libSQL DB on fresh install is Pass, not Fail - service: quote ExecStart path for systemd space handling Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: correct cost guard doc comment (LLM calls, not LLM/tool) Co-Authored-By: Claude Opus 4.6 <[email protected]> --------- Co-authored-by: Claude Opus 4.6 <[email protected]>
323 lines
9.1 KiB
Rust
323 lines
9.1 KiB
Rust
//! Configuration management CLI commands.
|
|
//!
|
|
//! Commands for viewing and modifying settings.
|
|
//! Settings are stored in the database (env > DB > default).
|
|
|
|
use std::sync::Arc;
|
|
|
|
use clap::Subcommand;
|
|
|
|
use crate::settings::Settings;
|
|
|
|
#[derive(Subcommand, Debug, Clone)]
|
|
pub enum ConfigCommand {
|
|
/// Generate a default config.toml file
|
|
Init {
|
|
/// Output path (default: ~/.ironclaw/config.toml)
|
|
#[arg(short, long)]
|
|
output: Option<std::path::PathBuf>,
|
|
|
|
/// Overwrite existing file
|
|
#[arg(long)]
|
|
force: bool,
|
|
},
|
|
|
|
/// List all settings and their current values
|
|
List {
|
|
/// Show only settings matching this prefix (e.g., "agent", "heartbeat")
|
|
#[arg(short, long)]
|
|
filter: Option<String>,
|
|
},
|
|
|
|
/// Get a specific setting value
|
|
Get {
|
|
/// Setting path (e.g., "agent.max_parallel_jobs")
|
|
path: String,
|
|
},
|
|
|
|
/// Set a setting value
|
|
Set {
|
|
/// Setting path (e.g., "agent.max_parallel_jobs")
|
|
path: String,
|
|
|
|
/// Value to set
|
|
value: String,
|
|
},
|
|
|
|
/// Reset a setting to its default value
|
|
Reset {
|
|
/// Setting path (e.g., "agent.max_parallel_jobs")
|
|
path: String,
|
|
},
|
|
|
|
/// Show the settings storage info
|
|
Path,
|
|
}
|
|
|
|
/// Run a config command.
|
|
///
|
|
/// Connects to the database to read/write settings. Falls back to disk
|
|
/// if the database is not available.
|
|
pub async fn run_config_command(cmd: ConfigCommand) -> anyhow::Result<()> {
|
|
// Try to connect to the DB for settings access
|
|
let db: Option<Arc<dyn crate::db::Database>> = match connect_db().await {
|
|
Ok(d) => Some(d),
|
|
Err(e) => {
|
|
eprintln!(
|
|
"Warning: Could not connect to database ({}), using disk fallback",
|
|
e
|
|
);
|
|
None
|
|
}
|
|
};
|
|
|
|
let db_ref = db.as_deref();
|
|
match cmd {
|
|
ConfigCommand::Init { output, force } => init_toml(db_ref, output, force).await,
|
|
ConfigCommand::List { filter } => list_settings(db_ref, filter).await,
|
|
ConfigCommand::Get { path } => get_setting(db_ref, &path).await,
|
|
ConfigCommand::Set { path, value } => set_setting(db_ref, &path, &value).await,
|
|
ConfigCommand::Reset { path } => reset_setting(db_ref, &path).await,
|
|
ConfigCommand::Path => show_path(db_ref.is_some()),
|
|
}
|
|
}
|
|
|
|
/// Bootstrap a DB connection for config commands (backend-agnostic).
|
|
async fn connect_db() -> anyhow::Result<Arc<dyn crate::db::Database>> {
|
|
let config = crate::config::Config::from_env()
|
|
.await
|
|
.map_err(|e| anyhow::anyhow!("{}", e))?;
|
|
crate::db::connect_from_config(&config.database)
|
|
.await
|
|
.map_err(|e| anyhow::anyhow!("{}", e))
|
|
}
|
|
|
|
const DEFAULT_USER_ID: &str = "default";
|
|
|
|
/// Load settings: DB if available, else disk.
|
|
async fn load_settings(store: Option<&dyn crate::db::Database>) -> Settings {
|
|
if let Some(store) = store {
|
|
match store.get_all_settings(DEFAULT_USER_ID).await {
|
|
Ok(map) if !map.is_empty() => return Settings::from_db_map(&map),
|
|
_ => {}
|
|
}
|
|
}
|
|
Settings::default()
|
|
}
|
|
|
|
/// List all settings.
|
|
async fn list_settings(
|
|
store: Option<&dyn crate::db::Database>,
|
|
filter: Option<String>,
|
|
) -> anyhow::Result<()> {
|
|
let settings = load_settings(store).await;
|
|
let all = settings.list();
|
|
|
|
let max_key_len = all.iter().map(|(k, _)| k.len()).max().unwrap_or(0);
|
|
|
|
let source = if store.is_some() { "database" } else { "disk" };
|
|
println!("Settings (source: {}):", source);
|
|
println!();
|
|
|
|
for (key, value) in all {
|
|
if let Some(ref f) = filter
|
|
&& !key.starts_with(f)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
let display_value = if value.len() > 60 {
|
|
format!("{}...", &value[..57])
|
|
} else {
|
|
value
|
|
};
|
|
|
|
println!(" {:width$} {}", key, display_value, width = max_key_len);
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Get a specific setting.
|
|
async fn get_setting(store: Option<&dyn crate::db::Database>, path: &str) -> anyhow::Result<()> {
|
|
let settings = load_settings(store).await;
|
|
|
|
match settings.get(path) {
|
|
Some(value) => {
|
|
println!("{}", value);
|
|
Ok(())
|
|
}
|
|
None => {
|
|
anyhow::bail!("Setting not found: {}", path);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Set a setting value.
|
|
async fn set_setting(
|
|
store: Option<&dyn crate::db::Database>,
|
|
path: &str,
|
|
value: &str,
|
|
) -> anyhow::Result<()> {
|
|
let mut settings = load_settings(store).await;
|
|
|
|
settings
|
|
.set(path, value)
|
|
.map_err(|e| anyhow::anyhow!("{}", e))?;
|
|
|
|
let store = store.ok_or_else(|| {
|
|
anyhow::anyhow!("Database connection required to save settings. Check DATABASE_URL.")
|
|
})?;
|
|
let json_value = match serde_json::from_str::<serde_json::Value>(value) {
|
|
Ok(v) => v,
|
|
Err(_) => serde_json::Value::String(value.to_string()),
|
|
};
|
|
store
|
|
.set_setting(DEFAULT_USER_ID, path, &json_value)
|
|
.await
|
|
.map_err(|e| anyhow::anyhow!("Failed to save to database: {}", e))?;
|
|
|
|
println!("Set {} = {}", path, value);
|
|
Ok(())
|
|
}
|
|
|
|
/// Reset a setting to default.
|
|
async fn reset_setting(store: Option<&dyn crate::db::Database>, path: &str) -> anyhow::Result<()> {
|
|
let default = Settings::default();
|
|
let default_value = default
|
|
.get(path)
|
|
.ok_or_else(|| anyhow::anyhow!("Unknown setting: {}", path))?;
|
|
|
|
let store = store.ok_or_else(|| {
|
|
anyhow::anyhow!("Database connection required to reset settings. Check DATABASE_URL.")
|
|
})?;
|
|
store
|
|
.delete_setting(DEFAULT_USER_ID, path)
|
|
.await
|
|
.map_err(|e| anyhow::anyhow!("Failed to delete setting from database: {}", e))?;
|
|
|
|
println!("Reset {} to default: {}", path, default_value);
|
|
Ok(())
|
|
}
|
|
|
|
/// Generate a default TOML config file.
|
|
async fn init_toml(
|
|
store: Option<&dyn crate::db::Database>,
|
|
output: Option<std::path::PathBuf>,
|
|
force: bool,
|
|
) -> anyhow::Result<()> {
|
|
let path = output.unwrap_or_else(Settings::default_toml_path);
|
|
|
|
if path.exists() && !force {
|
|
anyhow::bail!(
|
|
"Config file already exists: {}\nUse --force to overwrite.",
|
|
path.display()
|
|
);
|
|
}
|
|
|
|
// Start from current settings (DB or defaults) so the generated file
|
|
// reflects the user's existing configuration.
|
|
let settings = load_settings(store).await;
|
|
|
|
settings
|
|
.save_toml(&path)
|
|
.map_err(|e| anyhow::anyhow!("{}", e))?;
|
|
|
|
println!("Config file written to {}", path.display());
|
|
println!();
|
|
println!("Edit the file to customize settings.");
|
|
println!("Priority: env var > config.toml > database > defaults");
|
|
Ok(())
|
|
}
|
|
|
|
/// Show the settings storage info.
|
|
fn show_path(has_db: bool) -> anyhow::Result<()> {
|
|
if has_db {
|
|
println!("Settings stored in: database (settings table)");
|
|
} else {
|
|
println!("Settings stored in: PostgreSQL (not connected, using defaults)");
|
|
}
|
|
println!(
|
|
"Env config: {}",
|
|
crate::bootstrap::ironclaw_env_path().display()
|
|
);
|
|
|
|
let toml_path = Settings::default_toml_path();
|
|
let toml_status = if toml_path.exists() {
|
|
"found"
|
|
} else {
|
|
"not found (run `ironclaw config init` to create)"
|
|
};
|
|
println!(
|
|
"TOML config: {} ({})",
|
|
toml_path.display(),
|
|
toml_status
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use tempfile::tempdir;
|
|
|
|
#[test]
|
|
fn test_list_settings() {
|
|
// Just verify it doesn't panic
|
|
let settings = Settings::default();
|
|
let list = settings.list();
|
|
assert!(!list.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn test_get_set_reset() {
|
|
let _dir = tempdir().unwrap();
|
|
|
|
let mut settings = Settings::default();
|
|
|
|
// Set a value
|
|
settings.set("agent.name", "testbot").unwrap();
|
|
assert_eq!(settings.agent.name, "testbot");
|
|
|
|
// Reset to default
|
|
settings.reset("agent.name").unwrap();
|
|
assert_eq!(settings.agent.name, "ironclaw");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn init_toml_creates_file() {
|
|
let dir = tempdir().unwrap();
|
|
let path = dir.path().join("config.toml");
|
|
|
|
init_toml(None, Some(path.clone()), false).await.unwrap();
|
|
assert!(path.exists());
|
|
|
|
let content = std::fs::read_to_string(&path).unwrap();
|
|
assert!(content.contains("[agent]"));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn init_toml_refuses_overwrite_without_force() {
|
|
let dir = tempdir().unwrap();
|
|
let path = dir.path().join("config.toml");
|
|
std::fs::write(&path, "existing").unwrap();
|
|
|
|
let result = init_toml(None, Some(path.clone()), false).await;
|
|
assert!(result.is_err());
|
|
assert!(result.unwrap_err().to_string().contains("already exists"));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn init_toml_force_overwrites() {
|
|
let dir = tempdir().unwrap();
|
|
let path = dir.path().join("config.toml");
|
|
std::fs::write(&path, "old content").unwrap();
|
|
|
|
init_toml(None, Some(path.clone()), true).await.unwrap();
|
|
|
|
let content = std::fs::read_to_string(&path).unwrap();
|
|
assert!(content.contains("[agent]"));
|
|
}
|
|
}
|