mirror of
https://github.com/affaan-m/everything-claude-code.git
synced 2026-04-10 19:33:37 +08:00
feat: show ecc2 selected worktree diff summaries
This commit is contained in:
@@ -16,6 +16,7 @@ use crate::session::output::{OutputEvent, OutputLine, SessionOutputStore, Output
|
|||||||
use crate::session::store::StateStore;
|
use crate::session::store::StateStore;
|
||||||
use crate::session::manager;
|
use crate::session::manager;
|
||||||
use crate::session::{Session, SessionMetrics, SessionState, WorktreeInfo};
|
use crate::session::{Session, SessionMetrics, SessionState, WorktreeInfo};
|
||||||
|
use crate::worktree;
|
||||||
|
|
||||||
const DEFAULT_PANE_SIZE_PERCENT: u16 = 35;
|
const DEFAULT_PANE_SIZE_PERCENT: u16 = 35;
|
||||||
const DEFAULT_GRID_SIZE_PERCENT: u16 = 50;
|
const DEFAULT_GRID_SIZE_PERCENT: u16 = 50;
|
||||||
@@ -33,6 +34,7 @@ pub struct Dashboard {
|
|||||||
sessions: Vec<Session>,
|
sessions: Vec<Session>,
|
||||||
session_output_cache: HashMap<String, Vec<OutputLine>>,
|
session_output_cache: HashMap<String, Vec<OutputLine>>,
|
||||||
logs: Vec<ToolLogEntry>,
|
logs: Vec<ToolLogEntry>,
|
||||||
|
selected_diff_summary: Option<String>,
|
||||||
selected_pane: Pane,
|
selected_pane: Pane,
|
||||||
selected_session: usize,
|
selected_session: usize,
|
||||||
show_help: bool,
|
show_help: bool,
|
||||||
@@ -104,6 +106,7 @@ impl Dashboard {
|
|||||||
sessions,
|
sessions,
|
||||||
session_output_cache: HashMap::new(),
|
session_output_cache: HashMap::new(),
|
||||||
logs: Vec::new(),
|
logs: Vec::new(),
|
||||||
|
selected_diff_summary: None,
|
||||||
selected_pane: Pane::Sessions,
|
selected_pane: Pane::Sessions,
|
||||||
selected_session: 0,
|
selected_session: 0,
|
||||||
show_help: false,
|
show_help: false,
|
||||||
@@ -114,6 +117,7 @@ impl Dashboard {
|
|||||||
session_table_state,
|
session_table_state,
|
||||||
};
|
};
|
||||||
dashboard.sync_selected_output();
|
dashboard.sync_selected_output();
|
||||||
|
dashboard.sync_selected_diff();
|
||||||
dashboard.refresh_logs();
|
dashboard.refresh_logs();
|
||||||
dashboard
|
dashboard
|
||||||
}
|
}
|
||||||
@@ -449,6 +453,7 @@ impl Dashboard {
|
|||||||
self.sync_selection();
|
self.sync_selection();
|
||||||
self.reset_output_view();
|
self.reset_output_view();
|
||||||
self.sync_selected_output();
|
self.sync_selected_output();
|
||||||
|
self.sync_selected_diff();
|
||||||
self.refresh_logs();
|
self.refresh_logs();
|
||||||
}
|
}
|
||||||
Pane::Output => {
|
Pane::Output => {
|
||||||
@@ -480,6 +485,7 @@ impl Dashboard {
|
|||||||
self.sync_selection();
|
self.sync_selection();
|
||||||
self.reset_output_view();
|
self.reset_output_view();
|
||||||
self.sync_selected_output();
|
self.sync_selected_output();
|
||||||
|
self.sync_selected_diff();
|
||||||
self.refresh_logs();
|
self.refresh_logs();
|
||||||
}
|
}
|
||||||
Pane::Output => {
|
Pane::Output => {
|
||||||
@@ -578,6 +584,7 @@ impl Dashboard {
|
|||||||
self.sync_selection_by_id(selected_id.as_deref());
|
self.sync_selection_by_id(selected_id.as_deref());
|
||||||
self.ensure_selected_pane_visible();
|
self.ensure_selected_pane_visible();
|
||||||
self.sync_selected_output();
|
self.sync_selected_output();
|
||||||
|
self.sync_selected_diff();
|
||||||
self.refresh_logs();
|
self.refresh_logs();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -624,6 +631,14 @@ impl Dashboard {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn sync_selected_diff(&mut self) {
|
||||||
|
self.selected_diff_summary = self
|
||||||
|
.sessions
|
||||||
|
.get(self.selected_session)
|
||||||
|
.and_then(|session| session.worktree.as_ref())
|
||||||
|
.and_then(|worktree| worktree::diff_summary(worktree).ok().flatten());
|
||||||
|
}
|
||||||
|
|
||||||
fn selected_session_id(&self) -> Option<&str> {
|
fn selected_session_id(&self) -> Option<&str> {
|
||||||
self.sessions
|
self.sessions
|
||||||
.get(self.selected_session)
|
.get(self.selected_session)
|
||||||
@@ -715,6 +730,9 @@ impl Dashboard {
|
|||||||
worktree.branch, worktree.base_branch
|
worktree.branch, worktree.base_branch
|
||||||
));
|
));
|
||||||
lines.push(format!("Worktree {}", worktree.path.display()));
|
lines.push(format!("Worktree {}", worktree.path.display()));
|
||||||
|
if let Some(diff_summary) = self.selected_diff_summary.as_ref() {
|
||||||
|
lines.push(format!("Diff {diff_summary}"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
lines.push(format!(
|
lines.push(format!(
|
||||||
@@ -1155,10 +1173,12 @@ mod tests {
|
|||||||
text: "last useful output".to_string(),
|
text: "last useful output".to_string(),
|
||||||
}],
|
}],
|
||||||
);
|
);
|
||||||
|
dashboard.selected_diff_summary = Some("1 file changed, 2 insertions(+)".to_string());
|
||||||
|
|
||||||
let text = dashboard.selected_session_metrics_text();
|
let text = dashboard.selected_session_metrics_text();
|
||||||
assert!(text.contains("Branch ecc/focus | Base main"));
|
assert!(text.contains("Branch ecc/focus | Base main"));
|
||||||
assert!(text.contains("Worktree /tmp/ecc/focus"));
|
assert!(text.contains("Worktree /tmp/ecc/focus"));
|
||||||
|
assert!(text.contains("Diff 1 file changed, 2 insertions(+)"));
|
||||||
assert!(text.contains("Last output last useful output"));
|
assert!(text.contains("Last output last useful output"));
|
||||||
assert!(text.contains("Needs attention:"));
|
assert!(text.contains("Needs attention:"));
|
||||||
assert!(text.contains("Failed failed-8 | Render dashboard rows"));
|
assert!(text.contains("Failed failed-8 | Render dashboard rows"));
|
||||||
@@ -1466,6 +1486,7 @@ mod tests {
|
|||||||
sessions,
|
sessions,
|
||||||
session_output_cache: HashMap::new(),
|
session_output_cache: HashMap::new(),
|
||||||
logs: Vec::new(),
|
logs: Vec::new(),
|
||||||
|
selected_diff_summary: None,
|
||||||
selected_pane: Pane::Sessions,
|
selected_pane: Pane::Sessions,
|
||||||
selected_session,
|
selected_session,
|
||||||
show_help: false,
|
show_help: false,
|
||||||
|
|||||||
@@ -87,6 +87,56 @@ pub fn list() -> Result<Vec<String>> {
|
|||||||
Ok(worktrees)
|
Ok(worktrees)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn diff_summary(worktree: &WorktreeInfo) -> Result<Option<String>> {
|
||||||
|
let base_ref = format!("{}...HEAD", worktree.base_branch);
|
||||||
|
let committed = git_diff_shortstat(&worktree.path, &[&base_ref])?;
|
||||||
|
let working = git_diff_shortstat(&worktree.path, &[])?;
|
||||||
|
|
||||||
|
let mut parts = Vec::new();
|
||||||
|
if let Some(committed) = committed {
|
||||||
|
parts.push(format!("Branch {committed}"));
|
||||||
|
}
|
||||||
|
if let Some(working) = working {
|
||||||
|
parts.push(format!("Working tree {working}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if parts.is_empty() {
|
||||||
|
Ok(Some(format!("Clean relative to {}", worktree.base_branch)))
|
||||||
|
} else {
|
||||||
|
Ok(Some(parts.join(" | ")))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn git_diff_shortstat(worktree_path: &Path, extra_args: &[&str]) -> Result<Option<String>> {
|
||||||
|
let mut command = Command::new("git");
|
||||||
|
command
|
||||||
|
.arg("-C")
|
||||||
|
.arg(worktree_path)
|
||||||
|
.arg("diff")
|
||||||
|
.arg("--shortstat");
|
||||||
|
command.args(extra_args);
|
||||||
|
|
||||||
|
let output = command
|
||||||
|
.output()
|
||||||
|
.context("Failed to generate worktree diff summary")?;
|
||||||
|
|
||||||
|
if !output.status.success() {
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
tracing::warn!(
|
||||||
|
"Worktree diff summary warning for {}: {stderr}",
|
||||||
|
worktree_path.display()
|
||||||
|
);
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
|
||||||
|
let summary = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
||||||
|
if summary.is_empty() {
|
||||||
|
Ok(None)
|
||||||
|
} else {
|
||||||
|
Ok(Some(summary))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn get_current_branch(repo_root: &Path) -> Result<String> {
|
fn get_current_branch(repo_root: &Path) -> Result<String> {
|
||||||
let output = Command::new("git")
|
let output = Command::new("git")
|
||||||
.arg("-C")
|
.arg("-C")
|
||||||
@@ -97,3 +147,69 @@ fn get_current_branch(repo_root: &Path) -> Result<String> {
|
|||||||
|
|
||||||
Ok(String::from_utf8_lossy(&output.stdout).trim().to_string())
|
Ok(String::from_utf8_lossy(&output.stdout).trim().to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use anyhow::Result;
|
||||||
|
use std::fs;
|
||||||
|
use std::process::Command;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
fn run_git(repo: &Path, args: &[&str]) -> Result<()> {
|
||||||
|
let output = Command::new("git").arg("-C").arg(repo).args(args).output()?;
|
||||||
|
if !output.status.success() {
|
||||||
|
anyhow::bail!("{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn diff_summary_reports_clean_and_dirty_worktrees() -> Result<()> {
|
||||||
|
let root = std::env::temp_dir().join(format!("ecc2-worktree-{}", Uuid::new_v4()));
|
||||||
|
let repo = root.join("repo");
|
||||||
|
fs::create_dir_all(&repo)?;
|
||||||
|
|
||||||
|
run_git(&repo, &["init", "-b", "main"])?;
|
||||||
|
run_git(&repo, &["config", "user.email", "ecc@example.com"])?;
|
||||||
|
run_git(&repo, &["config", "user.name", "ECC"])?;
|
||||||
|
fs::write(repo.join("README.md"), "hello\n")?;
|
||||||
|
run_git(&repo, &["add", "README.md"])?;
|
||||||
|
run_git(&repo, &["commit", "-m", "init"])?;
|
||||||
|
|
||||||
|
let worktree_dir = root.join("wt-1");
|
||||||
|
run_git(
|
||||||
|
&repo,
|
||||||
|
&[
|
||||||
|
"worktree",
|
||||||
|
"add",
|
||||||
|
"-b",
|
||||||
|
"ecc/test",
|
||||||
|
worktree_dir.to_str().expect("utf8 path"),
|
||||||
|
"HEAD",
|
||||||
|
],
|
||||||
|
)?;
|
||||||
|
|
||||||
|
let info = WorktreeInfo {
|
||||||
|
path: worktree_dir.clone(),
|
||||||
|
branch: "ecc/test".to_string(),
|
||||||
|
base_branch: "main".to_string(),
|
||||||
|
};
|
||||||
|
|
||||||
|
assert_eq!(diff_summary(&info)?, Some("Clean relative to main".to_string()));
|
||||||
|
|
||||||
|
fs::write(worktree_dir.join("README.md"), "hello\nmore\n")?;
|
||||||
|
let dirty = diff_summary(&info)?.expect("dirty summary");
|
||||||
|
assert!(dirty.contains("Working tree"));
|
||||||
|
assert!(dirty.contains("file changed"));
|
||||||
|
|
||||||
|
let _ = Command::new("git")
|
||||||
|
.arg("-C")
|
||||||
|
.arg(&repo)
|
||||||
|
.args(["worktree", "remove", "--force"])
|
||||||
|
.arg(&worktree_dir)
|
||||||
|
.output();
|
||||||
|
let _ = fs::remove_dir_all(root);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user