Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Rename "path mismatch" to "branch-worktree mismatch" (#418)
Maximilian Roos0755acf15f63
diff --git a/docs/content/list.md b/docs/content/list.mdindex 59937a43a..2c04d3097 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -125,7 +125,7 @@ The Status column has multiple subcolumns. Within each, only the first matching| | `⤴` | Rebase in progress || | `⤵` | Merge in progress || | `/` | Branch without worktree |-| | `⚑` | Worktree path doesn't match branch name |+| | `⚑` | Branch-worktree mismatch (branch name doesn't match worktree path) || | `⊟` | Prunable (directory missing) || | `⊞` | Locked worktree || Default branch | `^` | Is the default branch |@@ -230,7 +230,7 @@ wt list --format=json | jq '.[] | select(.main_state == "integrated" or .main_st| Field | Type | Description ||-------|------|-------------|-| `state` | string | `"path_mismatch"`, `"prunable"`, `"locked"` (absent when normal) |+| `state` | string | `"branch_worktree_mismatch"`, `"prunable"`, `"locked"` (absent when normal) || `reason` | string | Reason for locked/prunable state || `detached` | boolean | HEAD is detached |diff --git a/src/cli.rs b/src/cli.rsindex 02cbaf4ca..b28539671 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -2091,7 +2091,7 @@ The Status column has multiple subcolumns. Within each, only the first matching| | `⤴` | Rebase in progress || | `⤵` | Merge in progress || | `/` | Branch without worktree |-| | `⚑` | Worktree path doesn't match branch name |+| | `⚑` | Branch-worktree mismatch (branch name doesn't match worktree path) || | `⊟` | Prunable (directory missing) || | `⊞` | Locked worktree || Default branch | `^` | Is the default branch |@@ -2196,7 +2196,7 @@ wt list --format=json | jq '.[] | select(.main_state == "integrated" or .main_st| Field | Type | Description ||-------|------|-------------|-| `state` | string | `"path_mismatch"`, `"prunable"`, `"locked"` (absent when normal) |+| `state` | string | `"branch_worktree_mismatch"`, `"prunable"`, `"locked"` (absent when normal) || `reason` | string | Reason for locked/prunable state || `detached` | boolean | HEAD is detached |diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rsindex 75918f192..150842fbc 100644--- a/src/commands/list/collect.rs+++ b/src/commands/list/collect.rs@@ -769,12 +769,12 @@ pub fn collect(// Check if worktree is at its expected path based on config template// Use optimized variant with pre-computed default_branch and is_bare- let path_mismatch =+ let branch_worktree_mismatch =!is_worktree_at_expected_path_with(wt, repo, config, &default_branch, is_bare);let mut worktree_data =WorktreeData::from_worktree(wt, is_main, is_current, is_previous);- worktree_data.path_mismatch = path_mismatch;+ worktree_data.branch_worktree_mismatch = branch_worktree_mismatch;// URL expanded post-skeleton to minimize time-to-skeletonListItem {diff --git a/src/commands/list/json_output.rs b/src/commands/list/json_output.rsindex ce31fe3ec..67e6e8880 100644--- a/src/commands/list/json_output.rs+++ b/src/commands/list/json_output.rs@@ -191,7 +191,7 @@ pub struct JsonRemote {/// Worktree-specific state#[derive(Debug, Clone, Serialize)]pub struct JsonWorktree {- /// Worktree state: "no_worktree", "path_mismatch", "prunable", "locked" (absent when normal)+ /// Worktree state: "no_worktree", "branch_worktree_mismatch", "prunable", "locked" (absent when normal)#[serde(skip_serializing_if = "Option::is_none")]pub state: Option<&'static str>,@@ -384,7 +384,9 @@ fn worktree_state_to_json(match symbols.worktree_state {WorktreeState::None => {}WorktreeState::Branch => return (Some("no_worktree"), None),- WorktreeState::PathMismatch => return (Some("path_mismatch"), None),+ WorktreeState::BranchWorktreeMismatch => {+ return (Some("branch_worktree_mismatch"), None);+ }WorktreeState::Prunable => return (Some("prunable"), data.prunable.clone()),WorktreeState::Locked => return (Some("locked"), data.locked.clone()),}@@ -631,7 +633,7 @@ mod tests {working_tree_diff: None,working_tree_diff_with_main: None,git_operation: GitOperationState::None,- path_mismatch: false,+ branch_worktree_mismatch: false,working_diff_display: None,}}@@ -666,11 +668,12 @@ mod tests {}#[test]- fn test_worktree_state_to_json_path_mismatch() {+ fn test_worktree_state_to_json_branch_worktree_mismatch() {let data = make_worktree_data();- let symbols = make_status_symbols_with_worktree_state(WorktreeState::PathMismatch);+ let symbols =+ make_status_symbols_with_worktree_state(WorktreeState::BranchWorktreeMismatch);let (state, reason) = worktree_state_to_json(&data, Some(&symbols));- assert_eq!(state, Some("path_mismatch"));+ assert_eq!(state, Some("branch_worktree_mismatch"));assert!(reason.is_none());}diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex b9a8a0996..cbdca40ff 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -95,7 +95,7 @@//! which means empty penalties don't apply in progressive mode.//!//! Exceptions that we can compute instantly from items:-//! - `path`: true only if any worktree has `path_mismatch` (computed from items)+//! - `path`: true only if any worktree has `branch_worktree_mismatch` (computed from items)//! - `branch_diff`/`ci_status`: false if their required task is skipped//!//! Other columns (status, working_diff, ahead_behind, upstream) require expensive git operations,@@ -258,7 +258,7 @@ pub struct ColumnDataFlags {pub upstream: bool,pub url: bool,pub ci_status: bool,- pub path: bool, // True if any worktree has path_mismatch (path doesn't match template)+ pub path: bool, // True if any worktree has branch_worktree_mismatch}/// Layout metadata including position mask for Status column@@ -559,7 +559,7 @@ fn estimate_url_width(url_template: Option<&str>, longest_branch: Option<&str>)fn build_estimated_widths(max_branch: usize,skip_tasks: &HashSet<TaskKind>,- has_path_mismatch: bool,+ has_branch_worktree_mismatch: bool,url_width: usize,) -> LayoutMetadata {// Fixed widths for slow columns (require expensive git operations)@@ -580,7 +580,7 @@ fn build_estimated_widths(// before the data arrives, so empty penalties don't apply properly.//// Exceptions that we can compute instantly from items:- // - path: true only if any worktree has path_mismatch (path doesn't match template)+ // - path: true only if any worktree has branch_worktree_mismatch// - branch_diff/ci_status: false if their required task is skippedlet data_flags = ColumnDataFlags {status: true,@@ -590,7 +590,7 @@ fn build_estimated_widths(upstream: true,url: !skip_tasks.contains(&TaskKind::UrlStatus),ci_status: !skip_tasks.contains(&TaskKind::CiStatus),- path: has_path_mismatch,+ path: has_branch_worktree_mismatch,};// URL width estimated from template + longest branch (or fallback)@@ -880,18 +880,23 @@ pub fn calculate_layout_with_width(.unwrap_or(0);let max_path_width = fit_header(ColumnKind::Path.header(), path_data_width);- // Check if any worktree has a path that doesn't match the expected template.+ // Check if any worktree has a branch-worktree mismatch.// Path column is only useful when there's a mismatch; otherwise it's redundant with branch.- let has_path_mismatch = items+ let has_branch_worktree_mismatch = items.iter().filter_map(|item| item.worktree_data())- .any(|data| data.path_mismatch);+ .any(|data| data.branch_worktree_mismatch);// Estimate URL width from template + longest branchlet url_width = estimate_url_width(url_template, longest_branch);// Build pre-allocated width estimates (same as buffered mode)- let metadata = build_estimated_widths(max_branch, skip_tasks, has_path_mismatch, url_width);+ let metadata = build_estimated_widths(+ max_branch,+ skip_tasks,+ has_branch_worktree_mismatch,+ url_width,+ );let commit_width = fit_header(ColumnKind::Commit.header(), COMMIT_HASH_WIDTH);@@ -1129,7 +1134,7 @@ mod tests {fn test_pre_allocated_width_estimates() {// Test that build_estimated_widths() returns correct pre-allocated estimates// Empty skip set means all tasks are computed (equivalent to --full)- // has_path_mismatch=true to test the path flag is passed through+ // has_branch_worktree_mismatch=true to test the path flag is passed through// url_width=0 since we're not testing URL column herelet metadata = build_estimated_widths(20, &HashSet::new(), true, 0);let widths = metadata.widths;@@ -1238,7 +1243,7 @@ mod tests {is_main: false,is_current: false,is_previous: false,- path_mismatch: false,+ branch_worktree_mismatch: false,working_diff_display: None,})),};@@ -1336,7 +1341,7 @@ mod tests {is_main: true, // Primary worktree: no ahead/behind shownis_current: false,is_previous: false,- path_mismatch: false,+ branch_worktree_mismatch: false,working_diff_display: None,})),};diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex 830c665bb..fe1a960b1 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -90,10 +90,10 @@ pub struct WorktreeData {/// Whether this was the previous worktree (from WT_PREVIOUS_BRANCH)#[serde(skip_serializing_if = "std::ops::Not::not")]pub is_previous: bool,- /// Whether the worktree path doesn't match what the template would generate.+ /// Whether the worktree is at an unexpected location (branch-worktree mismatch)./// Only true when: has branch name, not main worktree, and path differs from template.#[serde(skip_serializing_if = "std::ops::Not::not")]- pub path_mismatch: bool,+ pub branch_worktree_mismatch: bool,#[serde(skip_serializing_if = "Option::is_none")]pub working_diff_display: Option<String>,}@@ -494,9 +494,9 @@ impl ListItem {ItemKind::Worktree(data) => {// Full status computation for worktrees- // Worktree location state - priority: path_mismatch > prunable > locked- let worktree_state = if data.path_mismatch {- WorktreeState::PathMismatch+ // Worktree location state - priority: branch_worktree_mismatch > prunable > locked+ let worktree_state = if data.branch_worktree_mismatch {+ WorktreeState::BranchWorktreeMismatch} else if data.prunable.is_some() {WorktreeState::Prunable} else if data.locked.is_some() {@@ -727,15 +727,15 @@ impl Divergence {/// - For worktrees: whether the path matches the template, or has issues/// - For branches (without worktree): shows / to distinguish from worktrees///-/// Priority order for worktrees: PathMismatch > Prunable > Locked+/// Priority order for worktrees: BranchWorktreeMismatch > Prunable > Locked#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]pub enum WorktreeState {#[strum(serialize = "")]/// Normal worktree (path matches template, not locked or prunable)#[default]None,- /// Path doesn't match what the template would generate (red flag = "not at home")- PathMismatch,+ /// Branch-worktree mismatch: path doesn't match what the template would generate+ BranchWorktreeMismatch,/// Prunable (worktree directory missing)Prunable,/// Locked (protected from removal)@@ -748,7 +748,7 @@ impl std::fmt::Display for WorktreeState {fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {match self {Self::None => Ok(()),- Self::PathMismatch => write!(f, "⚑"),+ Self::BranchWorktreeMismatch => write!(f, "⚑"),Self::Prunable => write!(f, "⊟"),Self::Locked => write!(f, "⊞"),Self::Branch => write!(f, "/"),@@ -1021,7 +1021,7 @@ impl PositionMask {1, // STAGED: + (1 char)1, // MODIFIED: ! (1 char)1, // UNTRACKED: ? (1 char)- 1, // WORKTREE_STATE: ✘⤴⤵/⚑⊟⊞ (1 char, priority: conflicts > rebase > merge > path_mismatch > prunable > locked > branch)+ 1, // WORKTREE_STATE: ✘⤴⤵/⚑⊟⊞ (1 char, priority: conflicts > rebase > merge > branch_worktree_mismatch > prunable > locked > branch)1, // MAIN_STATE: ^✗_–⊂↕↑↓ (1 char, priority: is_main > would_conflict > empty > same_commit > integrated > diverged > ahead > behind)1, // UPSTREAM_DIVERGENCE: |⇡⇣⇅ (1 char)2, // USER_MARKER: single emoji or two chars (allocate 2)@@ -1051,7 +1051,7 @@ impl PositionMask {/// - ✘: Actual conflicts (must resolve)/// - ⤴: Rebase in progress/// - ⤵: Merge in progress-/// - ⚑: Worktree path doesn't match branch name+/// - ⚑: Branch-worktree mismatch/// - ⊟: Prunable (directory missing)/// - ⊞: Locked worktree/// - /: Branch without worktree@@ -1207,8 +1207,10 @@ impl StatusSymbols {WorktreeState::None => (String::new(), false),// Branch indicator (/) is informational (dimmed)WorktreeState::Branch => (cformat!("<dim>{}</>", self.worktree_state), true),- // Path mismatch (⚑) is a stronger warning (red)- WorktreeState::PathMismatch => (cformat!("<red>{}</>", self.worktree_state), true),+ // Branch-worktree mismatch (⚑) is a stronger warning (red)+ WorktreeState::BranchWorktreeMismatch => {+ (cformat!("<red>{}</>", self.worktree_state), true)+ }// Other worktree attrs (⊟⊞) are warnings (yellow)_ => (cformat!("<yellow>{}</>", self.worktree_state), true),}@@ -1634,7 +1636,7 @@ mod tests {#[test]fn test_worktree_state_display() {assert_eq!(format!("{}", WorktreeState::None), "");- assert_eq!(format!("{}", WorktreeState::PathMismatch), "⚑");+ assert_eq!(format!("{}", WorktreeState::BranchWorktreeMismatch), "⚑");assert_eq!(format!("{}", WorktreeState::Prunable), "⊟");assert_eq!(format!("{}", WorktreeState::Locked), "⊞");assert_eq!(format!("{}", WorktreeState::Branch), "/");@@ -1646,7 +1648,7 @@ mod tests {let json = serde_json::to_string(&WorktreeState::None).unwrap();assert_eq!(json, "\"\"");- let json = serde_json::to_string(&WorktreeState::PathMismatch).unwrap();+ let json = serde_json::to_string(&WorktreeState::BranchWorktreeMismatch).unwrap();assert_eq!(json, "\"⚑\"");let json = serde_json::to_string(&WorktreeState::Branch).unwrap();diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 3740d78a8..8b26cbd91 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -352,7 +352,7 @@ impl SwitchResult {pub struct SwitchBranchInfo {/// The branch being switched topub branch: String,- /// Expected path when there's a path mismatch (None = path matches template)+ /// Expected path when there's a branch-worktree mismatch (None = path matches template)pub expected_path: Option<PathBuf>,}@@ -495,9 +495,9 @@ pub fn handle_switch(.map(|cur| cur == &canonical_path).unwrap_or(false);- // Check if the actual path matches the expected path.+ // Check if the actual path matches the expected path (branch-worktree mismatch detection).let canonical_expected = canonicalize(&expected_path).unwrap_or(expected_path.clone());- let path_mismatch = if canonical_path != canonical_expected {+ let mismatch_path = if canonical_path != canonical_expected {Some(expected_path.clone())} else {None@@ -510,7 +510,7 @@ pub fn handle_switch(};let branch_info = SwitchBranchInfo {branch: resolved_branch.clone(),- expected_path: path_mismatch,+ expected_path: mismatch_path,};(result, branch_info)};diff --git a/src/md_help.rs b/src/md_help.rsindex b6e0626f8..e6b2b024d 100644--- a/src/md_help.rs+++ b/src/md_help.rs@@ -328,7 +328,7 @@ fn colorize_status_symbols(text: &str) -> String {result = replace_dim(result, "⤵", warning);result = replace_dim(result, "✗", warning);- // Worktree state: PathMismatch (red), Prunable/Locked (yellow)+ // Worktree state: BranchWorktreeMismatch (red), Prunable/Locked (yellow)result = replace_dim(result, "⚑", error);result = replace_dim(result, "⊟", warning);result = replace_dim(result, "⊞", warning);diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 025927bac..168776854 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -297,11 +297,12 @@ pub fn handle_switch_output(Some(compute_shell_warning_reason())};- // Show path mismatch warning after the main message- let path_mismatch_warning = branch_info.expected_path.as_ref().map(|expected| {+ // Show branch-worktree mismatch warning after the main message+ let branch_worktree_mismatch_warning = branch_info.expected_path.as_ref().map(|expected| {let expected_display = format_path_for_display(expected);+ let branch = &branch_info.branch;warning_message(cformat!(- "Worktree path doesn't match branch name; expected <bold>{expected_display}</> <red>⚑</>"+ "Branch-worktree mismatch; expected <bold>{branch}</> @ <bold>{expected_display}</> <red>⚑</>"))});@@ -311,7 +312,7 @@ pub fn handle_switch_output(super::print(info_message(cformat!("Already on worktree for <bold>{branch}</> @ <bold>{path_display}</>")))?;- if let Some(warning) = path_mismatch_warning {+ if let Some(warning) = branch_worktree_mismatch_warning {super::print(warning)?;}// User is already there - no path annotation needed@@ -320,7 +321,7 @@ pub fn handle_switch_output(SwitchResult::Existing(_) => {if let Some(reason) = &shell_warning_reason {// Shell integration not active — single warning with context- if let Some(warning) = path_mismatch_warning {+ if let Some(warning) = branch_worktree_mismatch_warning {super::print(warning)?;}if let Some(cmd) = execute_command {@@ -345,7 +346,7 @@ pub fn handle_switch_output(super::print(info_message(format_switch_message(branch, path, false, None, None,)))?;- if let Some(warning) = path_mismatch_warning {+ if let Some(warning) = branch_worktree_mismatch_warning {super::print(warning)?;}// cd will happen - no path annotation needed@@ -389,7 +390,7 @@ pub fn handle_switch_output(// cd will happen - no path annotation neededNone}- // Note: No path_mismatch_warning — created worktrees are always at+ // Note: No branch_worktree_mismatch_warning — created worktrees are always at// the expected path (SwitchBranchInfo::expected_path is None)}};diff --git a/tests/integration_tests/switch.rs b/tests/integration_tests/switch.rsindex 5968ca346..ce9120b02 100644--- a/tests/integration_tests/switch.rs+++ b/tests/integration_tests/switch.rs@@ -464,7 +464,7 @@ fn test_switch_no_warning_when_branch_matches(mut repo: TestRepo) {/// Test switching to a worktree at an unexpected path shows a hint#[rstest]-fn test_switch_path_mismatch_shows_hint(repo: TestRepo) {+fn test_switch_branch_worktree_mismatch_shows_hint(repo: TestRepo) {// Create a worktree at a non-standard path (sibling to repo, not following template)let wrong_path = repo.root_path().parent().unwrap().join("wrong-path");repo.run_git(&[@@ -475,16 +475,20 @@ fn test_switch_path_mismatch_shows_hint(repo: TestRepo) {"feature",]);- // Switch to feature - should show hint about path mismatch- snapshot_switch_with_directive_file("switch_path_mismatch_shows_hint", &repo, &["feature"]);+ // Switch to feature - should show hint about branch-worktree mismatch+ snapshot_switch_with_directive_file(+ "switch_branch_worktree_mismatch_shows_hint",+ &repo,+ &["feature"],+ );}-/// Test path mismatch warning without shell integration.+/// Test branch-worktree mismatch warning without shell integration.///-/// When shell integration is not active, the path mismatch warning should appear+/// When shell integration is not active, the branch-worktree mismatch warning should appear/// alongside the "cannot change directory" warning.#[rstest]-fn test_switch_path_mismatch_without_shell_integration(repo: TestRepo) {+fn test_switch_branch_worktree_mismatch_without_shell_integration(repo: TestRepo) {// Create a worktree at a non-standard pathlet wrong_path = repo.root_path()@@ -501,18 +505,18 @@ fn test_switch_path_mismatch_without_shell_integration(repo: TestRepo) {// Switch without directive file (no shell integration) - should show both warningssnapshot_switch(- "switch_path_mismatch_no_shell",+ "switch_branch_worktree_mismatch_no_shell",&repo,&["feature-mismatch"],);}-/// Test AlreadyAt with path mismatch.+/// Test AlreadyAt with branch-worktree mismatch.////// When already in a worktree whose path doesn't match the branch name,-/// switching to that branch should show the path mismatch warning.+/// switching to that branch should show the branch-worktree mismatch warning.#[rstest]-fn test_switch_already_at_with_path_mismatch(repo: TestRepo) {+fn test_switch_already_at_with_branch_worktree_mismatch(repo: TestRepo) {// Create a worktree at a non-standard pathlet wrong_path = repo.root_path()@@ -527,9 +531,9 @@ fn test_switch_already_at_with_path_mismatch(repo: TestRepo) {"feature-already",]);- // Switch from within the worktree with mismatched path (AlreadyAt case)+ // Switch from within the worktree with branch-worktree mismatch (AlreadyAt case)snapshot_switch_from_dir(- "switch_already_at_path_mismatch",+ "switch_already_at_branch_worktree_mismatch",&repo,&["feature-already"],&wrong_path,diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex 4c240aab6..3bba67680 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -134,7 +134,7 @@ The Status column has multiple subcolumns. Within each, only the first matching⤴ Rebase in progress⤵ Merge in progress/ Branch without worktree- ⚑ Worktree path doesn't match branch name+ ⚑ Branch-worktree mismatch (branch name doesn't match worktree path)⊟ Prunable (directory missing)⊞ Locked worktreeDefault branch ^ Is the default branch@@ -235,11 +235,11 @@ Query structured data with [2m--format=json[0m:[1mworktree object- Field Type Description- ──────── ─────── ──────────────────────────────────────────────────────────- state string "path_mismatch", "prunable", "locked" (absent when normal)- reason string Reason for locked/prunable state- detached boolean HEAD is detached+ Field Type Description+ ──────── ─────── ─────────────────────────────────────────────────────────────────────+ state string "branch_worktree_mismatch", "prunable", "locked" (absent when normal)+ reason string Reason for locked/prunable state+ detached boolean HEAD is detached[1mci objectdiff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snapindex 8aa48a5cd..7b7090b9b 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap@@ -132,19 +132,20 @@ to view or clear.The Status column has multiple subcolumns. Within each, only the first matchingsymbol is shown (listed in priority order):- Subcolumn Symbol Meaning- ──────────────── ────── ───────────────────────────────────────- Working tree (1) + Staged files- Working tree (2) ! Modified files (unstaged)- Working tree (3) ? Untracked files- Worktree ✘ Merge conflicts- ⤴ Rebase in progress- ⤵ Merge in progress- / Branch without worktree- ⚑ Worktree path doesn't match branch name- ⊟ Prunable (directory missing)- ⊞ Locked worktree- Default branch ^ Is the default branch+ Subcolumn Symbol Meaning+ ──────────────── ────── ────────────────────────────────────────────────────+ Working tree (1) + Staged files+ Working tree (2) ! Modified files (unstaged)+ Working tree (3) ? Untracked files+ Worktree ✘ Merge conflicts+ ⤴ Rebase in progress+ ⤵ Merge in progress+ / Branch without worktree+ ⚑ Branch-worktree mismatch (branch name doesn't match+ worktree path)+ ⊟ Prunable (directory missing)+ ⊞ Locked worktree+ Default branch ^ Is the default branch| | [33m✗[0m | Would conflict if merged to the default branch (with [2m--full[0m,includes uncommitted changes) |_ Same commit as the default branch, clean@@ -255,8 +256,8 @@ deleted}[2m |Field Type Description───── ──── ───────────-| [2mstate[0m | string | [2m"path_mismatch"[0m, [2m"prunable"[0m, [2m"locked"[0m (absent when-normal) |+| [2mstate[0m | string | [2m"branch_worktree_mismatch"[0m, [2m"prunable"[0m, [2m"locked"+(absent when normal) |reason string Reason for locked/prunable statedetached boolean HEAD is detacheddiff --git a/tests/snapshots/integration__integration_tests__switch__switch_already_at_path_mismatch.snap b/tests/snapshots/integration__integration_tests__switch__switch_already_at_branch_worktree_mismatch.snapsimilarity index 87%rename from tests/snapshots/integration__integration_tests__switch__switch_already_at_path_mismatch.snaprename to tests/snapshots/integration__integration_tests__switch__switch_already_at_branch_worktree_mismatch.snapindex d23d88367..270a75455 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_already_at_path_mismatch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_already_at_branch_worktree_mismatch.snap@@ -32,5 +32,5 @@ exit_code: 0----- stderr -----[2m○[22m Already on worktree for [1mfeature-already[22m @ [1m[PROJECT_ID][22m-[33m▲[39m [33mWorktree path doesn't match branch name; expected [1m_REPO_.feature-already[22m [31m⚑[39m[39m+[33m▲[39m [33mBranch-worktree mismatch; expected [1mfeature-already[22m @ [1m_REPO_.feature-already[22m [31m⚑[39m[39m[2m↳[22m [2mTo enable automatic cd, run [90mwt config shell install[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_no_shell.snap b/tests/snapshots/integration__integration_tests__switch__switch_branch_worktree_mismatch_no_shell.snapsimilarity index 88%rename from tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_no_shell.snaprename to tests/snapshots/integration__integration_tests__switch__switch_branch_worktree_mismatch_no_shell.snapindex a1fd6c32f..f7af740b4 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_no_shell.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_branch_worktree_mismatch_no_shell.snap@@ -31,6 +31,6 @@ exit_code: 0----- stdout ---------- stderr ------[33m▲[39m [33mWorktree path doesn't match branch name; expected [1m_REPO_.feature-mismatch[22m [31m⚑[39m[39m+[33m▲[39m [33mBranch-worktree mismatch; expected [1mfeature-mismatch[22m @ [1m_REPO_.feature-mismatch[22m [31m⚑[39m[39m[33m▲[39m [33mWorktree for [1mfeature-mismatch[22m @ [1m[PROJECT_ID][22m, but cannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [90mwt config shell install[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_shows_hint.snap b/tests/snapshots/integration__integration_tests__switch__switch_branch_worktree_mismatch_shows_hint.snapsimilarity index 88%rename from tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_shows_hint.snaprename to tests/snapshots/integration__integration_tests__switch__switch_branch_worktree_mismatch_shows_hint.snapindex 58f7ed2be..3ffec9e31 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_shows_hint.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_branch_worktree_mismatch_shows_hint.snap@@ -33,4 +33,4 @@ exit_code: 0----- stderr -----[2m○[22m Switched to worktree for [1mfeature[22m @ [1m[PROJECT_ID][22m-[33m▲[39m [33mWorktree path doesn't match branch name; expected [1m_REPO_.feature[22m [31m⚑[39m[39m+[33m▲[39m [33mBranch-worktree mismatch; expected [1mfeature[22m @ [1m_REPO_.feature[22m [31m⚑[39m[39m