Skip to content

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

Replace possessive pronouns with articles in user-facing text

Maximilian Roosf649a6506169
diff --git a/.claude-plugin/skills/worktrunk/reference/faq.md b/.claude-plugin/skills/worktrunk/reference/faq.md
index 9b2dad080..3bf7ee5c0 100644
--- a/.claude-plugin/skills/worktrunk/reference/faq.md
+++ b/.claude-plugin/skills/worktrunk/reference/faq.md
@@ -138,9 +138,9 @@ If shell integration isn't working (auto-cd not happening, completions missing,
1. Install the [Worktrunk plugin](https://worktrunk.dev/claude-code/) in Claude Code
2. Ask Claude to debug the Worktrunk shell integration
-Claude will run `wt config show`, inspect your shell config files, and identify the issue.
+Claude will run `wt config show`, inspect the shell config files, and identify the issue.
-If Claude can't fix it, please [open an issue](https://github.com/max-sixty/worktrunk/issues/new?title=Shell%20setup%20issue&body=%23%23%20Shell%20and%20OS%0A%0A-%20Shell%3A%20%0A-%20OS%3A%20%0A%0A%23%23%20Output%20of%20%60wt%20config%20show%60%0A%0A%60%60%60%0A%0A%60%60%60%0A%0A%23%23%20What%20Claude%20found%20%28if%20available%29%0A%0A) with the output of `wt config show`, your shell (bash/zsh/fish), and OS. (And even if it fixes the problem, feel free to open an issue: non-standard success cases are useful for ensuring Worktrunk is easy to set up for others.)
+If Claude can't fix it, please [open an issue](https://github.com/max-sixty/worktrunk/issues/new?title=Shell%20setup%20issue&body=%23%23%20Shell%20and%20OS%0A%0A-%20Shell%3A%20%0A-%20OS%3A%20%0A%0A%23%23%20Output%20of%20%60wt%20config%20show%60%0A%0A%60%60%60%0A%0A%60%60%60%0A%0A%23%23%20What%20Claude%20found%20%28if%20available%29%0A%0A) with the output of `wt config show`, the shell (bash/zsh/fish), and OS. (And even if it fixes the problem, feel free to open an issue: non-standard success cases are useful for ensuring Worktrunk is easy to set up for others.)
## What files does Worktrunk create?
@@ -175,7 +175,7 @@ Created by `wt config shell install`:
### 4. Metadata in `.git/` (automatic)
-Worktrunk stores small amounts of cache and log data in your repository's `.git/` directory:
+Worktrunk stores small amounts of cache and log data in the repository's `.git/` directory:
| Location | Purpose | Created by |
|----------|---------|------------|
diff --git a/.claude-plugin/skills/worktrunk/reference/shell-integration.md b/.claude-plugin/skills/worktrunk/reference/shell-integration.md
index 47d1a1ccd..6c3dc2526 100644
--- a/.claude-plugin/skills/worktrunk/reference/shell-integration.md
+++ b/.claude-plugin/skills/worktrunk/reference/shell-integration.md
@@ -4,9 +4,9 @@ How Worktrunk's shell integration works and how to debug issues.
## Why Shell Integration Exists
-Subprocesses cannot change the parent shell's current directory. When you run
-`wt switch feature`, the `wt` binary runs as a child process and cannot `cd`
-your terminal.
+Subprocesses cannot change the parent shell's current directory. When
+`wt switch feature` runs, the `wt` binary runs as a child process and cannot
+`cd` the terminal.
Worktrunk solves this with **directive file passing**:
@@ -16,7 +16,7 @@ Worktrunk solves this with **directive file passing**:
4. Shell sources the file after `wt` exits, executing the commands
5. Shell removes the temp file
-This allows `wt switch` to change your terminal's directory.
+This allows `wt switch` to change the terminal's directory.
## Installation
@@ -24,7 +24,7 @@ This allows `wt switch` to change your terminal's directory.
# Auto-install for all shells (bash, zsh, fish, PowerShell)
wt config shell install
-# Or manual installation - add to your shell config:
+# Or manual installation - add to the shell config:
# bash (~/.bashrc):
eval "$(wt config shell init bash)"
@@ -67,31 +67,30 @@ started before installation. The shell function isn't loaded yet.
### "ran ./path/to/wt; shell integration wraps wt"
-**Meaning**: You invoked the binary with an explicit path (like `./target/debug/wt`
+**Meaning**: The binary was invoked with an explicit path (like `./target/debug/wt`
or `/usr/local/bin/wt`) instead of just `wt`. The shell wrapper only intercepts
the bare command `wt`.
**Fix**: Use `wt` without a path. For testing dev builds, set `WORKTRUNK_BIN`:
```bash
export WORKTRUNK_BIN=./target/debug/wt
-wt switch feature # Now uses your dev build with shell integration
+wt switch feature # Now uses the dev build with shell integration
```
### "ran git wt; running through git prevents cd"
-**Meaning**: You ran `git wt` (git alias) instead of `wt`. Git runs worktrunk as
+**Meaning**: `git wt` (git alias) was used instead of `wt`. Git runs worktrunk as
a subprocess, bypassing the shell wrapper.
-**Fix**: Use `wt` directly instead of `git wt` when you need directory switching.
+**Fix**: Use `wt` directly instead of `git wt` when directory switching is needed.
### "Alias bypasses shell integration"
-**Meaning**: You have an alias like `alias gwt="/usr/bin/wt"` or
-`alias gwt="wt.exe"` that points directly to the binary instead of the shell
-function.
+**Meaning**: An alias like `alias gwt="/usr/bin/wt"` or `alias gwt="wt.exe"`
+points directly to the binary instead of the shell function.
When shell integration is installed, it creates a shell function named `wt` (or
-`git-wt`). If your alias points to the binary path, it bypasses this function
+`git-wt`). If the alias points to the binary path, it bypasses this function
and shell integration won't work.
**Examples that bypass** (won't auto-cd):
diff --git a/.claude-plugin/skills/worktrunk/reference/step.md b/.claude-plugin/skills/worktrunk/reference/step.md
index 5299d1971..ee2fd5e97 100644
--- a/.claude-plugin/skills/worktrunk/reference/step.md
+++ b/.claude-plugin/skills/worktrunk/reference/step.md
@@ -227,7 +227,7 @@ Git worktrees share the repository but not untracked files. This command copies
### Setup
-Add to your project config:
+Add to the project config:
```toml
# .config/wt.toml
diff --git a/docs/content/faq.md b/docs/content/faq.md
index 72338bf3a..6330fc4b8 100644
--- a/docs/content/faq.md
+++ b/docs/content/faq.md
@@ -148,9 +148,9 @@ If shell integration isn't working (auto-cd not happening, completions missing,
1. Install the [Worktrunk plugin](@/claude-code.md) in Claude Code
2. Ask Claude to debug the Worktrunk shell integration
-Claude will run `wt config show`, inspect your shell config files, and identify the issue.
+Claude will run `wt config show`, inspect the shell config files, and identify the issue.
-If Claude can't fix it, please [open an issue](https://github.com/max-sixty/worktrunk/issues/new?title=Shell%20setup%20issue&body=%23%23%20Shell%20and%20OS%0A%0A-%20Shell%3A%20%0A-%20OS%3A%20%0A%0A%23%23%20Output%20of%20%60wt%20config%20show%60%0A%0A%60%60%60%0A%0A%60%60%60%0A%0A%23%23%20What%20Claude%20found%20%28if%20available%29%0A%0A) with the output of `wt config show`, your shell (bash/zsh/fish), and OS. (And even if it fixes the problem, feel free to open an issue: non-standard success cases are useful for ensuring Worktrunk is easy to set up for others.)
+If Claude can't fix it, please [open an issue](https://github.com/max-sixty/worktrunk/issues/new?title=Shell%20setup%20issue&body=%23%23%20Shell%20and%20OS%0A%0A-%20Shell%3A%20%0A-%20OS%3A%20%0A%0A%23%23%20Output%20of%20%60wt%20config%20show%60%0A%0A%60%60%60%0A%0A%60%60%60%0A%0A%23%23%20What%20Claude%20found%20%28if%20available%29%0A%0A) with the output of `wt config show`, the shell (bash/zsh/fish), and OS. (And even if it fixes the problem, feel free to open an issue: non-standard success cases are useful for ensuring Worktrunk is easy to set up for others.)
## What files does Worktrunk create?
@@ -185,7 +185,7 @@ Created by `wt config shell install`:
### 4. Metadata in `.git/` (automatic)
-Worktrunk stores small amounts of cache and log data in your repository's `.git/` directory:
+Worktrunk stores small amounts of cache and log data in the repository's `.git/` directory:
| Location | Purpose | Created by |
|----------|---------|------------|
diff --git a/docs/content/step.md b/docs/content/step.md
index e2704769d..0cebd056e 100644
--- a/docs/content/step.md
+++ b/docs/content/step.md
@@ -246,7 +246,7 @@ Git worktrees share the repository but not untracked files. This command copies
### Setup
-Add to your project config:
+Add to the project config:
```toml
# .config/wt.toml
diff --git a/src/cli/step.rs b/src/cli/step.rs
index ff49ed5b4..2d9529ffe 100644
--- a/src/cli/step.rs
+++ b/src/cli/step.rs
@@ -162,7 +162,7 @@ wt step squash --show-prompt | less
## Setup
-Add to your project config:
+Add to the project config:
```toml
# .config/wt.toml
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 98600bc42..eb3c3cce7 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -521,7 +521,7 @@ pub fn plan_switch(
let remove_cmd = suggest_command("remove", &[&resolved_branch], &[]);
let switch_cmd = suggest_command("switch", &[&resolved_branch], &[]);
crate::output::print(hint_message(cformat!(
- "To switch to the remote branch, remove this added branch and then run without <bright-black>--create</>: <bright-black>{remove_cmd} && {switch_cmd}</>"
+ "To switch to the remote branch, delete this branch and switch without --create: <bright-black>{remove_cmd} && {switch_cmd}</>"
)))?;
}
}
diff --git a/src/snapshots/worktrunk__shell__tests__init_zsh.snap b/src/snapshots/worktrunk__shell__tests__init_zsh.snap
index 207136d3c..c0772990a 100644
--- a/src/snapshots/worktrunk__shell__tests__init_zsh.snap
+++ b/src/snapshots/worktrunk__shell__tests__init_zsh.snap
@@ -5,7 +5,7 @@ expression: output
# worktrunk shell integration for zsh
#
# Completions require zsh's completion system (compinit). If completions don't work:
-# autoload -Uz compinit && compinit # add before this line in your .zshrc
+# autoload -Uz compinit && compinit # add before this line in .zshrc
# Only initialize if wt is available (in PATH or via WORKTRUNK_BIN)
if command -v wt >/dev/null 2>&1 || [[ -n "${WORKTRUNK_BIN:-}" ]]; then
diff --git a/templates/zsh.zsh b/templates/zsh.zsh
index ed510b0af..1ef4ce12c 100644
--- a/templates/zsh.zsh
+++ b/templates/zsh.zsh
@@ -1,7 +1,7 @@
# worktrunk shell integration for zsh
#
# Completions require zsh's completion system (compinit). If completions don't work:
-# autoload -Uz compinit && compinit # add before this line in your .zshrc
+# autoload -Uz compinit && compinit # add before this line in .zshrc
# Only initialize if {{ cmd }} is available (in PATH or via WORKTRUNK_BIN)
if command -v {{ cmd }} >/dev/null 2>&1 || [[ -n "${WORKTRUNK_BIN:-}" ]]; then
diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
index 9526c954f..63d62c50b 100644
--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
@@ -10,7 +10,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -35,7 +35,7 @@ exit_code: 0
# worktrunk shell integration for zsh
#
# Completions require zsh's completion system (compinit). If completions don't work:
-# autoload -Uz compinit && compinit # add before this line in your .zshrc
+# autoload -Uz compinit && compinit # add before this line in .zshrc
# Only initialize if wt is available (in PATH or via WORKTRUNK_BIN)
if command -v wt >/dev/null 2>&1 || [[ -n "${WORKTRUNK_BIN:-}" ]]; then
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
index 157a871d9..a680abe5b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
▲ Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
-↳ To switch to the remote branch, remove this added branch and then run without --create: wt remove remote-feature && wt switch remote-feature
+↳ To switch to the remote branch, delete this branch and switch without --create: wt remove remote-feature && wt switch remote-feature
✓ Created branch remote-feature from main and worktree @ _REPO_.remote-feature
↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed