dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Fix merge conflict resolution artifacts in agents.rs

Browse Source 
- 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 <noreply@anthropic.com>
This commit is contained in:
Dave
2026-02-24 13:24:39 +00:00
parent 59c75a8748
commit c8efe2059f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/agents.rs
View File

@@ -1573,6 +1573,7 @@ impl AgentPool {
completion: None, completion: None,
project_root: None, project_root: None,
log_session_id: None, log_session_id: None,
completed_at: None,
}, },
); );
tx tx
@@ -1601,6 +1602,8 @@ impl AgentPool {
check_orphaned_agents(&agents); check_orphaned_agents(&agents);
} }
}); });
}
/// Remove all agent entries for a given story_id from the pool. /// 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. /// Called when a story is archived so that stale entries don't accumulate.
@@ -4796,6 +4799,7 @@ footer
#[test] #[test]
fn resolve_simple_conflicts_malformed_no_separator() { fn resolve_simple_conflicts_malformed_no_separator() {
let input = "\ let input = "\
<<<<<<< HEAD
ours ours
>>>>>>> feature >>>>>>> feature
"; ";
@@ -4806,7 +4810,9 @@ ours
#[test] #[test]
fn resolve_simple_conflicts_malformed_no_end() { fn resolve_simple_conflicts_malformed_no_end() {
let input = "\ let input = "\
<<<<<<< HEAD
ours ours
=======
theirs theirs
"; ";
let result = resolve_simple_conflicts(input); let result = resolve_simple_conflicts(input);
@@ -5082,7 +5088,6 @@ theirs
assert!(report.had_conflicts, "should report conflicts"); assert!(report.had_conflicts, "should report conflicts");
} }
<<<<<<< HEAD
// ── process health monitoring tests ────────────────────────────────────── // ── process health monitoring tests ──────────────────────────────────────
/// Demonstrates that the PTY read-loop inactivity timeout fires when no output /// Demonstrates that the PTY read-loop inactivity timeout fires when no output