zsp/everything-claude-code
1
0
Fork 0
mirror of https://github.com/affaan-m/everything-claude-code.git synced 2026-04-10 11:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: surface ecc2 daemon auto-merge activity

Browse Source
This commit is contained in:
Affaan Mustafa
2026-04-08 15:27:16 -07:00
parent d8c8178f92
commit dada133784
4 changed files with 267 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ecc2/src/session/manager.rs
View File

@@ -1555,6 +1555,19 @@ impl fmt::Display for CoordinationStatus {
}
}
if let Some(last_auto_merge_at) = self.daemon_activity.last_auto_merge_at.as_ref() {
writeln!(
f,
"Last daemon auto-merge: {} merged / {} active / {} conflicted / {} dirty / {} failed @ {}",
self.daemon_activity.last_auto_merge_merged,
self.daemon_activity.last_auto_merge_active_skipped,
self.daemon_activity.last_auto_merge_conflicted_skipped,
self.daemon_activity.last_auto_merge_dirty_skipped,
self.daemon_activity.last_auto_merge_failed,
last_auto_merge_at.to_rfc3339()
)?;
}
Ok(())
}
}
@@ -1656,6 +1669,12 @@ mod tests {
last_rebalance_at: Some(now - Duration::seconds(2)),
last_rebalance_rerouted: 0,
last_rebalance_leads: 1,
last_auto_merge_at: Some(now - Duration::seconds(1)),
last_auto_merge_merged: 1,
last_auto_merge_active_skipped: 1,
last_auto_merge_conflicted_skipped: 0,
last_auto_merge_dirty_skipped: 0,
last_auto_merge_failed: 0,
}
}
@@ -3100,6 +3119,11 @@ mod tests {
assert!(rendered.contains("Last daemon dispatch: 3 routed / 1 deferred across 2 lead(s)"));
assert!(rendered.contains("Last daemon recovery dispatch: 2 handoff(s) across 1 lead(s)"));
assert!(rendered.contains("Last daemon rebalance: 0 handoff(s) across 1 lead(s)"));
assert!(
rendered.contains(
"Last daemon auto-merge: 1 merged / 1 active / 0 conflicted / 0 dirty / 0 failed"
)
);
}
#[test]