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]>
519 lines
15 KiB
Rust
519 lines
15 KiB
Rust
//! Submission types for the turn-based agent loop.
|
|
//!
|
|
//! Submissions are the different types of input the agent can receive
|
|
//! and process as part of the turn-based development loop.
|
|
|
|
use serde::{Deserialize, Serialize};
|
|
use uuid::Uuid;
|
|
|
|
/// Parses user input into Submission types.
|
|
pub struct SubmissionParser;
|
|
|
|
impl SubmissionParser {
|
|
/// Parse message content into a Submission.
|
|
pub fn parse(content: &str) -> Submission {
|
|
let trimmed = content.trim();
|
|
let lower = trimmed.to_lowercase();
|
|
|
|
// Control commands (exact match or prefix)
|
|
if lower == "/undo" {
|
|
return Submission::Undo;
|
|
}
|
|
if lower == "/redo" {
|
|
return Submission::Redo;
|
|
}
|
|
if lower == "/interrupt" || lower == "/stop" {
|
|
return Submission::Interrupt;
|
|
}
|
|
if lower == "/compact" {
|
|
return Submission::Compact;
|
|
}
|
|
if lower == "/clear" {
|
|
return Submission::Clear;
|
|
}
|
|
if lower == "/heartbeat" {
|
|
return Submission::Heartbeat;
|
|
}
|
|
if lower == "/summarize" || lower == "/summary" {
|
|
return Submission::Summarize;
|
|
}
|
|
if lower == "/suggest" {
|
|
return Submission::Suggest;
|
|
}
|
|
if lower == "/thread new" || lower == "/new" {
|
|
return Submission::NewThread;
|
|
}
|
|
if lower == "/quit" || lower == "/exit" || lower == "/shutdown" {
|
|
return Submission::Quit;
|
|
}
|
|
|
|
// /thread <uuid> - switch thread
|
|
if let Some(rest) = lower.strip_prefix("/thread ") {
|
|
let rest = rest.trim();
|
|
if rest != "new" {
|
|
if let Ok(id) = Uuid::parse_str(rest) {
|
|
return Submission::SwitchThread { thread_id: id };
|
|
}
|
|
}
|
|
}
|
|
|
|
// /resume <uuid> - resume from checkpoint
|
|
if let Some(rest) = lower.strip_prefix("/resume ") {
|
|
if let Ok(id) = Uuid::parse_str(rest.trim()) {
|
|
return Submission::Resume { checkpoint_id: id };
|
|
}
|
|
}
|
|
|
|
// Try structured JSON approval (from web gateway's /api/chat/approval endpoint)
|
|
if trimmed.starts_with('{') {
|
|
if let Ok(submission) = serde_json::from_str::<Submission>(trimmed) {
|
|
if matches!(submission, Submission::ExecApproval { .. }) {
|
|
return submission;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Approval responses (simple yes/no/always for pending approvals)
|
|
// These are short enough to check explicitly
|
|
match lower.as_str() {
|
|
"yes" | "y" | "approve" | "ok" => {
|
|
return Submission::ApprovalResponse {
|
|
approved: true,
|
|
always: false,
|
|
};
|
|
}
|
|
"always" | "yes always" | "approve always" => {
|
|
return Submission::ApprovalResponse {
|
|
approved: true,
|
|
always: true,
|
|
};
|
|
}
|
|
"no" | "n" | "deny" | "reject" | "cancel" => {
|
|
return Submission::ApprovalResponse {
|
|
approved: false,
|
|
always: false,
|
|
};
|
|
}
|
|
_ => {}
|
|
}
|
|
|
|
// Default: user input
|
|
Submission::UserInput {
|
|
content: content.to_string(),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A submission to the agent.
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub enum Submission {
|
|
/// User text input (starts a new turn).
|
|
UserInput {
|
|
/// The user's message content.
|
|
content: String,
|
|
},
|
|
|
|
/// Response to an execution approval request (with explicit request ID).
|
|
ExecApproval {
|
|
/// ID of the approval request being responded to.
|
|
request_id: Uuid,
|
|
/// Whether the execution was approved.
|
|
approved: bool,
|
|
/// If true, auto-approve this tool for the rest of the session.
|
|
always: bool,
|
|
},
|
|
|
|
/// Simple approval response (yes/no/always) for the current pending approval.
|
|
ApprovalResponse {
|
|
/// Whether the execution was approved.
|
|
approved: bool,
|
|
/// If true, auto-approve this tool for the rest of the session.
|
|
always: bool,
|
|
},
|
|
|
|
/// Interrupt the current turn.
|
|
Interrupt,
|
|
|
|
/// Request context compaction.
|
|
Compact,
|
|
|
|
/// Undo the last turn.
|
|
Undo,
|
|
|
|
/// Redo a previously undone turn (if available).
|
|
Redo,
|
|
|
|
/// Resume from a specific checkpoint.
|
|
Resume {
|
|
/// ID of the checkpoint to resume from.
|
|
checkpoint_id: Uuid,
|
|
},
|
|
|
|
/// Clear the current thread and start fresh.
|
|
Clear,
|
|
|
|
/// Switch to a different thread.
|
|
SwitchThread {
|
|
/// ID of the thread to switch to.
|
|
thread_id: Uuid,
|
|
},
|
|
|
|
/// Create a new thread.
|
|
NewThread,
|
|
|
|
/// Trigger a manual heartbeat check.
|
|
Heartbeat,
|
|
|
|
/// Summarize the current thread.
|
|
Summarize,
|
|
|
|
/// Suggest next steps based on the current thread.
|
|
Suggest,
|
|
|
|
/// Quit the agent. Bypasses thread-state checks.
|
|
Quit,
|
|
}
|
|
|
|
impl Submission {
|
|
/// Create a user input submission.
|
|
pub fn user_input(content: impl Into<String>) -> Self {
|
|
Self::UserInput {
|
|
content: content.into(),
|
|
}
|
|
}
|
|
|
|
/// Create an approval submission.
|
|
pub fn approval(request_id: Uuid, approved: bool) -> Self {
|
|
Self::ExecApproval {
|
|
request_id,
|
|
approved,
|
|
always: false,
|
|
}
|
|
}
|
|
|
|
/// Create an "always approve" submission.
|
|
pub fn always_approve(request_id: Uuid) -> Self {
|
|
Self::ExecApproval {
|
|
request_id,
|
|
approved: true,
|
|
always: true,
|
|
}
|
|
}
|
|
|
|
/// Create an interrupt submission.
|
|
pub fn interrupt() -> Self {
|
|
Self::Interrupt
|
|
}
|
|
|
|
/// Create a compact submission.
|
|
pub fn compact() -> Self {
|
|
Self::Compact
|
|
}
|
|
|
|
/// Create an undo submission.
|
|
pub fn undo() -> Self {
|
|
Self::Undo
|
|
}
|
|
|
|
/// Create a redo submission.
|
|
pub fn redo() -> Self {
|
|
Self::Redo
|
|
}
|
|
|
|
/// Check if this submission starts a new turn.
|
|
pub fn starts_turn(&self) -> bool {
|
|
matches!(self, Self::UserInput { .. })
|
|
}
|
|
|
|
/// Check if this submission is a control command.
|
|
pub fn is_control(&self) -> bool {
|
|
matches!(
|
|
self,
|
|
Self::Interrupt
|
|
| Self::Compact
|
|
| Self::Undo
|
|
| Self::Redo
|
|
| Self::Clear
|
|
| Self::NewThread
|
|
| Self::Heartbeat
|
|
| Self::Summarize
|
|
| Self::Suggest
|
|
)
|
|
}
|
|
}
|
|
|
|
/// Result of processing a submission.
|
|
#[derive(Debug, Clone)]
|
|
pub enum SubmissionResult {
|
|
/// Turn completed with a response.
|
|
Response {
|
|
/// The agent's response.
|
|
content: String,
|
|
},
|
|
|
|
/// Need approval before continuing.
|
|
NeedApproval {
|
|
/// ID of the approval request.
|
|
request_id: Uuid,
|
|
/// Tool that needs approval.
|
|
tool_name: String,
|
|
/// Description of what the tool will do.
|
|
description: String,
|
|
/// Parameters being passed.
|
|
parameters: serde_json::Value,
|
|
},
|
|
|
|
/// Successfully processed (for control commands).
|
|
Ok {
|
|
/// Optional message.
|
|
message: Option<String>,
|
|
},
|
|
|
|
/// Error occurred.
|
|
Error {
|
|
/// Error message.
|
|
message: String,
|
|
},
|
|
|
|
/// Turn was interrupted.
|
|
Interrupted,
|
|
}
|
|
|
|
impl SubmissionResult {
|
|
/// Create a response result.
|
|
pub fn response(content: impl Into<String>) -> Self {
|
|
Self::Response {
|
|
content: content.into(),
|
|
}
|
|
}
|
|
|
|
/// Create an OK result.
|
|
pub fn ok() -> Self {
|
|
Self::Ok { message: None }
|
|
}
|
|
|
|
/// Create an OK result with a message.
|
|
pub fn ok_with_message(message: impl Into<String>) -> Self {
|
|
Self::Ok {
|
|
message: Some(message.into()),
|
|
}
|
|
}
|
|
|
|
/// Create an error result.
|
|
pub fn error(message: impl Into<String>) -> Self {
|
|
Self::Error {
|
|
message: message.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_submission_types() {
|
|
let input = Submission::user_input("Hello");
|
|
assert!(input.starts_turn());
|
|
assert!(!input.is_control());
|
|
|
|
let undo = Submission::undo();
|
|
assert!(!undo.starts_turn());
|
|
assert!(undo.is_control());
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_user_input() {
|
|
let submission = SubmissionParser::parse("Hello, how are you?");
|
|
assert!(
|
|
matches!(submission, Submission::UserInput { content } if content == "Hello, how are you?")
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_undo() {
|
|
let submission = SubmissionParser::parse("/undo");
|
|
assert!(matches!(submission, Submission::Undo));
|
|
|
|
let submission = SubmissionParser::parse("/UNDO");
|
|
assert!(matches!(submission, Submission::Undo));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_redo() {
|
|
let submission = SubmissionParser::parse("/redo");
|
|
assert!(matches!(submission, Submission::Redo));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_interrupt() {
|
|
let submission = SubmissionParser::parse("/interrupt");
|
|
assert!(matches!(submission, Submission::Interrupt));
|
|
|
|
let submission = SubmissionParser::parse("/stop");
|
|
assert!(matches!(submission, Submission::Interrupt));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_compact() {
|
|
let submission = SubmissionParser::parse("/compact");
|
|
assert!(matches!(submission, Submission::Compact));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_clear() {
|
|
let submission = SubmissionParser::parse("/clear");
|
|
assert!(matches!(submission, Submission::Clear));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_new_thread() {
|
|
let submission = SubmissionParser::parse("/thread new");
|
|
assert!(matches!(submission, Submission::NewThread));
|
|
|
|
let submission = SubmissionParser::parse("/new");
|
|
assert!(matches!(submission, Submission::NewThread));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_switch_thread() {
|
|
let uuid = Uuid::new_v4();
|
|
let submission = SubmissionParser::parse(&format!("/thread {}", uuid));
|
|
assert!(matches!(submission, Submission::SwitchThread { thread_id } if thread_id == uuid));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_resume() {
|
|
let uuid = Uuid::new_v4();
|
|
let submission = SubmissionParser::parse(&format!("/resume {}", uuid));
|
|
assert!(
|
|
matches!(submission, Submission::Resume { checkpoint_id } if checkpoint_id == uuid)
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_heartbeat() {
|
|
let submission = SubmissionParser::parse("/heartbeat");
|
|
assert!(matches!(submission, Submission::Heartbeat));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_summarize() {
|
|
let submission = SubmissionParser::parse("/summarize");
|
|
assert!(matches!(submission, Submission::Summarize));
|
|
|
|
let submission = SubmissionParser::parse("/summary");
|
|
assert!(matches!(submission, Submission::Summarize));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_suggest() {
|
|
let submission = SubmissionParser::parse("/suggest");
|
|
assert!(matches!(submission, Submission::Suggest));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_invalid_commands_become_user_input() {
|
|
// Invalid UUID should become user input
|
|
let submission = SubmissionParser::parse("/thread not-a-uuid");
|
|
assert!(matches!(submission, Submission::UserInput { .. }));
|
|
|
|
// Unknown command should become user input
|
|
let submission = SubmissionParser::parse("/unknown");
|
|
assert!(matches!(submission, Submission::UserInput { content } if content == "/unknown"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_json_exec_approval() {
|
|
let req_id = Uuid::new_v4();
|
|
let json = serde_json::to_string(&Submission::ExecApproval {
|
|
request_id: req_id,
|
|
approved: true,
|
|
always: false,
|
|
})
|
|
.expect("serialize");
|
|
|
|
let submission = SubmissionParser::parse(&json);
|
|
assert!(
|
|
matches!(submission, Submission::ExecApproval { request_id, approved, always }
|
|
if request_id == req_id && approved && !always)
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_json_exec_approval_always() {
|
|
let req_id = Uuid::new_v4();
|
|
let json = serde_json::to_string(&Submission::ExecApproval {
|
|
request_id: req_id,
|
|
approved: true,
|
|
always: true,
|
|
})
|
|
.expect("serialize");
|
|
|
|
let submission = SubmissionParser::parse(&json);
|
|
assert!(
|
|
matches!(submission, Submission::ExecApproval { request_id, approved, always }
|
|
if request_id == req_id && approved && always)
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_json_exec_approval_deny() {
|
|
let req_id = Uuid::new_v4();
|
|
let json = serde_json::to_string(&Submission::ExecApproval {
|
|
request_id: req_id,
|
|
approved: false,
|
|
always: false,
|
|
})
|
|
.expect("serialize");
|
|
|
|
let submission = SubmissionParser::parse(&json);
|
|
assert!(
|
|
matches!(submission, Submission::ExecApproval { request_id, approved, always }
|
|
if request_id == req_id && !approved && !always)
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_json_non_approval_stays_user_input() {
|
|
// A JSON UserInput should NOT be intercepted, it should be treated as text
|
|
let json = r#"{"UserInput":{"content":"hello"}}"#;
|
|
let submission = SubmissionParser::parse(json);
|
|
assert!(matches!(submission, Submission::UserInput { .. }));
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_json_roundtrip_matches_approval_handler() {
|
|
// Simulate exactly what chat_approval_handler does: serialize a Submission::ExecApproval
|
|
// and verify the parser picks it up correctly.
|
|
let request_id = Uuid::new_v4();
|
|
let approval = Submission::ExecApproval {
|
|
request_id,
|
|
approved: true,
|
|
always: false,
|
|
};
|
|
let json = serde_json::to_string(&approval).expect("serialize");
|
|
eprintln!("Serialized approval JSON: {}", json);
|
|
|
|
let parsed = SubmissionParser::parse(&json);
|
|
assert!(
|
|
matches!(parsed, Submission::ExecApproval { request_id: rid, approved, always }
|
|
if rid == request_id && approved && !always),
|
|
"Expected ExecApproval, got {:?}",
|
|
parsed
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_parser_quit() {
|
|
assert!(matches!(SubmissionParser::parse("/quit"), Submission::Quit));
|
|
assert!(matches!(SubmissionParser::parse("/exit"), Submission::Quit));
|
|
assert!(matches!(
|
|
SubmissionParser::parse("/shutdown"),
|
|
Submission::Quit
|
|
));
|
|
assert!(matches!(SubmissionParser::parse("/QUIT"), Submission::Quit));
|
|
assert!(matches!(SubmissionParser::parse("/Exit"), Submission::Quit));
|
|
}
|
|
}
|