Add effective_exec_events_path function and related tests; enhance harness_exec output normalization

Author: vinhnx

src/cli/exec/mod.rs

@@ -39,7 +39,10 @@ mod tests {
     use super::event_output::{
         ExecEventProcessor, human_event_line, render_final_tail, serialize_event_line,
     };
-    use super::run::{REVIEW_TASK_ID, resolve_exec_event_log_path, task_instructions, task_spec};
+    use super::run::{
+        REVIEW_TASK_ID, effective_exec_events_path, resolve_exec_event_log_path, task_instructions,
+        task_spec,
+    };
     use tempfile::TempDir;
     use vtcode_core::core::agent::task::{TaskOutcome, TaskResults};
     use vtcode_core::exec::events::{
@@ -215,6 +218,43 @@ mod tests {
         assert!(file_name.ends_with(".jsonl"));
     }
 
+    #[test]
+    fn effective_exec_events_path_uses_config_when_cli_path_is_absent() {
+        let temp = TempDir::new().expect("tempdir");
+        let configured = temp.path().join("events.jsonl");
+
+        let resolved = effective_exec_events_path(
+            None,
+            Some(configured.to_str().expect("configured path")),
+            "session-123",
+        )
+        .expect("resolved path");
+
+        assert_eq!(resolved, configured);
+    }
+
+    #[test]
+    fn effective_exec_events_path_ignores_empty_config_path() {
+        let resolved = effective_exec_events_path(None, Some(""), "session-123");
+        assert!(resolved.is_none());
+    }
+
+    #[test]
+    fn effective_exec_events_path_prefers_cli_path_over_config() {
+        let temp = TempDir::new().expect("tempdir");
+        let cli = temp.path().join("cli-events.jsonl");
+        let configured = temp.path().join("configured-events.jsonl");
+
+        let resolved = effective_exec_events_path(
+            Some(cli.as_path()),
+            Some(configured.to_str().expect("configured path")),
+            "session-123",
+        )
+        .expect("resolved path");
+
+        assert_eq!(resolved, cli);
+    }
+
     #[test]
     fn final_tail_includes_summary_and_metrics() {
         let result = TaskResults {

src/cli/exec/run.rs

@@ -2,6 +2,7 @@ use anyhow::{Context, Result};
 use chrono::Utc;
 use std::fs::File;
 use std::io::{self, BufWriter};
+use std::path::Path;
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use vtcode_core::config::VTCodeConfig;
@@ -63,6 +64,18 @@ pub(super) fn resolve_exec_event_log_path(path: &str, session_id: &str) -> PathB
     base
 }
 
+pub(super) fn effective_exec_events_path(
+    cli_events_path: Option<&Path>,
+    harness_event_log_path: Option<&str>,
+    session_id: &str,
+) -> Option<PathBuf> {
+    cli_events_path.map(Path::to_path_buf).or_else(|| {
+        harness_event_log_path
+            .filter(|path| !path.trim().is_empty())
+            .map(|path| resolve_exec_event_log_path(path, session_id))
+    })
+}
+
 pub(super) async fn handle_exec_command_impl(
     config: &CoreAgentConfig,
     vt_cfg: &VTCodeConfig,
@@ -111,15 +124,11 @@ pub(super) async fn handle_exec_command_impl(
         runner.enable_plan_mode();
     }
     runner.set_quiet(true);
-    let events_path = options.events_path.clone().or_else(|| {
-        run_vt_cfg
-            .agent
-            .harness
-            .event_log_path
-            .as_deref()
-            .filter(|path| !path.trim().is_empty())
-            .map(|path| resolve_exec_event_log_path(path, &event_session_id))
-    });
+    let events_path = effective_exec_events_path(
+        options.events_path.as_deref(),
+        run_vt_cfg.agent.harness.event_log_path.as_deref(),
+        &event_session_id,
+    );
 
     let processor = Arc::new(Mutex::new(ExecEventProcessor::<
         io::Stdout,

vtcode-core/src/core/agent/completion.rs

@@ -83,6 +83,7 @@ pub fn check_for_response_loop(response_text: &str, session_state: &mut AgentSes
         .iter()
         .rev()
         .filter(|m| m.role == MessageRole::Assistant)
+        .skip(1)
         .take(2)
         .any(|m| {
             let normalized_prev = m
@@ -109,6 +110,7 @@ pub fn check_for_response_loop(response_text: &str, session_state: &mut AgentSes
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::llm::provider::Message;
 
     #[test]
     fn test_completion_indicators() {
@@ -126,4 +128,29 @@ mod tests {
         assert!(!check_completion_indicators("Is the task done?"));
         assert!(!check_completion_indicators("random text"));
     }
+
+    #[test]
+    fn response_loop_ignores_current_assistant_message() {
+        let repeated_response = "The task is complete";
+        let mut state = AgentSessionState::new("session".to_string(), 8, 4, 128_000);
+        state
+            .messages
+            .push(Message::assistant(repeated_response.to_string()));
+
+        assert!(!check_for_response_loop(repeated_response, &mut state));
+    }
+
+    #[test]
+    fn response_loop_still_detects_prior_duplicate_assistant_message() {
+        let repeated_response = "The task is complete";
+        let mut state = AgentSessionState::new("session".to_string(), 8, 4, 128_000);
+        state
+            .messages
+            .push(Message::assistant(repeated_response.to_string()));
+        state
+            .messages
+            .push(Message::assistant(repeated_response.to_string()));
+
+        assert!(check_for_response_loop(repeated_response, &mut state));
+    }
 }