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

feat: add ecc2 merge queue reporting

Browse Source
This commit is contained in:
Affaan Mustafa
2026-04-09 20:04:04 -07:00
parent cf8b5473c7
commit d0dbb20805
4 changed files with 669 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ecc2/src/tui/dashboard.rs
View File

@@ -4371,6 +4371,35 @@ impl Dashboard {
lines.push(format!("- conflict {conflict}"));
}
}
if let Ok(merge_queue) = manager::build_merge_queue(&self.db) {
let entry = merge_queue
.ready_entries
.iter()
.chain(merge_queue.blocked_entries.iter())
.find(|entry| entry.session_id == session.id);
if let Some(entry) = entry {
lines.push("Merge queue".to_string());
if let Some(position) = entry.queue_position {
lines.push(format!(
"- ready #{} | {}",
position, entry.suggested_action
));
} else {
lines.push(format!("- blocked | {}", entry.suggested_action));
}
for blocker in entry.blocked_by.iter().take(2) {
lines.push(format!(
" blocker {} [{}] | {}",
format_session_id(&blocker.session_id),
blocker.branch,
blocker.summary
));
for conflict in blocker.conflicts.iter().take(3) {
lines.push(format!(" conflict {conflict}"));
}
}
}
}
}
lines.push(format!(