mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-25 14:53:34 +00:00
* feat: add Docker detection module with platform guidance Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add Docker sandbox step to setup wizard Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: show Docker status in boot screen Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: check Docker availability at startup When SANDBOX_ENABLED=true, proactively detect whether Docker is installed and running before creating the ContainerJobManager. If Docker is unavailable, log a warning with platform-specific guidance and disable the sandbox for the session. Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: enable sandbox by default, improve wizard explanation, document detection limits - SandboxConfig defaults to enabled=true (startup check disables gracefully if Docker is unavailable) - Wizard step explains why Docker matters: isolation for LLM-generated code vs running directly on the host - Document detection confidence per platform in detect.rs module docs: high on macOS/Linux, medium on Windows (named pipe edge cases) Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: cargo fmt + update test_builder_defaults for enabled-by-default Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: deduplicate wizard Docker status handling per review Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: fix skills system - enable by default, fix registry connectivity and install - Enable skills system by default (SKILLS_ENABLED no longer required) - Bypass Vercel TLS fingerprint blocking by pointing DEFAULT_REGISTRY_URL directly at the Convex backend (wry-manatee-359.convex.site) - Handle ZIP archives from ClawHub download API - the registry returns ZIP files containing SKILL.md, not raw text. Uses flate2 (existing dep) to extract SKILL.md from the archive. - Surface catalog search errors in the UI with a yellow warning banner instead of silently returning empty results - Handle both {"results":[...]} envelope and bare [...] array JSON formats from the search API - Add ClawHub links and metadata to search result cards (clickable skill names linking to clawhub.ai, relevance score, "updated X ago" recency) - Fix 3 pre-existing clippy warnings in tests/html_to_markdown.rs Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: address security review feedback on ZIP extraction and SSRF - Cap download size to 10 MB before reading response body - Guard against ZIP bombs: cap uncompressed_size at 1 MB, wrap DeflateDecoder with .take() read limit - Use checked_add for ZIP header offset arithmetic to prevent overflow - Remove .unwrap() on try_into() -- use direct array construction - Handle IPv4-mapped IPv6 addresses (::ffff:192.168.x.x) in SSRF checks - Don't leak internal registry URLs in user-facing catalog_error messages - Fix non-ASCII panic in catalog response debug logging (use .get() instead of byte slicing) Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: add /skills command and enrich search results with ClawHub metadata - Parse /skills and /skills search <query> as SystemCommands in submission.rs - Add skill_catalog to AgentDeps and wire it through main.rs - Handle "skills" command in commands.rs: list installed skills and search ClawHub - Add /skills and /skills search <q> entries to /help output - Add SkillDetail, SkillStats, SkillOwner structs to catalog.rs - Add fetch_skill_detail() calling GET /api/v1/skills/{slug} on Convex backend - Add enrich_search_results() to fetch stars/downloads/owner for top 5 results in parallel - Fix SkillDetailResponse wrapper struct to match actual API shape: {"skill":{...},"owner":{...}} - Surface stars, downloads, owner in web UI skill search cards (app.js) - Surface enriched data in skills web handler and skill_search tool output Co-Authored-By: Claude Sonnet 4.6 <[email protected]> * fix: cargo fmt after merge conflict resolution Co-Authored-By: Claude Sonnet 4.6 <[email protected]> * fix: separate installed_skills dir for correct trust on restart, remove duplicate handlers Trust level bug: skills installed from ClawHub were written to user_dir (~/.ironclaw/skills/) which is discovered as Trusted on restart. Now installs go to ~/.ironclaw/installed_skills/ which is discovered as Installed, matching the documented skill directory layout. Changes: - SkillsConfig: add installed_dir field (SKILLS_INSTALLED_DIR env var, default ~/.ironclaw/installed_skills/) - SkillRegistry: add with_installed_dir() builder, installed_dir()/ install_target_dir() accessors, and discover installed_dir with SkillTrust::Installed in discover_all() - All install paths (web handler, skill tool) use install_target_dir() instead of user_dir() so new installs land in the correct directory - 3 new registry tests: test_installed_dir_uses_installed_trust, test_install_target_dir_prefers_installed_dir, test_user_dir_stays_trusted_with_installed_dir Duplicate handler cleanup: handlers/skills.rs was the canonical implementation but the handlers module was never compiled (not declared in web/mod.rs), so server.rs had its own duplicate inline definitions that the router used. Wire up the handlers module, delete the 260-line duplicate in server.rs, and have server.rs import skills handlers from handlers::skills. Fix pre-existing compile error in handlers/extensions.rs (missing needs_setup field). Add #[allow(dead_code)] on not-yet-migrated handler modules to suppress warnings. Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: probe more Docker socket paths on macOS Docker Desktop 4.13+ (stabilised in 4.18) no longer creates the /var/run/docker.sock symlink by default. The API socket lives at ~/.docker/run/docker.sock, which bollard's connect_with_local_defaults() does not try. Add a fallback probe list covering the common macOS container runtimes: - ~/.docker/run/docker.sock — Docker Desktop 4.13+ - ~/.colima/default/docker.sock — Colima - ~/.rd/docker.sock — Rancher Desktop Remove the bogus ~/.docker/desktop/docker.sock path that was added previously; it is not an API socket on any known Docker installation. Fixes the false-negative "Docker is installed but not running" warning reported by Illia on macOS with Docker Desktop 4.18+. Co-Authored-By: Claude Sonnet 4.6 <[email protected]> * Harden Docker detection for rootless Linux and Windows fallback --------- Co-authored-by: Claude Opus 4.6 <[email protected]>
253 lines
7.9 KiB
Rust
253 lines
7.9 KiB
Rust
//! Boot screen displayed after all initialization completes.
|
|
//!
|
|
//! Shows a polished ANSI-styled status panel summarizing the agent's runtime
|
|
//! state: model, database, tool count, enabled features, active channels,
|
|
//! and the gateway URL.
|
|
|
|
/// All displayable fields for the boot screen.
|
|
pub struct BootInfo {
|
|
pub version: String,
|
|
pub agent_name: String,
|
|
pub llm_backend: String,
|
|
pub llm_model: String,
|
|
pub cheap_model: Option<String>,
|
|
pub db_backend: String,
|
|
pub db_connected: bool,
|
|
pub tool_count: usize,
|
|
pub gateway_url: Option<String>,
|
|
pub embeddings_enabled: bool,
|
|
pub embeddings_provider: Option<String>,
|
|
pub heartbeat_enabled: bool,
|
|
pub heartbeat_interval_secs: u64,
|
|
pub sandbox_enabled: bool,
|
|
pub docker_status: crate::sandbox::detect::DockerStatus,
|
|
pub claude_code_enabled: bool,
|
|
pub routines_enabled: bool,
|
|
pub skills_enabled: bool,
|
|
pub channels: Vec<String>,
|
|
/// Public URL from a managed tunnel (e.g., "https://abc.ngrok.io").
|
|
pub tunnel_url: Option<String>,
|
|
/// Provider name for the managed tunnel (e.g., "ngrok").
|
|
pub tunnel_provider: Option<String>,
|
|
}
|
|
|
|
/// Print the boot screen to stdout.
|
|
pub fn print_boot_screen(info: &BootInfo) {
|
|
// ANSI codes matching existing REPL palette
|
|
let bold = "\x1b[1m";
|
|
let cyan = "\x1b[36m";
|
|
let dim = "\x1b[90m";
|
|
let yellow = "\x1b[33m";
|
|
let yellow_underline = "\x1b[33;4m";
|
|
let reset = "\x1b[0m";
|
|
|
|
let border = format!(" {dim}{}{reset}", "\u{2576}".repeat(58));
|
|
|
|
println!();
|
|
println!("{border}");
|
|
println!();
|
|
println!(" {bold}{}{reset} v{}", info.agent_name, info.version);
|
|
println!();
|
|
|
|
// Model line
|
|
let model_display = if let Some(ref cheap) = info.cheap_model {
|
|
format!(
|
|
"{cyan}{}{reset} {dim}cheap{reset} {cyan}{}{reset}",
|
|
info.llm_model, cheap
|
|
)
|
|
} else {
|
|
format!("{cyan}{}{reset}", info.llm_model)
|
|
};
|
|
println!(
|
|
" {dim}model{reset} {model_display} {dim}via {}{reset}",
|
|
info.llm_backend
|
|
);
|
|
|
|
// Database line
|
|
let db_status = if info.db_connected {
|
|
"connected"
|
|
} else {
|
|
"none"
|
|
};
|
|
println!(
|
|
" {dim}database{reset} {cyan}{}{reset} {dim}({db_status}){reset}",
|
|
info.db_backend
|
|
);
|
|
|
|
// Tools line
|
|
println!(
|
|
" {dim}tools{reset} {cyan}{}{reset} {dim}registered{reset}",
|
|
info.tool_count
|
|
);
|
|
|
|
// Features line
|
|
let mut features = Vec::new();
|
|
if info.embeddings_enabled {
|
|
if let Some(ref provider) = info.embeddings_provider {
|
|
features.push(format!("embeddings ({provider})"));
|
|
} else {
|
|
features.push("embeddings".to_string());
|
|
}
|
|
}
|
|
if info.heartbeat_enabled {
|
|
let mins = info.heartbeat_interval_secs / 60;
|
|
features.push(format!("heartbeat ({mins}m)"));
|
|
}
|
|
match info.docker_status {
|
|
crate::sandbox::detect::DockerStatus::Available => {
|
|
features.push("sandbox".to_string());
|
|
}
|
|
crate::sandbox::detect::DockerStatus::NotInstalled => {
|
|
features.push(format!("{yellow}sandbox (docker not installed){reset}"));
|
|
}
|
|
crate::sandbox::detect::DockerStatus::NotRunning => {
|
|
features.push(format!("{yellow}sandbox (docker not running){reset}"));
|
|
}
|
|
crate::sandbox::detect::DockerStatus::Disabled => {
|
|
// Don't show sandbox when disabled
|
|
}
|
|
}
|
|
if info.claude_code_enabled {
|
|
features.push("claude-code".to_string());
|
|
}
|
|
if info.routines_enabled {
|
|
features.push("routines".to_string());
|
|
}
|
|
if info.skills_enabled {
|
|
features.push("skills".to_string());
|
|
}
|
|
if !features.is_empty() {
|
|
println!(
|
|
" {dim}features{reset} {cyan}{}{reset}",
|
|
features.join(" ")
|
|
);
|
|
}
|
|
|
|
// Channels line
|
|
if !info.channels.is_empty() {
|
|
println!(
|
|
" {dim}channels{reset} {cyan}{}{reset}",
|
|
info.channels.join(" ")
|
|
);
|
|
}
|
|
|
|
// Gateway URL (highlighted)
|
|
if let Some(ref url) = info.gateway_url {
|
|
println!();
|
|
println!(" {dim}gateway{reset} {yellow_underline}{url}{reset}");
|
|
}
|
|
|
|
// Tunnel URL
|
|
if let Some(ref url) = info.tunnel_url {
|
|
let provider_tag = info
|
|
.tunnel_provider
|
|
.as_deref()
|
|
.map(|p| format!(" {dim}({p}){reset}"))
|
|
.unwrap_or_default();
|
|
println!(" {dim}tunnel{reset} {yellow_underline}{url}{reset}{provider_tag}");
|
|
}
|
|
|
|
println!();
|
|
println!("{border}");
|
|
println!();
|
|
println!(" /help for commands, /quit to exit");
|
|
println!();
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::sandbox::detect::DockerStatus;
|
|
|
|
#[test]
|
|
fn test_print_boot_screen_full() {
|
|
let info = BootInfo {
|
|
version: "0.2.0".to_string(),
|
|
agent_name: "ironclaw".to_string(),
|
|
llm_backend: "nearai".to_string(),
|
|
llm_model: "claude-3-5-sonnet-20241022".to_string(),
|
|
cheap_model: Some("gpt-4o-mini".to_string()),
|
|
db_backend: "libsql".to_string(),
|
|
db_connected: true,
|
|
tool_count: 24,
|
|
gateway_url: Some("http://127.0.0.1:3001/?token=abc123".to_string()),
|
|
embeddings_enabled: true,
|
|
embeddings_provider: Some("openai".to_string()),
|
|
heartbeat_enabled: true,
|
|
heartbeat_interval_secs: 1800,
|
|
sandbox_enabled: true,
|
|
docker_status: DockerStatus::Available,
|
|
claude_code_enabled: false,
|
|
routines_enabled: true,
|
|
skills_enabled: true,
|
|
channels: vec![
|
|
"repl".to_string(),
|
|
"gateway".to_string(),
|
|
"telegram".to_string(),
|
|
],
|
|
tunnel_url: Some("https://abc123.ngrok.io".to_string()),
|
|
tunnel_provider: Some("ngrok".to_string()),
|
|
};
|
|
// Should not panic
|
|
print_boot_screen(&info);
|
|
}
|
|
|
|
#[test]
|
|
fn test_print_boot_screen_minimal() {
|
|
let info = BootInfo {
|
|
version: "0.2.0".to_string(),
|
|
agent_name: "ironclaw".to_string(),
|
|
llm_backend: "nearai".to_string(),
|
|
llm_model: "gpt-4o".to_string(),
|
|
cheap_model: None,
|
|
db_backend: "none".to_string(),
|
|
db_connected: false,
|
|
tool_count: 5,
|
|
gateway_url: None,
|
|
embeddings_enabled: false,
|
|
embeddings_provider: None,
|
|
heartbeat_enabled: false,
|
|
heartbeat_interval_secs: 0,
|
|
sandbox_enabled: false,
|
|
docker_status: DockerStatus::Disabled,
|
|
claude_code_enabled: false,
|
|
routines_enabled: false,
|
|
skills_enabled: false,
|
|
channels: vec![],
|
|
tunnel_url: None,
|
|
tunnel_provider: None,
|
|
};
|
|
// Should not panic
|
|
print_boot_screen(&info);
|
|
}
|
|
|
|
#[test]
|
|
fn test_print_boot_screen_no_features() {
|
|
let info = BootInfo {
|
|
version: "0.1.0".to_string(),
|
|
agent_name: "test".to_string(),
|
|
llm_backend: "openai".to_string(),
|
|
llm_model: "gpt-4o".to_string(),
|
|
cheap_model: None,
|
|
db_backend: "postgres".to_string(),
|
|
db_connected: true,
|
|
tool_count: 10,
|
|
gateway_url: None,
|
|
embeddings_enabled: false,
|
|
embeddings_provider: None,
|
|
heartbeat_enabled: false,
|
|
heartbeat_interval_secs: 0,
|
|
sandbox_enabled: false,
|
|
docker_status: DockerStatus::Disabled,
|
|
claude_code_enabled: false,
|
|
routines_enabled: false,
|
|
skills_enabled: false,
|
|
channels: vec!["repl".to_string()],
|
|
tunnel_url: None,
|
|
tunnel_provider: None,
|
|
};
|
|
// Should not panic
|
|
print_boot_screen(&info);
|
|
}
|
|
}
|