Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Remove shell aliases to simplify shell integration
Maximilian Roos8e741052d1ca
diff --git a/README.md b/README.mdindex 04e2c5fd1..fd93e302d 100644--- a/README.md+++ b/README.md@@ -79,12 +79,6 @@ eval "$(wt init bash --cmd myprefix)"eval "$(wt init bash --hook prompt)"```-**Disable aliases:**-```bash-# Don't create short aliases like wt-sw, wt-fin-eval "$(wt init bash --no-alias)"-```-## How It WorksWorktrunk uses a **directive protocol** to communicate with shell wrappers:diff --git a/templates/bash.sh b/templates/bash.shindex f4c2fcbf3..3203372a2 100644--- a/templates/bash.sh+++ b/templates/bash.sh@@ -29,10 +29,6 @@ _wt_exec() {_wt_exec finish --internal "$@"}-# Convenience aliases-alias {{ cmd_prefix }}-sw='{{ cmd_prefix }}-switch'-alias {{ cmd_prefix }}-fin='{{ cmd_prefix }}-finish'-{% if hook.to_string() == "prompt" %}# Prompt hook for tracking current worktree_wt_prompt_hook() {diff --git a/templates/fish.fish b/templates/fish.fishindex 0646a4c7e..739ebbec7 100644--- a/templates/fish.fish+++ b/templates/fish.fish@@ -28,10 +28,6 @@ function {{ cmd_prefix }}-finish_wt_exec finish --internal $argvend-# Convenience aliases-alias {{ cmd_prefix }}-sw='{{ cmd_prefix }}-switch'-alias {{ cmd_prefix }}-fin='{{ cmd_prefix }}-finish'-{% if hook.to_string() == "prompt" %}# Prompt hook for tracking current worktreefunction _wt_prompt_hook --on-event fish_promptdiff --git a/tests/common/mod.rs b/tests/common/mod.rsindex 139f51086..349d42d37 100644--- a/tests/common/mod.rs+++ b/tests/common/mod.rs@@ -354,7 +354,7 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {for (name, path) in &repo.worktrees {settings.add_filter(path.to_str().unwrap(),- &format!("[WORKTREE_{}]", name.to_uppercase().replace('-', "_")),+ format!("[WORKTREE_{}]", name.to_uppercase().replace('-', "_")),);}diff --git a/tests/integration_tests/e2e_shell.rs b/tests/integration_tests/e2e_shell.rsindex 46fccd2b4..766ed0332 100644--- a/tests/integration_tests/e2e_shell.rs+++ b/tests/integration_tests/e2e_shell.rs@@ -541,48 +541,3 @@ fn test_bash_e2e_switch_to_existing_worktree() {output);}--#[test]-fn test_bash_e2e_aliases() {- if !is_shell_available("bash") {- eprintln!("Skipping test: bash not available");- return;- }-- let mut repo = TestRepo::new();- repo.commit("Initial commit");- repo.setup_remote("main");-- let init_code = generate_init_code(&repo, "bash");-- // Test that short aliases work- let script = format!(- r#"- shopt -s expand_aliases- export PATH="{}:$PATH"- {}- wt-sw --create test-alias- pwd- wt-fin- pwd- "#,- get_cargo_bin("wt").parent().unwrap().to_string_lossy(),- init_code- );-- let output = execute_shell_script(&repo, "bash", &script);-- // Should have switched to test-alias- assert!(- output.contains("test-alias"),- "Expected wt-sw alias to work, got: {}",- output- );-- // Should have returned to main (wt-fin should work)- assert!(- output.contains("main"),- "Expected wt-fin alias to work, got: {}",- output- );-}diff --git a/tests/integration_tests/switch.rs b/tests/integration_tests/switch.rsindex 3389473a4..3998cbf13 100644--- a/tests/integration_tests/switch.rs+++ b/tests/integration_tests/switch.rs@@ -1,6 +1,5 @@use crate::common::{TestRepo, make_snapshot_cmd, setup_snapshot_settings};use insta_cmd::assert_cmd_snapshot;-use std::process::Command;/// Helper to create snapshot with normalized paths and SHAsfn snapshot_switch(test_name: &str, repo: &TestRepo, args: &[&str]) {diff --git a/tests/snapshots/integration__integration_tests__init__init_bash.snap b/tests/snapshots/integration__integration_tests__init__init_bash.snapindex 9f0adf346..7ee9cae37 100644--- a/tests/snapshots/integration__integration_tests__init__init_bash.snap+++ b/tests/snapshots/integration__integration_tests__init__init_bash.snap@@ -49,10 +49,6 @@ wt-finish() {_wt_exec finish --internal "$@"}-# Convenience aliases-alias wt-sw='wt-switch'-alias wt-fin='wt-finish'------ stderr -----diff --git a/tests/snapshots/integration__integration_tests__init__init_bash_all_options.snap b/tests/snapshots/integration__integration_tests__init__init_bash_all_options.snapindex 54a0f6c1f..b814469e6 100644--- a/tests/snapshots/integration__integration_tests__init__init_bash_all_options.snap+++ b/tests/snapshots/integration__integration_tests__init__init_bash_all_options.snap@@ -53,10 +53,6 @@ wt-finish() {_wt_exec finish --internal "$@"}-# Convenience aliases-alias wt-sw='wt-switch'-alias wt-fin='wt-finish'-# Prompt hook for tracking current worktree_wt_prompt_hook() {diff --git a/tests/snapshots/integration__integration_tests__init__init_bash_custom_prefix.snap b/tests/snapshots/integration__integration_tests__init__init_bash_custom_prefix.snapindex 515ef5ff8..90d396383 100644--- a/tests/snapshots/integration__integration_tests__init__init_bash_custom_prefix.snap+++ b/tests/snapshots/integration__integration_tests__init__init_bash_custom_prefix.snap@@ -51,10 +51,6 @@ wt-finish() {_wt_exec finish --internal "$@"}-# Convenience aliases-alias wt-sw='wt-switch'-alias wt-fin='wt-finish'------ stderr -----diff --git a/tests/snapshots/integration__integration_tests__init__init_bash_prompt_hook.snap b/tests/snapshots/integration__integration_tests__init__init_bash_prompt_hook.snapindex 806afaa4a..6ed4a7273 100644--- a/tests/snapshots/integration__integration_tests__init__init_bash_prompt_hook.snap+++ b/tests/snapshots/integration__integration_tests__init__init_bash_prompt_hook.snap@@ -51,10 +51,6 @@ wt-finish() {_wt_exec finish --internal "$@"}-# Convenience aliases-alias wt-sw='wt-switch'-alias wt-fin='wt-finish'-# Prompt hook for tracking current worktree_wt_prompt_hook() {diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snapindex 81a52705f..0ab974cd5 100644--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap@@ -48,10 +48,6 @@ function wt-finish_wt_exec finish --internal $argvend-# Convenience aliases-alias wt-sw='wt-switch'-alias wt-fin='wt-finish'------ stderr -----diff --git a/tests/snapshots/integration__integration_tests__init__init_fish_prompt_hook.snap b/tests/snapshots/integration__integration_tests__init__init_fish_prompt_hook.snapindex 4e40d5175..39e92af75 100644--- a/tests/snapshots/integration__integration_tests__init__init_fish_prompt_hook.snap+++ b/tests/snapshots/integration__integration_tests__init__init_fish_prompt_hook.snap@@ -50,10 +50,6 @@ function wt-finish_wt_exec finish --internal $argvend-# Convenience aliases-alias wt-sw='wt-switch'-alias wt-fin='wt-finish'-# Prompt hook for tracking current worktreefunction _wt_prompt_hook --on-event fish_promptdiff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snapindex 025457086..d3466389e 100644--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap@@ -49,10 +49,6 @@ wt-finish() {_wt_exec finish --internal "$@"}-# Convenience aliases-alias wt-sw='wt-switch'-alias wt-fin='wt-finish'------ stderr -----