Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
refactor(list): Refactor list display fields into DisplayFields
Maximilian Roos75abacb78b4f
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex 300ef7f10..14a7cda93 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -427,7 +427,8 @@ mod tests {#[test]fn test_column_width_calculation_with_unicode() {use crate::commands::list::model::{- AheadBehind, BranchDiffTotals, CommitDetails, UpstreamStatus, WorktreeInfo,+ AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,+ WorktreeInfo,};let info1 = WorktreeInfo {@@ -454,11 +455,8 @@ mod tests {upstream: UpstreamStatus::from_parts(Some("origin".to_string()), 4, 0),worktree_state: None,pr_status: None,- commits_display: None,+ display: DisplayFields::default(),working_diff_display: None,- branch_diff_display: None,- upstream_display: None,- ci_status_display: None,};let widths = calculate_column_widths(&[super::ListItem::Worktree(info1)]);@@ -499,7 +497,8 @@ mod tests {#[test]fn test_visible_columns_follow_gap_rule() {use crate::commands::list::model::{- AheadBehind, BranchDiffTotals, CommitDetails, UpstreamStatus, WorktreeInfo,+ AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,+ WorktreeInfo,};// Create test data with specific widths to verify position calculation@@ -527,11 +526,8 @@ mod tests {upstream: UpstreamStatus::from_parts(Some("origin".to_string()), 4, 2),worktree_state: None,pr_status: None,- commits_display: None,+ display: DisplayFields::default(),working_diff_display: None,- branch_diff_display: None,- upstream_display: None,- ci_status_display: None,};let items = vec![super::ListItem::Worktree(info)];@@ -583,7 +579,8 @@ mod tests {#[test]fn test_column_positions_with_hidden_columns() {use crate::commands::list::model::{- AheadBehind, BranchDiffTotals, CommitDetails, UpstreamStatus, WorktreeInfo,+ AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,+ WorktreeInfo,};// Create minimal data - most columns will be hidden@@ -611,11 +608,8 @@ mod tests {upstream: UpstreamStatus::default(),worktree_state: None,pr_status: None,- commits_display: None,+ display: DisplayFields::default(),working_diff_display: None,- branch_diff_display: None,- upstream_display: None,- ci_status_display: None,};let items = vec![super::ListItem::Worktree(info)];@@ -645,7 +639,8 @@ mod tests {#[test]fn test_consecutive_hidden_columns_skip_correctly() {use crate::commands::list::model::{- AheadBehind, BranchDiffTotals, CommitDetails, UpstreamStatus, WorktreeInfo,+ AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,+ WorktreeInfo,};// Create data where multiple consecutive columns are hidden:@@ -675,11 +670,8 @@ mod tests {upstream: UpstreamStatus::default(), // Hidden: no upstreamworktree_state: None, // Hidden: no statepr_status: None,- commits_display: None,+ display: DisplayFields::default(),working_diff_display: None,- branch_diff_display: None,- upstream_display: None,- ci_status_display: None,};let items = vec![super::ListItem::Worktree(info)];diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rsindex 918ff772c..918cd436d 100644--- a/src/commands/list/mod.rs+++ b/src/commands/list/mod.rs@@ -21,12 +21,7 @@ fn enrich_common_fields(branch_diff: &model::BranchDiffTotals,upstream: &model::UpstreamStatus,pr_status: &Option<ci_status::PrStatus>,-) -> (- Option<String>,- Option<String>,- Option<String>,- Option<String>,-) {+) -> model::DisplayFields {let commits_display = format_ahead_behind_plain(counts.ahead, counts.behind);let (added, deleted) = branch_diff.diff;@@ -40,48 +35,36 @@ fn enrich_common_fields(let ci_status_display = pr_status.as_ref().map(format_ci_status_plain);- (+ model::DisplayFields {commits_display,branch_diff_display,upstream_display,ci_status_display,- )+ }}/// Enrich a ListItem with display fields for json-pretty formatfn enrich_with_display_fields(mut item: ListItem) -> ListItem {match &mut item {ListItem::Worktree(info) => {- let (commits_display, branch_diff_display, upstream_display, ci_status_display) =- enrich_common_fields(- &info.counts,- &info.branch_diff,- &info.upstream,- &info.pr_status,- );-- info.commits_display = commits_display;- info.branch_diff_display = branch_diff_display;- info.upstream_display = upstream_display;- info.ci_status_display = ci_status_display;+ info.display = enrich_common_fields(+ &info.counts,+ &info.branch_diff,+ &info.upstream,+ &info.pr_status,+ );// Working tree specific fieldlet (added, deleted) = info.working_tree_diff;info.working_diff_display = format_diff_plain(added, deleted);}ListItem::Branch(info) => {- let (commits_display, branch_diff_display, upstream_display, ci_status_display) =- enrich_common_fields(- &info.counts,- &info.branch_diff,- &info.upstream,- &info.pr_status,- );-- info.commits_display = commits_display;- info.branch_diff_display = branch_diff_display;- info.upstream_display = upstream_display;- info.ci_status_display = ci_status_display;+ info.display = enrich_common_fields(+ &info.counts,+ &info.branch_diff,+ &info.upstream,+ &info.pr_status,+ );}}itemdiff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex 189ea5819..2a5b57fe7 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -5,6 +5,20 @@ use worktrunk::styling::{HINT, HINT_EMOJI, WARNING, WARNING_EMOJI, println};use super::ci_status::PrStatus;+/// Display fields shared between WorktreeInfo and BranchInfo+/// These contain formatted strings with ANSI colors for json-pretty output+#[derive(serde::Serialize, Default)]+pub struct DisplayFields {+ #[serde(skip_serializing_if = "Option::is_none")]+ pub commits_display: Option<String>,+ #[serde(skip_serializing_if = "Option::is_none")]+ pub branch_diff_display: Option<String>,+ #[serde(skip_serializing_if = "Option::is_none")]+ pub upstream_display: Option<String>,+ #[serde(skip_serializing_if = "Option::is_none")]+ pub ci_status_display: Option<String>,+}+#[derive(serde::Serialize)]pub struct WorktreeInfo {pub worktree: worktrunk::git::Worktree,@@ -22,16 +36,10 @@ pub struct WorktreeInfo {pub pr_status: Option<PrStatus>,// Display fields for json-pretty format (with ANSI colors)- #[serde(skip_serializing_if = "Option::is_none")]- pub commits_display: Option<String>,+ #[serde(flatten)]+ pub display: DisplayFields,#[serde(skip_serializing_if = "Option::is_none")]pub working_diff_display: Option<String>,- #[serde(skip_serializing_if = "Option::is_none")]- pub branch_diff_display: Option<String>,- #[serde(skip_serializing_if = "Option::is_none")]- pub upstream_display: Option<String>,- #[serde(skip_serializing_if = "Option::is_none")]- pub ci_status_display: Option<String>,}#[derive(serde::Serialize)]@@ -49,14 +57,8 @@ pub struct BranchInfo {pub pr_status: Option<PrStatus>,// Display fields for json-pretty format (with ANSI colors)- #[serde(skip_serializing_if = "Option::is_none")]- pub commits_display: Option<String>,- #[serde(skip_serializing_if = "Option::is_none")]- pub branch_diff_display: Option<String>,- #[serde(skip_serializing_if = "Option::is_none")]- pub upstream_display: Option<String>,- #[serde(skip_serializing_if = "Option::is_none")]- pub ci_status_display: Option<String>,+ #[serde(flatten)]+ pub display: DisplayFields,}#[derive(serde::Serialize, Clone)]@@ -274,10 +276,7 @@ impl BranchInfo {branch_diff,upstream,pr_status,- commits_display: None,- branch_diff_display: None,- upstream_display: None,- ci_status_display: None,+ display: DisplayFields::default(),})}}@@ -321,11 +320,8 @@ impl WorktreeInfo {upstream,worktree_state,pr_status,- commits_display: None,+ display: DisplayFields::default(),working_diff_display: None,- branch_diff_display: None,- upstream_display: None,- ci_status_display: None,})}}diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snapindex ecff4f78f..3646d59f5 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2EXKU6/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXgpxYO/test-config.toml---success: trueexit_code: 0@@ -82,8 +82,8 @@ exit_code: 0"worktree_state": null,"pr_status": null,"commits_display": "[GREEN]↑2[RESET] [DIM][RED]↓2[RESET]",- "working_diff_display": "[GREEN]+1[RESET] [RED]-1[RESET]",- "branch_diff_display": "[GREEN]+1[RESET]"+ "branch_diff_display": "[GREEN]+1[RESET]",+ "working_diff_display": "[GREEN]+1[RESET] [RED]-1[RESET]"},{"type": "worktree",