mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-26 15:40:18 +00:00
- Fix MCP tool schema deserialization: rename input_schema to match protocol's camelCase inputSchema, so models receive actual parameter schemas instead of empty defaults - Fix conversation history: add tool_calls field to ChatMessage and include assistant message with tool_calls before tool results, as required by OpenAI-compatible APIs - Fix approval loop: pass resume_after_tool flag to run_agentic_loop so the "force tool use" heuristic doesn't re-trigger after approval - Fix shutdown: add Submission::Quit, Ctrl+C signal handler, and graceful shutdown flow - Fix MCP activate button: auto-attempt auth flow when activation fails due to missing authentication - Add inline approval cards in chat via SSE ApprovalNeeded events - Add markdown rendering in chat (marked.js) with proper streaming - Add structured fields to log entries (key=value pairs from tracing) - Collapse log entries to single line with click-to-expand Co-Authored-By: Claude Opus 4.6 <[email protected]>
317 lines
9.1 KiB
Rust
317 lines
9.1 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;
|
|
|
|
/// 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>>,
|
|
}
|
|
|
|
impl LogBroadcaster {
|
|
pub fn new() -> Self {
|
|
let (tx, _) = broadcast::channel(512);
|
|
Self {
|
|
tx,
|
|
recent: Mutex::new(VecDeque::with_capacity(HISTORY_CAP)),
|
|
}
|
|
}
|
|
|
|
pub fn send(&self, entry: LogEntry) {
|
|
// 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()
|
|
}
|
|
}
|
|
|
|
/// 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.
|
|
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),
|
|
};
|
|
|
|
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(), "");
|
|
}
|
|
}
|