Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Feat: Format TOML arrays as multiline for improved readability

Maximilian Roos56db53d984b9
diff --git a/README.md b/README.md
index 3ca172a4e..08bf6d479 100644
--- a/README.md
+++ b/README.md
@@ -63,10 +63,10 @@ merge, cleanup.
```console
$ wt list
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ⇡0 ⇣0 b834638e 10mo Initial commit
-+ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug
-+ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo ⇡0 ⇣0 b834638e 10mo Initial commit
++ bugfix-y ↑ ↑1 ./repo.bugfix-y 412a27c8 10mo Fix bug
++ feature-x + ↑ +5 ↑3 ./repo.feature-x 7fd821aa 10mo Add file 3
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
```
@@ -931,12 +931,12 @@ git config worktrunk.status.feature-x "💬"
```console
$ wt list
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ clean-no-status ∅ ./clean-no-status b834638e 10mo Initial commit
-+ clean-with-status ∅ 💬 ./clean-with-status b834638e 10mo Initial commit
-+ dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10mo Initial commit
-+ dirty-with-status ?∅ 🤖 ./dirty-with-status b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ clean-no-status ∅ ./repo.clean-no-status b834638e 10mo Initial commit
++ clean-with-status ∅ 💬 ./repo.clean-with-status b834638e 10mo Initial commit
++ dirty-no-status ! +1 -1 ./repo.dirty-no-status b834638e 10mo Initial commit
++ dirty-with-status ?∅ 🤖 ./repo.dirty-with-status b834638e 10mo Initial commit
⚪ Showing 5 worktrees, 1 with changes
```
@@ -960,12 +960,12 @@ When using Claude:
```console
$ wt list
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ clean-no-status ∅ ./clean-no-status b834638e 10mo Initial commit
-+ clean-with-status ∅ 💬 ./clean-with-status b834638e 10mo Initial commit
-+ dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10mo Initial commit
-+ dirty-with-status ?∅ 🤖 ./dirty-with-status b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ clean-no-status ∅ ./repo.clean-no-status b834638e 10mo Initial commit
++ clean-with-status ∅ 💬 ./repo.clean-with-status b834638e 10mo Initial commit
++ dirty-no-status ! +1 -1 ./repo.dirty-no-status b834638e 10mo Initial commit
++ dirty-with-status ?∅ 🤖 ./repo.dirty-with-status b834638e 10mo Initial commit
⚪ Showing 5 worktrees, 1 with changes
```
@@ -1048,7 +1048,7 @@ Commands from project hooks and LLM configuration require approval on first run.
<!-- ⚠️ AUTO-GENERATED from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap — edit source to update -->
```
-🟡 test-repo needs approval to execute 3 commands:
+🟡 repo needs approval to execute 3 commands:
⚪ post-create install:
echo 'Installing dependencies...'
diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rs
index 787be1271..f10c69e1c 100644
--- a/src/commands/list/collect.rs
+++ b/src/commands/list/collect.rs
@@ -292,6 +292,7 @@ pub fn collect(
check_merge_tree_conflicts: bool,
show_progress: bool,
render_table: bool,
+ config: &worktrunk::config::WorktrunkConfig,
) -> anyhow::Result<Option<super::model::ListData>> {
use super::progressive_table::ProgressiveTable;
@@ -318,6 +319,13 @@ pub fn collect(
current_worktree_path.as_ref(),
);
+ // Get main worktree directory name for path template expansion
+ let main_worktree_name = main_worktree
+ .path
+ .file_name()
+ .and_then(|n| n.to_str())
+ .unwrap_or("");
+
// Get branches early for layout calculation and skeleton creation (when --branches is used)
// Sort by timestamp (most recent first)
let branches_without_worktrees = if show_branches {
@@ -347,6 +355,43 @@ pub fn collect(
let is_previous = previous_branch
.as_deref()
.is_some_and(|prev| wt.branch.as_deref() == Some(prev));
+
+ // Compute path mismatch: does the actual path match what the template would generate?
+ // Main worktree on default branch is the reference point (no mismatch possible)
+ // Main worktree on OTHER branch should show mismatch (it's "not at home")
+ let path_mismatch = if is_main && wt.branch.as_deref() == Some(default_branch.as_str())
+ {
+ false
+ } else if let Some(branch) = &wt.branch {
+ // Expand template and compare with actual path
+ match config.format_path(main_worktree_name, branch) {
+ Ok(expected_relative) => {
+ // Template path is relative to main worktree, resolve it
+ let expected_path = main_worktree.path.join(&expected_relative);
+ // Canonicalize both paths for comparison (handles symlinks, .., etc.)
+ let actual_canonical = wt.path.canonicalize().ok();
+ let expected_canonical = expected_path.canonicalize().ok();
+ match (actual_canonical, expected_canonical) {
+ (Some(actual), Some(expected)) => actual != expected,
+ // Can't canonicalize one or both paths (e.g., worktree deleted,
+ // expected parent doesn't exist). Fall back to direct comparison.
+ _ => wt.path != expected_path,
+ }
+ }
+ Err(e) => {
+ log::debug!("Template expansion failed for branch {}: {}", branch, e);
+ false // Template expansion failed, don't mark as mismatch
+ }
+ }
+ } else {
+ // Detached HEAD - not on any branch, so "not at home"
+ true
+ };
+
+ let mut worktree_data =
+ WorktreeData::from_worktree(wt, is_main, is_current, is_previous);
+ worktree_data.path_mismatch = path_mismatch;
+
ListItem {
head: wt.head.clone(),
branch: wt.branch.clone(),
@@ -357,12 +402,7 @@ pub fn collect(
pr_status: None,
status_symbols: None,
display: DisplayFields::default(),
- kind: ItemKind::Worktree(Box::new(WorktreeData::from_worktree(
- wt,
- is_main,
- is_current,
- is_previous,
- ))),
+ kind: ItemKind::Worktree(Box::new(worktree_data)),
}
})
.collect();
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 99caba1ae..eeb65519e 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -851,6 +851,7 @@ mod tests {
is_main: false,
is_current: false,
is_previous: false,
+ path_mismatch: false,
working_diff_display: None,
})),
};
@@ -936,6 +937,7 @@ mod tests {
is_main: true, // Primary worktree: no ahead/behind shown
is_current: false,
is_previous: false,
+ path_mismatch: false,
working_diff_display: None,
})),
};
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rs
index ec4cde512..c4d35930c 100644
--- a/src/commands/list/mod.rs
+++ b/src/commands/list/mod.rs
@@ -143,6 +143,7 @@ pub fn handle_list(
show_remotes: bool,
show_full: bool,
render_mode: RenderMode,
+ config: &worktrunk::config::WorktrunkConfig,
) -> anyhow::Result<()> {
let repo = Repository::current();
@@ -167,6 +168,7 @@ pub fn handle_list(
check_merge_tree_conflicts,
show_progress,
render_table,
+ config,
)?;
let Some(ListData { items }) = list_data else {
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 836b51eb7..f68bc918e 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -89,6 +89,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.
+ /// 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,
#[serde(skip_serializing_if = "Option::is_none")]
pub working_diff_display: Option<String>,
}
@@ -420,13 +424,15 @@ impl ListItem {
// Full status computation for worktrees
// Use default_branch directly (None for main worktree)
- // Worktree state - priority: prunable > locked (1 char max)
- let worktree_state = if data.prunable.is_some() {
- "⌫".to_string() // Prunable (directory missing)
+ // Worktree state - priority: path_mismatch > prunable > locked
+ let worktree_state = if data.path_mismatch {
+ WorktreeState::PathMismatch
+ } else if data.prunable.is_some() {
+ WorktreeState::Prunable
} else if data.locked.is_some() {
- "⊠".to_string() // Locked (protected)
+ WorktreeState::Locked
} else {
- String::new()
+ WorktreeState::None
};
// Determine base branch state (only for non-main worktrees with base branch)
@@ -487,7 +493,7 @@ impl ListItem {
self.status_symbols = Some(StatusSymbols {
branch_op_state,
- worktree_state: "⎇".to_string(), // Branch indicator
+ worktree_state: WorktreeState::Branch,
main_divergence,
upstream_divergence,
working_tree: String::new(),
@@ -661,6 +667,50 @@ impl UpstreamDivergence {
}
}
+/// Worktree state indicator
+///
+/// Shows the "location" state of a worktree or branch:
+/// - 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
+#[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 (white flag = "not at home")
+ PathMismatch,
+ /// Prunable (worktree directory missing)
+ Prunable,
+ /// Locked (protected from removal)
+ Locked,
+ /// Branch indicator (for branches without worktrees)
+ Branch,
+}
+
+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::Prunable => write!(f, "⌫"),
+ Self::Locked => write!(f, "⊠"),
+ Self::Branch => write!(f, "⎇"),
+ }
+ }
+}
+
+impl serde::Serialize for WorktreeState {
+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+ where
+ S: serde::Serializer,
+ {
+ serializer.serialize_str(&self.to_string())
+ }
+}
+
/// Combined branch and operation state
///
/// Represents the primary state of a branch/worktree in a single position.
@@ -772,7 +822,7 @@ impl PositionMask {
1, // BRANCH_OP_STATE: ✖↻⋈⚠≡∅ (1 char, priority: conflicts > rebase > merge > merge-tree > no-commits > matches)
1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)
1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)
- 1, // WORKTREE_STATE: ⎇ for branches, ⌫⊠ for worktrees (priority-only: prunable > locked)
+ 1, // WORKTREE_STATE: ⎇ for branches, ⚐⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)
2, // USER_STATUS: single emoji or two chars (allocate 2)
],
};
@@ -790,7 +840,7 @@ impl PositionMask {
/// - Branch/op state: ✖, ↻, ⋈, ⚠, ≡, ∅ (combined position with priority)
/// - Main divergence: ^, ↑, ↓, ↕
/// - Upstream divergence: ⇡, ⇣, ⇅
-/// - Worktree state: ⎇ for branches, ⌫⊠ for worktrees (priority-only)
+/// - Worktree state: ⎇ for branches, ⚐⌫⊠ for worktrees (priority-only)
/// - User status: custom labels, emoji
///
/// ## Mutual Exclusivity
@@ -809,8 +859,8 @@ impl PositionMask {
/// - ⇡ vs ⇣ vs ⇅: Upstream divergence (UpstreamDivergence enum)
///
/// **Priority-only (can co-occur but only highest priority shown):**
-/// - ⌫ vs ⊠: Worktree attrs (priority: prunable ⌫ > locked ⊠)
-/// - ⎇: Branch indicator (mutually exclusive with ⌫⊠ as branches can't have worktree attrs)
+/// - ⚐ vs ⌫ vs ⊠: Worktree attrs (priority: path_mismatch ⚐ > prunable ⌫ > locked ⊠)
+/// - ⎇: Branch indicator (mutually exclusive with ⚐⌫⊠ as branches can't have worktree attrs)
///
/// **NOT mutually exclusive (can co-occur):**
/// - Working tree symbols (+!?): Can have multiple types of changes
@@ -820,9 +870,8 @@ pub struct StatusSymbols {
/// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚠) > MatchesMain (≡) > NoCommits (∅)
pub(crate) branch_op_state: BranchOpState,
- /// Worktree state: ⎇ for branches, ⌫⊠ for worktrees (priority-only: prunable > locked)
- /// Priority-only rendering (shows highest priority symbol when multiple states exist)
- pub(crate) worktree_state: String,
+ /// Worktree state: ⎇ for branches, ⚐⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)
+ pub(crate) worktree_state: WorktreeState,
/// Main branch divergence state (mutually exclusive)
pub(crate) main_divergence: MainDivergence,
@@ -884,15 +933,10 @@ impl StatusSymbols {
let (staged_str, has_staged) = style_working('+');
let (modified_str, has_modified) = style_working('!');
let (untracked_str, has_untracked) = style_working('?');
- let worktree_state_str = if !self.worktree_state.is_empty() {
- // Branch indicator (⎇) is informational (dimmed), worktree attrs (⌫⊠) are warnings (yellow)
- if self.worktree_state == "⎇" {
- format!("{HINT}{}{HINT:#}", self.worktree_state)
- } else {
- format!("{WARNING}{}{WARNING:#}", self.worktree_state)
- }
- } else {
- String::new()
+ let worktree_state_str = match self.worktree_state {
+ WorktreeState::None => String::new(),
+ WorktreeState::Branch => format!("{HINT}{}{HINT:#}", self.worktree_state),
+ _ => format!("{WARNING}{}{WARNING:#}", self.worktree_state),
};
let user_status_str = self.user_status.as_deref().unwrap_or("").to_string();
@@ -924,7 +968,7 @@ impl StatusSymbols {
(
PositionMask::WORKTREE_STATE,
worktree_state_str,
- !self.worktree_state.is_empty(),
+ self.worktree_state != WorktreeState::None,
),
(
PositionMask::USER_STATUS,
@@ -960,7 +1004,7 @@ impl StatusSymbols {
/// Check if symbols are empty
pub fn is_empty(&self) -> bool {
self.branch_op_state == BranchOpState::None
- && self.worktree_state.is_empty()
+ && self.worktree_state == WorktreeState::None
&& self.main_divergence == MainDivergence::None
&& self.upstream_divergence == UpstreamDivergence::None
&& self.working_tree.is_empty()
@@ -983,9 +1027,12 @@ impl StatusSymbols {
result.push_str(&styled);
}
- // Worktree state (locked/prunable) - skip branch indicator (⎇)
+ // Worktree state (path mismatch/locked/prunable) - skip branch indicator (⎇)
// Note: ⎇ only appears for branch-only items, never for worktrees (statusline context)
- if !self.worktree_state.is_empty() && self.worktree_state != "⎇" {
+ if matches!(
+ self.worktree_state,
+ WorktreeState::PathMismatch | WorktreeState::Prunable | WorktreeState::Locked
+ ) {
result.push_str(&format!("{WARNING}{}{WARNING:#}", self.worktree_state));
}
@@ -1061,16 +1108,8 @@ impl serde::Serialize for StatusSymbols {
let main_divergence_variant: &'static str = self.main_divergence.into();
let upstream_divergence_variant: &'static str = self.upstream_divergence.into();
- // Worktree state: ⎇ = Branch, ⌫ = Prunable, ⊠ = Locked
- let worktree_state_variant = if self.worktree_state.contains('⌫') {
- "Prunable"
- } else if self.worktree_state.contains('⊠') {
- "Locked"
- } else if self.worktree_state.contains('⎇') {
- "Branch"
- } else {
- ""
- };
+ // Worktree state (derived via strum::IntoStaticStr)
+ let worktree_state_variant: &'static str = self.worktree_state.into();
let queryable_status = QueryableStatus {
working_tree: WorkingTreeChanges::from_symbols(&self.working_tree),
@@ -1086,7 +1125,7 @@ impl serde::Serialize for StatusSymbols {
branch_op_state: self.branch_op_state.to_string(),
main_divergence: self.main_divergence.to_string(),
upstream_divergence: self.upstream_divergence.to_string(),
- worktree_state: self.worktree_state.clone(),
+ worktree_state: self.worktree_state.to_string(),
user_status: self.user_status.clone(),
};
diff --git a/src/commands/select.rs b/src/commands/select.rs
index c33c45a4c..6904b1982 100644
--- a/src/commands/select.rs
+++ b/src/commands/select.rs
@@ -473,6 +473,11 @@ pub fn handle_select(is_directive_mode: bool) -> anyhow::Result<()> {
// Initialize preview mode state file (auto-cleanup on drop)
let _state = PreviewState::new();
+ // Load config (or use default) for path mismatch detection
+ let config = WorktrunkConfig::load()
+ .inspect_err(|e| log::warn!("Config load failed, using defaults: {}", e))
+ .unwrap_or_default();
+
// Gather list data using simplified collection (buffered mode)
let Some(list_data) = collect::collect(
&repo, true, // show_branches (include branches without worktrees)
@@ -482,6 +487,7 @@ pub fn handle_select(is_directive_mode: bool) -> anyhow::Result<()> {
false, // check_conflicts (no conflict checking with select command)
false, // show_progress (no progress bars)
false, // render_table (select renders its own UI)
+ &config,
)?
else {
return Ok(());
diff --git a/src/main.rs b/src/main.rs
index 4233ca228..8e1f8cebc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -590,7 +590,14 @@ fn main() {
_ => None,
};
let render_mode = RenderMode::detect(progressive_opt, cli.internal);
- handle_list(format, show_branches, show_remotes, show_full, render_mode)
+ handle_list(
+ format,
+ show_branches,
+ show_remotes,
+ show_full,
+ render_mode,
+ &config,
+ )
})
}
Commands::Switch {
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index a7e188a47..ac6ac0d81 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -118,7 +118,7 @@ impl TestRepo {
pub fn new() -> Self {
let temp_dir = TempDir::new().unwrap();
// Create main repo as a subdirectory so worktrees can be siblings
- let root = temp_dir.path().join("test-repo");
+ let root = temp_dir.path().join("repo");
std::fs::create_dir(&root).unwrap();
// Canonicalize to resolve symlinks (important on macOS where /var is symlink to /private/var)
let root = root.canonicalize().unwrap();
@@ -332,9 +332,15 @@ impl TestRepo {
}
/// Add a worktree with the given name and branch
- pub fn add_worktree(&mut self, name: &str, branch: &str) -> PathBuf {
- // Create worktree inside temp directory to ensure cleanup
- let worktree_path = self.temp_dir.path().join(name);
+ ///
+ /// The worktree path follows the default template format: `repo.{branch}`
+ /// (sanitized, with slashes replaced by dashes).
+ pub fn add_worktree(&mut self, branch: &str) -> PathBuf {
+ // Sanitize branch name the same way the template does (see src/config/expansion.rs)
+ let safe_branch = branch.replace(['/', '\\'], "-");
+ // Use default template path format: ../{{ main_worktree }}.{{ branch }}
+ // From {temp_dir}/repo, this resolves to {temp_dir}/repo.{branch}
+ let worktree_path = self.temp_dir.path().join(format!("repo.{}", safe_branch));
let mut cmd = Command::new("git");
self.configure_git_cmd(&mut cmd);
@@ -360,8 +366,9 @@ impl TestRepo {
// Canonicalize worktree path to match what git returns
let canonical_path = worktree_path.canonicalize().unwrap();
+ // Use branch as key (consistent with path generation)
self.worktrees
- .insert(name.to_string(), canonical_path.clone());
+ .insert(branch.to_string(), canonical_path.clone());
canonical_path
}
@@ -371,7 +378,7 @@ impl TestRepo {
/// in the standard location expected by merge tests. Returns the path to the
/// created worktree.
pub fn add_main_worktree(&self) -> PathBuf {
- let main_wt = self.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = self.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
self.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -381,14 +388,24 @@ impl TestRepo {
main_wt
}
- /// Detach HEAD in the repository
+ /// Detach HEAD in the main repository
pub fn detach_head(&self) {
+ self.detach_head_at(&self.root);
+ }
+
+ /// Detach HEAD in a specific worktree
+ pub fn detach_head_in_worktree(&self, name: &str) {
+ let worktree_path = self.worktree_path(name);
+ self.detach_head_at(worktree_path);
+ }
+
+ fn detach_head_at(&self, path: &Path) {
// Get current commit SHA
let mut cmd = Command::new("git");
self.configure_git_cmd(&mut cmd);
let output = cmd
.args(["rev-parse", "HEAD"])
- .current_dir(&self.root)
+ .current_dir(path)
.output()
.unwrap();
@@ -397,7 +414,7 @@ impl TestRepo {
let mut cmd = Command::new("git");
self.configure_git_cmd(&mut cmd);
cmd.args(["checkout", "--detach", &sha])
- .current_dir(&self.root)
+ .current_dir(path)
.output()
.unwrap();
}
diff --git a/tests/common/progressive_output.rs b/tests/common/progressive_output.rs
index dad53a79d..de3535da1 100644
--- a/tests/common/progressive_output.rs
+++ b/tests/common/progressive_output.rs
@@ -29,7 +29,7 @@
//! fn test_progressive_rendering() {
//! let mut repo = TestRepo::new();
//! repo.commit("Initial");
-//! repo.add_worktree("feature", "feature");
+//! repo.add_worktree("feature");
//!
//! // Capture using byte-based strategy (deterministic for behavioral tests)
//! let output = capture_progressive_output(
diff --git a/tests/helpers/setup-select-test/src/main.rs b/tests/helpers/setup-select-test/src/main.rs
index 77a495494..d4db8845e 100644
--- a/tests/helpers/setup-select-test/src/main.rs
+++ b/tests/helpers/setup-select-test/src/main.rs
@@ -24,7 +24,7 @@ fn main() {
}
fs::create_dir(&temp_base).unwrap();
- let root = temp_base.join("test-repo");
+ let root = temp_base.join("repo");
fs::create_dir(&root).unwrap();
let root = root.canonicalize().unwrap();
diff --git a/tests/integration_tests/bare_repository.rs b/tests/integration_tests/bare_repository.rs
index 7aa6a2b90..4579fcde2 100644
--- a/tests/integration_tests/bare_repository.rs
+++ b/tests/integration_tests/bare_repository.rs
@@ -15,7 +15,7 @@ struct BareRepoTest {
impl BareRepoTest {
fn new() -> Self {
let temp_dir = tempfile::TempDir::new().unwrap();
- let bare_repo_path = temp_dir.path().join("test-repo.git");
+ let bare_repo_path = temp_dir.path().join("repo.git");
let test_config_path = temp_dir.path().join("test-config.toml");
let mut test = Self {
@@ -160,10 +160,10 @@ fn test_bare_repo_list_worktrees() {
let test = BareRepoTest::new();
// Create two worktrees
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Initial commit on main");
- let feature_worktree = test.create_worktree("feature", "test-repo.feature");
+ let feature_worktree = test.create_worktree("feature", "repo.feature");
test.commit_in_worktree(&feature_worktree, "Work on feature");
let settings = setup_temp_snapshot_settings(test.temp_path());
@@ -182,7 +182,7 @@ fn test_bare_repo_list_shows_no_bare_entry() {
let test = BareRepoTest::new();
// Create one worktree
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Initial commit");
// Run wt list and verify bare repo is NOT shown
@@ -204,7 +204,7 @@ fn test_bare_repo_switch_creates_worktree() {
let test = BareRepoTest::new();
// Create initial worktree
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Initial commit");
// Use default template (sibling worktrees): ../{{ main_worktree }}.{{ branch }}
@@ -244,7 +244,7 @@ fn test_bare_repo_switch_creates_worktree() {
);
// Verify the new worktree was created as sibling with dot separator
- // Default template: ../{{ main_worktree }}.{{ branch }} -> test-repo.git.feature
+ // Default template: ../{{ main_worktree }}.{{ branch }} -> repo.git.feature
let bare_name = test.bare_repo_path().file_name().unwrap().to_str().unwrap();
let expected_path = test.temp_path().join(format!("{}.feature", bare_name));
assert!(
@@ -277,11 +277,11 @@ fn test_bare_repo_switch_with_default_naming() {
let test = BareRepoTest::new();
// Create initial worktree
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Initial commit");
// Use default naming pattern (should still work with bare repos)
- // Default is "../{{ main_worktree }}.{{ branch }}" which becomes "test-repo.git.feature"
+ // Default is "../{{ main_worktree }}.{{ branch }}" which becomes "repo.git.feature"
let mut cmd = wt_command();
test.configure_wt_cmd(&mut cmd);
cmd.args(["switch", "--create", "feature", "--internal"])
@@ -312,10 +312,10 @@ fn test_bare_repo_remove_worktree() {
let test = BareRepoTest::new();
// Create two worktrees
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Initial commit");
- let feature_worktree = test.create_worktree("feature", "test-repo.feature");
+ let feature_worktree = test.create_worktree("feature", "repo.feature");
test.commit_in_worktree(&feature_worktree, "Feature work");
// Remove feature worktree from main worktree
@@ -349,11 +349,11 @@ fn test_bare_repo_identifies_primary_correctly() {
let test = BareRepoTest::new();
// Create multiple worktrees
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Main commit");
- let _feature1 = test.create_worktree("feature1", "test-repo.feature1");
- let _feature2 = test.create_worktree("feature2", "test-repo.feature2");
+ let _feature1 = test.create_worktree("feature1", "repo.feature1");
+ let _feature2 = test.create_worktree("feature2", "repo.feature2");
// Run wt list to see which is marked as primary
let mut cmd = wt_command();
@@ -373,7 +373,7 @@ fn test_bare_repo_worktree_base_used_for_paths() {
let test = BareRepoTest::new();
// Create initial worktree
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Initial commit");
// Use default template - creates sibling worktrees with dot separator
@@ -388,7 +388,7 @@ fn test_bare_repo_worktree_base_used_for_paths() {
cmd.output().unwrap();
// Verify path is created as sibling to bare repo (using worktree_base)
- // Default template: ../{{ main_worktree }}.{{ branch }} -> test-repo.git.dev
+ // Default template: ../{{ main_worktree }}.{{ branch }} -> repo.git.dev
let bare_name = test.bare_repo_path().file_name().unwrap().to_str().unwrap();
let expected = test.temp_path().join(format!("{}.dev", bare_name));
assert!(
@@ -452,7 +452,7 @@ fn test_bare_repo_commands_from_bare_directory() {
let test = BareRepoTest::new();
// Create a worktree so the repo has some content
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Initial commit");
// Run wt list from the bare repo directory itself (not from a worktree)
@@ -482,7 +482,7 @@ fn test_bare_repo_merge_workflow() {
let test = BareRepoTest::new();
// Create main worktree
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Initial commit on main");
// Use default template - creates sibling worktrees with dot separator
@@ -561,7 +561,7 @@ fn test_bare_repo_background_logs_location() {
let test = BareRepoTest::new();
// Create main worktree
- let main_worktree = test.create_worktree("main", "test-repo.main");
+ let main_worktree = test.create_worktree("main", "repo.main");
test.commit_in_worktree(&main_worktree, "Initial commit");
// Create feature worktree
diff --git a/tests/integration_tests/column_alignment_verification.rs b/tests/integration_tests/column_alignment_verification.rs
index 6a64c7e4b..d4a381138 100644
--- a/tests/integration_tests/column_alignment_verification.rs
+++ b/tests/integration_tests/column_alignment_verification.rs
@@ -314,9 +314,9 @@ fn test_alignment_verification_with_varying_content() {
repo.commit("Initial commit");
// Create diverse worktrees to test alignment
- repo.add_worktree("main-feature", "main-feature");
- repo.add_worktree("short", "short");
- repo.add_worktree("very-long-branch-name-here", "very-long");
+ repo.add_worktree("main-feature");
+ repo.add_worktree("short");
+ repo.add_worktree("very-long");
// Add files to create working tree diffs
let feature_path = repo.worktrees.get("main-feature").unwrap();
@@ -352,9 +352,9 @@ fn test_alignment_with_unicode_content() {
repo.commit("Initial commit with émoji 🎉");
// Create worktrees with unicode in names
- repo.add_worktree("café", "cafe");
- repo.add_worktree("naïve-approach", "naive");
- repo.add_worktree("résumé-feature", "resume");
+ repo.add_worktree("cafe");
+ repo.add_worktree("naive");
+ repo.add_worktree("resume");
// Run wt list
let mut cmd = wt_command();
@@ -381,17 +381,17 @@ fn test_alignment_with_sparse_columns() {
repo.commit("Initial commit");
// Create mix of worktrees - some with diffs, some without
- repo.add_worktree("no-changes-1", "no-changes-1");
+ repo.add_worktree("no-changes-1");
- repo.add_worktree("with-changes", "with-changes");
+ repo.add_worktree("with-changes");
let changes_path = repo.worktrees.get("with-changes").unwrap();
for i in 0..100 {
std::fs::write(changes_path.join(format!("file{}.txt", i)), "content").unwrap();
}
- repo.add_worktree("no-changes-2", "no-changes-2");
+ repo.add_worktree("no-changes-2");
- repo.add_worktree("small-change", "small-change");
+ repo.add_worktree("small-change");
let small_path = repo.worktrees.get("small-change").unwrap();
std::fs::write(small_path.join("one.txt"), "x").unwrap();
@@ -421,29 +421,29 @@ fn test_alignment_real_world_scenario() {
// Create feature branches with varying amounts of working tree changes
// This simulates a real-world scenario with different diff sizes
- repo.add_worktree("feature-tiny", "feature-tiny");
+ repo.add_worktree("feature-tiny");
let tiny_path = repo.worktrees.get("feature-tiny").unwrap();
std::fs::write(tiny_path.join("file.txt"), "x").unwrap();
- repo.add_worktree("feature-small", "feature-small");
+ repo.add_worktree("feature-small");
let small_path = repo.worktrees.get("feature-small").unwrap();
for i in 0..10 {
std::fs::write(small_path.join(format!("file{}.txt", i)), "content").unwrap();
}
- repo.add_worktree("feature-medium", "feature-medium");
+ repo.add_worktree("feature-medium");
let medium_path = repo.worktrees.get("feature-medium").unwrap();
for i in 0..100 {
std::fs::write(medium_path.join(format!("file{}.txt", i)), "content").unwrap();
}
- repo.add_worktree("feature-large", "feature-large");
+ repo.add_worktree("feature-large");
let large_path = repo.worktrees.get("feature-large").unwrap();
for i in 0..1000 {
std::fs::write(large_path.join(format!("file{}.txt", i)), "content").unwrap();
}
- repo.add_worktree("no-changes", "no-changes");
+ repo.add_worktree("no-changes");
// No changes on this one
// Run wt list at a width where Dirty column is visible
@@ -470,8 +470,8 @@ fn test_alignment_at_different_terminal_widths() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("feature-a", "feature-a");
- repo.add_worktree("feature-b", "feature-b");
+ repo.add_worktree("feature-a");
+ repo.add_worktree("feature-b");
let path_a = repo.worktrees.get("feature-a").unwrap();
std::fs::write(path_a.join("file.txt"), "content").unwrap();
diff --git a/tests/integration_tests/completion.rs b/tests/integration_tests/completion.rs
index 9c5354e97..99275de75 100644
--- a/tests/integration_tests/completion.rs
+++ b/tests/integration_tests/completion.rs
@@ -66,7 +66,7 @@ fn test_complete_switch_shows_all_branches_including_worktrees() {
temp.commit("initial");
// Create worktree (this creates a new branch "feature/new")
- temp.add_worktree("feature-worktree", "feature/new");
+ temp.add_worktree("feature/new");
// Create another branch without worktree
Command::new("git")
@@ -94,7 +94,7 @@ fn test_complete_push_shows_all_branches() {
temp.commit("initial");
// Create worktree (creates "feature/new" branch)
- temp.add_worktree("feature-worktree", "feature/new");
+ temp.add_worktree("feature/new");
// Create another branch without worktree
Command::new("git")
@@ -365,8 +365,8 @@ fn test_complete_switch_shows_all_branches_even_with_worktrees() {
temp.commit("initial");
// Create two branches, both with worktrees
- temp.add_worktree("feature-worktree", "feature/new");
- temp.add_worktree("hotfix-worktree", "hotfix/bug");
+ temp.add_worktree("feature/new");
+ temp.add_worktree("hotfix/bug");
// From the main worktree, test completion - should show all branches
let output = temp.completion_cmd(&["wt", "switch", ""]).output().unwrap();
@@ -463,7 +463,7 @@ fn test_complete_merge_shows_branches() {
temp.commit("initial");
// Create worktree (creates "feature/new" branch)
- temp.add_worktree("feature-worktree", "feature/new");
+ temp.add_worktree("feature/new");
// Create another branch without worktree
Command::new("git")
@@ -664,7 +664,7 @@ fn test_complete_remove_shows_branches() {
temp.commit("initial");
// Create worktree (creates "feature/new" branch)
- temp.add_worktree("feature-worktree", "feature/new");
+ temp.add_worktree("feature/new");
// Create another branch without worktree
Command::new("git")
@@ -1024,8 +1024,8 @@ fn test_complete_remove_flexible_argument_ordering() {
temp.commit("initial");
// Create two worktrees
- temp.add_worktree("feature-worktree", "feature");
- temp.add_worktree("bugfix-worktree", "bugfix");
+ temp.add_worktree("feature");
+ temp.add_worktree("bugfix");
// Test that .last(true) allows positional before flags
// wt remove feature --no-delete-branch <cursor>
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index 561205477..3885bafbb 100644
--- a/tests/integration_tests/directives.rs
+++ b/tests/integration_tests/directives.rs
@@ -128,7 +128,7 @@ fn test_merge_internal_no_remove() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -137,7 +137,7 @@ fn test_merge_internal_no_remove() {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -182,7 +182,7 @@ fn test_merge_internal_remove() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -191,7 +191,7 @@ fn test_merge_internal_remove() {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
diff --git a/tests/integration_tests/e2e_shell_post_start.rs b/tests/integration_tests/e2e_shell_post_start.rs
index dd8e44631..565f3b7e4 100644
--- a/tests/integration_tests/e2e_shell_post_start.rs
+++ b/tests/integration_tests/e2e_shell_post_start.rs
@@ -35,7 +35,7 @@ fn test_shell_integration_post_start_background(#[case] shell: &str) {
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["sleep 0.05 && echo 'Background task done' > bg_marker.txt"]
"#,
)
@@ -68,11 +68,7 @@ approved-commands = ["sleep 0.05 && echo 'Background task done' > bg_marker.txt"
);
// Verify background command actually ran
- let worktree_path = repo
- .root_path()
- .parent()
- .unwrap()
- .join("test-repo.bg-feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.bg-feature");
// First check if log file was created (proves process was spawned)
// Logs are centralized in the common git directory
@@ -135,7 +131,7 @@ task2 = "sleep 0.05 && echo 'Task 2' > task2.txt"
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"sleep 0.05 && echo 'Task 1' > task1.txt",
"sleep 0.05 && echo 'Task 2' > task2.txt",
@@ -171,7 +167,7 @@ approved-commands = [
.root_path()
.parent()
.unwrap()
- .join("test-repo.parallel-test");
+ .join("repo.parallel-test");
wait_for_file(
worktree_path.join("task1.txt").as_path(),
@@ -205,7 +201,7 @@ fn test_bash_shell_integration_post_create_blocks() {
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'Setup done' > setup.txt"]
"#,
)
@@ -218,7 +214,7 @@ approved-commands = ["echo 'Setup done' > setup.txt"]
.root_path()
.parent()
.unwrap()
- .join("test-repo.blocking-test");
+ .join("repo.blocking-test");
let script = format!(
r#"
export PATH="{}:$PATH"
@@ -279,7 +275,7 @@ fish_bg = "sleep 0.05 && echo 'Fish background done' > fish_bg.txt"
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["sleep 0.05 && echo 'Fish background done' > fish_bg.txt"]
"#,
)
@@ -309,11 +305,7 @@ approved-commands = ["sleep 0.05 && echo 'Fish background done' > fish_bg.txt"]
);
// Wait for background command AND flush content (allow plenty of margin on CI)
- let worktree_path = repo
- .root_path()
- .parent()
- .unwrap()
- .join("test-repo.fish-bg-test");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.fish-bg-test");
let marker_file = worktree_path.join("fish_bg.txt");
wait_for_file_content(marker_file.as_path(), Duration::from_secs(2));
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index 1fd4a73a5..4f946dee0 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -139,7 +139,7 @@ fn setup_timestamped_worktrees(repo: &mut TestRepo) -> std::path::PathBuf {
}
// 1. Create feature-current (01:00) - we'll run test from here
- let current_path = repo.add_worktree("feature-current", "feature-current");
+ let current_path = repo.add_worktree("feature-current");
commit_at_time(
repo,
&current_path,
@@ -149,7 +149,7 @@ fn setup_timestamped_worktrees(repo: &mut TestRepo) -> std::path::PathBuf {
);
// 2. Create feature-newest (03:00) - most recent, should be 3rd
- let newest_path = repo.add_worktree("feature-newest", "feature-newest");
+ let newest_path = repo.add_worktree("feature-newest");
commit_at_time(
repo,
&newest_path,
@@ -159,7 +159,7 @@ fn setup_timestamped_worktrees(repo: &mut TestRepo) -> std::path::PathBuf {
);
// 3. Create feature-middle (02:00) - should be 4th
- let middle_path = repo.add_worktree("feature-middle", "feature-middle");
+ let middle_path = repo.add_worktree("feature-middle");
commit_at_time(
repo,
&middle_path,
@@ -169,7 +169,7 @@ fn setup_timestamped_worktrees(repo: &mut TestRepo) -> std::path::PathBuf {
);
// 4. Create feature-oldest (00:30) - should be 5th
- let oldest_path = repo.add_worktree("feature-oldest", "feature-oldest");
+ let oldest_path = repo.add_worktree("feature-oldest");
commit_at_time(
repo,
&oldest_path,
@@ -214,8 +214,8 @@ fn test_list_multiple_worktrees() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("feature-a", "feature-a");
- repo.add_worktree("feature-b", "feature-b");
+ repo.add_worktree("feature-a");
+ repo.add_worktree("feature-b");
snapshot_list("multiple_worktrees", &repo);
}
@@ -226,7 +226,7 @@ fn test_list_previous_worktree_gutter() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("feature", "feature");
+ repo.add_worktree("feature");
// Use wt switch to establish history: main -> feature -> main
// After this, "feature" is the previous branch
@@ -255,12 +255,25 @@ fn test_list_detached_head() {
snapshot_list("detached_head", &repo);
}
+#[test]
+fn test_list_detached_head_in_worktree() {
+ // Non-main worktree in detached HEAD SHOULD show path mismatch flag
+ // (detached HEAD = "not at home", not on any branch)
+ let mut repo = TestRepo::new();
+ repo.commit("Initial commit");
+
+ repo.add_worktree("feature");
+ repo.detach_head_in_worktree("feature");
+
+ snapshot_list("detached_head_in_worktree", &repo);
+}
+
#[test]
fn test_list_locked_worktree() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("locked-feature", "locked-feature");
+ repo.add_worktree("locked-feature");
repo.lock_worktree("locked-feature", Some("Testing lock functionality"));
snapshot_list("locked_worktree", &repo);
@@ -271,7 +284,7 @@ fn test_list_locked_no_reason() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("locked-no-reason", "locked-no-reason");
+ repo.add_worktree("locked-no-reason");
repo.lock_worktree("locked-no-reason", None);
snapshot_list("locked_no_reason", &repo);
@@ -286,7 +299,7 @@ fn test_list_long_commit_message() {
// Create commit with very long message
repo.commit("This is a very long commit message that should test how the message column handles truncation and word boundary detection in the list output");
- repo.add_worktree("feature-a", "feature-a");
+ repo.add_worktree("feature-a");
repo.commit("Short message");
snapshot_list("long_commit_message", &repo);
@@ -301,7 +314,7 @@ fn test_list_unicode_commit_message() {
// Create commit with Unicode message
repo.commit("Add support for 日本語 and émoji 🎉");
- repo.add_worktree("feature-test", "feature-test");
+ repo.add_worktree("feature-test");
repo.commit("Fix bug with café ☕ handling");
snapshot_list("unicode_commit_message", &repo);
@@ -313,14 +326,14 @@ fn test_list_many_worktrees_with_varied_stats() {
repo.commit("Initial commit");
// Create multiple worktrees with different characteristics
- repo.add_worktree("short", "short");
+ repo.add_worktree("short");
- repo.add_worktree("medium-name", "medium-name");
+ repo.add_worktree("medium-name");
- repo.add_worktree("very-long-branch-name-here", "very-long-branch-name-here");
+ repo.add_worktree("very-long-branch-name-here");
// Add some with files to create diff stats
- repo.add_worktree("with-changes", "with-changes");
+ repo.add_worktree("with-changes");
snapshot_list("many_worktrees_varied", &repo);
}
@@ -334,10 +347,10 @@ fn test_list_json_with_metadata() {
repo.commit("Initial commit");
// Create worktree with detached head
- repo.add_worktree("feature-detached", "feature-detached");
+ repo.add_worktree("feature-detached");
// Create locked worktree
- repo.add_worktree("locked-feature", "locked-feature");
+ repo.add_worktree("locked-feature");
repo.lock_worktree("locked-feature", Some("Testing"));
snapshot_list_json("json_with_metadata", &repo);
@@ -354,7 +367,7 @@ fn test_list_with_branches_flag() {
create_branch(&repo, "fix-bug");
// Create one branch with a worktree
- repo.add_worktree("feature-with-worktree", "feature-with-worktree");
+ repo.add_worktree("feature-with-worktree");
snapshot_list_with_branches("with_branches_flag", &repo);
}
@@ -365,8 +378,8 @@ fn test_list_with_branches_flag_no_available() {
repo.commit("Initial commit");
// All branches have worktrees (only main exists and has worktree)
- repo.add_worktree("feature-a", "feature-a");
- repo.add_worktree("feature-b", "feature-b");
+ repo.add_worktree("feature-a");
+ repo.add_worktree("feature-b");
snapshot_list_with_branches("with_branches_flag_none_available", &repo);
}
@@ -451,7 +464,7 @@ fn test_list_with_remotes_filters_existing_worktrees() {
repo.setup_remote("main");
// Create a worktree and push the branch
- repo.add_worktree("feature-with-worktree", "feature-with-worktree");
+ repo.add_worktree("feature-with-worktree");
push_branch(&repo, "feature-with-worktree");
// Create a branch, push it, delete it locally (remote-only)
@@ -478,7 +491,7 @@ fn test_list_json_with_display_fields() {
repo.commit("Initial commit on main");
// Create feature branch with commits (ahead of main)
- repo.add_worktree("feature-ahead", "feature-ahead");
+ repo.add_worktree("feature-ahead");
// Make commits in the feature worktree
let feature_path = repo.worktree_path("feature-ahead");
@@ -510,7 +523,7 @@ fn test_list_json_with_display_fields() {
std::fs::write(feature_path.join("feature.txt"), "modified content").unwrap();
// Create another feature that will be behind after main advances
- repo.add_worktree("feature-behind", "feature-behind");
+ repo.add_worktree("feature-behind");
// Make more commits on main (so feature-behind is behind)
repo.commit("Main commit 1");
@@ -540,7 +553,7 @@ fn test_list_with_upstream_tracking() {
repo.setup_remote("main");
// Scenario 1: Branch in sync with remote (should show ↑0 ↓0)
- let in_sync_wt = repo.add_worktree("in-sync", "in-sync");
+ let in_sync_wt = repo.add_worktree("in-sync");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["push", "-u", "origin", "in-sync"])
@@ -549,7 +562,7 @@ fn test_list_with_upstream_tracking() {
.unwrap();
// Scenario 2: Branch ahead of remote (should show ↑2)
- let ahead_wt = repo.add_worktree("ahead", "ahead");
+ let ahead_wt = repo.add_worktree("ahead");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["push", "-u", "origin", "ahead"])
@@ -587,7 +600,7 @@ fn test_list_with_upstream_tracking() {
.unwrap();
// Scenario 3: Branch behind remote (should show ↓1)
- let behind_wt = repo.add_worktree("behind", "behind");
+ let behind_wt = repo.add_worktree("behind");
std::fs::write(behind_wt.join("behind.txt"), "behind").unwrap();
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
@@ -616,7 +629,7 @@ fn test_list_with_upstream_tracking() {
.unwrap();
// Scenario 4: Branch both ahead and behind (should show ↑1 ↓1)
- let diverged_wt = repo.add_worktree("diverged", "diverged");
+ let diverged_wt = repo.add_worktree("diverged");
std::fs::write(diverged_wt.join("diverged.txt"), "diverged").unwrap();
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
@@ -658,7 +671,7 @@ fn test_list_with_upstream_tracking() {
.unwrap();
// Scenario 5: Branch without upstream (should show blank)
- repo.add_worktree("no-upstream", "no-upstream");
+ repo.add_worktree("no-upstream");
// Run list --branches --full to show all columns including Remote
let mut settings = setup_snapshot_settings(&repo);
@@ -687,8 +700,8 @@ fn test_list_primary_on_different_branch() {
repo.switch_primary_to("develop");
assert_eq!(repo.current_branch(), "develop");
- repo.add_worktree("feature-a", "feature-a");
- repo.add_worktree("feature-b", "feature-b");
+ repo.add_worktree("feature-a");
+ repo.add_worktree("feature-b");
snapshot_list("list_primary_on_different_branch", &repo);
}
@@ -699,7 +712,7 @@ fn test_list_with_user_status() {
repo.commit("Initial commit");
// Worktree with user status only (no git changes)
- repo.add_worktree("clean-with-status", "clean-with-status");
+ repo.add_worktree("clean-with-status");
// Set user status (emoji only, branch-keyed)
let mut cmd = Command::new("git");
@@ -710,7 +723,7 @@ fn test_list_with_user_status() {
.unwrap();
// Worktree with both git status and user status
- let dirty_wt = repo.add_worktree("dirty-with-status", "dirty-with-status");
+ let dirty_wt = repo.add_worktree("dirty-with-status");
// Set user status (emoji only, branch-keyed)
let mut cmd = Command::new("git");
@@ -724,11 +737,11 @@ fn test_list_with_user_status() {
std::fs::write(dirty_wt.join("new.txt"), "content").unwrap();
// Worktree with git status only (no user status)
- let dirty_no_status_wt = repo.add_worktree("dirty-no-status", "dirty-no-status");
+ let dirty_no_status_wt = repo.add_worktree("dirty-no-status");
std::fs::write(dirty_no_status_wt.join("file.txt"), "content").unwrap();
// Worktree with neither (control)
- repo.add_worktree("clean-no-status", "clean-no-status");
+ repo.add_worktree("clean-no-status");
snapshot_list("with_user_status", &repo);
}
@@ -739,7 +752,7 @@ fn test_list_json_with_user_status() {
repo.commit("Initial commit");
// Worktree with user status (emoji only)
- repo.add_worktree("with-status", "with-status");
+ repo.add_worktree("with-status");
// Set user status (branch-keyed)
let mut cmd = Command::new("git");
@@ -750,7 +763,7 @@ fn test_list_json_with_user_status() {
.unwrap();
// Worktree without user status
- repo.add_worktree("without-status", "without-status");
+ repo.add_worktree("without-status");
snapshot_list_json("json_with_user_status", &repo);
}
@@ -787,7 +800,7 @@ fn test_list_user_status_with_special_characters() {
repo.commit("Initial commit");
// Test with single emoji
- repo.add_worktree("emoji", "emoji");
+ repo.add_worktree("emoji");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
@@ -797,7 +810,7 @@ fn test_list_user_status_with_special_characters() {
.unwrap();
// Test with compound emoji (multi-codepoint)
- repo.add_worktree("multi", "multi");
+ repo.add_worktree("multi");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
@@ -819,8 +832,8 @@ fn test_readme_example_simple_list() {
repo.setup_remote("main");
// Create worktrees with various states
- let feature_x = repo.add_worktree("feature-x", "feature-x");
- let bugfix_y = repo.add_worktree("bugfix-y", "bugfix-y");
+ let feature_x = repo.add_worktree("feature-x");
+ let bugfix_y = repo.add_worktree("bugfix-y");
// feature-x: ahead with uncommitted changes
// Make 3 commits
@@ -878,8 +891,8 @@ fn test_readme_example_simple_list() {
fn test_list_progressive_flag() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("feature-a", "feature-a");
- repo.add_worktree("feature-b", "feature-b");
+ repo.add_worktree("feature-a");
+ repo.add_worktree("feature-b");
// Force progressive mode even in non-TTY test environment
// Output should be identical to buffered mode (only process differs)
@@ -890,7 +903,7 @@ fn test_list_progressive_flag() {
fn test_list_no_progressive_flag() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("feature", "feature");
+ repo.add_worktree("feature");
// Explicitly force buffered mode
snapshot_list_no_progressive("no_progressive_flag", &repo);
@@ -902,7 +915,7 @@ fn test_list_progressive_with_branches() {
repo.commit("Initial commit");
// Create worktrees
- repo.add_worktree("feature-a", "feature-a");
+ repo.add_worktree("feature-a");
// Create branches without worktrees
create_branch(&repo, "orphan-1");
@@ -930,9 +943,9 @@ fn test_list_task_dag_multiple_worktrees() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("feature-a", "feature-a");
- repo.add_worktree("feature-b", "feature-b");
- repo.add_worktree("feature-c", "feature-c");
+ repo.add_worktree("feature-a");
+ repo.add_worktree("feature-b");
+ repo.add_worktree("feature-c");
snapshot_list_task_dag("task_dag_multiple_worktrees", &repo);
}
@@ -943,11 +956,11 @@ fn test_list_task_dag_full_with_diffs() {
repo.commit("Initial commit");
// Create worktree with changes
- let feature_a = repo.add_worktree("feature-a", "feature-a");
+ let feature_a = repo.add_worktree("feature-a");
std::fs::write(feature_a.join("new.txt"), "content").unwrap();
// Create another worktree with commits
- let feature_b = repo.add_worktree("feature-b", "feature-b");
+ let feature_b = repo.add_worktree("feature-b");
std::fs::write(feature_b.join("file.txt"), "test").unwrap();
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
@@ -972,7 +985,7 @@ fn test_list_task_dag_with_upstream() {
repo.setup_remote("main");
// Branch in sync
- let in_sync = repo.add_worktree("in-sync", "in-sync");
+ let in_sync = repo.add_worktree("in-sync");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["push", "-u", "origin", "in-sync"])
@@ -981,7 +994,7 @@ fn test_list_task_dag_with_upstream() {
.unwrap();
// Branch ahead
- let ahead = repo.add_worktree("ahead", "ahead");
+ let ahead = repo.add_worktree("ahead");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["push", "-u", "origin", "ahead"])
@@ -1009,7 +1022,7 @@ fn test_list_task_dag_many_worktrees() {
// Create 10 worktrees to test parallel processing
for i in 1..=10 {
- repo.add_worktree(&format!("feature-{}", i), &format!("feature-{}", i));
+ repo.add_worktree(&format!("feature-{}", i));
}
snapshot_list_task_dag("task_dag_many_worktrees", &repo);
@@ -1020,8 +1033,8 @@ fn test_list_task_dag_with_locked_worktree() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("normal", "normal");
- repo.add_worktree("locked", "locked");
+ repo.add_worktree("normal");
+ repo.add_worktree("locked");
repo.lock_worktree("locked", Some("Testing task DAG with locked worktree"));
snapshot_list_task_dag("task_dag_with_locked", &repo);
@@ -1067,8 +1080,8 @@ fn test_list_progressive_vs_buffered_identical_data() {
repo.commit("Initial commit");
// Create varied worktrees to test multiple data points
- repo.add_worktree("feature-a", "feature-a");
- repo.add_worktree("feature-b", "feature-b");
+ repo.add_worktree("feature-a");
+ repo.add_worktree("feature-b");
// Modify a worktree to have uncommitted changes
let feature_a_path = repo.worktree_path("feature-a");
@@ -1125,7 +1138,7 @@ fn test_list_error_shows_worktree_context() {
repo.commit("Initial commit");
// Create a worktree
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
// Delete the worktree directory manually to trigger an error
// (but keep the git metadata, so git worktree list still shows it)
@@ -1167,8 +1180,8 @@ fn test_list_with_c_flag() {
repo.commit("Initial commit");
// Create some worktrees
- repo.add_worktree("feature-a", "feature-a");
- repo.add_worktree("feature-b", "feature-b");
+ repo.add_worktree("feature-a");
+ repo.add_worktree("feature-b");
// Run wt -C <repo_path> list from a completely different directory
let mut settings = list_snapshots::standard_settings(&repo);
@@ -1190,7 +1203,7 @@ fn test_list_large_diffs_alignment() {
// Worktree with large uncommitted changes and ahead commits
// Use a longer branch name similar to user's "wli-sequence" to trigger column width
- let large_wt = repo.add_worktree("feature-changes", "feature-changes");
+ let large_wt = repo.add_worktree("feature-changes");
// Create a file with many lines for large diff
let large_content = (1..=100)
@@ -1240,7 +1253,7 @@ fn test_list_large_diffs_alignment() {
.unwrap();
// Worktree with short name to show gap before Status column
- let short_wt = repo.add_worktree("fix", "fix");
+ let short_wt = repo.add_worktree("fix");
std::fs::write(short_wt.join("quick.txt"), "quick fix").unwrap();
// Set user status for short branch
@@ -1252,7 +1265,7 @@ fn test_list_large_diffs_alignment() {
.unwrap();
// Worktree with diverged status and working tree changes
- let diverged_wt = repo.add_worktree("diverged", "diverged");
+ let diverged_wt = repo.add_worktree("diverged");
// Commit some changes
let diverged_content = (1..=60)
@@ -1297,7 +1310,7 @@ fn test_list_status_column_padding_with_emoji() {
repo.commit("Initial commit");
// Create worktree matching user's exact scenario: "wli-sequence"
- let wli_seq = repo.add_worktree("wli-sequence", "wli-sequence");
+ let wli_seq = repo.add_worktree("wli-sequence");
// Create large working tree changes: +164, -111
// Need ~164 added lines and ~111 deleted lines
@@ -1344,7 +1357,7 @@ fn test_list_status_column_padding_with_emoji() {
.unwrap();
// Create "pr-link" worktree with different status (fewer symbols, same emoji type)
- let pr_link = repo.add_worktree("pr-link", "pr-link");
+ let pr_link = repo.add_worktree("pr-link");
// Commit to make it ahead
std::fs::write(pr_link.join("pr.txt"), "pr content").unwrap();
@@ -1370,7 +1383,7 @@ fn test_list_status_column_padding_with_emoji() {
.unwrap();
// Create "main-symbol" with different emoji
- let main_sym = repo.add_worktree("main-symbol", "main-symbol");
+ let main_sym = repo.add_worktree("main-symbol");
std::fs::write(main_sym.join("sym.txt"), "symbol").unwrap();
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
@@ -1403,7 +1416,7 @@ fn test_list_maximum_working_tree_symbols() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- let feature = repo.add_worktree("feature", "feature");
+ let feature = repo.add_worktree("feature");
// Create initial files to manipulate
std::fs::write(feature.join("file-a.txt"), "original a").unwrap();
@@ -1477,7 +1490,7 @@ fn test_list_maximum_status_with_git_operation() {
repo.commit("Initial commit");
// Create feature worktree
- let feature = repo.add_worktree("feature", "feature");
+ let feature = repo.add_worktree("feature");
// Feature makes changes
std::fs::write(
@@ -1592,7 +1605,7 @@ fn test_list_maximum_status_symbols() {
repo.commit("Initial commit");
// Create feature worktree
- let feature = repo.add_worktree("feature", "feature");
+ let feature = repo.add_worktree("feature");
// Make feature diverge from main (ahead) with conflicting change
std::fs::write(feature.join("shared.txt"), "feature version").unwrap();
diff --git a/tests/integration_tests/list_column_alignment.rs b/tests/integration_tests/list_column_alignment.rs
index ff015281f..7dd86c6fd 100644
--- a/tests/integration_tests/list_column_alignment.rs
+++ b/tests/integration_tests/list_column_alignment.rs
@@ -13,7 +13,7 @@ fn test_status_column_alignment_with_header() {
repo.commit("Initial commit");
// Create worktree with status symbols
- let wt = repo.add_worktree("test", "test");
+ let wt = repo.add_worktree("test");
std::fs::write(wt.join("file.txt"), "content").unwrap();
let mut cmd = std::process::Command::new("git");
@@ -46,7 +46,7 @@ fn test_status_column_width_consistency() {
repo.commit("Initial commit");
// Create multiple worktrees with different status symbol combinations
- let wt1 = repo.add_worktree("simple", "simple");
+ let wt1 = repo.add_worktree("simple");
std::fs::write(wt1.join("file.txt"), "content").unwrap();
let mut cmd = std::process::Command::new("git");
@@ -61,7 +61,7 @@ fn test_status_column_width_consistency() {
.output()
.unwrap();
- let wt2 = repo.add_worktree("complex", "complex");
+ let wt2 = repo.add_worktree("complex");
std::fs::write(wt2.join("file.txt"), "content").unwrap();
repo.configure_git_cmd(&mut cmd);
cmd.args(["add", "file.txt"])
diff --git a/tests/integration_tests/list_config.rs b/tests/integration_tests/list_config.rs
index 21282ca6f..aff5a2ade 100644
--- a/tests/integration_tests/list_config.rs
+++ b/tests/integration_tests/list_config.rs
@@ -19,7 +19,7 @@ fn test_list_config_full_enabled() {
global_config_dir.join("config.toml"),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo".list]
+[projects."repo".list]
full = true
"#,
)
@@ -59,7 +59,7 @@ fn test_list_config_branches_enabled() {
global_config_dir.join("config.toml"),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo".list]
+[projects."repo".list]
branches = true
"#,
)
@@ -99,7 +99,7 @@ fn test_list_config_cli_override() {
global_config_dir.join("config.toml"),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo".list]
+[projects."repo".list]
branches = false
"#,
)
@@ -142,7 +142,7 @@ fn test_list_config_full_and_branches() {
global_config_dir.join("config.toml"),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo".list]
+[projects."repo".list]
full = true
branches = true
"#,
diff --git a/tests/integration_tests/list_progressive.rs b/tests/integration_tests/list_progressive.rs
index 3fd02401b..a0cb318a1 100644
--- a/tests/integration_tests/list_progressive.rs
+++ b/tests/integration_tests/list_progressive.rs
@@ -12,9 +12,9 @@ fn test_list_progressive_rendering_basic() {
repo.commit("Initial commit");
// Create a few worktrees to have data to render
- repo.add_worktree("feature-a", "feature-a");
- repo.add_worktree("feature-b", "feature-b");
- repo.add_worktree("bugfix", "bugfix");
+ repo.add_worktree("feature-a");
+ repo.add_worktree("feature-b");
+ repo.add_worktree("bugfix");
// Capture progressive output using byte-based strategy (deterministic)
let output = capture_progressive_output(
@@ -62,7 +62,7 @@ fn test_list_progressive_dots_decrease() {
// Create multiple worktrees to ensure progressive rendering is observable
for i in 1..=5 {
- repo.add_worktree(&format!("branch-{}", i), &format!("branch-{}", i));
+ repo.add_worktree(&format!("branch-{}", i));
}
let output = capture_progressive_output(
@@ -80,7 +80,7 @@ fn test_list_progressive_dots_decrease() {
fn test_list_progressive_timing() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("feature", "feature");
+ repo.add_worktree("feature");
let output = capture_progressive_output(
&repo,
@@ -109,7 +109,7 @@ fn test_list_progressive_timing() {
fn test_list_progressive_snapshot_at() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("feature", "feature");
+ repo.add_worktree("feature");
let output = capture_progressive_output(
&repo,
@@ -142,7 +142,7 @@ fn test_list_progressive_many_worktrees() {
// Create many worktrees to ensure rendering takes time
for i in 1..=10 {
- repo.add_worktree(&format!("worktree-{:02}", i), &format!("branch-{:02}", i));
+ repo.add_worktree(&format!("branch-{:02}", i));
}
let output = capture_progressive_output(
diff --git a/tests/integration_tests/list_pty.rs b/tests/integration_tests/list_pty.rs
index 37b569ec2..4a8105e99 100644
--- a/tests/integration_tests/list_pty.rs
+++ b/tests/integration_tests/list_pty.rs
@@ -123,7 +123,7 @@ fn test_list_pty_status_column_padding_with_emoji() {
repo.commit("Initial commit");
// Create wli-sequence worktree with large diff
- let wli_seq = repo.add_worktree("wli-sequence", "wli-sequence");
+ let wli_seq = repo.add_worktree("wli-sequence");
// Create initial content: 200 lines
let initial_content = (1..=200)
@@ -169,7 +169,7 @@ fn test_list_pty_status_column_padding_with_emoji() {
.unwrap();
// Create pr-link worktree with emoji
- let pr_link = repo.add_worktree("pr-link", "pr-link");
+ let pr_link = repo.add_worktree("pr-link");
std::fs::write(pr_link.join("pr.txt"), "PR commit").unwrap();
repo.configure_git_cmd(&mut cmd);
cmd.args(["add", "pr.txt"])
@@ -189,7 +189,7 @@ fn test_list_pty_status_column_padding_with_emoji() {
.unwrap();
// Create main-symbol worktree with emoji
- let main_symbol = repo.add_worktree("main-symbol", "main-symbol");
+ let main_symbol = repo.add_worktree("main-symbol");
std::fs::write(main_symbol.join("symbol.txt"), "Symbol commit").unwrap();
repo.configure_git_cmd(&mut cmd);
cmd.args(["add", "symbol.txt"])
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 7504d75a2..8573b7ed8 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -48,7 +48,7 @@ fn setup_merge_scenario() -> (TestRepo, std::path::PathBuf) {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -57,7 +57,7 @@ fn setup_merge_scenario() -> (TestRepo, std::path::PathBuf) {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -85,7 +85,7 @@ fn setup_merge_scenario_multi_commit() -> (TestRepo, std::path::PathBuf) {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -94,7 +94,7 @@ fn setup_merge_scenario_multi_commit() -> (TestRepo, std::path::PathBuf) {
.unwrap();
// Create a feature worktree and make multiple commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("file1.txt"), "content 1").unwrap();
let mut cmd = Command::new("git");
@@ -148,7 +148,7 @@ fn test_merge_when_primary_not_on_default_but_default_has_worktree() {
let _main_wt = repo.add_main_worktree();
// Create a feature worktree and commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -203,7 +203,7 @@ fn test_merge_dirty_working_tree() {
repo.setup_remote("main");
// Create a feature worktree with uncommitted changes
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("dirty.txt"), "uncommitted content").unwrap();
// Try to merge (should fail due to dirty working tree)
@@ -240,7 +240,7 @@ fn test_merge_not_fast_forward() {
.unwrap();
// Create a feature worktree branching from before the main commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -365,7 +365,7 @@ fn test_merge_rebase_conflict() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -401,7 +401,7 @@ fn test_merge_rebase_conflict() {
.unwrap();
let base_commit = String::from_utf8_lossy(&output.stdout).trim().to_string();
- let feature_wt = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let feature_wt = repo.root_path().parent().unwrap().join("repo.feature");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args([
@@ -477,7 +477,7 @@ fn test_merge_squash_deterministic() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -486,7 +486,7 @@ fn test_merge_squash_deterministic() {
.unwrap();
// Create a feature worktree and make multiple commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("file1.txt"), "content 1").unwrap();
let mut cmd = Command::new("git");
@@ -546,7 +546,7 @@ fn test_merge_squash_with_llm() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -555,7 +555,7 @@ fn test_merge_squash_with_llm() {
.unwrap();
// Create a feature worktree and make multiple commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("auth.txt"), "auth module").unwrap();
let mut cmd = Command::new("git");
@@ -605,7 +605,7 @@ fn test_merge_squash_llm_fallback() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -614,7 +614,7 @@ fn test_merge_squash_llm_fallback() {
.unwrap();
// Create a feature worktree and make multiple commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("file1.txt"), "content 1").unwrap();
let mut cmd = Command::new("git");
@@ -676,7 +676,7 @@ fn test_merge_squash_llm_error() {
.unwrap();
// Create a feature worktree and make commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("file1.txt"), "content 1").unwrap();
let mut cmd = Command::new("git");
@@ -732,7 +732,7 @@ fn test_merge_squash_single_commit() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -741,7 +741,7 @@ fn test_merge_squash_single_commit() {
.unwrap();
// Create a feature worktree with only one commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("file1.txt"), "content").unwrap();
let mut cmd = Command::new("git");
@@ -786,7 +786,7 @@ fn test_merge_squash_empty_changes() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -795,7 +795,7 @@ fn test_merge_squash_empty_changes() {
.unwrap();
// Create a feature worktree with commits that result in no net changes
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
// Get the initial content of file.txt (created by the initial commit)
let file_path = feature_wt.join("file.txt");
@@ -862,7 +862,7 @@ fn test_merge_auto_commit_deterministic() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -871,7 +871,7 @@ fn test_merge_auto_commit_deterministic() {
.unwrap();
// Create a feature worktree with a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "initial content").unwrap();
let mut cmd = Command::new("git");
@@ -907,7 +907,7 @@ fn test_merge_auto_commit_with_llm() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -916,7 +916,7 @@ fn test_merge_auto_commit_with_llm() {
.unwrap();
// Create a feature worktree with a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("auth.txt"), "initial auth").unwrap();
let mut cmd = Command::new("git");
@@ -986,7 +986,7 @@ fn test_merge_with_untracked_files() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -995,7 +995,7 @@ fn test_merge_with_untracked_files() {
.unwrap();
// Create a feature worktree with one commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("file1.txt"), "content 1").unwrap();
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
@@ -1041,7 +1041,7 @@ fn test_merge_pre_merge_command_success() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1050,7 +1050,7 @@ fn test_merge_pre_merge_command_success() {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1090,7 +1090,7 @@ fn test_merge_pre_merge_command_failure() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1099,7 +1099,7 @@ fn test_merge_pre_merge_command_failure() {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1139,7 +1139,7 @@ fn test_merge_pre_merge_command_no_hooks() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1148,7 +1148,7 @@ fn test_merge_pre_merge_command_no_hooks() {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1197,7 +1197,7 @@ test = "exit 0"
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1206,7 +1206,7 @@ test = "exit 0"
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1250,7 +1250,7 @@ fn test_merge_post_merge_command_success() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1259,7 +1259,7 @@ fn test_merge_post_merge_command_success() {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1316,7 +1316,7 @@ fn test_merge_post_merge_command_skipped_with_no_verify() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1325,7 +1325,7 @@ fn test_merge_post_merge_command_skipped_with_no_verify() {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1372,7 +1372,7 @@ fn test_merge_post_merge_command_failure() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1381,7 +1381,7 @@ fn test_merge_post_merge_command_failure() {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1429,7 +1429,7 @@ deploy = "echo 'Deploying branch {{ branch }}' > deploy.txt"
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1438,7 +1438,7 @@ deploy = "echo 'Deploying branch {{ branch }}' > deploy.txt"
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1495,7 +1495,7 @@ fn test_merge_post_merge_runs_with_nothing_to_merge() {
repo.commit("Add config");
// Create a worktree for main (destination for post-merge commands)
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1504,7 +1504,7 @@ fn test_merge_post_merge_runs_with_nothing_to_merge() {
.unwrap();
// Create a feature worktree with NO commits (already up-to-date with main)
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
// Merge with --force - nothing to merge but post-merge should still run
snapshot_merge(
@@ -1574,7 +1574,7 @@ fn test_merge_pre_commit_command_success() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1583,7 +1583,7 @@ fn test_merge_pre_commit_command_success() {
.unwrap();
// Create a feature worktree and make a change
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
// Merge with --force (changes uncommitted, should trigger pre-commit hook)
@@ -1609,7 +1609,7 @@ fn test_merge_pre_commit_command_failure() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1618,7 +1618,7 @@ fn test_merge_pre_commit_command_failure() {
.unwrap();
// Create a feature worktree and make a change
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
// Merge with --force - pre-commit command should fail and block merge
@@ -1648,7 +1648,7 @@ fn test_merge_pre_squash_command_success() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1657,7 +1657,7 @@ fn test_merge_pre_squash_command_success() {
.unwrap();
// Create a feature worktree and make commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1697,7 +1697,7 @@ fn test_merge_pre_squash_command_failure() {
repo.commit("Add config");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1706,7 +1706,7 @@ fn test_merge_pre_squash_command_failure() {
.unwrap();
// Create a feature worktree and make commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1739,7 +1739,7 @@ fn test_merge_no_remote() {
// Deliberately NOT calling setup_remote to test the error case
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1786,11 +1786,7 @@ fn test_readme_example_simple() {
);
// Get the created worktree path and make a commit
- let feature_wt = repo
- .root_path()
- .parent()
- .unwrap()
- .join("test-repo.fix-auth");
+ let feature_wt = repo.root_path().parent().unwrap().join("repo.fix-auth");
let auth_rs = r#"// JWT validation utilities
pub struct JwtClaims {
pub sub: String,
@@ -1937,7 +1933,7 @@ EOF
.unwrap();
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1946,7 +1942,7 @@ EOF
.unwrap();
// Create a feature worktree and make multiple commits
- let feature_wt = repo.add_worktree("feature-auth", "feature-auth");
+ let feature_wt = repo.add_worktree("feature-auth");
// First commit: token refresh
let commit_one = r#"// Token refresh logic
@@ -2261,7 +2257,7 @@ fi
.unwrap();
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -2270,7 +2266,7 @@ fi
.unwrap();
// Create a feature worktree and make multiple commits
- let feature_wt = repo.add_worktree("feature-auth", "feature-auth");
+ let feature_wt = repo.add_worktree("feature-auth");
// First commit - create initial auth.py with login endpoint
fs::create_dir_all(feature_wt.join("api")).unwrap();
@@ -2417,7 +2413,7 @@ fn test_merge_no_commit_with_clean_tree() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -2426,7 +2422,7 @@ fn test_merge_no_commit_with_clean_tree() {
.unwrap();
// Create a feature worktree with commits (clean tree)
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -2475,7 +2471,7 @@ fn test_merge_no_commit_with_dirty_tree() {
repo.setup_remote("main");
// Create a feature worktree with a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("committed.txt"), "committed content").unwrap();
let mut cmd = Command::new("git");
@@ -2520,7 +2516,7 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -2529,7 +2525,7 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
.unwrap();
// Create a feature worktree with commits (clean tree)
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -2581,7 +2577,7 @@ fn test_merge_no_commits() {
repo.add_main_worktree();
// Create a feature worktree with NO commits (just branched from main)
- let feature_wt = repo.add_worktree("no-commits", "no-commits");
+ let feature_wt = repo.add_worktree("no-commits");
// Merge without any commits - should skip both squashing and rebasing
snapshot_merge("merge_no_commits", &repo, &["main"], Some(&feature_wt));
@@ -2597,7 +2593,7 @@ fn test_merge_no_commits_with_changes() {
repo.add_main_worktree();
// Create a feature worktree with NO commits but WITH uncommitted changes
- let feature_wt = repo.add_worktree("no-commits-dirty", "no-commits-dirty");
+ let feature_wt = repo.add_worktree("no-commits-dirty");
fs::write(feature_wt.join("newfile.txt"), "new content").unwrap();
// Merge - should commit the changes, skip squashing (only 1 commit), and skip rebasing (at merge base)
@@ -2618,7 +2614,7 @@ fn test_merge_rebase_fast_forward() {
repo.setup_remote("main");
// Create a feature worktree with NO commits (just branched from main)
- let feature_wt = repo.add_worktree("fast-forward-test", "fast-forward-test");
+ let feature_wt = repo.add_worktree("fast-forward-test");
// Advance main with a new commit (in the primary worktree which is on main)
fs::write(repo.root_path().join("main-update.txt"), "main content").unwrap();
@@ -2655,7 +2651,7 @@ fn test_merge_rebase_true_rebase() {
repo.setup_remote("main");
// Create a feature worktree with a commit
- let feature_wt = repo.add_worktree("true-rebase-test", "true-rebase-test");
+ let feature_wt = repo.add_worktree("true-rebase-test");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -2708,7 +2704,7 @@ fn test_merge_primary_on_different_branch() {
assert_eq!(repo.current_branch(), "develop");
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature-from-develop", "feature-from-develop");
+ let feature_wt = repo.add_worktree("feature-from-develop");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -2781,7 +2777,7 @@ fn test_merge_primary_on_different_branch_dirty() {
fs::write(repo.root_path().join("file.txt"), "develop local changes").unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature-dirty-primary", "feature-dirty-primary");
+ let feature_wt = repo.add_worktree("feature-dirty-primary");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -2814,7 +2810,7 @@ fn test_merge_race_condition_commit_after_push() {
repo.setup_remote("main");
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -2823,7 +2819,7 @@ fn test_merge_race_condition_commit_after_push() {
.unwrap();
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -2976,11 +2972,7 @@ fn test_merge_to_non_default_target() {
.unwrap();
// Create a worktree for staging
- let staging_wt = repo
- .root_path()
- .parent()
- .unwrap()
- .join("test-repo.staging-wt");
+ let staging_wt = repo.root_path().parent().unwrap().join("repo.staging-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", staging_wt.to_str().unwrap(), "staging"])
@@ -2993,7 +2985,7 @@ fn test_merge_to_non_default_target() {
.root_path()
.parent()
.unwrap()
- .join("test-repo.feature-for-staging");
+ .join("repo.feature-for-staging");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args([
@@ -3045,7 +3037,7 @@ fn test_merge_squash_with_working_tree_creates_backup() {
repo.add_main_worktree();
// Create a feature worktree with multiple commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
// First commit
std::fs::write(feature_wt.join("file1.txt"), "content 1").unwrap();
@@ -3209,7 +3201,7 @@ fn test_step_squash_with_no_verify_flag() {
repo.setup_remote("main");
// Create a feature worktree with multiple commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
// Add a pre-commit hook so --no-verify has something to skip
// Create in feature worktree since worktrees don't share working tree files
@@ -3270,7 +3262,7 @@ fn test_step_squash_with_stage_tracked_flag() {
repo.commit("Initial commit");
repo.setup_remote("main");
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("file1.txt"), "content 1").expect("Failed to write file");
let mut cmd = Command::new("git");
@@ -3324,7 +3316,7 @@ fn test_step_squash_with_both_flags() {
repo.commit("Initial commit");
repo.setup_remote("main");
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
// Add a pre-commit hook so --no-verify has something to skip
// Create in feature worktree since worktrees don't share working tree files
@@ -3389,7 +3381,7 @@ fn test_step_squash_no_commits() {
repo.setup_remote("main");
// Create a feature worktree but don't add any commits
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
snapshot_step_squash_with_env("step_squash_no_commits", &repo, &[], Some(&feature_wt), &[]);
}
@@ -3402,7 +3394,7 @@ fn test_step_squash_single_commit() {
repo.setup_remote("main");
// Create a feature worktree with exactly one commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("file1.txt"), "content 1").expect("Failed to write file");
let mut cmd = Command::new("git");
diff --git a/tests/integration_tests/post_start_commands.rs b/tests/integration_tests/post_start_commands.rs
index edf0b5b9d..4e3c64ef8 100644
--- a/tests/integration_tests/post_start_commands.rs
+++ b/tests/integration_tests/post_start_commands.rs
@@ -57,7 +57,7 @@ fn test_post_create_single_command() {
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'Setup complete'"]
"#,
);
@@ -84,7 +84,7 @@ fn test_post_create_multiple_commands_array() {
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"echo 'First'",
"echo 'Second'",
@@ -119,7 +119,7 @@ setup = "echo 'Running setup'"
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"echo 'Installing deps'",
"echo 'Running setup'",
@@ -149,7 +149,7 @@ fn test_post_create_failing_command() {
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["exit 1"]
"#,
);
@@ -180,11 +180,11 @@ fn test_post_create_template_expansion() {
repo.commit("Add config with templates");
// Pre-approve all commands in isolated test config
- let repo_name = "test-repo";
+ let repo_name = "repo";
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"echo 'Repo: {{ main_worktree }}' > info.txt",
"echo 'Branch: {{ branch }}' >> info.txt",
@@ -249,7 +249,7 @@ fn test_post_start_single_background_command() {
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["sleep 0.1 && echo 'Background task done' > background.txt"]
"#,
);
@@ -262,7 +262,7 @@ approved-commands = ["sleep 0.1 && echo 'Background task done' > background.txt"
);
// Verify log file was created in the common git directory
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
let git_common_dir = resolve_git_common_dir(&worktree_path);
let log_dir = git_common_dir.join("wt-logs");
assert!(log_dir.exists(), "Log directory should be created");
@@ -291,7 +291,7 @@ task2 = "echo 'Task 2 running' > task2.txt"
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"echo 'Task 1 running' > task1.txt",
"echo 'Task 2 running' > task2.txt",
@@ -307,7 +307,7 @@ approved-commands = [
);
// Wait for both background commands
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
wait_for_file(
worktree_path.join("task1.txt").as_path(),
Duration::from_secs(5),
@@ -338,7 +338,7 @@ server = "sleep 0.05 && echo 'Server running' > server.txt"
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"echo 'Setup done' > setup.txt",
"sleep 0.05 && echo 'Server running' > server.txt",
@@ -350,7 +350,7 @@ approved-commands = [
snapshot_switch("both_create_and_start", &repo, &["--create", "feature"]);
// Setup file should exist immediately (post-create is blocking)
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
assert!(
worktree_path.join("setup.txt").exists(),
"Post-create command should have completed before wt exits"
@@ -395,7 +395,7 @@ fn test_post_start_log_file_captures_output() {
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'stdout output' && echo 'stderr output' >&2"]
"#,
);
@@ -407,7 +407,7 @@ approved-commands = ["echo 'stdout output' && echo 'stderr output' >&2"]
);
// Wait for log file to be created (not just the directory)
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
let git_common_dir = resolve_git_common_dir(&worktree_path);
let log_dir = git_common_dir.join("wt-logs");
wait_for_file_count(&log_dir, "log", 1, Duration::from_secs(5));
@@ -454,7 +454,7 @@ fn test_post_start_invalid_command_handling() {
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'unclosed quote"]
"#,
);
@@ -467,7 +467,7 @@ approved-commands = ["echo 'unclosed quote"]
);
// Verify worktree was created despite command error
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
assert!(
worktree_path.exists(),
"Worktree should be created even if post-start command fails"
@@ -494,7 +494,7 @@ task3 = "echo 'TASK3_OUTPUT'"
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"echo 'TASK1_OUTPUT'",
"echo 'TASK2_OUTPUT'",
@@ -506,7 +506,7 @@ approved-commands = [
snapshot_switch("post_start_separate_logs", &repo, &["--create", "feature"]);
// Wait for all 3 log files to be created (poll, don't use fixed sleep)
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
let git_common_dir = resolve_git_common_dir(&worktree_path);
let log_dir = git_common_dir.join("wt-logs");
wait_for_file_count(&log_dir, "log", 3, Duration::from_secs(5));
@@ -572,7 +572,7 @@ fn test_execute_flag_with_post_start_commands() {
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'Background task' > background.txt"]
"#,
);
@@ -589,7 +589,7 @@ approved-commands = ["echo 'Background task' > background.txt"]
],
);
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
// Execute flag file should exist immediately (synchronous)
assert!(
@@ -620,7 +620,7 @@ fn test_post_start_complex_shell_commands() {
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'line1\nline2\nline3' | grep line2 > filtered.txt"]
"#,
);
@@ -628,7 +628,7 @@ approved-commands = ["echo 'line1\nline2\nline3' | grep line2 > filtered.txt"]
snapshot_switch("post_start_complex_shell", &repo, &["--create", "feature"]);
// Wait for background command to create the file AND flush content
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
let filtered_file = worktree_path.join("filtered.txt");
wait_for_file_content(filtered_file.as_path(), Duration::from_secs(5));
@@ -661,7 +661,7 @@ echo 'third line' >> multiline.txt
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ main_worktree }}}}.{{{{ branch }}}}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["""
{}"""]
"#,
@@ -675,7 +675,7 @@ approved-commands = ["""
);
// Wait for background command to write all 3 lines (not just the first)
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
let output_file = worktree_path.join("multiline.txt");
wait_for_file_lines(output_file.as_path(), 3, Duration::from_secs(5));
@@ -716,7 +716,7 @@ fi
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ main_worktree }}}}.{{{{ branch }}}}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["""
{}"""]
"#,
@@ -730,7 +730,7 @@ approved-commands = ["""
);
// Verify the command executed correctly
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
let result_file = worktree_path.join("result.txt");
assert!(
result_file.exists(),
@@ -763,7 +763,7 @@ fn test_post_start_skipped_on_existing_worktree() {
repo.write_test_config(
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'POST-START-RAN' > post_start_marker.txt"]
"#,
);
@@ -776,7 +776,7 @@ approved-commands = ["echo 'POST-START-RAN' > post_start_marker.txt"]
);
// Wait for background post-start command to complete
- let worktree_path = repo.root_path().parent().unwrap().join("test-repo.feature");
+ let worktree_path = repo.root_path().parent().unwrap().join("repo.feature");
let marker_file = worktree_path.join("post_start_marker.txt");
wait_for_file(marker_file.as_path(), Duration::from_secs(5));
diff --git a/tests/integration_tests/push.rs b/tests/integration_tests/push.rs
index 22f9f7ec0..01d8e87e6 100644
--- a/tests/integration_tests/push.rs
+++ b/tests/integration_tests/push.rs
@@ -21,7 +21,7 @@ fn test_push_fast_forward() {
repo.setup_remote("main");
// Create a worktree for main (checking out existing branch)
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -30,7 +30,7 @@ fn test_push_fast_forward() {
.unwrap();
// Make a commit in a feature worktree
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("test.txt"), "test content").unwrap();
let mut cmd = Command::new("git");
@@ -75,7 +75,7 @@ fn test_push_not_fast_forward() {
.output()
.unwrap();
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -102,7 +102,7 @@ fn test_push_to_default_branch() {
repo.commit("Initial commit");
repo.setup_remote("main");
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -110,7 +110,7 @@ fn test_push_to_default_branch() {
.output()
.unwrap();
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -140,7 +140,7 @@ fn test_push_with_dirty_target() {
// Make main worktree (repo root) dirty with a conflicting file
std::fs::write(repo.root_path().join("conflict.txt"), "old content").unwrap();
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("conflict.txt"), "new content").unwrap();
let mut cmd = Command::new("git");
@@ -192,7 +192,7 @@ fn test_push_dirty_target_autostash() {
// Make main worktree (repo root) dirty with a non-conflicting file
std::fs::write(repo.root_path().join("notes.txt"), "temporary notes").unwrap();
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -243,7 +243,7 @@ fn test_push_error_not_fast_forward() {
repo.setup_remote("main");
// Create feature branch from initial commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
// Make a commit in the main worktree (repo root) and push it
std::fs::write(repo.root_path().join("main-file.txt"), "main content").unwrap();
@@ -302,7 +302,7 @@ fn test_push_error_with_merge_commits() {
repo.setup_remote("main");
// Create feature branch
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("file1.txt"), "content1").unwrap();
let mut cmd = Command::new("git");
@@ -374,7 +374,7 @@ fn test_push_with_merge_commits_allowed() {
repo.setup_remote("main");
// Create feature branch
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("file1.txt"), "content1").unwrap();
let mut cmd = Command::new("git");
@@ -446,7 +446,7 @@ fn test_push_no_remote() {
// Deliberately NOT calling setup_remote to test the error case
// Create a feature worktree and make a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
std::fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
diff --git a/tests/integration_tests/readme_sync.rs b/tests/integration_tests/readme_sync.rs
index 36996114e..0c606857c 100644
--- a/tests/integration_tests/readme_sync.rs
+++ b/tests/integration_tests/readme_sync.rs
@@ -42,7 +42,7 @@ static HASH_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\[HASH\]").un
/// Regex for TMPDIR paths
static TMPDIR_REGEX: LazyLock<Regex> =
- LazyLock::new(|| Regex::new(r"\[TMPDIR\]/test-repo\.([^\s/]+)").unwrap());
+ LazyLock::new(|| Regex::new(r"\[TMPDIR\]/repo\.([^\s/]+)").unwrap());
/// Regex for REPO placeholder
static REPO_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\[REPO\]").unwrap());
diff --git a/tests/integration_tests/remove.rs b/tests/integration_tests/remove.rs
index 50096c090..633dacaff 100644
--- a/tests/integration_tests/remove.rs
+++ b/tests/integration_tests/remove.rs
@@ -57,7 +57,7 @@ fn test_remove_switch_to_default() {
fn test_remove_from_worktree() {
let mut repo = setup_remove_repo();
- let worktree_path = repo.add_worktree("feature-wt", "feature-wt");
+ let worktree_path = repo.add_worktree("feature-wt");
// Run remove from within the worktree
snapshot_remove("remove_from_worktree", &repo, &[], Some(&worktree_path));
@@ -67,7 +67,7 @@ fn test_remove_from_worktree() {
fn test_remove_internal_mode() {
let mut repo = setup_remove_repo();
- let worktree_path = repo.add_worktree("feature-internal", "feature-internal");
+ let worktree_path = repo.add_worktree("feature-internal");
snapshot_remove_with_global_flags(
"remove_internal_mode",
@@ -93,7 +93,7 @@ fn test_remove_by_name_from_main() {
let mut repo = setup_remove_repo();
// Create a worktree
- let _worktree_path = repo.add_worktree("feature-a", "feature-a");
+ let _worktree_path = repo.add_worktree("feature-a");
// Remove it by name from main repo
snapshot_remove("remove_by_name_from_main", &repo, &["feature-a"], None);
@@ -104,8 +104,8 @@ fn test_remove_by_name_from_other_worktree() {
let mut repo = setup_remove_repo();
// Create two worktrees
- let worktree_a = repo.add_worktree("feature-a", "feature-a");
- let _worktree_b = repo.add_worktree("feature-b", "feature-b");
+ let worktree_a = repo.add_worktree("feature-a");
+ let _worktree_b = repo.add_worktree("feature-b");
// From worktree A, remove worktree B by name
snapshot_remove(
@@ -120,7 +120,7 @@ fn test_remove_by_name_from_other_worktree() {
fn test_remove_current_by_name() {
let mut repo = setup_remove_repo();
- let worktree_path = repo.add_worktree("feature-current", "feature-current");
+ let worktree_path = repo.add_worktree("feature-current");
// Remove current worktree by specifying its name
snapshot_remove(
@@ -143,7 +143,7 @@ fn test_remove_nonexistent_worktree() {
fn test_remove_by_name_dirty_target() {
let mut repo = setup_remove_repo();
- let worktree_path = repo.add_worktree("feature-dirty", "feature-dirty");
+ let worktree_path = repo.add_worktree("feature-dirty");
// Create a dirty file in the target worktree
std::fs::write(worktree_path.join("dirty.txt"), "uncommitted changes").unwrap();
@@ -162,9 +162,9 @@ fn test_remove_multiple_worktrees() {
let mut repo = setup_remove_repo();
// Create three worktrees
- let _worktree_a = repo.add_worktree("feature-a", "feature-a");
- let _worktree_b = repo.add_worktree("feature-b", "feature-b");
- let _worktree_c = repo.add_worktree("feature-c", "feature-c");
+ let _worktree_a = repo.add_worktree("feature-a");
+ let _worktree_b = repo.add_worktree("feature-b");
+ let _worktree_c = repo.add_worktree("feature-c");
// Remove all three at once from main repo
snapshot_remove(
@@ -180,9 +180,9 @@ fn test_remove_multiple_including_current() {
let mut repo = setup_remove_repo();
// Create three worktrees
- let worktree_a = repo.add_worktree("feature-a", "feature-a");
- let _worktree_b = repo.add_worktree("feature-b", "feature-b");
- let _worktree_c = repo.add_worktree("feature-c", "feature-c");
+ let worktree_a = repo.add_worktree("feature-a");
+ let _worktree_b = repo.add_worktree("feature-b");
+ let _worktree_c = repo.add_worktree("feature-c");
// From worktree A, remove all three (including current)
snapshot_remove(
@@ -198,7 +198,7 @@ fn test_remove_branch_not_fully_merged() {
let mut repo = setup_remove_repo();
// Create a worktree with an unmerged commit
- let worktree_path = repo.add_worktree("feature-unmerged", "feature-unmerged");
+ let worktree_path = repo.add_worktree("feature-unmerged");
// Add a commit to the feature branch that's not in main
std::fs::write(worktree_path.join("feature.txt"), "new feature").unwrap();
@@ -226,7 +226,7 @@ fn test_remove_foreground() {
let mut repo = setup_remove_repo();
// Create a worktree
- let _worktree_path = repo.add_worktree("feature-fg", "feature-fg");
+ let _worktree_path = repo.add_worktree("feature-fg");
// Remove it with --no-background flag from main repo
snapshot_remove(
@@ -242,7 +242,7 @@ fn test_remove_no_delete_branch() {
let mut repo = setup_remove_repo();
// Create a worktree
- let _worktree_path = repo.add_worktree("feature-keep", "feature-keep");
+ let _worktree_path = repo.add_worktree("feature-keep");
// Remove worktree but keep the branch using --no-delete-branch flag
snapshot_remove(
diff --git a/tests/integration_tests/security.rs b/tests/integration_tests/security.rs
index 3de4a7b25..9e060f0da 100644
--- a/tests/integration_tests/security.rs
+++ b/tests/integration_tests/security.rs
@@ -295,7 +295,7 @@ fn test_commit_message_with_directive_not_executed() {
repo.commit_with_message(malicious_message);
// Create a worktree
- let _feature_wt = repo.add_worktree("feature", "feature");
+ let _feature_wt = repo.add_worktree("feature");
let settings = setup_snapshot_settings(&repo);
diff --git a/tests/integration_tests/select.rs b/tests/integration_tests/select.rs
index 64af5e090..1375cccfa 100644
--- a/tests/integration_tests/select.rs
+++ b/tests/integration_tests/select.rs
@@ -205,7 +205,7 @@ fn normalize_output(output: &str) -> String {
let output = lines.join("\n");
- // Replace temp paths like /var/folders/.../test-repo.XXX with [REPO]
+ // Replace temp paths like /var/folders/.../repo.XXX with [REPO]
let re = regex::Regex::new(r"/[^\s]+\.tmp[^\s/]*").unwrap();
let output = re.replace_all(&output, "[REPO]");
@@ -249,8 +249,8 @@ fn test_select_abort_with_escape() {
fn test_select_with_multiple_worktrees() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("feature-one", "feature-one");
- repo.add_worktree("feature-two", "feature-two");
+ repo.add_worktree("feature-one");
+ repo.add_worktree("feature-two");
let env_vars = repo.test_env_vars();
let (raw_output, exit_code) = exec_in_pty_with_input(
@@ -273,7 +273,7 @@ fn test_select_with_multiple_worktrees() {
fn test_select_with_branches() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- repo.add_worktree("active-worktree", "active-worktree");
+ repo.add_worktree("active-worktree");
// Create a branch without a worktree
let output = repo
.git_command(&["branch", "orphan-branch"])
@@ -303,7 +303,7 @@ fn test_select_with_branches() {
fn test_select_preview_panel_uncommitted() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- let feature_path = repo.add_worktree("feature", "feature");
+ let feature_path = repo.add_worktree("feature");
// First, create and commit a file so we have something to modify
std::fs::write(feature_path.join("tracked.txt"), "Original content\n").unwrap();
@@ -354,7 +354,7 @@ fn test_select_preview_panel_uncommitted() {
fn test_select_preview_panel_history() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- let feature_path = repo.add_worktree("feature", "feature");
+ let feature_path = repo.add_worktree("feature");
// Make several commits in the feature worktree
for i in 1..=5 {
@@ -404,7 +404,7 @@ fn test_select_preview_panel_history() {
fn test_select_preview_panel_main_diff() {
let mut repo = TestRepo::new();
repo.commit("Initial commit");
- let feature_path = repo.add_worktree("feature", "feature");
+ let feature_path = repo.add_worktree("feature");
// Make commits in the feature worktree that differ from main
std::fs::write(
diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rs
index d89417558..cd7ea4d7b 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -675,7 +675,7 @@ mod tests {
repo.commit("Initial commit");
// Create a worktree that already exists
- repo.add_worktree("existing", "existing");
+ repo.add_worktree("existing");
// Try to create it again - should fail
let output = exec_through_wrapper(shell, &repo, "switch", &["--create", "existing"]);
@@ -736,7 +736,7 @@ mod tests {
repo.commit("Initial commit");
// Create a worktree to remove
- repo.add_worktree("to-remove", "to-remove");
+ repo.add_worktree("to-remove");
let output = exec_through_wrapper(shell, &repo, "remove", &["to-remove"]);
@@ -759,7 +759,7 @@ mod tests {
repo.commit("Initial commit");
// Create a feature branch
- repo.add_worktree("feature", "feature");
+ repo.add_worktree("feature");
let output = exec_through_wrapper(shell, &repo, "merge", &["main"]);
@@ -893,7 +893,7 @@ watch = "echo 'Watching for file changes'"
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"echo 'Installing dependencies...'",
"echo 'Building project...'",
@@ -941,7 +941,7 @@ test = "echo '✓ All 47 tests passed in 2.3s'"
repo.commit("Add pre-merge validation");
// Create a main worktree
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -950,7 +950,7 @@ test = "echo '✓ All 47 tests passed in 2.3s'"
.unwrap();
// Create feature worktree with a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -972,7 +972,7 @@ test = "echo '✓ All 47 tests passed in 2.3s'"
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"echo '✓ Code formatting check passed'",
"echo '✓ Linting passed - no warnings'",
@@ -1022,7 +1022,7 @@ test = "echo '✗ Test suite failed: 3 tests failing' && exit 1"
repo.commit("Add failing pre-merge validation");
// Create a main worktree
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1031,7 +1031,7 @@ test = "echo '✗ Test suite failed: 3 tests failing' && exit 1"
.unwrap();
// Create feature worktree with a commit
- let feature_wt = repo.add_worktree("feature-fail", "feature-fail");
+ let feature_wt = repo.add_worktree("feature-fail");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1053,7 +1053,7 @@ test = "echo '✗ Test suite failed: 3 tests failing' && exit 1"
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"echo '✓ Code formatting check passed'",
"echo '✗ Test suite failed: 3 tests failing' && exit 1",
@@ -1110,7 +1110,7 @@ check2 = "{} check2 3"
repo.commit("Add pre-merge validation with mixed output");
// Create a main worktree
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -1119,7 +1119,7 @@ check2 = "{} check2 3"
.unwrap();
// Create feature worktree with a commit
- let feature_wt = repo.add_worktree("feature", "feature");
+ let feature_wt = repo.add_worktree("feature");
fs::write(feature_wt.join("feature.txt"), "feature content").unwrap();
let mut cmd = Command::new("git");
@@ -1142,7 +1142,7 @@ check2 = "{} check2 3"
format!(
r#"worktree-path = "../{{{{ main_worktree }}}}.{{{{ branch }}}}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = [
"{} check1 3",
"{} check2 3",
@@ -1197,7 +1197,7 @@ approved-commands = [
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'test command executed'"]
"#,
)
@@ -1317,7 +1317,7 @@ approved-commands = ["echo 'test command executed'"]
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'background task'"]
"#,
)
@@ -1385,7 +1385,7 @@ approved-commands = ["echo 'background task'"]
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'fish background task'"]
"#,
)
@@ -1630,7 +1630,7 @@ approved-commands = ["echo 'fish background task'"]
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'background job'"]
"#,
)
@@ -1685,7 +1685,7 @@ approved-commands = ["echo 'background job'"]
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'bash background'"]
"#,
)
@@ -2072,7 +2072,7 @@ approved-commands = ["echo 'bash background'"]
repo.test_config_path(),
r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"
-[projects."test-repo"]
+[projects."repo"]
approved-commands = ["echo 'cleanup test'"]
"#,
)
@@ -2221,7 +2221,7 @@ fi
.unwrap();
// Create a worktree for main
- let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
@@ -2230,7 +2230,7 @@ fi
.unwrap();
// Create a feature worktree and make multiple commits
- let feature_wt = repo.add_worktree("feature-auth", "feature-auth");
+ let feature_wt = repo.add_worktree("feature-auth");
// First commit - create initial auth.py with login endpoint
fs::create_dir_all(feature_wt.join("api")).unwrap();
@@ -2348,7 +2348,7 @@ def refresh_token(token: str) -> Optional[Dict]:
// Configure LLM in worktrunk config
let llm_path = bin_dir.join("llm");
let worktrunk_config = format!(
- r#"worktree-path = "../test-repo.{{{{ branch }}}}"
+ r#"worktree-path = "../repo.{{{{ branch }}}}"
[commit-generation]
command = "{}"
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index d869bf027..344490a3d 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-🟡 test-repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command'
@@ -13,5 +13,5 @@ y
🔄 Running post-create:
  echo 'test command'
test command
-✅ Created new worktree for test-approve from main at [REPO]/test-repo.test-approve
+✅ Created new worktree for test-approve from main at [REPO]/repo.test-approve
💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index e117d8824..e606e8693 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -4,12 +4,12 @@ expression: normalized
---
n
-🟡 test-repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command'
💡 Allow and remember? [y/N]
⚪ Commands declined, continuing worktree creation
-✅ Created new worktree for test-decline from main at [REPO]/test-repo.test-decline
+✅ Created new worktree for test-decline from main at [REPO]/repo.test-decline
💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index fba81762d..33fba1242 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-🟡 test-repo needs approval to execute 2 commands:
+🟡 repo needs approval to execute 2 commands:
⚪ post-create:
  echo 'First command'
@@ -22,5 +22,5 @@ y
🔄 Running post-create:
  echo 'Third command'
Third command
-✅ Created new worktree for test-mixed-accept from main at [REPO]/test-repo.test-mixed-accept
+✅ Created new worktree for test-mixed-accept from main at [REPO]/repo.test-mixed-accept
💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index cc4713c3a..8e2fd677d 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -4,7 +4,7 @@ expression: normalized
---
n
-🟡 test-repo needs approval to execute 2 commands:
+🟡 repo needs approval to execute 2 commands:
⚪ post-create:
  echo 'First command'
@@ -14,5 +14,5 @@ n
💡 Allow and remember? [y/N]
⚪ Commands declined, continuing worktree creation
-✅ Created new worktree for test-mixed-decline from main at [REPO]/test-repo.test-mixed-decline
+✅ Created new worktree for test-mixed-decline from main at [REPO]/repo.test-mixed-decline
💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index d37d7acea..19e2c7b8f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-🟡 test-repo needs approval to execute 3 commands:
+🟡 repo needs approval to execute 3 commands:
⚪ post-create:
  echo 'First command'
@@ -25,5 +25,5 @@ y
🔄 Running post-create:
  echo 'Third command'
Third command
-✅ Created new worktree for test-multi from main at [REPO]/test-repo.test-multi
+✅ Created new worktree for test-multi from main at [REPO]/repo.test-multi
💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index 31772fa88..21777b3c3 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-🟡 test-repo needs approval to execute 3 commands:
+🟡 repo needs approval to execute 3 commands:
⚪ post-create install:
  echo 'Installing dependencies...'
@@ -25,5 +25,5 @@ y
🔄 Running post-create test:
  echo 'Running tests...'
Running tests...
-✅ Created new worktree for test-named from main at [REPO]/test-repo.test-named
+✅ Created new worktree for test-named from main at [REPO]/repo.test-named
💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index 9b4b7330a..a280775c3 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-🟡 test-repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command'
@@ -15,5 +15,5 @@ y
🔄 Running post-create:
  echo 'test command'
test command
-✅ Created new worktree for test-permission from main at [REPO]/test-repo.test-permission
+✅ Created new worktree for test-permission from main at [REPO]/repo.test-permission
💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
index 781c4d9ca..e7824ef98 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
@@ -4,9 +4,9 @@ expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Path │ctrl-u/d: scroll
-> @ main ^ ./test-rep..│
- + feature-one ∅ ./feature-..│⚪ No uncommitted changes
- + feature-two ∅ ./feature-..│
+> @ main ^ ./repo ..│
+ + feature-one ∅ ./repo.fea..│⚪ No uncommitted changes
+ + feature-two ∅ ./repo.fea..│
│
│
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap
index 470535031..9f38148de 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap
@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path Rem│ctrl-u/d: scroll
-> + feature ↑ ↑5 ./feature ..│
+ Branch Status HEAD± main↕ Path │ctrl-u/d: scroll
+> + feature ↑ ↑5 ./repo.feature..│
│* b1549b6 (feature) Add file 5 with important changes
│* 111f7e4 Add file 4 with important changes
│* fe8881c Add file 3 with important changes
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
index be689b1de..3f1b5554c 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path Rem│ctrl-u/d: scroll
-> + feature ↑ ↑2 ./feature ..│
+ Branch Status HEAD± main↕ Path │ctrl-u/d: scroll
+> + feature ↑ ↑2 ./repo.feature..│
│ feature_code.rs | 6 ++++++
│ tests.rs | 4 ++++
│ 2 files changed, 10 insertions(+)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
index e14c584cd..de5e5286f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path Rem│ctrl-u/d: scroll
-> + feature ! ↑ +3 -1 ↑1 ./feature ..│
+ Branch Status HEAD± main↕ Path │ctrl-u/d: scroll
+> + feature ! ↑ +3 -1 ↑1 ./repo.feature..│
│ tracked.txt | 4 +++-
│ 1 file changed, 3 insertions(+), 1 deletion(-)
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
index dfed76a61..b91dfe581 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
@@ -4,9 +4,9 @@ expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Path │ctrl-u/d: scroll
-> @ main ^ ./test..│
- + active-worktree ∅ ./acti..│⚪ No uncommitted changes
- orphan-branch ∅ ⎇ ..│
+> @ main ^ ./repo │
+ + active-worktree ∅ ./repo..│⚪ No uncommitted changes
+ orphan-branch ∅ ⎇ │
│
│
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
index d138e0fa6..6bff4af1a 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for bash-test from main at [TMPDIR]/test-repo.bash-test
+✅ Created new worktree for bash-test from main at [TMPDIR]/repo.bash-test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index fd30ebee1..9b24491a5 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fish-multiline from main at [TMPDIR]/test-repo.fish-multiline
+✅ Created new worktree for fish-multiline from main at [TMPDIR]/repo.fish-multiline
🔄 Executing (--execute):
  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
index 565ace53c..f47634014 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fish-minimal from main at [TMPDIR]/test-repo.fish-minimal
+✅ Created new worktree for fish-minimal from main at [TMPDIR]/repo.fish-minimal
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index 545b58b57..a99d0de2a 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fish-bg from main at [TMPDIR]/test-repo.fish-bg
+✅ Created new worktree for fish-bg from main at [TMPDIR]/repo.fish-bg
🔄 Running post-start:
  echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap
index 50caa42d0..132fc26fb 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: prompt_only
---
-🟡 test-repo needs approval to execute 3 commands:
+🟡 repo needs approval to execute 3 commands:
⚪ post-create install:
echo 'Installing dependencies...'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
index 679b77d6a..32706c886 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
@@ -7,6 +7,6 @@ expression: output.normalized()
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
-✅ Created new worktree for feature-x from main at [TMPDIR]/test-repo.feature-x
+✅ Created new worktree for feature-x from main at [TMPDIR]/repo.feature-x
🔄 Running post-start dev:
  uv run dev
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
index ae93fcdc4..387f26fc1 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fix-auth from main at [TMPDIR]/test-repo.fix-auth
+✅ Created new worktree for fix-auth from main at [TMPDIR]/repo.fix-auth
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
index 85d7c9be6..43aaa2fa8 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for feature from main at [TMPDIR]/test-repo.feature
+✅ Created new worktree for feature from main at [TMPDIR]/repo.feature
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index 01bbb8e02..010c89d18 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for test-exec from main at [TMPDIR]/test-repo.test-exec
+✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
🔄 Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index 01bbb8e02..010c89d18 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for test-exec from main at [TMPDIR]/test-repo.test-exec
+✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
🔄 Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index 73e560eec..4d1e265a7 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -8,7 +8,7 @@ Installing dependencies...
🔄 Running post-create:
  echo 'Building project...'
Building project...
-✅ Created new worktree for feature-hooks from main at [TMPDIR]/test-repo.feature-hooks
+✅ Created new worktree for feature-hooks from main at [TMPDIR]/repo.feature-hooks
🔄 Running post-start server:
  echo 'Starting dev server on port 3000'
🔄 Running post-start watch:
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index af1bb0a96..93cdb4f77 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for feature-with-hooks from main at [TMPDIR]/test-repo.feature-with-hooks
+✅ Created new worktree for feature-with-hooks from main at [TMPDIR]/repo.feature-with-hooks
🔄 Running post-start:
  echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index 2de672e56..0539d072f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for feature-bg from main at [TMPDIR]/test-repo.feature-bg
+✅ Created new worktree for feature-bg from main at [TMPDIR]/repo.feature-bg
🔄 Running post-start:
  echo 'background task'
diff --git a/tests/integration_tests/spacing_edge_cases.rs b/tests/integration_tests/spacing_edge_cases.rs
index 646274b3e..c6fc210dd 100644
--- a/tests/integration_tests/spacing_edge_cases.rs
+++ b/tests/integration_tests/spacing_edge_cases.rs
@@ -31,9 +31,9 @@ fn test_short_branch_names_shorter_than_header() {
repo.commit("Initial commit");
// Create worktrees with very short branch names (shorter than "Branch" header)
- repo.add_worktree("a", "a");
- repo.add_worktree("bb", "bb");
- repo.add_worktree("ccc", "ccc");
+ repo.add_worktree("a");
+ repo.add_worktree("bb");
+ repo.add_worktree("ccc");
snapshot_list("short_branch_names", &repo);
}
@@ -44,15 +44,9 @@ fn test_long_branch_names_longer_than_header() {
repo.commit("Initial commit");
// Create worktrees with very long branch names
- repo.add_worktree(
- "very-long-feature-branch-name",
- "very-long-feature-branch-name",
- );
- repo.add_worktree(
- "another-extremely-long-name-here",
- "another-extremely-long-name-here",
- );
- repo.add_worktree("short", "short");
+ repo.add_worktree("very-long-feature-branch-name");
+ repo.add_worktree("another-extremely-long-name-here");
+ repo.add_worktree("short");
snapshot_list("long_branch_names", &repo);
}
@@ -64,9 +58,9 @@ fn test_unicode_branch_names_width_calculation() {
// Create worktrees with unicode characters that have different visual widths
// Note: Git may have restrictions on branch names, so use valid characters
- repo.add_worktree("café", "cafe");
- repo.add_worktree("naïve", "naive");
- repo.add_worktree("résumé", "resume");
+ repo.add_worktree("cafe");
+ repo.add_worktree("naive");
+ repo.add_worktree("resume");
snapshot_list("unicode_branch_names", &repo);
}
@@ -77,12 +71,9 @@ fn test_mixed_length_branch_names() {
repo.commit("Initial commit");
// Mix of very short, medium, and very long branch names
- repo.add_worktree("x", "x");
- repo.add_worktree("medium-length-name", "medium");
- repo.add_worktree(
- "extremely-long-branch-name-that-might-cause-layout-issues",
- "long",
- );
+ repo.add_worktree("x");
+ repo.add_worktree("medium");
+ repo.add_worktree("extremely-long-branch-name-that-might-cause-layout-issues");
snapshot_list("mixed_length_branch_names", &repo);
}
@@ -96,9 +87,9 @@ fn test_column_alignment_varying_diff_widths() {
repo.commit("Initial commit");
// Create worktrees with varying diff sizes to test alignment
- repo.add_worktree("feature-small", "feature-small");
- repo.add_worktree("feature-medium", "feature-medium");
- repo.add_worktree("feature-large", "feature-large");
+ repo.add_worktree("feature-small");
+ repo.add_worktree("feature-medium");
+ repo.add_worktree("feature-large");
// Add files to create diffs with different digit counts
let small_path = repo.worktrees.get("feature-small").unwrap();
@@ -126,13 +117,13 @@ fn test_column_alignment_with_empty_diffs() {
repo.commit("Initial commit");
// Mix of worktrees with and without diffs
- repo.add_worktree("no-changes", "no-changes");
+ repo.add_worktree("no-changes");
- repo.add_worktree("with-changes", "with-changes");
+ repo.add_worktree("with-changes");
let changes_path = repo.worktrees.get("with-changes").unwrap();
std::fs::write(changes_path.join("file.txt"), "content").unwrap();
- repo.add_worktree("also-no-changes", "also-no-changes");
+ repo.add_worktree("also-no-changes");
// Path column should align even when some rows have diffs and others don't
snapshot_list_with_width("alignment_empty_diffs", &repo, 180);
@@ -144,8 +135,8 @@ fn test_column_alignment_extreme_diff_sizes() {
repo.commit("Initial commit");
// Create worktrees with extreme diff size differences
- repo.add_worktree("tiny", "tiny");
- repo.add_worktree("huge", "huge");
+ repo.add_worktree("tiny");
+ repo.add_worktree("huge");
let tiny_path = repo.worktrees.get("tiny").unwrap();
std::fs::write(tiny_path.join("file.txt"), "x").unwrap();
diff --git a/tests/integration_tests/statusline.rs b/tests/integration_tests/statusline.rs
index a627b28f1..34f3ea25e 100644
--- a/tests/integration_tests/statusline.rs
+++ b/tests/integration_tests/statusline.rs
@@ -80,7 +80,7 @@ fn setup_repo_with_commits_ahead() -> TestRepo {
repo.setup_remote("main");
// Create feature branch with commits ahead
- let feature_path = repo.add_worktree("feature", "feature");
+ let feature_path = repo.add_worktree("feature");
// Add commits in the feature worktree
std::fs::write(feature_path.join("feature.txt"), "feature content").unwrap();
@@ -137,9 +137,9 @@ fn test_statusline_commits_ahead() {
fn claude_code_snapshot_settings(repo: &TestRepo) -> insta::Settings {
let mut settings = insta::Settings::clone_current();
// The path gets fish-style abbreviated, so filter the abbreviated form
- // e.g., /private/var/folders/.../test-repo -> /p/v/f/.../test-repo
- // We replace everything up to "test-repo" with [PATH]
- settings.add_filter(r"(?m)^.*test-repo", "[PATH]");
+ // e.g., /private/var/folders/.../repo -> /p/v/f/.../repo
+ // We replace everything up to "repo" with [PATH]
+ settings.add_filter(r"(?m)^.*repo", "[PATH]");
// Also filter the raw path in case it appears
settings.add_filter(&repo.root_path().display().to_string(), "[PATH]");
settings
diff --git a/tests/integration_tests/switch.rs b/tests/integration_tests/switch.rs
index 8cb0f668c..c72ddb740 100644
--- a/tests/integration_tests/switch.rs
+++ b/tests/integration_tests/switch.rs
@@ -61,7 +61,7 @@ fn test_switch_create_existing_branch_error() {
let mut repo = setup_switch_repo();
// Create a branch first
- repo.add_worktree("feature-y", "feature-y");
+ repo.add_worktree("feature-y");
// Try to create it again - should error
snapshot_switch(
@@ -117,7 +117,7 @@ fn test_switch_existing_branch() {
let mut repo = setup_switch_repo();
// Create a worktree for a branch
- repo.add_worktree("feature-z", "feature-z");
+ repo.add_worktree("feature-z");
// Switch to it (should find existing worktree)
snapshot_switch("switch_existing_branch", &repo, &["feature-z"]);
@@ -144,7 +144,7 @@ fn test_switch_existing_with_shell_integration_configured() {
.unwrap();
// Create a worktree first
- repo.add_worktree("shell-configured", "shell-configured");
+ repo.add_worktree("shell-configured");
// Switch to existing worktree - should show success + "cd with: wt switch" hint
// NOT the warning about "cannot cd (no shell integration)"
@@ -196,7 +196,7 @@ fn test_switch_internal_mode() {
fn test_switch_existing_worktree_internal() {
let mut repo = setup_switch_repo();
- repo.add_worktree("existing-wt", "existing-wt");
+ repo.add_worktree("existing-wt");
snapshot_switch_with_global_flags(
"switch_existing_internal",
@@ -225,7 +225,7 @@ fn test_switch_error_missing_worktree_directory() {
let mut repo = setup_switch_repo();
// Create a worktree
- let wt_path = repo.add_worktree("missing-wt", "missing-wt");
+ let wt_path = repo.add_worktree("missing-wt");
// Remove the worktree directory (but leave it registered in git)
std::fs::remove_dir_all(&wt_path).unwrap();
@@ -274,7 +274,7 @@ fn test_switch_execute_with_existing_worktree() {
let mut repo = setup_switch_repo();
// Create a worktree first
- repo.add_worktree("existing-exec", "existing-exec");
+ repo.add_worktree("existing-exec");
let create_file_cmd = "echo 'existing worktree' > existing.txt";
@@ -368,7 +368,7 @@ fn test_switch_no_config_commands_with_existing_worktree() {
let mut repo = setup_switch_repo();
// Create a worktree first
- repo.add_worktree("existing-no-hooks", "existing-no-hooks");
+ repo.add_worktree("existing-no-hooks");
// With --no-hooks, the --execute command should still run
snapshot_switch(
@@ -438,7 +438,7 @@ fn test_switch_primary_on_different_branch() {
);
// Also test switching to an existing branch
- repo.add_worktree("existing-branch", "existing-branch");
+ repo.add_worktree("existing-branch");
snapshot_switch(
"switch_to_existing_primary_on_different_branch",
&repo,
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
index 08f9abb75..2bd6ed8d7 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
@@ -28,7 +28,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
index d98e359e9..483996a55 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
@@ -9,7 +9,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 2 commands:
+🟡 repo needs approval to execute 2 commands:
⚪ post-create:
  echo 'First command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
index 13f300b4a..445742b7e 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
@@ -9,7 +9,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 4 commands:
+🟡 repo needs approval to execute 4 commands:
⚪ post-create:
  echo 'Branch: test-nested-branch'
@@ -18,7 +18,7 @@ exit_code: 1
  echo 'Worktree: [REPO].test-nested-branch'
⚪ post-create:
-  echo 'Repo: test-repo'
+  echo 'Repo: repo'
⚪ post-create:
  cd [REPO].test-nested-branch && pwd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
index 4d3dea13a..50dcdf3eb 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
@@ -9,7 +9,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 3 commands:
+🟡 repo needs approval to execute 3 commands:
⚪ post-create install:
  echo 'Installing dependencies...'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
index 7fc1cb81e..5bfcfca3d 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
@@ -9,7 +9,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'Worktree path: [REPO].feature-test-approval'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
index d98e359e9..483996a55 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
@@ -9,7 +9,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 2 commands:
+🟡 repo needs approval to execute 2 commands:
⚪ post-create:
  echo 'First command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
index ca7adc446..6d7a47c5b 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
@@ -9,7 +9,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command' > output.txt
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
index 7f9582817..29d3d606a 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
@@ -9,7 +9,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-merge:
  echo 'Post-merge cleanup for main'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
index 6f2ffd2bb..6fd167a8a 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
@@ -9,7 +9,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ pre-merge:
  echo 'Running pre-merge checks on main'
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
index c3cd3ebad..c824f3412 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
@@ -29,7 +29,7 @@ exit_code: 1
💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
----- stderr -----
-🟡 test-repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test'
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
index 8b06da7ed..c1be95e29 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
@@ -14,6 +14,7 @@ info:
LC_ALL: C
NO_COLOR: ""
SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -21,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo.main 6c3da842 10mo Initial commit on main
-+ feature ↑ ↑1 ./test-repo.feature 72413a3b 10mo Work on feature
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo.main 6c3da842 10mo Initial commit on main
++ feature ↑ ⚐ ↑1 ./repo.feature 72413a3b 10mo Work on feature
⚪ Showing 2 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
index 569cbce06..0103c17aa 100644
--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ . b834638e 10mo Initial commit
+@ develop ^ ⚐ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index d8bcb65db..d42697572 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ . b834638e 10mo Initial commit
+@ - ^ ⚐ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
new file mode 100644
index 000000000..501b4c4d6
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
@@ -0,0 +1,30 @@
+---
+source: tests/integration_tests/list.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ LANG: C
+ LC_ALL: C
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_BIN: ""
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+
+----- stderr -----
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ - ∅ ⚐ ./repo.feature b834638e 10mo Initial commit
+
+⚪ Showing 2 worktrees
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.snap
index d41637156..4c710793b 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
@@ -114,7 +114,7 @@ exit_code: 0
"branch_diff_display": "/u001b[32m+1/u001b[0m",
"status_line": "feature-ahead /u001b[36m!?/u001b[0m ±/u001b[32m+1/u001b[0m /u001b[31m-1/u001b[0m /u001b[32m↑2/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
"type": "worktree",
- "path": "[WORKTREE_FEATURE_AHEAD]",
+ "path": "[REPO].feature-ahead",
"bare": false,
"detached": false,
"working_tree_diff": {
@@ -164,7 +164,7 @@ exit_code: 0
"commits_display": "/u001b[2m/u001b[31m↓2/u001b[0m",
"status_line": "feature-behind /u001b[2m∅/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
"type": "worktree",
- "path": "[WORKTREE_FEATURE_BEHIND]",
+ "path": "[REPO].feature-behind",
"bare": false,
"detached": false,
"working_tree_diff": {
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index abbee6b35..d51b189a0 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -16,6 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -111,7 +112,7 @@ exit_code: 0
},
"status_line": "feature-detached /u001b[2m∅/u001b[0m",
"type": "worktree",
- "path": "[WORKTREE_FEATURE_DETACHED]",
+ "path": "[REPO].feature-detached",
"bare": false,
"detached": false,
"working_tree_diff": {
@@ -162,7 +163,7 @@ exit_code: 0
},
"status_line": "locked-feature /u001b[2m∅/u001b[0m/u001b[33m⊠/u001b[0m",
"type": "worktree",
- "path": "[WORKTREE_LOCKED_FEATURE]",
+ "path": "[REPO].locked-feature",
"bare": false,
"detached": false,
"locked": "Testing",
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
index 26717d2a7..7c5220e28 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
@@ -16,6 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -113,7 +114,7 @@ exit_code: 0
},
"status_line": "with-status /u001b[2m∅/u001b[0m🔧",
"type": "worktree",
- "path": "[WORKTREE_WITH_STATUS]",
+ "path": "[REPO].with-status",
"bare": false,
"detached": false,
"working_tree_diff": {
@@ -164,7 +165,7 @@ exit_code: 0
},
"status_line": "without-status /u001b[2m∅/u001b[0m",
"type": "worktree",
- "path": "[WORKTREE_WITHOUT_STATUS]",
+ "path": "[REPO].without-status",
"bare": false,
"detached": false,
"working_tree_diff": {
diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
index cbce4d1a3..a90b1d3fa 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10mo Diverged commit
-+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10mo Add 100 lines
-+ fix ?∅ 💬 ./fix b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged 8ba5aa92 10mo Diverged commit
++ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 10mo Add 100 lines
++ fix ?∅ 💬 ./repo.fix b834638e 10mo Initial commit
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index 10c86ee10..47e740858 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -23,11 +23,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
-@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
-+ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
-+ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
-+ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+^ main ^ ./repo 6c3da842 10mo Initial commit on main
+@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 9mo Commit at 01:00
++ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 9mo Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 9mo Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 9mo Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
index 8e375aa28..2c00cee8c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ develop ^ ⚐ ./repo b834638e 10mo Initial commit
++ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index e814e2eb3..2c0779921 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
@@ -18,9 +18,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index 4510c3342..f9e481fb6 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ locked-no-reason ∅ ⊠ ./locked-no-reason b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ locked-no-reason ∅ ⊠ ./repo.locked-no-reason b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index bf4be6c97..d52c52b1a 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ locked-feature ∅ ⊠ ./locked-feature b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ locked-feature ∅ ⊠ ./repo.locked-feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
index 1627c265b..a49d3e915 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo 1310bfb9 10mo Short message
-+ feature-a ∅↓ ↓1 ./feature-a f078644e 10mo This is a very long commit message that should test how the…
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo 1310bfb9 10mo Short message
++ feature-a ∅↓ ↓1 ./repo.feature-a f078644e 10mo This is a very long commit message that should test how the…
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
index 04c744cd8..0764f8540 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -23,11 +23,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ medium-name ∅ ./medium-name b834638e 10mo Initial commit
-+ short ∅ ./short b834638e 10mo Initial commit
-+ very-long-branch-name-here ∅ ./very-long-branch-name-here b834638e 10mo Initial commit
-+ with-changes ∅ ./with-changes b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ medium-name ∅ ./repo.medium-name b834638e 10mo Initial commit
++ short ∅ ./repo.short b834638e 10mo Initial commit
++ very-long-branch-name-here ∅ ./repo.very-long-branch-name-here b834638e 10mo Initial commit
++ with-changes ∅ ./repo.with-changes b834638e 10mo Initial commit
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 83abe2801..a3a2fb729 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ ./test-repo ⇡1 ⇣0 85ed6d3d 10mo Main advances
-+ feature +!?⚠↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ⇡1 ⇣1 4afb2b9e 10mo Local commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ ./repo ⇡1 ⇣0 85ed6d3d 10mo Main advances
++ feature +!?⚠↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 10mo Local commit
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
index 4265346ea..c6a412129 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo b7c14ce1 10mo Main conflicting changes
-+ feature +!?✖ ⊠🤖 +7 ./feature b7c14ce1 10mo Main conflicting changes
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./repo b7c14ce1 10mo Main conflicting changes
++ feature +!?✖ ⊠🤖 +7 ./repo.feature b7c14ce1 10mo Main conflicting changes
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
index 39e4ef788..993d94a2f 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature +!? ↑ +2 -3 ↑1 ./feature 689c2504 10mo Add files
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature +!? ↑ +2 -3 ↑1 ./repo.feature 689c2504 10mo Add files
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index a52daae08..698f17ec9 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
index 20c53bf78..8fff02b8a 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature ∅ ./feature b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature ∅ ./repo.feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
index bae79b4e4..5e1181e25 100644
--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-- feature ∅ ./feature b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
+- feature ∅ ./repo.feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
index 75edde3d6..4d28b8e63 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
index 4ed7c3ff0..54fa020f1 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -25,10 +25,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
- orphan-1 ∅ ⎇ b834638e 10mo Initial commit
- orphan-2 ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
+ orphan-1 ∅ ⎇ b834638e 10mo Initial commit
+ orphan-2 ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
index 43bf39e1b..afab99e29 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ⇡0 ⇣0 b834638e 10mo Initial commit
-+ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug
-+ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo ⇡0 ⇣0 b834638e 10mo Initial commit
++ bugfix-y ↑ ↑1 ./repo.bugfix-y 412a27c8 10mo Fix bug
++ feature-x + ↑ +5 ↑3 ./repo.feature-x 7fd821aa 10mo Add file 3
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
index 30fb62a90..31ca02220 100644
--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10mo Symbol commit
-+ pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10mo PR commit
-+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10mo Initial content
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ main-symbol ↑ 💬 ↑1 ./repo.main-symbol 579fcd0b 10mo Symbol commit
++ pr-link ↑ 🤖 ↑1 ./repo.pr-link e17e7d2d 10mo PR commit
++ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence a2483ffd 10mo Initial content
⚪ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
index ec16267f7..395ff3e2d 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ . b834638e 10mo Initial commit
+@ - ^ ⚐ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
index 2fd77020d..0eae34993 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ?∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10mo Test commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-a ?∅ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 10mo Test commit
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
index 48f6a66f1..e9dfa4b67 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
@@ -24,17 +24,17 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-1 ∅ ./feature-1 b834638e 10mo Initial commit
-+ feature-10 ∅ ./feature-10 b834638e 10mo Initial commit
-+ feature-2 ∅ ./feature-2 b834638e 10mo Initial commit
-+ feature-3 ∅ ./feature-3 b834638e 10mo Initial commit
-+ feature-4 ∅ ./feature-4 b834638e 10mo Initial commit
-+ feature-5 ∅ ./feature-5 b834638e 10mo Initial commit
-+ feature-6 ∅ ./feature-6 b834638e 10mo Initial commit
-+ feature-7 ∅ ./feature-7 b834638e 10mo Initial commit
-+ feature-8 ∅ ./feature-8 b834638e 10mo Initial commit
-+ feature-9 ∅ ./feature-9 b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-1 ∅ ./repo.feature-1 b834638e 10mo Initial commit
++ feature-10 ∅ ./repo.feature-10 b834638e 10mo Initial commit
++ feature-2 ∅ ./repo.feature-2 b834638e 10mo Initial commit
++ feature-3 ∅ ./repo.feature-3 b834638e 10mo Initial commit
++ feature-4 ∅ ./repo.feature-4 b834638e 10mo Initial commit
++ feature-5 ∅ ./repo.feature-5 b834638e 10mo Initial commit
++ feature-6 ∅ ./repo.feature-6 b834638e 10mo Initial commit
++ feature-7 ∅ ./repo.feature-7 b834638e 10mo Initial commit
++ feature-8 ∅ ./repo.feature-8 b834638e 10mo Initial commit
++ feature-9 ∅ ./repo.feature-9 b834638e 10mo Initial commit
⚪ Showing 11 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
index 076ac97f9..99532be9f 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
-+ feature-c ∅ ./feature-c b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
++ feature-c ∅ ./repo.feature-c b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
index 6425d58c6..488675eb1 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
-@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
-+ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
-+ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
-+ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+^ main ^ ./repo 6c3da842 10mo Initial commit on main
+@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 9mo Commit at 01:00
++ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 9mo Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 9mo Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 9mo Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
index 5fd3746f9..acf0f74c1 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ locked ∅ ⊠ ./locked b834638e 10mo Initial commit
-+ normal ∅ ./normal b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ locked ∅ ⊠ ./repo.locked b834638e 10mo Initial commit
++ normal ∅ ./repo.normal b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index 3cafd88f6..01a064ab0 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo ⇡0 ⇣0 6c3da842 10mo Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./ahead ⇡1 ⇣0 2fff52c2 10mo Ahead commit
-+ in-sync ∅ ./in-sync ⇡0 ⇣0 6c3da842 10mo Initial commit on main
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./repo ⇡0 ⇣0 6c3da842 10mo Initial commit on main
++ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 ⇣0 2fff52c2 10mo Ahead commit
++ in-sync ∅ ./repo.in-sync ⇡0 ⇣0 6c3da842 10mo Initial commit on main
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index 11d352a99..e40962b5e 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo e4614cb7 10mo Fix bug with café ☕ handling
-+ feature-test ∅↓ ↓1 ./feature-test 0c53695b 10mo Add support for 日本語 and émoji 🎉
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo e4614cb7 10mo Fix bug with café ☕ handling
++ feature-test ∅↓ ↓1 ./repo.feature-test 0c53695b 10mo Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
index 37e9493be..20e0e7fc6 100644
--- a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
+++ b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ emoji ∅ 🔄 ./emoji b834638e 10mo Initial commit
-+ multi ∅ 👨‍💻 ./multi b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ emoji ∅ 🔄 ./repo.emoji b834638e 10mo Initial commit
++ multi ∅ 👨‍💻 ./repo.multi b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index db2d5e5e8..b69cb70b5 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-with-worktree ∅ ./feature-with-worktree b834638e 10mo Initial commit
- another-branch ∅ ⎇ b834638e 10mo Initial commit
- feature-without-worktree ∅ ⎇ b834638e 10mo Initial commit
- fix-bug ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-with-worktree ∅ ./repo.feature-with-worktree b834638e 10mo Initial commit
+ another-branch ∅ ⎇ b834638e 10mo Initial commit
+ feature-without-worktree ∅ ⎇ b834638e 10mo Initial commit
+ fix-bug ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
index d73b8497c..4864e9384 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index da711b2a0..072870d14 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ⇡0 ⇣0 b834638e 10mo Initial commit
-+ feature-with-worktree ∅ ./feature-with-worktree b834638e 10mo Initial commit
- origin/remote-only ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo ⇡0 ⇣0 b834638e 10mo Initial commit
++ feature-with-worktree ∅ ./repo.feature-with-worktree b834638e 10mo Initial commit
+ origin/remote-only ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 1 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index c57284e3f..af88be544 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -26,12 +26,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo ⇡0 ⇣0 [SHA] 10mo Initial commit on main
-+ ahead ↑⇡ ↑2 +2 ./ahead ⇡2 ⇣0 [SHA] 10mo Ahead commit 2
-+ behind ∅ ⇣ ./behind ⇡0 ⇣1 [SHA] 10mo Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ./diverged ⇡1 ⇣1 [SHA] 10mo Diverged local commit
-+ in-sync ∅ ./in-sync ⇡0 ⇣0 [SHA] 10mo Initial commit on main
-+ no-upstream ∅ ./no-upstream [SHA] 10mo Initial commit on main
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./repo ⇡0 ⇣0 [SHA] 10mo Initial commit on main
++ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 ⇣0 [SHA] 10mo Ahead commit 2
++ behind ∅ ⇣ ./repo.behind ⇡0 ⇣1 [SHA] 10mo Initial commit on main
++ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 [SHA] 10mo Diverged local commit
++ in-sync ∅ ./repo.in-sync ⇡0 ⇣0 [SHA] 10mo Initial commit on main
++ no-upstream ∅ ./repo.no-upstream [SHA] 10mo Initial commit on main
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
index 62c2a54ae..f67723ed2 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -23,11 +23,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ clean-no-status ∅ ./clean-no-status b834638e 10mo Initial commit
-+ clean-with-status ∅ 💬 ./clean-with-status b834638e 10mo Initial commit
-+ dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10mo Initial commit
-+ dirty-with-status ?∅ 🤖 ./dirty-with-status b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ clean-no-status ∅ ./repo.clean-no-status b834638e 10mo Initial commit
++ clean-with-status ∅ 💬 ./repo.clean-with-status b834638e 10mo Initial commit
++ dirty-no-status ! +1 -1 ./repo.dirty-no-status b834638e 10mo Initial commit
++ dirty-with-status ?∅ 🤖 ./repo.dirty-with-status b834638e 10mo Initial commit
⚪ Showing 5 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
index 1baa4d561..a6d67dbb3 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo [SHA] 10mo Initial commit
-+ test +!? +1 -1 ./test [SHA] 10mo Initial commit
+@ main ^ ./repo [SHA] 10mo Initial commit
++ test +!? +1 -1 ./repo.test [SHA] 10mo Initial commit
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
index 17727be85..f5b667b7c 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo [SHA] 10mo Initial commit
-+ complex !? +1 -1 ./complex [SHA] 10mo Initial commit
-+ simple + ? +1 -1 ./simple [SHA] 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo [SHA] 10mo Initial commit
++ complex !? +1 -1 ./repo.complex [SHA] 10mo Initial commit
++ simple + ? +1 -1 ./repo.simple [SHA] 10mo Initial commit
⚪ Showing 3 worktrees, 2 with changes
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
index 3dfc7be0d..5e6f12492 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
@@ -25,7 +25,7 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  echo 'Repo: test-repo' > info.txt
+  echo 'Repo: repo' > info.txt
🔄 Running post-create:
  echo 'Branch: feature-test' >> info.txt
🔄 Running post-create:
diff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
index 8dcdb5252..6fd8eb546 100644
--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature ∅ ./feature [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature ∅ ./repo.feature [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
index a3aa687f8..abb2f92ee 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ also-no-changes ∅ ./also-no-changes b834638e 10mo Initial commit
-+ no-changes ∅ ./no-changes b834638e 10mo Initial commit
-+ with-changes ! +1 -1 ./with-changes b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ also-no-changes ∅ ./repo.also-no-changes b834638e 10mo Initial commit
++ no-changes ∅ ./repo.no-changes b834638e 10mo Initial commit
++ with-changes ! +1 -1 ./repo.with-changes b834638e 10mo Initial commit
⚪ Showing 4 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
index a63c46860..ae9c66e55 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ huge ?∅ ./huge b834638e 10mo Initial commit
-+ tiny ! +1 -1 ./tiny b834638e 10mo Initial commit
+@ main ^ ./repo b834638e 10mo Initial commit
++ huge ?∅ ./repo.huge b834638e 10mo Initial commit
++ tiny ! +1 -1 ./repo.tiny b834638e 10mo Initial commit
⚪ Showing 3 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
index 300f90177..8e7ba9e42 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-large ?∅ ./feature-large b834638e 10mo Initial commit
-+ feature-medium ?∅ ./feature-medium b834638e 10mo Initial commit
-+ feature-small ?∅ ./feature-small b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ feature-large ?∅ ./repo.feature-large b834638e 10mo Initial commit
++ feature-medium ?∅ ./repo.feature-medium b834638e 10mo Initial commit
++ feature-small ?∅ ./repo.feature-small b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
index ed0d399ba..cb93ee358 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ another-extremely-long-name-here ∅ ./another-extremely-long-name-here b834638e 10mo Initial commit
-+ short ∅ ./short b834638e 10mo Initial commit
-+ very-long-feature-branch-name ∅ ./very-long-feature-branch-name b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age
+@ main ^ ./repo b834638e 10mo
++ another-extremely-long-name-here ∅ ./repo.another-extremely-long-name-here b834638e 10mo
++ short ∅ ./repo.short b834638e 10mo
++ very-long-feature-branch-name ∅ ./repo.very-long-feature-branch-name b834638e 10mo
-⚪ Showing 4 worktrees
+⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
index c4eddd320..baa31a482 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ long ∅ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10mo Initial commit
-+ medium ∅ ./medium-length-name b834638e 10mo Initial commit
-+ x ∅ ./x b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Remote⇅ Commit Age Message
+@ main ^ b834638e 10mo Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues ∅ b834638e 10mo Initial commit
++ medium ∅ b834638e 10mo Initial commit
++ x ∅ b834638e 10mo Initial commit
-⚪ Showing 4 worktrees
+⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
index 7486192ed..b25444f0e 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ a ∅ ./a b834638e 10mo Initial commit
-+ bb ∅ ./bb b834638e 10mo Initial commit
-+ ccc ∅ ./ccc b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ a ∅ ./repo.a b834638e 10mo Initial commit
++ bb ∅ ./repo.bb b834638e 10mo Initial commit
++ ccc ∅ ./repo.ccc b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
index c06f62e4c..65b8f7da8 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ cafe ∅ ./café b834638e 10mo Initial commit
-+ naive ∅ ./naïve b834638e 10mo Initial commit
-+ resume ∅ ./résumé b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 10mo Initial commit
++ cafe ∅ ./repo.cafe b834638e 10mo Initial commit
++ naive ∅ ./repo.naive b834638e 10mo Initial commit
++ resume ∅ ./repo.resume b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index c71b2a2be..fcd0bcb5e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -25,7 +25,7 @@ info:
success: true
exit_code: 0
----- stdout -----
-✅ Switched to worktree for existing-exec at [WORKTREE_EXISTING_EXEC]
+✅ Switched to worktree for existing-exec at [REPO].existing-exec
🔄 Executing (--execute):
  echo 'existing worktree' > existing.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
index a6d361bc7..74ca7c12a 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
@@ -23,7 +23,7 @@ info:
success: true
exit_code: 0
----- stdout -----
-🟡 Worktree for feature-z at [WORKTREE_FEATURE_Z]; cannot cd (no shell integration)
+🟡 Worktree for feature-z at [REPO].feature-z; cannot cd (no shell integration)
💡 Run `wt config shell install` to enable automatic cd
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
index 3bc4b3085..4b61944c3 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
@@ -18,12 +18,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-cd '[WORKTREE_EXISTING_WT]'
+cd '[REPO].existing-wt'
----- stderr -----
-✅ Switched to worktree for existing-wt at [WORKTREE_EXISTING_WT]
+✅ Switched to worktree for existing-wt at [REPO].existing-wt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
index 6d9ec3c4e..b218d6c75 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-✅ Switched to worktree for shell-configured at [WORKTREE_SHELL_CONFIGURED]
+✅ Switched to worktree for shell-configured at [REPO].shell-configured
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
index 5420d8fe2..0a78c6e8b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
@@ -23,7 +23,7 @@ info:
success: true
exit_code: 0
----- stdout -----
-🟡 Worktree for existing-branch at [WORKTREE_EXISTING_BRANCH]; cannot cd (no shell integration)
+🟡 Worktree for existing-branch at [REPO].existing-branch; cannot cd (no shell integration)
💡 Run `wt config shell install` to enable automatic cd
----- stderr -----