mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-26 23:50:17 +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]>
356 lines
10 KiB
Rust
356 lines
10 KiB
Rust
//! Test harness for constructing `AgentDeps` with sensible defaults.
|
|
//!
|
|
//! Provides:
|
|
//! - [`StubLlm`]: A configurable LLM provider that returns a fixed response
|
|
//! - [`TestHarnessBuilder`]: Builder for wiring `AgentDeps` with defaults
|
|
//! - [`TestHarness`]: The assembled components ready for use in tests
|
|
//!
|
|
//! # Usage
|
|
//!
|
|
//! ```rust,no_run
|
|
//! use ironclaw::testing::TestHarnessBuilder;
|
|
//!
|
|
//! #[tokio::test]
|
|
//! async fn test_something() {
|
|
//! let harness = TestHarnessBuilder::new().build().await;
|
|
//! // use harness.deps, harness.db, etc.
|
|
//! }
|
|
//! ```
|
|
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
|
|
|
|
use async_trait::async_trait;
|
|
use rust_decimal::Decimal;
|
|
|
|
use crate::agent::AgentDeps;
|
|
use crate::db::Database;
|
|
use crate::error::LlmError;
|
|
use crate::llm::{
|
|
CompletionRequest, CompletionResponse, FinishReason, LlmProvider, ToolCompletionRequest,
|
|
ToolCompletionResponse,
|
|
};
|
|
use crate::tools::ToolRegistry;
|
|
|
|
/// Create a libSQL-backed test database in a temporary directory.
|
|
///
|
|
/// Returns the database and a `TempDir` guard — the database file is
|
|
/// deleted when the guard is dropped.
|
|
#[cfg(feature = "libsql")]
|
|
pub async fn test_db() -> (Arc<dyn Database>, tempfile::TempDir) {
|
|
use crate::db::libsql::LibSqlBackend;
|
|
|
|
let dir = tempfile::tempdir().expect("failed to create temp dir");
|
|
let path = dir.path().join("test.db");
|
|
let backend = LibSqlBackend::new_local(&path)
|
|
.await
|
|
.expect("failed to create test LibSqlBackend");
|
|
backend
|
|
.run_migrations()
|
|
.await
|
|
.expect("failed to run migrations");
|
|
(Arc::new(backend) as Arc<dyn Database>, dir)
|
|
}
|
|
|
|
/// What kind of error the stub should produce when failing.
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub enum StubErrorKind {
|
|
/// Transient/retryable error (`LlmError::RequestFailed`).
|
|
Transient,
|
|
/// Non-transient error (`LlmError::ContextLengthExceeded`).
|
|
NonTransient,
|
|
}
|
|
|
|
/// A configurable LLM provider stub for tests.
|
|
///
|
|
/// Supports:
|
|
/// - Fixed response content
|
|
/// - Call counting via [`calls()`](Self::calls)
|
|
/// - Runtime failure toggling via [`set_failing()`](Self::set_failing)
|
|
/// - Configurable error kinds (transient vs non-transient)
|
|
///
|
|
/// Use this in tests instead of creating ad-hoc stub implementations.
|
|
pub struct StubLlm {
|
|
model_name: String,
|
|
response: String,
|
|
call_count: AtomicU32,
|
|
should_fail: AtomicBool,
|
|
error_kind: StubErrorKind,
|
|
}
|
|
|
|
impl StubLlm {
|
|
/// Create a new stub that returns the given response.
|
|
pub fn new(response: impl Into<String>) -> Self {
|
|
Self {
|
|
model_name: "stub-model".to_string(),
|
|
response: response.into(),
|
|
call_count: AtomicU32::new(0),
|
|
should_fail: AtomicBool::new(false),
|
|
error_kind: StubErrorKind::Transient,
|
|
}
|
|
}
|
|
|
|
/// Create a stub that always fails with a transient error.
|
|
pub fn failing(name: impl Into<String>) -> Self {
|
|
Self {
|
|
model_name: name.into(),
|
|
response: String::new(),
|
|
call_count: AtomicU32::new(0),
|
|
should_fail: AtomicBool::new(true),
|
|
error_kind: StubErrorKind::Transient,
|
|
}
|
|
}
|
|
|
|
/// Create a stub that always fails with a non-transient error.
|
|
pub fn failing_non_transient(name: impl Into<String>) -> Self {
|
|
Self {
|
|
model_name: name.into(),
|
|
response: String::new(),
|
|
call_count: AtomicU32::new(0),
|
|
should_fail: AtomicBool::new(true),
|
|
error_kind: StubErrorKind::NonTransient,
|
|
}
|
|
}
|
|
|
|
/// Set the model name.
|
|
pub fn with_model_name(mut self, name: impl Into<String>) -> Self {
|
|
self.model_name = name.into();
|
|
self
|
|
}
|
|
|
|
/// Get the number of times `complete` or `complete_with_tools` was called.
|
|
pub fn calls(&self) -> u32 {
|
|
self.call_count.load(Ordering::Relaxed)
|
|
}
|
|
|
|
/// Toggle whether calls should fail at runtime.
|
|
pub fn set_failing(&self, fail: bool) {
|
|
self.should_fail.store(fail, Ordering::Relaxed);
|
|
}
|
|
|
|
fn make_error(&self) -> LlmError {
|
|
match self.error_kind {
|
|
StubErrorKind::Transient => LlmError::RequestFailed {
|
|
provider: self.model_name.clone(),
|
|
reason: "server error".to_string(),
|
|
},
|
|
StubErrorKind::NonTransient => LlmError::ContextLengthExceeded {
|
|
used: 100_000,
|
|
limit: 50_000,
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Default for StubLlm {
|
|
fn default() -> Self {
|
|
Self::new("OK")
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl LlmProvider for StubLlm {
|
|
fn model_name(&self) -> &str {
|
|
&self.model_name
|
|
}
|
|
|
|
fn cost_per_token(&self) -> (Decimal, Decimal) {
|
|
(Decimal::ZERO, Decimal::ZERO)
|
|
}
|
|
|
|
async fn complete(&self, _request: CompletionRequest) -> Result<CompletionResponse, LlmError> {
|
|
self.call_count.fetch_add(1, Ordering::Relaxed);
|
|
if self.should_fail.load(Ordering::Relaxed) {
|
|
return Err(self.make_error());
|
|
}
|
|
Ok(CompletionResponse {
|
|
content: self.response.clone(),
|
|
input_tokens: 10,
|
|
output_tokens: 5,
|
|
finish_reason: FinishReason::Stop,
|
|
})
|
|
}
|
|
|
|
async fn complete_with_tools(
|
|
&self,
|
|
_request: ToolCompletionRequest,
|
|
) -> Result<ToolCompletionResponse, LlmError> {
|
|
self.call_count.fetch_add(1, Ordering::Relaxed);
|
|
if self.should_fail.load(Ordering::Relaxed) {
|
|
return Err(self.make_error());
|
|
}
|
|
Ok(ToolCompletionResponse {
|
|
content: Some(self.response.clone()),
|
|
tool_calls: Vec::new(),
|
|
input_tokens: 10,
|
|
output_tokens: 5,
|
|
finish_reason: FinishReason::Stop,
|
|
})
|
|
}
|
|
}
|
|
|
|
/// Assembled test components.
|
|
pub struct TestHarness {
|
|
/// The agent dependencies, ready for use.
|
|
pub deps: AgentDeps,
|
|
/// Direct reference to the database (as `Arc<dyn Database>`).
|
|
pub db: Arc<dyn Database>,
|
|
/// Temp directory guard — keeps the test database alive. Dropped
|
|
/// automatically when the harness goes out of scope.
|
|
#[cfg(feature = "libsql")]
|
|
_temp_dir: tempfile::TempDir,
|
|
}
|
|
|
|
/// Builder for constructing a [`TestHarness`] with sensible defaults.
|
|
///
|
|
/// All defaults are designed to work without any external services:
|
|
/// - Database: libSQL in a temp directory (real SQL, FTS5, no network)
|
|
/// - LLM: `StubLlm` returning "OK"
|
|
/// - Safety: permissive config
|
|
/// - Tools: builtin tools registered
|
|
/// - Hooks: empty registry
|
|
/// - Cost guard: no limits
|
|
pub struct TestHarnessBuilder {
|
|
db: Option<Arc<dyn Database>>,
|
|
llm: Option<Arc<dyn LlmProvider>>,
|
|
tools: Option<Arc<ToolRegistry>>,
|
|
}
|
|
|
|
impl TestHarnessBuilder {
|
|
/// Create a new builder with all defaults.
|
|
pub fn new() -> Self {
|
|
Self {
|
|
db: None,
|
|
llm: None,
|
|
tools: None,
|
|
}
|
|
}
|
|
|
|
/// Override the database backend.
|
|
pub fn with_db(mut self, db: Arc<dyn Database>) -> Self {
|
|
self.db = Some(db);
|
|
self
|
|
}
|
|
|
|
/// Override the LLM provider.
|
|
pub fn with_llm(mut self, llm: Arc<dyn LlmProvider>) -> Self {
|
|
self.llm = Some(llm);
|
|
self
|
|
}
|
|
|
|
/// Override the tool registry.
|
|
pub fn with_tools(mut self, tools: Arc<ToolRegistry>) -> Self {
|
|
self.tools = Some(tools);
|
|
self
|
|
}
|
|
|
|
/// Build the harness with defaults applied.
|
|
#[cfg(feature = "libsql")]
|
|
pub async fn build(self) -> TestHarness {
|
|
use crate::agent::cost_guard::{CostGuard, CostGuardConfig};
|
|
use crate::config::{SafetyConfig, SkillsConfig};
|
|
use crate::hooks::HookRegistry;
|
|
use crate::safety::SafetyLayer;
|
|
|
|
let (db, temp_dir) = if let Some(db) = self.db {
|
|
// Caller provided a DB; create a dummy temp dir to satisfy the struct.
|
|
let dir = tempfile::tempdir().expect("failed to create temp dir");
|
|
(db, dir)
|
|
} else {
|
|
test_db().await
|
|
};
|
|
|
|
let llm: Arc<dyn LlmProvider> = self.llm.unwrap_or_else(|| Arc::new(StubLlm::default()));
|
|
|
|
let tools = self.tools.unwrap_or_else(|| {
|
|
let t = Arc::new(ToolRegistry::new());
|
|
t.register_builtin_tools();
|
|
t
|
|
});
|
|
|
|
let safety = Arc::new(SafetyLayer::new(&SafetyConfig {
|
|
max_output_length: 100_000,
|
|
injection_check_enabled: false,
|
|
}));
|
|
|
|
let hooks = Arc::new(HookRegistry::new());
|
|
|
|
let cost_guard = Arc::new(CostGuard::new(CostGuardConfig {
|
|
max_cost_per_day_cents: None,
|
|
max_actions_per_hour: None,
|
|
}));
|
|
|
|
let deps = AgentDeps {
|
|
store: Some(Arc::clone(&db)),
|
|
llm,
|
|
cheap_llm: None,
|
|
safety,
|
|
tools,
|
|
workspace: None,
|
|
extension_manager: None,
|
|
skill_registry: None,
|
|
skill_catalog: None,
|
|
skills_config: SkillsConfig::default(),
|
|
hooks,
|
|
cost_guard,
|
|
};
|
|
|
|
TestHarness {
|
|
deps,
|
|
db,
|
|
_temp_dir: temp_dir,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Default for TestHarnessBuilder {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[cfg(feature = "libsql")]
|
|
#[tokio::test]
|
|
async fn test_harness_builds_with_defaults() {
|
|
let harness = TestHarnessBuilder::new().build().await;
|
|
assert!(harness.deps.store.is_some());
|
|
assert_eq!(harness.deps.llm.model_name(), "stub-model");
|
|
}
|
|
|
|
#[cfg(feature = "libsql")]
|
|
#[tokio::test]
|
|
async fn test_harness_custom_llm() {
|
|
let custom_llm = Arc::new(StubLlm::new("custom response").with_model_name("my-model"));
|
|
let harness = TestHarnessBuilder::new().with_llm(custom_llm).build().await;
|
|
assert_eq!(harness.deps.llm.model_name(), "my-model");
|
|
}
|
|
|
|
#[cfg(feature = "libsql")]
|
|
#[tokio::test]
|
|
async fn test_harness_db_works() {
|
|
let harness = TestHarnessBuilder::new().build().await;
|
|
|
|
let id = harness
|
|
.db
|
|
.create_conversation("test", "user1", None)
|
|
.await
|
|
.expect("create conversation");
|
|
assert!(!id.is_nil());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_stub_llm_complete() {
|
|
let llm = StubLlm::new("hello world");
|
|
let response = llm
|
|
.complete(CompletionRequest::new(vec![]))
|
|
.await
|
|
.expect("complete");
|
|
assert_eq!(response.content, "hello world");
|
|
assert_eq!(response.finish_reason, FinishReason::Stop);
|
|
}
|
|
}
|