add context window monitor
Writes the current context window to logs/current_context_window (uses a symlink to a session ID). This PR was unfortunately generated by a different LLM and did a ton of superficial reformating, it's actually a fairly small and benign change, but I don't want to roll back everything. Hope that's ok.
This commit is contained in:
@@ -30,7 +30,7 @@ impl TaskResult {
|
||||
// Look for the final_output marker pattern
|
||||
// The final_output content typically appears after the tool is called
|
||||
// and is the substantive content that follows
|
||||
|
||||
|
||||
// First, try to find if there's a clear final_output section
|
||||
// This would be the content after the last tool execution
|
||||
if let Some(final_output_pos) = content_without_timing.rfind("final_output") {
|
||||
@@ -39,7 +39,7 @@ impl TaskResult {
|
||||
if let Some(content_start) = content_without_timing[final_output_pos..].find('\n') {
|
||||
let start_pos = final_output_pos + content_start + 1;
|
||||
let final_content = &content_without_timing[start_pos..];
|
||||
|
||||
|
||||
// Trim and return the complete content
|
||||
let trimmed = final_content.trim();
|
||||
if !trimmed.is_empty() {
|
||||
@@ -47,7 +47,7 @@ impl TaskResult {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Fallback to the original extract_last_block behavior if we can't find final_output
|
||||
// This maintains backward compatibility
|
||||
self.extract_last_block()
|
||||
@@ -62,12 +62,13 @@ impl TaskResult {
|
||||
} else {
|
||||
&self.response
|
||||
};
|
||||
|
||||
|
||||
// Split by double newlines to find the last substantial block
|
||||
let blocks: Vec<&str> = content_without_timing.split("\n\n").collect();
|
||||
|
||||
|
||||
// Find the last non-empty block that isn't just whitespace
|
||||
blocks.iter()
|
||||
blocks
|
||||
.iter()
|
||||
.rev()
|
||||
.find(|block| !block.trim().is_empty())
|
||||
.map(|block| block.trim().to_string())
|
||||
@@ -79,7 +80,8 @@ impl TaskResult {
|
||||
|
||||
/// Check if the response contains an approval (for autonomous mode)
|
||||
pub fn is_approved(&self) -> bool {
|
||||
self.extract_final_output().contains("IMPLEMENTATION_APPROVED")
|
||||
self.extract_final_output()
|
||||
.contains("IMPLEMENTATION_APPROVED")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,20 +93,21 @@ mod tests {
|
||||
fn test_extract_last_block() {
|
||||
// Test case 1: Response with timing info
|
||||
let context_window = ContextWindow::new(1000);
|
||||
let response_with_timing = "Some initial content\n\nFinal block content\n\n⏱️ 2.3s | 💭 1.2s".to_string();
|
||||
let response_with_timing =
|
||||
"Some initial content\n\nFinal block content\n\n⏱️ 2.3s | 💭 1.2s".to_string();
|
||||
let result = TaskResult::new(response_with_timing, context_window.clone());
|
||||
assert_eq!(result.extract_last_block(), "Final block content");
|
||||
|
||||
|
||||
// Test case 2: Response without timing
|
||||
let response_no_timing = "Some initial content\n\nFinal block content".to_string();
|
||||
let result = TaskResult::new(response_no_timing, context_window.clone());
|
||||
assert_eq!(result.extract_last_block(), "Final block content");
|
||||
|
||||
|
||||
// Test case 3: Response with IMPLEMENTATION_APPROVED
|
||||
let response_approved = "Some content\n\nIMPLEMENTATION_APPROVED".to_string();
|
||||
let result = TaskResult::new(response_approved, context_window.clone());
|
||||
assert!(result.is_approved());
|
||||
|
||||
|
||||
// Test case 4: Response without approval
|
||||
let response_not_approved = "Some content\n\nNeeds more work".to_string();
|
||||
let result = TaskResult::new(response_not_approved, context_window);
|
||||
@@ -114,17 +117,17 @@ mod tests {
|
||||
#[test]
|
||||
fn test_extract_last_block_edge_cases() {
|
||||
let context_window = ContextWindow::new(1000);
|
||||
|
||||
|
||||
// Test empty response
|
||||
let empty_response = "".to_string();
|
||||
let result = TaskResult::new(empty_response, context_window.clone());
|
||||
assert_eq!(result.extract_last_block(), "");
|
||||
|
||||
|
||||
// Test single block
|
||||
let single_block = "Just one block".to_string();
|
||||
let result = TaskResult::new(single_block, context_window.clone());
|
||||
assert_eq!(result.extract_last_block(), "Just one block");
|
||||
|
||||
|
||||
// Test multiple empty blocks
|
||||
let multiple_empty = "\n\n\n\nSome content\n\n\n\n".to_string();
|
||||
let result = TaskResult::new(multiple_empty, context_window);
|
||||
@@ -134,18 +137,22 @@ mod tests {
|
||||
#[test]
|
||||
fn test_extract_final_output() {
|
||||
let context_window = ContextWindow::new(1000);
|
||||
|
||||
|
||||
// Test case 1: Response with final_output tool call
|
||||
let response_with_final_output = "Analyzing files...\n\nCalling final_output\n\nThis is the complete feedback\nwith multiple lines\nand important details\n\n⏱️ 2.3s".to_string();
|
||||
let result = TaskResult::new(response_with_final_output, context_window.clone());
|
||||
assert_eq!(result.extract_final_output(), "This is the complete feedback\nwith multiple lines\nand important details");
|
||||
|
||||
assert_eq!(
|
||||
result.extract_final_output(),
|
||||
"This is the complete feedback\nwith multiple lines\nand important details"
|
||||
);
|
||||
|
||||
// Test case 2: Response with IMPLEMENTATION_APPROVED in final_output
|
||||
let response_approved = "Review complete\n\nfinal_output called\n\nIMPLEMENTATION_APPROVED".to_string();
|
||||
let response_approved =
|
||||
"Review complete\n\nfinal_output called\n\nIMPLEMENTATION_APPROVED".to_string();
|
||||
let result = TaskResult::new(response_approved, context_window.clone());
|
||||
assert_eq!(result.extract_final_output(), "IMPLEMENTATION_APPROVED");
|
||||
assert!(result.is_approved());
|
||||
|
||||
|
||||
// Test case 3: Response with detailed feedback in final_output
|
||||
let response_feedback = "Checking implementation...\n\nfinal_output\n\nThe following issues need to be addressed:\n1. Missing error handling in main.rs\n2. Tests are not comprehensive\n3. Documentation needs improvement\n\nPlease fix these issues.".to_string();
|
||||
let result = TaskResult::new(response_feedback, context_window.clone());
|
||||
@@ -154,12 +161,12 @@ mod tests {
|
||||
assert!(extracted.contains("1. Missing error handling"));
|
||||
assert!(extracted.contains("Please fix these issues."));
|
||||
assert!(!result.is_approved());
|
||||
|
||||
|
||||
// Test case 4: Response without final_output (fallback to extract_last_block)
|
||||
let response_no_final_output = "Some analysis\n\nFinal thoughts here".to_string();
|
||||
let result = TaskResult::new(response_no_final_output, context_window.clone());
|
||||
assert_eq!(result.extract_final_output(), "Final thoughts here");
|
||||
|
||||
|
||||
// Test case 5: Empty response
|
||||
let empty_response = "".to_string();
|
||||
let result = TaskResult::new(empty_response, context_window);
|
||||
|
||||
Reference in New Issue
Block a user