checkpoint

Author: ekang7

crates/agent/tests/common/mod.rs

@@ -59,6 +59,7 @@ pub struct TestCaseBuilder {
 
 impl TestCaseBuilder {
     pub async fn new() -> Self {
+        let mut test_base = TestBase::new().await;
 Self { test_base: TestBase::new().await, test_name: Default::default(), agent_config: todo!(), files: todo!(), mock_responses: todo!(), trust_all_tools: todo!(), tool_use_approvals: todo!() }
     }
 
@@ -96,8 +97,10 @@ Self { test_base: TestBase::new().await, test_name: Default::default(), agent_co
         self
     }
 
-    pub fn with_test_perprompt_hook(mut self) -> Self {
-        
+    pub fn with_emit_output_to_file(mut self, file: &str) -> Self {
+        // redirects the output of this test case to the given temp file
+         
+        self
     }
 
     pub async fn build(self) -> Result<TestCase> {

crates/agent/tests/test_hooks.rs

@@ -1,38 +1,33 @@
 mod common;
 
-use agent::agent_config::definitions::*;
-use common::*;
 use std::collections::HashMap;
 use std::time::Duration;
+
+use agent::agent_config::definitions::*;
+use common::*;
 use tracing::info;
 
 fn create_spawn_hook_single_shell_config() -> AgentConfig {
-    let hooks = HashMap::from([
-        (
-            HookTrigger::AgentSpawn,
-            vec![HookConfig::ShellCommand(CommandHook {
-                command: "echo 'Agent initialized'".to_string(),
-                opts: BaseHookConfig {
-                    timeout_ms: 5000,
-                    max_output_size: 1024,
-                    cache_ttl_seconds: 0,
-                    matcher: None,
-                },
-            })],
-        ),
-    ]);
+    let hooks = HashMap::from([(HookTrigger::AgentSpawn, vec![HookConfig::ShellCommand(CommandHook {
+        command: "echo 'Agent initialized'".to_string(),
+        opts: BaseHookConfig {
+            timeout_ms: 5000,
+            max_output_size: 1024,
+            cache_ttl_seconds: 0,
+            matcher: None,
+        },
+    })])]);
 
     AgentConfig::V2025_08_22(AgentConfigV2025_08_22 {
         hooks,
         ..Default::default()
     })
 }
 
-
 #[tokio::test]
 async fn test_agent_spawn_hook_single() {
     let _ = tracing_subscriber::fmt::try_init();
-   
+
     let mut test: TestCase = TestCase::builder()
         .test_name("agent spawn hook behavior for single shell command and one turn")
         .with_agent_config(create_spawn_hook_single_shell_config())
@@ -44,19 +39,19 @@ async fn test_agent_spawn_hook_single() {
         .build()
         .await
         .unwrap();
-    
+
     test.wait_until_agent_initializes(Duration::from_millis(100)).await;
     test.send_prompt("hello".to_string()).await;
     test.wait_until_agent_stop(Duration::from_millis(100)).await;
     let req = test.requests().first().expect("should have one request");
-    let first_msg = req.messages().first().expect("first message should exist").text(); 
+    let first_msg = req.messages().first().expect("first message should exist").text();
     assert_contains(&first_msg, "Agent initialized");
 }
 
 #[tokio::test]
 async fn test_agent_spawn_hook_persistence() {
     let _ = tracing_subscriber::fmt::try_init();
-   
+
     let mut test: TestCase = TestCase::builder()
         .test_name("agent spawn hook behavior for single shell command and two turns")
         .with_agent_config(create_spawn_hook_single_shell_config())
@@ -68,35 +63,32 @@ async fn test_agent_spawn_hook_persistence() {
         .build()
         .await
         .unwrap();
-    
+
     test.wait_until_agent_initializes(Duration::from_millis(100)).await;
     test.send_prompt("hello".to_string()).await;
     test.wait_until_agent_stop(Duration::from_millis(100)).await;
     test.send_prompt("bye".to_string()).await;
     test.wait_until_agent_stop(Duration::from_millis(100)).await;
     for req in test.requests() {
-        let first_msg = req.messages().first().expect("first message should exist").text(); 
+        let first_msg = req.messages().first().expect("first message should exist").text();
         assert_contains(&first_msg, "Agent initialized");
     }
 }
 
 #[tokio::test]
 async fn test_user_prompt_hook_single() {
     let _ = tracing_subscriber::fmt::try_init();
-    let hooks = HashMap::from([
-        (
-            HookTrigger::UserPromptSubmit,
-            vec![HookConfig::ShellCommand(CommandHook {
-                command: "echo 'submitted!'".to_string(),
-                opts: BaseHookConfig {
-                    timeout_ms: 5000,
-                    max_output_size: 1024,
-                    cache_ttl_seconds: 0,
-                    matcher: None,
-                },
-            })],
-        ),
-    ]);
+    let hooks = HashMap::from([(HookTrigger::UserPromptSubmit, vec![HookConfig::ShellCommand(
+        CommandHook {
+            command: "echo 'submitted!'".to_string(),
+            opts: BaseHookConfig {
+                timeout_ms: 5000,
+                max_output_size: 1024,
+                cache_ttl_seconds: 0,
+                matcher: None,
+            },
+        },
+    )])]);
 
     let agent_config = AgentConfig::V2025_08_22(AgentConfigV2025_08_22 {
         hooks,
@@ -113,33 +105,30 @@ async fn test_user_prompt_hook_single() {
         .build()
         .await
         .unwrap();
-    
+
     test.wait_until_agent_initializes(Duration::from_millis(100)).await;
     test.send_prompt("hello".to_string()).await;
     test.wait_until_agent_stop(Duration::from_millis(100)).await;
     let req = test.requests().first().expect("should have one request");
-    let first_msg = req.messages().first().expect("first message should exist").text(); 
+    let first_msg = req.messages().first().expect("first message should exist").text();
     assert_contains(&first_msg, "submitted!");
 }
 
 #[tokio::test]
 async fn test_user_prompt_hook_persistence() {
     let _ = tracing_subscriber::fmt::try_init();
-    
-    let hooks = HashMap::from([
-        (
-            HookTrigger::UserPromptSubmit,
-            vec![HookConfig::ShellCommand(CommandHook {
-                command: "printf 'a' >> turns.txt; printf \"char count: $(wc -c < turns.txt | tr -d ' ')\"".to_string(),
-                opts: BaseHookConfig {
-                    timeout_ms: 5000,
-                    max_output_size: 1024,
-                    cache_ttl_seconds: 0,
-                    matcher: None,
-                },
-            })],
-        ),
-    ]);
+
+    let hooks = HashMap::from([(HookTrigger::UserPromptSubmit, vec![HookConfig::ShellCommand(
+        CommandHook {
+            command: "printf 'a' >> turns.txt; printf \"char count: $(wc -c < turns.txt | tr -d ' ')\"".to_string(),
+            opts: BaseHookConfig {
+                timeout_ms: 5000,
+                max_output_size: 1024,
+                cache_ttl_seconds: 0,
+                matcher: None,
+            },
+        },
+    )])]);
 
     let agent_config = AgentConfig::V2025_08_22(AgentConfigV2025_08_22 {
         hooks,
@@ -158,16 +147,16 @@ async fn test_user_prompt_hook_persistence() {
         .build()
         .await
         .unwrap();
-    
+
     test.wait_until_agent_initializes(Duration::from_millis(100)).await;
     test.send_prompt("hello".to_string()).await;
     test.wait_until_agent_stop(Duration::from_millis(100)).await;
     test.send_prompt("bye".to_string()).await;
     test.wait_until_agent_stop(Duration::from_millis(100)).await;
     let req = test.requests().first().expect("first request should exist");
-    let first_msg = req.messages().first().expect("first message should exist").text(); 
-    assert_contains(&first_msg, "char count: 1"); 
-    let req = test.requests().get(1).expect("second request should exist"); 
-    let first_msg = req.messages().first().expect("first message should exist").text(); 
-    assert_contains(&first_msg, "char count: 2"); 
+    let first_msg = req.messages().first().expect("first message should exist").text();
+    assert_contains(&first_msg, "char count: 1");
+    let req = test.requests().get(1).expect("second request should exist");
+    let first_msg = req.messages().first().expect("first message should exist").text();
+    assert_contains(&first_msg, "char count: 2");
 }