Skip to content

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

Docs: Remove second-person phrasing from help messages

Maximilian Roosc075291d857b
diff --git a/CLAUDE.md b/CLAUDE.md
index 22ac01960..9e603d171 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -94,6 +94,20 @@ Output messages should acknowledge user-supplied arguments (flags, options, valu
"Created new worktree for feature at /path/to/worktree"
```
+**Avoid second-person ("you", "your"):** Messages should describe actions and state, not address the user directly.
+
+```rust
+// ❌ BAD - second-person
+"Use 'wt merge' to rebase your changes onto main"
+// ✅ GOOD - describes the action
+"Use 'wt merge' to rebase onto main"
+
+// ❌ BAD - second-person
+"Add one line to your shell config"
+// ✅ GOOD - refers to the thing
+"Add one line to the shell config"
+```
+
**Avoid redundant parenthesized content:** Parenthesized text should add new information, not restate what's already said.
```rust
diff --git a/README.md b/README.md
index 05eec9646..c2ed17bf6 100644
--- a/README.md
+++ b/README.md
@@ -580,7 +580,7 @@ Removes worktree directory, git metadata, and branch. Requires clean working tre
### Background removal (default)
-- Returns immediately so you can continue working
+- Returns immediately for continued work
- Logs: `.git/wt-logs/{branch}-remove.log`
- Use `--no-background` for foreground (blocking)
@@ -792,7 +792,7 @@ Options:
wt config shell install
```
- Or manually add to your shell config:
+ Or manually add to the shell config:
```console
eval "$(wt config shell init bash)"
@@ -833,7 +833,7 @@ For OpenAI:
llm keys set openai
```
-Use `wt config show` to view your current configuration.
+Use `wt config show` to view the current configuration.
Docs: <https://llm.datasette.io/> | <https://github.com/sigoden/aichat>
## Configuration Files
diff --git a/src/cli.rs b/src/cli.rs
index 82426de57..d3dc22594 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -142,7 +142,7 @@ pub enum ConfigShellCommand {
/// Generate shell integration code
#[command(after_long_help = r#"## Manual Setup
-Add one line to your shell config:
+Add one line to the shell config:
Bash (~/.bashrc):
```console
@@ -161,7 +161,7 @@ eval "$(wt config shell init zsh)"
## Auto Setup
-Use `wt config shell install` to automatically add to your shell config."#)]
+Use `wt config shell install` to add to the shell config automatically."#)]
Init {
/// Shell to generate code for
#[arg(value_enum)]
@@ -511,7 +511,7 @@ pub enum Commands {
wt config shell install
```
- Or manually add to your shell config:
+ Or manually add to the shell config:
```console
eval "$(wt config shell init bash)"
@@ -552,7 +552,7 @@ For OpenAI:
llm keys set openai
```
-Use `wt config show` to view your current configuration.
+Use `wt config show` to view the current configuration.
Docs: <https://llm.datasette.io/> | <https://github.com/sigoden/aichat>
## Configuration Files
@@ -843,7 +843,7 @@ Removes worktree directory, git metadata, and branch. Requires clean working tre
### Background removal (default)
-- Returns immediately so you can continue working
+- Returns immediately for continued work
- Logs: `.git/wt-logs/{branch}-remove.log`
- Use `--no-background` for foreground (blocking)
diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rs
index f60fa8e62..3634efbb9 100644
--- a/src/commands/command_approval.rs
+++ b/src/commands/command_approval.rs
@@ -66,7 +66,7 @@ pub fn approve_command_batch(
if updated && let Err(e) = fresh_config.save() {
let _ = output::warning(format!("Failed to save command approval: {e}"));
- let _ = output::hint("You will be prompted again next time.");
+ let _ = output::hint("Approval will be requested again next time.");
}
}
diff --git a/src/git/error.rs b/src/git/error.rs
index c24a9ca3e..56708b0c3 100644
--- a/src/git/error.rs
+++ b/src/git/error.rs
@@ -187,7 +187,7 @@ pub fn not_fast_forward(target_branch: &str, commits_formatted: &str) -> anyhow:
}
msg.push_str(&format!(
- "\n{HINT_EMOJI} {HINT}Use 'wt merge' to rebase your changes onto {target_branch}{HINT:#}"
+ "\n{HINT_EMOJI} {HINT}Use 'wt merge' to rebase onto {target_branch}{HINT:#}"
));
anyhow::anyhow!("{}", msg)
}
diff --git a/tests/integration_tests/approval_pty.rs b/tests/integration_tests/approval_pty.rs
index 6ac89daf5..e5881a744 100644
--- a/tests/integration_tests/approval_pty.rs
+++ b/tests/integration_tests/approval_pty.rs
@@ -253,8 +253,8 @@ fn test_approval_prompt_permission_error() {
"Should show permission error warning"
);
assert!(
- normalized.contains("You will be prompted again next time"),
- "Should show hint about being prompted again"
+ normalized.contains("Approval will be requested again next time"),
+ "Should show hint about approval being requested again"
);
assert!(
normalized.contains("test command"),
diff --git a/tests/integration_tests/approval_save.rs b/tests/integration_tests/approval_save.rs
index 6b371d9a0..0e5304a0e 100644
--- a/tests/integration_tests/approval_save.rs
+++ b/tests/integration_tests/approval_save.rs
@@ -400,7 +400,7 @@ fn test_permission_error_prevents_save() {
// In the actual code (approve_command_batch), when this error occurs:
// 1. It's caught with `if let Err(e) = fresh_config.save()`
// 2. Warning is printed: "🟡 Failed to save command approval: {error}"
- // 3. Hint is printed: "💡 You will be prompted again next time."
+ // 3. Hint is printed: "💡 Approval will be requested again next time."
// 4. Function returns Ok(true) - execution continues!
//
// The approval succeeds (commands execute) even though saving failed.
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 9fa36dd86..9b4b7330a 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
@@ -11,7 +11,7 @@ y
💡 Allow and remember? [y/N]
🟡 Failed to save command approval: Failed to write config file: Permission denied (os error 13)
-💡 You will be prompted again next time.
+💡 Approval will be requested again next time.
🔄 Running post-create:
  echo 'test command'
test command
diff --git a/tests/snapshots/integration__integration_tests__help__help_config.snap b/tests/snapshots/integration__integration_tests__help__help_config.snap
index c81dea975..15787f142 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config.snap
@@ -48,7 +48,7 @@ Global Options:
 wt config shell install
- Or manually add to your shell config:
+ Or manually add to the shell config:
 eval "$(wt config shell init bash)"
@@ -79,7 +79,7 @@ For OpenAI:
llm keys set openai
-Use wt config show to view your current configuration.
+Use wt config show to view the current configuration.
Docs: <https://llm.datasette.io/> | <https://github.com/sigoden/aichat>
Configuration Files
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove.snap b/tests/snapshots/integration__integration_tests__help__help_remove.snap
index f310e75dc..145f81e55 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove.snap
@@ -63,7 +63,7 @@ Removes worktree directory, git metadata, and branch. Requires clean working tre
### Background removal (default)
-- Returns immediately so you can continue working
+- Returns immediately for continued work
- Logs: .git/wt-logs/{branch}-remove.log
- Use --no-background for foreground (blocking)
diff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
index a5af86bec..3ac5bda34 100644
--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: false
@@ -25,6 +26,6 @@ exit_code: 1
❌ Can't push to local main branch: it has newer commits
  * [SHA] Main commit
-💡 Use 'wt merge' to rebase your changes onto main
+💡 Use 'wt merge' to rebase onto main
----- stderr -----