mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-26 23:50:17 +00:00
* fix: persist turns after approval and add agent-level tests Port relevant changes from PR #112 that were not carried over to #237: - Add persist_turn calls in process_approval for the response, error, and auth-required paths. Previously, turns completed after tool approval were never persisted to DB — if the process crashed after approval the entire turn (user message + assistant response) was lost. - Add agent-level unit tests: StaticLlmProvider mock, make_test_agent helper, tests for auto-approval logic, destructive shell command detection, and PendingApproval backward-compatible deserialization (without deferred_tool_calls field). - Remove unused _thread_state binding in process_approval. Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: address 14 audit findings in src/agent/ Audit of the agent module found 2 High, 7 Medium, 3 Low, and 2 Nit severity issues. This commit fixes all of them: High: - Remove 4 `.expect()` calls in session.rs (entry API, match, direct indexing, if-let) to eliminate panic paths in production - Add typed RoutineError enum replacing Result<_, String> across routine.rs, routine_engine.rs, and callers in history/store.rs and db/libsql/mod.rs Medium: - Sanitize routine names in path construction to prevent directory traversal (routine_engine.rs) - Log warnings for 5 silently-swallowed errors in scheduler.rs, compaction.rs, and worker.rs - Extract shared handle_auth_intercept helper to deduplicate auth interception in thread_ops.rs - Add session count warning threshold in session_manager.rs - Make FullJob stub degradation visible via warn-level log and prepended warning in output Low: - Restrict dead code visibility with #[cfg(test)] on 19 unused items in submission.rs, task.rs, and undo.rs - Narrow pub to pub(crate) on self_repair.rs builder methods - Remove TaskStatus from mod.rs re-exports (test-only type) Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: address PR review comments - Reorder persist_turn before persist_response_chain so the conversation row exists before the metadata UPDATE runs - Add persist_response_chain call to handle_auth_intercept so auth-required paths preserve the response chain - Harden sanitize_routine_name to use allowlist (alphanumeric, dash, underscore) instead of denylist replacements - Fix stale active_thread ID in get_or_create_thread: fall back to create_thread() when the stored ID is missing from the map - Persist turn on approval rejection so user messages survive crashes after a tool is rejected Co-Authored-By: Claude Opus 4.6 <[email protected]> --------- Co-authored-by: Claude Opus 4.6 <[email protected]>
413 lines
12 KiB
Rust
413 lines
12 KiB
Rust
//! Error types for IronClaw.
|
|
|
|
use std::time::Duration;
|
|
|
|
use uuid::Uuid;
|
|
|
|
/// Top-level error type for the agent.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum Error {
|
|
#[error("Configuration error: {0}")]
|
|
Config(#[from] ConfigError),
|
|
|
|
#[error("Database error: {0}")]
|
|
Database(#[from] DatabaseError),
|
|
|
|
#[error("Channel error: {0}")]
|
|
Channel(#[from] ChannelError),
|
|
|
|
#[error("LLM error: {0}")]
|
|
Llm(#[from] LlmError),
|
|
|
|
#[error("Tool error: {0}")]
|
|
Tool(#[from] ToolError),
|
|
|
|
#[error("Safety error: {0}")]
|
|
Safety(#[from] SafetyError),
|
|
|
|
#[error("Job error: {0}")]
|
|
Job(#[from] JobError),
|
|
|
|
#[error("Estimation error: {0}")]
|
|
Estimation(#[from] EstimationError),
|
|
|
|
#[error("Evaluation error: {0}")]
|
|
Evaluation(#[from] EvaluationError),
|
|
|
|
#[error("Repair error: {0}")]
|
|
Repair(#[from] RepairError),
|
|
|
|
#[error("Workspace error: {0}")]
|
|
Workspace(#[from] WorkspaceError),
|
|
|
|
#[error("Hook error: {0}")]
|
|
Hook(#[from] crate::hooks::HookError),
|
|
|
|
#[error("Orchestrator error: {0}")]
|
|
Orchestrator(#[from] OrchestratorError),
|
|
|
|
#[error("Worker error: {0}")]
|
|
Worker(#[from] WorkerError),
|
|
|
|
#[error("Routine error: {0}")]
|
|
Routine(#[from] RoutineError),
|
|
}
|
|
|
|
/// Configuration-related errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum ConfigError {
|
|
#[error("Missing required environment variable: {0}")]
|
|
MissingEnvVar(String),
|
|
|
|
#[error("Missing required configuration: {key}. {hint}")]
|
|
MissingRequired { key: String, hint: String },
|
|
|
|
#[error("Invalid configuration value for {key}: {message}")]
|
|
InvalidValue { key: String, message: String },
|
|
|
|
#[error("Failed to parse configuration: {0}")]
|
|
ParseError(String),
|
|
|
|
#[error("IO error: {0}")]
|
|
Io(#[from] std::io::Error),
|
|
}
|
|
|
|
/// Database-related errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum DatabaseError {
|
|
#[error("Connection pool error: {0}")]
|
|
Pool(String),
|
|
|
|
#[error("Query failed: {0}")]
|
|
Query(String),
|
|
|
|
#[error("Entity not found: {entity} with id {id}")]
|
|
NotFound { entity: String, id: String },
|
|
|
|
#[error("Constraint violation: {0}")]
|
|
Constraint(String),
|
|
|
|
#[error("Migration failed: {0}")]
|
|
Migration(String),
|
|
|
|
#[error("Serialization error: {0}")]
|
|
Serialization(String),
|
|
|
|
#[cfg(feature = "postgres")]
|
|
#[error("PostgreSQL error: {0}")]
|
|
Postgres(#[from] tokio_postgres::Error),
|
|
|
|
#[cfg(feature = "postgres")]
|
|
#[error("Pool build error: {0}")]
|
|
PoolBuild(#[from] deadpool_postgres::BuildError),
|
|
|
|
#[cfg(feature = "postgres")]
|
|
#[error("Pool runtime error: {0}")]
|
|
PoolRuntime(#[from] deadpool_postgres::PoolError),
|
|
|
|
#[cfg(feature = "libsql")]
|
|
#[error("LibSQL error: {0}")]
|
|
LibSql(#[from] libsql::Error),
|
|
}
|
|
|
|
/// Channel-related errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum ChannelError {
|
|
#[error("Channel {name} failed to start: {reason}")]
|
|
StartupFailed { name: String, reason: String },
|
|
|
|
#[error("Channel {name} disconnected: {reason}")]
|
|
Disconnected { name: String, reason: String },
|
|
|
|
#[error("Failed to send response on channel {name}: {reason}")]
|
|
SendFailed { name: String, reason: String },
|
|
|
|
#[error("Invalid message format: {0}")]
|
|
InvalidMessage(String),
|
|
|
|
#[error("Authentication failed for channel {name}: {reason}")]
|
|
AuthFailed { name: String, reason: String },
|
|
|
|
#[error("Rate limited on channel {name}")]
|
|
RateLimited { name: String },
|
|
|
|
#[error("HTTP error: {0}")]
|
|
Http(String),
|
|
|
|
#[error("Channel health check failed: {name}")]
|
|
HealthCheckFailed { name: String },
|
|
}
|
|
|
|
/// LLM provider errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum LlmError {
|
|
#[error("Provider {provider} request failed: {reason}")]
|
|
RequestFailed { provider: String, reason: String },
|
|
|
|
#[error("Provider {provider} rate limited, retry after {retry_after:?}")]
|
|
RateLimited {
|
|
provider: String,
|
|
retry_after: Option<Duration>,
|
|
},
|
|
|
|
#[error("Invalid response from {provider}: {reason}")]
|
|
InvalidResponse { provider: String, reason: String },
|
|
|
|
#[error("Context length exceeded: {used} tokens used, {limit} allowed")]
|
|
ContextLengthExceeded { used: usize, limit: usize },
|
|
|
|
#[error("Model {model} not available on provider {provider}")]
|
|
ModelNotAvailable { provider: String, model: String },
|
|
|
|
#[error("Authentication failed for provider {provider}")]
|
|
AuthFailed { provider: String },
|
|
|
|
#[error("Session expired for provider {provider}")]
|
|
SessionExpired { provider: String },
|
|
|
|
#[error("Session renewal failed for provider {provider}: {reason}")]
|
|
SessionRenewalFailed { provider: String, reason: String },
|
|
|
|
#[error("HTTP error: {0}")]
|
|
Http(#[from] reqwest::Error),
|
|
|
|
#[error("JSON error: {0}")]
|
|
Json(#[from] serde_json::Error),
|
|
|
|
#[error("IO error: {0}")]
|
|
Io(#[from] std::io::Error),
|
|
}
|
|
|
|
/// Tool execution errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum ToolError {
|
|
#[error("Tool {name} not found")]
|
|
NotFound { name: String },
|
|
|
|
#[error("Tool {name} execution failed: {reason}")]
|
|
ExecutionFailed { name: String, reason: String },
|
|
|
|
#[error("Tool {name} timed out after {timeout:?}")]
|
|
Timeout { name: String, timeout: Duration },
|
|
|
|
#[error("Invalid parameters for tool {name}: {reason}")]
|
|
InvalidParameters { name: String, reason: String },
|
|
|
|
#[error("Tool {name} is disabled: {reason}")]
|
|
Disabled { name: String, reason: String },
|
|
|
|
#[error("Sandbox error for tool {name}: {reason}")]
|
|
Sandbox { name: String, reason: String },
|
|
|
|
#[error("Tool {name} requires authentication")]
|
|
AuthRequired { name: String },
|
|
|
|
#[error("Tool builder failed: {0}")]
|
|
BuilderFailed(String),
|
|
}
|
|
|
|
/// Safety/sanitization errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum SafetyError {
|
|
#[error("Potential prompt injection detected: {pattern}")]
|
|
InjectionDetected { pattern: String },
|
|
|
|
#[error("Output exceeded maximum length: {length} > {max}")]
|
|
OutputTooLarge { length: usize, max: usize },
|
|
|
|
#[error("Blocked content pattern detected: {pattern}")]
|
|
BlockedContent { pattern: String },
|
|
|
|
#[error("Validation failed: {reason}")]
|
|
ValidationFailed { reason: String },
|
|
|
|
#[error("Policy violation: {rule}")]
|
|
PolicyViolation { rule: String },
|
|
}
|
|
|
|
/// Job-related errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum JobError {
|
|
#[error("Job {id} not found")]
|
|
NotFound { id: Uuid },
|
|
|
|
#[error("Job {id} already in state {state}, cannot transition to {target}")]
|
|
InvalidTransition {
|
|
id: Uuid,
|
|
state: String,
|
|
target: String,
|
|
},
|
|
|
|
#[error("Job {id} failed: {reason}")]
|
|
Failed { id: Uuid, reason: String },
|
|
|
|
#[error("Job {id} stuck for {duration:?}")]
|
|
Stuck { id: Uuid, duration: Duration },
|
|
|
|
#[error("Maximum parallel jobs ({max}) exceeded")]
|
|
MaxJobsExceeded { max: usize },
|
|
|
|
#[error("Job {id} context error: {reason}")]
|
|
ContextError { id: Uuid, reason: String },
|
|
}
|
|
|
|
/// Estimation errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum EstimationError {
|
|
#[error("Insufficient data for estimation: need {needed} samples, have {have}")]
|
|
InsufficientData { needed: usize, have: usize },
|
|
|
|
#[error("Estimation calculation failed: {reason}")]
|
|
CalculationFailed { reason: String },
|
|
|
|
#[error("Invalid estimation parameters: {reason}")]
|
|
InvalidParameters { reason: String },
|
|
}
|
|
|
|
/// Evaluation errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum EvaluationError {
|
|
#[error("Evaluation failed for job {job_id}: {reason}")]
|
|
Failed { job_id: Uuid, reason: String },
|
|
|
|
#[error("Missing required evaluation data: {field}")]
|
|
MissingData { field: String },
|
|
|
|
#[error("Invalid evaluation criteria: {reason}")]
|
|
InvalidCriteria { reason: String },
|
|
}
|
|
|
|
/// Self-repair errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum RepairError {
|
|
#[error("Repair failed for {target_type} {target_id}: {reason}")]
|
|
Failed {
|
|
target_type: String,
|
|
target_id: Uuid,
|
|
reason: String,
|
|
},
|
|
|
|
#[error("Maximum repair attempts ({max}) exceeded for {target_type} {target_id}")]
|
|
MaxAttemptsExceeded {
|
|
target_type: String,
|
|
target_id: Uuid,
|
|
max: u32,
|
|
},
|
|
|
|
#[error("Cannot diagnose issue for {target_type} {target_id}: {reason}")]
|
|
DiagnosisFailed {
|
|
target_type: String,
|
|
target_id: Uuid,
|
|
reason: String,
|
|
},
|
|
}
|
|
|
|
/// Workspace/memory errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum WorkspaceError {
|
|
#[error("Document not found: {doc_type} for user {user_id}")]
|
|
DocumentNotFound { doc_type: String, user_id: String },
|
|
|
|
#[error("Search failed: {reason}")]
|
|
SearchFailed { reason: String },
|
|
|
|
#[error("Embedding generation failed: {reason}")]
|
|
EmbeddingFailed { reason: String },
|
|
|
|
#[error("Document chunking failed: {reason}")]
|
|
ChunkingFailed { reason: String },
|
|
|
|
#[error("Invalid document type: {doc_type}")]
|
|
InvalidDocType { doc_type: String },
|
|
|
|
#[error("Workspace not initialized for user {user_id}")]
|
|
NotInitialized { user_id: String },
|
|
|
|
#[error("Heartbeat error: {reason}")]
|
|
HeartbeatError { reason: String },
|
|
}
|
|
|
|
/// Orchestrator errors (internal API, container management).
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum OrchestratorError {
|
|
#[error("Container creation failed for job {job_id}: {reason}")]
|
|
ContainerCreationFailed { job_id: Uuid, reason: String },
|
|
|
|
#[error("Container not found for job {job_id}")]
|
|
ContainerNotFound { job_id: Uuid },
|
|
|
|
#[error("Container for job {job_id} is in unexpected state: {state}")]
|
|
InvalidContainerState { job_id: Uuid, state: String },
|
|
|
|
#[error("Internal API error: {reason}")]
|
|
ApiError { reason: String },
|
|
|
|
#[error("Docker error: {reason}")]
|
|
Docker { reason: String },
|
|
}
|
|
|
|
/// Worker errors (container-side execution).
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum WorkerError {
|
|
#[error("Failed to connect to orchestrator at {url}: {reason}")]
|
|
ConnectionFailed { url: String, reason: String },
|
|
|
|
#[error("LLM proxy request failed: {reason}")]
|
|
LlmProxyFailed { reason: String },
|
|
|
|
#[error("Secret resolution failed for {secret_name}: {reason}")]
|
|
SecretResolveFailed { secret_name: String, reason: String },
|
|
|
|
#[error("Orchestrator returned error for job {job_id}: {reason}")]
|
|
OrchestratorRejected { job_id: Uuid, reason: String },
|
|
|
|
#[error("Worker execution failed: {reason}")]
|
|
ExecutionFailed { reason: String },
|
|
|
|
#[error("Missing worker token (IRONCLAW_WORKER_TOKEN not set)")]
|
|
MissingToken,
|
|
}
|
|
|
|
/// Routine-related errors.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum RoutineError {
|
|
#[error("Unknown trigger type: {trigger_type}")]
|
|
UnknownTriggerType { trigger_type: String },
|
|
|
|
#[error("Unknown action type: {action_type}")]
|
|
UnknownActionType { action_type: String },
|
|
|
|
#[error("Missing field in {context}: {field}")]
|
|
MissingField { context: String, field: String },
|
|
|
|
#[error("Invalid cron expression: {reason}")]
|
|
InvalidCron { reason: String },
|
|
|
|
#[error("Unknown run status: {status}")]
|
|
UnknownRunStatus { status: String },
|
|
|
|
#[error("Routine {name} is disabled")]
|
|
Disabled { name: String },
|
|
|
|
#[error("Routine not found: {id}")]
|
|
NotFound { id: Uuid },
|
|
|
|
#[error("Routine {name} at max concurrent runs")]
|
|
MaxConcurrent { name: String },
|
|
|
|
#[error("Database error: {reason}")]
|
|
Database { reason: String },
|
|
|
|
#[error("LLM call failed: {reason}")]
|
|
LlmFailed { reason: String },
|
|
|
|
#[error("LLM returned empty content")]
|
|
EmptyResponse,
|
|
|
|
#[error("LLM response truncated (finish_reason=length) with no content")]
|
|
TruncatedResponse,
|
|
}
|
|
|
|
/// Result type alias for the agent.
|
|
pub type Result<T> = std::result::Result<T, Error>;
|