mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-25 14:53:34 +00:00
* fix: strip reasoning from LLM responses and persist assistant messages reliably - Filter out `type: "reasoning"` output items from NEAR AI Responses API parsing so chain-of-thought never reaches the UI (nearai.rs) - Rewrite clean_response with regex-based tag stripping that is code-aware (preserves tags inside fenced blocks and inline backticks), supports 9+ tag names (think, thought, reasoning, reflection, etc.), handles <final> extraction, pipe-delimited tags, and case/whitespace tolerance (reasoning.rs) - Add Reasoning::complete() helper so all non-agentic LLM call sites (summarize, suggest, heartbeat, compaction) get automatic response cleaning; thread SafetyLayer through to those callers - Change persist_turn from fire-and-forget tokio::spawn to awaited async so both user and assistant messages are written before returning, preventing data loss on shutdown/restart - Pass input_count through seed_response_chain so response chaining delta calculation is accurate after thread hydration on restart - Make NearAiResponse.usage optional and preserve response_id in alt response path for chaining continuity - Persist session token to DB during onboarding wizard so runtime loads it without legacy-key fallback; suppress spurious warning on fresh installs - Fix dev tool double-registration when builder already registers them - Load dotenv/ironclaw env for doctor and status subcommands - Reduce startup log noise (demote info→debug for skills, remove redundant info lines) Co-Authored-By: Claude Opus 4.6 <[email protected]> * Nudge to not loop over tools continuesly * refactor: remove Responses API, consolidate NEAR AI to Chat Completions only The Responses API provider (nearai.rs, 1278 lines) added significant complexity (response chaining state machine, delta message calculation, previous_response_id persistence) for marginal benefit. This consolidates to the Chat Completions API only, upgrading NearAiChatProvider with dual auth (session token + API key) and 401 retry for session token renewal. - Delete src/llm/nearai.rs (Responses API provider) - Upgrade nearai_chat.rs with SessionManager, dual auth, flexible list_models - Remove response_id from CompletionResponse and ToolCompletionResponse - Remove seed_response_chain/get_response_chain_id from LlmProvider trait - Remove response chain persistence from agent (thread_ops, session) - Remove NearAiApiMode enum and NEARAI_API_MODE config - Clean up all wrapper providers (retry, circuit_breaker, failover, cache) - Update documentation (CLAUDE.md, .env.example) Co-Authored-By: Claude Opus 4.6 <[email protected]> * feat: runtime log level control via gateway UI and URL parameter Add server-side log level switching using tracing_subscriber::reload::Layer so the EnvFilter can be swapped at runtime without restarting. Expose via GET/PUT /api/logs/level endpoints, a "Server: LEVEL" dropdown in the logs toolbar, and a ?log_level=debug URL parameter for one-click activation. Also applies cargo fmt to pre-existing files (llm/, tests/). Co-Authored-By: Claude Opus 4.6 <[email protected]> --------- Co-authored-by: Claude Opus 4.6 <[email protected]>
470 lines
14 KiB
Rust
470 lines
14 KiB
Rust
//! Tracing layer that broadcasts log events to the web gateway via SSE.
|
|
//!
|
|
//! ```text
|
|
//! tracing::info!("...")
|
|
//! │
|
|
//! ▼
|
|
//! WebLogLayer::on_event()
|
|
//! │
|
|
//! ▼
|
|
//! LogBroadcaster::send()
|
|
//! │
|
|
//! ├──► broadcast::Sender<LogEntry> (live subscribers)
|
|
//! └──► ring buffer (recent history for late joiners)
|
|
//! │
|
|
//! ▼
|
|
//! SSE /api/logs/events
|
|
//! ```
|
|
|
|
use std::collections::VecDeque;
|
|
use std::sync::{Arc, Mutex};
|
|
|
|
use serde::Serialize;
|
|
use tokio::sync::broadcast;
|
|
use tracing::field::{Field, Visit};
|
|
use tracing_subscriber::layer::SubscriberExt;
|
|
use tracing_subscriber::util::SubscriberInitExt;
|
|
use tracing_subscriber::{EnvFilter, Layer, reload};
|
|
|
|
use crate::safety::LeakDetector;
|
|
|
|
/// Maximum number of recent log entries kept for late-joining SSE subscribers.
|
|
const HISTORY_CAP: usize = 500;
|
|
|
|
/// A single log entry broadcast to connected clients.
|
|
#[derive(Debug, Clone, Serialize)]
|
|
pub struct LogEntry {
|
|
pub level: String,
|
|
pub target: String,
|
|
pub message: String,
|
|
pub timestamp: String,
|
|
}
|
|
|
|
/// Broadcasts log entries to SSE subscribers.
|
|
///
|
|
/// Created early in main.rs (before tracing init), shared with both
|
|
/// the tracing layer and the gateway's SSE endpoint.
|
|
///
|
|
/// Keeps a ring buffer of recent entries so browsers that connect
|
|
/// after startup still see the boot log.
|
|
pub struct LogBroadcaster {
|
|
tx: broadcast::Sender<LogEntry>,
|
|
recent: Mutex<VecDeque<LogEntry>>,
|
|
/// Scrubs secrets from log messages before broadcasting to SSE clients.
|
|
leak_detector: LeakDetector,
|
|
}
|
|
|
|
impl LogBroadcaster {
|
|
pub fn new() -> Self {
|
|
let (tx, _) = broadcast::channel(512);
|
|
Self {
|
|
tx,
|
|
recent: Mutex::new(VecDeque::with_capacity(HISTORY_CAP)),
|
|
leak_detector: LeakDetector::new(),
|
|
}
|
|
}
|
|
|
|
pub fn send(&self, mut entry: LogEntry) {
|
|
// Scrub secrets from the message before it reaches any subscriber.
|
|
// This is defense-in-depth: even if code elsewhere accidentally logs
|
|
// a secret, it won't be broadcast to SSE clients.
|
|
entry.message = self
|
|
.leak_detector
|
|
.scan_and_clean(&entry.message)
|
|
.unwrap_or_else(|_| "[log message redacted: contained blocked secret]".to_string());
|
|
|
|
// Stash in ring buffer (for late joiners)
|
|
if let Ok(mut buf) = self.recent.lock() {
|
|
if buf.len() >= HISTORY_CAP {
|
|
buf.pop_front();
|
|
}
|
|
buf.push_back(entry.clone());
|
|
}
|
|
// Broadcast to live subscribers (ok to drop if nobody listening)
|
|
let _ = self.tx.send(entry);
|
|
}
|
|
|
|
/// Subscribe to the live event stream.
|
|
pub fn subscribe(&self) -> broadcast::Receiver<LogEntry> {
|
|
self.tx.subscribe()
|
|
}
|
|
|
|
/// Snapshot of recent entries for replaying to a new subscriber.
|
|
pub fn recent_entries(&self) -> Vec<LogEntry> {
|
|
self.recent
|
|
.lock()
|
|
.map(|buf| buf.iter().cloned().collect())
|
|
.unwrap_or_default()
|
|
}
|
|
}
|
|
|
|
impl Default for LogBroadcaster {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
/// Handle for changing the tracing `EnvFilter` at runtime.
|
|
///
|
|
/// Wraps a `reload::Handle` so the gateway can switch between log levels
|
|
/// (e.g. `ironclaw=debug`) without restarting the process.
|
|
pub struct LogLevelHandle {
|
|
handle: reload::Handle<EnvFilter, tracing_subscriber::Registry>,
|
|
current_level: Mutex<String>,
|
|
base_filter: String,
|
|
}
|
|
|
|
impl LogLevelHandle {
|
|
pub fn new(
|
|
handle: reload::Handle<EnvFilter, tracing_subscriber::Registry>,
|
|
initial_level: String,
|
|
base_filter: String,
|
|
) -> Self {
|
|
Self {
|
|
handle,
|
|
current_level: Mutex::new(initial_level),
|
|
base_filter,
|
|
}
|
|
}
|
|
|
|
/// Change the `ironclaw=<level>` directive at runtime.
|
|
///
|
|
/// `level` must be one of: trace, debug, info, warn, error.
|
|
pub fn set_level(&self, level: &str) -> Result<(), String> {
|
|
const VALID: &[&str] = &["trace", "debug", "info", "warn", "error"];
|
|
let level = level.to_lowercase();
|
|
if !VALID.contains(&level.as_str()) {
|
|
return Err(format!(
|
|
"invalid level '{}', must be one of: {}",
|
|
level,
|
|
VALID.join(", ")
|
|
));
|
|
}
|
|
|
|
let filter_str = if self.base_filter.is_empty() {
|
|
format!("ironclaw={}", level)
|
|
} else {
|
|
format!("ironclaw={},{}", level, self.base_filter)
|
|
};
|
|
|
|
let new_filter = EnvFilter::new(&filter_str);
|
|
self.handle
|
|
.reload(new_filter)
|
|
.map_err(|e| format!("failed to reload filter: {}", e))?;
|
|
|
|
if let Ok(mut current) = self.current_level.lock() {
|
|
*current = level;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// Returns the current ironclaw log level (e.g. "info", "debug").
|
|
pub fn current_level(&self) -> String {
|
|
self.current_level
|
|
.lock()
|
|
.map(|l| l.clone())
|
|
.unwrap_or_else(|_| "info".to_string())
|
|
}
|
|
}
|
|
|
|
/// Initialise the tracing subscriber with a reloadable `EnvFilter`.
|
|
///
|
|
/// Returns the `LogLevelHandle` so callers can swap the filter at runtime.
|
|
/// The fmt layer and `WebLogLayer` are attached alongside the reloadable filter.
|
|
pub fn init_tracing(log_broadcaster: Arc<LogBroadcaster>) -> Arc<LogLevelHandle> {
|
|
let raw_filter =
|
|
std::env::var("RUST_LOG").unwrap_or_else(|_| "ironclaw=info,tower_http=warn".to_string());
|
|
|
|
// Split into the ironclaw directive and "everything else" (base_filter).
|
|
let mut ironclaw_level = String::from("info");
|
|
let mut base_parts: Vec<&str> = Vec::new();
|
|
|
|
for part in raw_filter.split(',') {
|
|
let trimmed = part.trim();
|
|
if trimmed.starts_with("ironclaw=") {
|
|
if let Some(lvl) = trimmed.strip_prefix("ironclaw=") {
|
|
ironclaw_level = lvl.to_string();
|
|
}
|
|
} else if !trimmed.is_empty() {
|
|
base_parts.push(trimmed);
|
|
}
|
|
}
|
|
let base_filter = base_parts.join(",");
|
|
|
|
let env_filter = EnvFilter::new(&raw_filter);
|
|
let (reload_layer, reload_handle) = reload::Layer::new(env_filter);
|
|
|
|
let handle = Arc::new(LogLevelHandle::new(
|
|
reload_handle,
|
|
ironclaw_level,
|
|
base_filter,
|
|
));
|
|
|
|
tracing_subscriber::registry()
|
|
.with(reload_layer)
|
|
.with(
|
|
tracing_subscriber::fmt::layer()
|
|
.with_target(false)
|
|
.with_writer(crate::tracing_fmt::TruncatingStderr::default()),
|
|
)
|
|
.with(WebLogLayer::new(log_broadcaster))
|
|
.init();
|
|
|
|
handle
|
|
}
|
|
|
|
/// Visitor that extracts the `message` field and all extra key-value
|
|
/// fields from a tracing event.
|
|
///
|
|
/// The terminal formatter shows something like:
|
|
/// INFO ironclaw::agent: Request completed url="http://..." status=200
|
|
///
|
|
/// We replicate that by capturing both the message and the extra fields.
|
|
struct MessageVisitor {
|
|
message: String,
|
|
fields: Vec<String>,
|
|
}
|
|
|
|
impl MessageVisitor {
|
|
fn new() -> Self {
|
|
Self {
|
|
message: String::new(),
|
|
fields: Vec::new(),
|
|
}
|
|
}
|
|
|
|
/// Build the final message string: "message key=val key=val ..."
|
|
fn finish(self) -> String {
|
|
if self.fields.is_empty() {
|
|
self.message
|
|
} else {
|
|
format!("{} {}", self.message, self.fields.join(" "))
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Visit for MessageVisitor {
|
|
fn record_debug(&mut self, field: &Field, value: &dyn std::fmt::Debug) {
|
|
if field.name() == "message" {
|
|
self.message = format!("{:?}", value);
|
|
// Strip surrounding quotes from Debug output
|
|
if self.message.starts_with('"') && self.message.ends_with('"') {
|
|
self.message = self.message[1..self.message.len() - 1].to_string();
|
|
}
|
|
} else {
|
|
self.fields.push(format!("{}={:?}", field.name(), value));
|
|
}
|
|
}
|
|
|
|
fn record_str(&mut self, field: &Field, value: &str) {
|
|
if field.name() == "message" {
|
|
self.message = value.to_string();
|
|
} else {
|
|
self.fields.push(format!("{}={}", field.name(), value));
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Tracing layer that forwards events to a [`LogBroadcaster`].
|
|
///
|
|
/// Only forwards DEBUG and above. Attach to the tracing subscriber
|
|
/// alongside the existing fmt layer.
|
|
///
|
|
/// Log messages are scrubbed through `LeakDetector` in `LogBroadcaster::send()`
|
|
/// (the single funnel point for all log output, including late-joiner history).
|
|
pub struct WebLogLayer {
|
|
broadcaster: Arc<LogBroadcaster>,
|
|
}
|
|
|
|
impl WebLogLayer {
|
|
pub fn new(broadcaster: Arc<LogBroadcaster>) -> Self {
|
|
Self { broadcaster }
|
|
}
|
|
}
|
|
|
|
impl<S: tracing::Subscriber> Layer<S> for WebLogLayer {
|
|
fn on_event(
|
|
&self,
|
|
event: &tracing::Event<'_>,
|
|
_ctx: tracing_subscriber::layer::Context<'_, S>,
|
|
) {
|
|
let metadata = event.metadata();
|
|
|
|
// Only forward DEBUG+
|
|
if *metadata.level() > tracing::Level::DEBUG {
|
|
return;
|
|
}
|
|
|
|
let mut visitor = MessageVisitor::new();
|
|
event.record(&mut visitor);
|
|
|
|
let entry = LogEntry {
|
|
level: metadata.level().to_string().to_uppercase(),
|
|
target: metadata.target().to_string(),
|
|
message: visitor.finish(),
|
|
timestamp: chrono::Utc::now().to_rfc3339_opts(chrono::SecondsFormat::Millis, true),
|
|
};
|
|
|
|
// LeakDetector scrubbing happens inside broadcaster.send()
|
|
self.broadcaster.send(entry);
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_log_broadcaster_creation() {
|
|
let broadcaster = LogBroadcaster::new();
|
|
// Should not panic with no receivers
|
|
broadcaster.send(LogEntry {
|
|
level: "INFO".to_string(),
|
|
target: "test".to_string(),
|
|
message: "hello".to_string(),
|
|
timestamp: "2024-01-01T00:00:00.000Z".to_string(),
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn test_log_broadcaster_subscribe() {
|
|
let broadcaster = LogBroadcaster::new();
|
|
let mut rx = broadcaster.subscribe();
|
|
|
|
broadcaster.send(LogEntry {
|
|
level: "WARN".to_string(),
|
|
target: "ironclaw::test".to_string(),
|
|
message: "test warning".to_string(),
|
|
timestamp: "2024-01-01T00:00:00.000Z".to_string(),
|
|
});
|
|
|
|
let entry = rx.try_recv().expect("should receive entry");
|
|
assert_eq!(entry.level, "WARN");
|
|
assert_eq!(entry.message, "test warning");
|
|
}
|
|
|
|
#[test]
|
|
fn test_log_entry_serialization() {
|
|
let entry = LogEntry {
|
|
level: "ERROR".to_string(),
|
|
target: "ironclaw::agent".to_string(),
|
|
message: "something broke".to_string(),
|
|
timestamp: "2024-01-01T00:00:00.000Z".to_string(),
|
|
};
|
|
let json = serde_json::to_string(&entry).expect("should serialize");
|
|
assert!(json.contains("\"level\":\"ERROR\""));
|
|
assert!(json.contains("something broke"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_recent_entries_buffer() {
|
|
let broadcaster = LogBroadcaster::new();
|
|
|
|
for i in 0..5 {
|
|
broadcaster.send(LogEntry {
|
|
level: "INFO".to_string(),
|
|
target: "test".to_string(),
|
|
message: format!("msg {}", i),
|
|
timestamp: "2024-01-01T00:00:00.000Z".to_string(),
|
|
});
|
|
}
|
|
|
|
let recent = broadcaster.recent_entries();
|
|
assert_eq!(recent.len(), 5);
|
|
assert_eq!(recent[0].message, "msg 0");
|
|
assert_eq!(recent[4].message, "msg 4");
|
|
}
|
|
|
|
#[test]
|
|
fn test_recent_entries_cap() {
|
|
let broadcaster = LogBroadcaster::new();
|
|
|
|
// Overflow the buffer
|
|
for i in 0..(HISTORY_CAP + 50) {
|
|
broadcaster.send(LogEntry {
|
|
level: "INFO".to_string(),
|
|
target: "test".to_string(),
|
|
message: format!("msg {}", i),
|
|
timestamp: "2024-01-01T00:00:00.000Z".to_string(),
|
|
});
|
|
}
|
|
|
|
let recent = broadcaster.recent_entries();
|
|
assert_eq!(recent.len(), HISTORY_CAP);
|
|
// Oldest should be msg 50 (first 50 evicted)
|
|
assert_eq!(recent[0].message, "msg 50");
|
|
}
|
|
|
|
#[test]
|
|
fn test_recent_entries_available_without_subscribers() {
|
|
let broadcaster = LogBroadcaster::new();
|
|
// No subscribe() call, just send
|
|
broadcaster.send(LogEntry {
|
|
level: "INFO".to_string(),
|
|
target: "test".to_string(),
|
|
message: "before anyone listened".to_string(),
|
|
timestamp: "2024-01-01T00:00:00.000Z".to_string(),
|
|
});
|
|
|
|
let recent = broadcaster.recent_entries();
|
|
assert_eq!(recent.len(), 1);
|
|
assert_eq!(recent[0].message, "before anyone listened");
|
|
}
|
|
|
|
#[test]
|
|
fn test_message_visitor_finish_message_only() {
|
|
let v = MessageVisitor {
|
|
message: "hello world".to_string(),
|
|
fields: vec![],
|
|
};
|
|
assert_eq!(v.finish(), "hello world");
|
|
}
|
|
|
|
#[test]
|
|
fn test_message_visitor_finish_with_fields() {
|
|
let v = MessageVisitor {
|
|
message: "Request completed".to_string(),
|
|
fields: vec![
|
|
"url=http://localhost:8080".to_string(),
|
|
"status=200".to_string(),
|
|
],
|
|
};
|
|
let result = v.finish();
|
|
assert_eq!(
|
|
result,
|
|
"Request completed url=http://localhost:8080 status=200"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_message_visitor_finish_empty() {
|
|
let v = MessageVisitor::new();
|
|
assert_eq!(v.finish(), "");
|
|
}
|
|
|
|
#[test]
|
|
fn test_broadcaster_has_leak_detector() {
|
|
let broadcaster = LogBroadcaster::new();
|
|
// Verify the leak detector is initialized with default patterns
|
|
assert!(broadcaster.leak_detector.pattern_count() > 0);
|
|
}
|
|
|
|
#[test]
|
|
fn test_leak_detector_scrubs_api_key_in_log() {
|
|
let detector = crate::safety::LeakDetector::new();
|
|
let msg = "Connecting with token sk-proj-test1234567890abcdefghij";
|
|
let result = detector.scan_and_clean(msg);
|
|
// Should be blocked (OpenAI key pattern)
|
|
assert!(result.is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn test_leak_detector_passes_clean_log() {
|
|
let detector = crate::safety::LeakDetector::new();
|
|
let msg = "Request completed status=200 url=https://api.example.com/data";
|
|
let result = detector.scan_and_clean(msg);
|
|
assert!(result.is_ok());
|
|
assert_eq!(result.unwrap(), msg);
|
|
}
|
|
}
|