From c8efe2059f814eb4f964869ac7197325d99c3cef Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 24 Feb 2026 13:24:39 +0000 Subject: [PATCH] Fix merge conflict resolution artifacts in agents.rs - Add missing closing brace for spawn_watchdog function - Remove leftover <<<<<<< HEAD conflict marker in test module - Restore conflict marker test data that was incorrectly stripped - Add missing completed_at field in inject_test_agent_with_handle Co-Authored-By: Claude Opus 4.6 --- server/src/agents.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/agents.rs b/server/src/agents.rs index e5d9be2..3dfb171 100644 --- a/server/src/agents.rs +++ b/server/src/agents.rs @@ -1573,6 +1573,7 @@ impl AgentPool { completion: None, project_root: None, log_session_id: None, + completed_at: None, }, ); tx @@ -1601,6 +1602,8 @@ impl AgentPool { check_orphaned_agents(&agents); } }); + } + /// Remove all agent entries for a given story_id from the pool. /// /// Called when a story is archived so that stale entries don't accumulate. @@ -4796,6 +4799,7 @@ footer #[test] fn resolve_simple_conflicts_malformed_no_separator() { let input = "\ +<<<<<<< HEAD ours >>>>>>> feature "; @@ -4806,7 +4810,9 @@ ours #[test] fn resolve_simple_conflicts_malformed_no_end() { let input = "\ +<<<<<<< HEAD ours +======= theirs "; let result = resolve_simple_conflicts(input); @@ -5082,7 +5088,6 @@ theirs assert!(report.had_conflicts, "should report conflicts"); } -<<<<<<< HEAD // ── process health monitoring tests ────────────────────────────────────── /// Demonstrates that the PTY read-loop inactivity timeout fires when no output