Refactor: Remove verbose from MCP context and save/load and fixed the failing test case for adding multiple file as context.

Author: shreyabhagat1

e2etests/run_context.clean.sh

@@ -16,8 +16,8 @@ const TEST_NAMES: &[&str] = &[
     "test_context_remove_command_of_non_existent_file",
     "test_add_remove_file_context",
     "test_add_glob_pattern_file_context",
-    "test_clear_context_command",
-    "test_add_remove_multiple_file_context"
+    "test_add_remove_multiple_file_context",
+    "test_clear_context_command"
 ];
 #[allow(dead_code)]
 const TOTAL_TESTS: usize = TEST_NAMES.len();
@@ -72,12 +72,12 @@ fn test_context_help_command() -> Result<(), Box<dyn std::error::Error>> {
     println!("📝 END OUTPUT");
 
     // Verify Usage section
-    assert!(response.contains("Usage:"), "Missing Usage section");
+    assert!(response.contains("Usage"), "Missing Usage section");
     assert!(response.contains("/context") && response.contains("<COMMAND>"), "Missing /context command in usage");
     println!("✅ Found Usage section");
 
     // Verify Commands section
-    assert!(response.contains("Commands:"), "Missing Commands section");
+    assert!(response.contains("Commands"), "Missing Commands section");
     assert!(response.contains("show"), "Missing show command");
     assert!(response.contains("add"), "Missing add command");
     assert!(response.contains("remove"), "Missing remove command");
@@ -113,11 +113,11 @@ fn test_context_without_subcommand() -> Result<(), Box<dyn std::error::Error>> {
     println!("{}", response);
     println!("📝 END OUTPUT");
 
-    assert!(response.contains("Usage:"), "Missing Usage section");
+    assert!(response.contains("Usage"), "Missing Usage section");
     assert!(response.contains("/context") && response.contains("<COMMAND>"), "Missing /context command in usage");
     println!("✅ Found Usage section with /context command");
 
-    assert!(response.contains("Commands:"), "Missing Commands section");
+    assert!(response.contains("Commands"), "Missing Commands section");
     assert!(response.contains("show"), "Missing show command");
     assert!(response.contains("add"), "Missing add command");
     assert!(response.contains("remove"), "Missing remove command");
@@ -213,7 +213,7 @@ fn test_context_remove_command_of_non_existent_file() -> Result<(), Box<dyn std:
     println!("📝 END OUTPUT");
 
     // Verify error message for non-existent file
-    assert!(response.contains("Error:"), "Missing error message for non-existent file");
+    assert!(response.contains("Error"), "Missing error message for non-existent file");
     println!("✅ Found expected error message for non-existent file removal");
 
     // Release the lock before cleanup
@@ -383,29 +383,33 @@ fn test_add_glob_pattern_file_context()-> Result<(), Box<dyn std::error::Error>>
 
 #[test]
 #[cfg(all(feature = "context", feature = "regression"))]
-fn test_clear_context_command()-> Result<(), Box<dyn std::error::Error>> {
-    println!("🔍 Testing /context clear command...");
-
-    let test_file_path = "/tmp/test_context_file.py";
+fn test_add_remove_multiple_file_context()-> Result<(), Box<dyn std::error::Error>> {
+    println!("🔍 Testing /context add <filename1> <filename2> <filename3> command and /context remove <filename1> <filename2> <filename3>...");
+    
+    let test_file1_path = "/tmp/test_context_file1.py";
+    let test_file2_path = "/tmp/test_context_file2.py";
+    let test_file3_path = "/tmp/test_context_file.js";
 
     // Create test files
-    std::fs::write(test_file_path, "# Test Python file 1 for context\nprint('Hello from Python file 1')")?;
-    println!("✅ Created test files at {}", test_file_path);
+    std::fs::write(test_file1_path, "# Test Python file 1 for context\nprint('Hello from Python file 1')")?;
+    std::fs::write(test_file2_path, "# Test Python file 2 for context\nprint('Hello from Python file 2')")?;
+    std::fs::write(test_file3_path, "// Test JavaScript file\nconsole.log('Hello from JS file');")?;
+    println!("✅ Created test files at {}, {}, {}", test_file1_path, test_file2_path, test_file3_path);
 
     let session = get_chat_session();
     let mut chat = session.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
-    
-    // Add multiple files to context
-    let add_response = chat.execute_command(&format!("/context add {}", test_file_path))?;
+
+    // Add multiple files to context in one command
+    let add_response = chat.execute_command(&format!("/context add {} {} {}", test_file1_path, test_file2_path, test_file3_path))?;
 
     println!("📝 Context add response: {} bytes", add_response.len());
     println!("📝 ADD RESPONSE:");
     println!("{}", add_response);
     println!("📝 END ADD RESPONSE");
 
     // Verify files were added successfully - be flexible with the exact message format
-    assert!(add_response.contains("Added"), "Missing success message for adding files");
-    println!("✅ Files added to context successfully");
+    assert!(add_response.contains("Added"), "Missing success message for adding multiple files");
+    println!("✅ Multiple files added to context successfully");
 
     // Execute /context show to confirm files are present
     let show_response = chat.execute_command("/context show")?;
@@ -415,41 +419,45 @@ fn test_clear_context_command()-> Result<(), Box<dyn std::error::Error>> {
     println!("{}", show_response);
     println!("📝 END SHOW RESPONSE");
 
-    // Verify files are present in context
-    assert!(show_response.contains(test_file_path), "Python file not found in context show output");
-    println!("✅ Files confirmed present in context");
-    
-    // Execute /context clear to remove all files
-    let clear_response = chat.execute_command("/context clear")?;
+    // Verify all files are present in context
+    assert!(show_response.contains(test_file1_path), "Python file not found in context show output");
+    assert!(show_response.contains(test_file2_path), "JavaScript file not found in context show output");
+    assert!(show_response.contains(test_file3_path), "Text file not found in context show output");
+    println!("✅ All files confirmed present in context");
+
+    // Remove multiple files from context
+    let remove_response = chat.execute_command(&format!("/context remove {} {} {}", test_file1_path, test_file2_path, test_file3_path))?;
 
-    println!("📝 Context clear response: {} bytes", clear_response.len());
-    println!("📝 CLEAR RESPONSE:");
-    println!("{}", clear_response);
-    println!("📝 END CLEAR RESPONSE");
+    println!("📝 Context remove response: {} bytes", remove_response.len());
+    println!("📝 REMOVE RESPONSE:");
+    println!("{}", remove_response);
+    println!("📝 END REMOVE RESPONSE");
 
-    // Verify context was cleared successfully
-    assert!(clear_response.contains("Cleared context"), "Missing success message for clearing context");
-    println!("✅ Context cleared successfully");
+    // Verify files were removed successfully - be flexible with the exact message format
+    assert!(remove_response.contains("Removed"), "Missing success message for removing multiple files");
+    println!("✅ Multiple files removed from context successfully");
 
-    // Execute /context show to confirm no files remain
+    // Execute /context show to confirm files are gone
     let final_show_response = chat.execute_command("/context show")?;
 
     println!("📝 Final context show response: {} bytes", final_show_response.len());
     println!("📝 FINAL SHOW RESPONSE:");
     println!("{}", final_show_response);
     println!("📝 END FINAL SHOW RESPONSE");
 
-    // Verify no files remain in context
-    assert!(!final_show_response.contains(test_file_path), "Python file still found in context after clear");
-    assert!(final_show_response.contains("Agent (q_cli_default):"), "Missing Agent section");
-    assert!(final_show_response.contains("<none>"), "Missing <none> indicator for cleared context");
-    println!("✅ All files confirmed removed from context and <none> sections present");
+    // Verify files are no longer in context
+    assert!(!final_show_response.contains(test_file1_path), "Python file still found in context after removal");
+    assert!(!final_show_response.contains(test_file2_path), "JavaScript file still found in context after removal");
+    assert!(!final_show_response.contains(test_file3_path), "Text file still found in context after removal");
+    println!("✅ All files confirmed removed from context");
 
     // Release the lock before cleanup
     drop(chat);
 
     // Clean up test file
-    let _ = std::fs::remove_file(test_file_path);
+    let _ = std::fs::remove_file(test_file1_path);
+    let _ = std::fs::remove_file(test_file2_path);
+    let _ = std::fs::remove_file(test_file3_path);
     println!("✅ Cleaned up test file");
 
     // Cleanup only if this is the last test
@@ -460,33 +468,29 @@ fn test_clear_context_command()-> Result<(), Box<dyn std::error::Error>> {
 
 #[test]
 #[cfg(all(feature = "context", feature = "regression"))]
-fn test_add_remove_multiple_file_context()-> Result<(), Box<dyn std::error::Error>> {
-    println!("🔍 Testing /context add <filename1> <filename2> <filename3> command and /context remove <filename1> <filename2> <filename3>...");
-    
-    let test_file1_path = "/tmp/test_context_file1.py";
-    let test_file2_path = "/tmp/test_context_file2.py";
-    let test_file3_path = "/tmp/test_context_file.js";
+fn test_clear_context_command()-> Result<(), Box<dyn std::error::Error>> {
+    println!("🔍 Testing /context clear command...");
+
+    let test_file_path = "/tmp/test_context_file.py";
 
     // Create test files
-    std::fs::write(test_file1_path, "# Test Python file 1 for context\nprint('Hello from Python file 1')")?;
-    std::fs::write(test_file2_path, "# Test Python file 2 for context\nprint('Hello from Python file 2')")?;
-    std::fs::write(test_file3_path, "// Test JavaScript file\nconsole.log('Hello from JS file');")?;
-    println!("✅ Created test files at {}, {}, {}", test_file1_path, test_file2_path, test_file3_path);
+    std::fs::write(test_file_path, "# Test Python file 1 for context\nprint('Hello from Python file 1')")?;
+    println!("✅ Created test files at {}", test_file_path);
 
     let session = get_chat_session();
     let mut chat = session.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
-
-    // Add multiple files to context in one command
-    let add_response = chat.execute_command(&format!("/context add {} {} {}", test_file1_path, test_file2_path, test_file3_path))?;
+    
+    // Add multiple files to context
+    let add_response = chat.execute_command(&format!("/context add {}", test_file_path))?;
 
     println!("📝 Context add response: {} bytes", add_response.len());
     println!("📝 ADD RESPONSE:");
     println!("{}", add_response);
     println!("📝 END ADD RESPONSE");
 
     // Verify files were added successfully - be flexible with the exact message format
-    assert!(add_response.contains("Added"), "Missing success message for adding multiple files");
-    println!("✅ Multiple files added to context successfully");
+    assert!(add_response.contains("Added"), "Missing success message for adding files");
+    println!("✅ Files added to context successfully");
 
     // Execute /context show to confirm files are present
     let show_response = chat.execute_command("/context show")?;
@@ -496,45 +500,41 @@ fn test_add_remove_multiple_file_context()-> Result<(), Box<dyn std::error::Erro
     println!("{}", show_response);
     println!("📝 END SHOW RESPONSE");
 
-    // Verify all files are present in context
-    assert!(show_response.contains(test_file1_path), "Python file not found in context show output");
-    assert!(show_response.contains(test_file2_path), "JavaScript file not found in context show output");
-    assert!(show_response.contains(test_file3_path), "Text file not found in context show output");
-    println!("✅ All files confirmed present in context");
-
-    // Remove multiple files from context
-    let remove_response = chat.execute_command(&format!("/context remove {} {} {}", test_file1_path, test_file2_path, test_file3_path))?;
+    // Verify files are present in context
+    assert!(show_response.contains(test_file_path), "Python file not found in context show output");
+    println!("✅ Files confirmed present in context");
 
-    println!("📝 Context remove response: {} bytes", remove_response.len());
-    println!("📝 REMOVE RESPONSE:");
-    println!("{}", remove_response);
-    println!("📝 END REMOVE RESPONSE");
+    // Execute /context clear to remove all files
+    let clear_response = chat.execute_command("/context clear")?;
 
-    // Verify files were removed successfully - be flexible with the exact message format
-    assert!(remove_response.contains("Removed"), "Missing success message for removing multiple files");
-    println!("✅ Multiple files removed from context successfully");
+    println!("📝 Context clear response: {} bytes", clear_response.len());
+    println!("📝 CLEAR RESPONSE:");
+    println!("{}", clear_response);
+    println!("📝 END CLEAR RESPONSE");
 
-    // Execute /context show to confirm files are gone
+    // Verify context was cleared successfully
+    assert!(clear_response.contains("Cleared context"), "Missing success message for clearing context");
+    println!("✅ Context cleared successfully");
+    
+    // Execute /context show to confirm no files remain
     let final_show_response = chat.execute_command("/context show")?;
 
     println!("📝 Final context show response: {} bytes", final_show_response.len());
     println!("📝 FINAL SHOW RESPONSE:");
     println!("{}", final_show_response);
     println!("📝 END FINAL SHOW RESPONSE");
 
-    // Verify files are no longer in context
-    assert!(!final_show_response.contains(test_file1_path), "Python file still found in context after removal");
-    assert!(!final_show_response.contains(test_file2_path), "JavaScript file still found in context after removal");
-    assert!(!final_show_response.contains(test_file3_path), "Text file still found in context after removal");
-    println!("✅ All files confirmed removed from context");
+    // Verify no files remain in context
+    assert!(!final_show_response.contains(test_file_path), "Python file still found in context after clear");
+    assert!(final_show_response.contains("Agent (q_cli_default):"), "Missing Agent section");
+    assert!(final_show_response.contains("<none>"), "Missing <none> indicator for cleared context");
+    println!("✅ All files confirmed removed from context and <none> sections present");
 
     // Release the lock before cleanup
     drop(chat);
 
     // Clean up test file
-    let _ = std::fs::remove_file(test_file1_path);
-    let _ = std::fs::remove_file(test_file2_path);
-    let _ = std::fs::remove_file(test_file3_path);
+    let _ = std::fs::remove_file(test_file_path);
     println!("✅ Cleaned up test file");
 
     // Cleanup only if this is the last test