Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Remove 2nd person pronouns from user-facing messages (#332)
Maximilian Roos455b43bbd7e3
diff --git a/dev/config.example.toml b/dev/config.example.tomlindex fa06430b2..fcca231be 100644--- a/dev/config.example.toml+++ b/dev/config.example.toml@@ -66,7 +66,7 @@ verify = true # Run project hooks# Approved Commands# Commands approved for project hooks in this repo-# Auto-populated when you approve hooks (prompt on first run) or run: wt hook approvals add+# Auto-populated when approving hooks (prompt on first run) or via `wt hook approvals add`[projects."github.com/user/repo"]approved-commands = ["npm install"]diff --git a/docs/content/config.md b/docs/content/config.mdindex eb7190ceb..d787d0efe 100644--- a/docs/content/config.md+++ b/docs/content/config.md@@ -353,7 +353,7 @@ verify = true # Run project hooks# Approved Commands# Commands approved for project hooks in this repo-# Auto-populated when you approve hooks (prompt on first run) or run: wt hook approvals add+# Auto-populated when approving hooks (prompt on first run) or via `wt hook approvals add`[projects."github.com/user/repo"]approved-commands = ["npm install"]diff --git a/docs/content/faq.md b/docs/content/faq.mdindex c349a944d..1b4b77ced 100644--- a/docs/content/faq.md+++ b/docs/content/faq.md@@ -12,7 +12,7 @@ Worktrunk executes commands in three contexts:1. **Project hooks** (`.config/wt.toml`) — Automation for worktree lifecycle2. **LLM commands** (`~/.config/worktrunk/config.toml`) — Commit message generation-3. **--execute flag** — Commands you provide explicitly+3. **--execute flag** — Explicitly provided commandsCommands from project hooks require approval on first run. Approved commands are saved to user config. If a command changes, Worktrunk requires new approval.diff --git a/docs/content/hook.md b/docs/content/hook.mdindex 22cd4b5ff..8321f18f8 100644--- a/docs/content/hook.md+++ b/docs/content/hook.md@@ -183,7 +183,7 @@ The `sanitize` filter makes branch names safe for filesystem paths. The `hash_podev = "npm run dev -- --host {{ branch }}.lvh.me --port {{ branch | hash_port }}"```-You can hash any string, including concatenations:+Hash any string, including concatenations:```toml# Unique port per repo+branch combinationdiff --git a/docs/content/merge.md b/docs/content/merge.mdindex 942e75f5f..f17727a40 100644--- a/docs/content/merge.md+++ b/docs/content/merge.md@@ -61,7 +61,7 @@ wt merge --no-commit6. **Cleanup** — Removes the worktree and branch. Use `--no-remove` to keep the worktree. When already on the target branch or in the main worktree, the worktree is preserved.7. **Post-merge hooks** — Project commands run after cleanup. Failures are logged but don't abort.-Use `--no-commit` to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless you pass `--no-rebase`. Useful after preparing commits manually with `wt step`. Requires a clean working tree.+Use `--no-commit` to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless `--no-rebase` is passed. Useful after preparing commits manually with `wt step`. Requires a clean working tree.## Local CIdiff --git a/docs/content/select.md b/docs/content/select.mdindex dc6b49339..7eee6bfbd 100644--- a/docs/content/select.md+++ b/docs/content/select.md@@ -50,7 +50,7 @@ Branches without worktrees are included — selecting one creates a worktree. (`## See also- [wt list](@/list.md) — Static table view with all worktree metadata-- [wt switch](@/switch.md) — Direct switching when you know the target branch+- [wt switch](@/switch.md) — Direct switching to a known target branch## Command referencediff --git a/src/cli.rs b/src/cli.rsindex c3af3b4ec..8bb9b8bf2 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -1629,7 +1629,7 @@ The `sanitize` filter makes branch names safe for filesystem paths. The `hash_podev = "npm run dev -- --host {{ branch }}.lvh.me --port {{ branch | hash_port }}"```-You can hash any string, including concatenations:+Hash any string, including concatenations:```toml# Unique port per repo+branch combination@@ -1882,7 +1882,7 @@ Branches without worktrees are included — selecting one creates a worktree. (`## See also- [wt list](@/list.md) — Static table view with all worktree metadata-- [wt switch](@/switch.md) — Direct switching when you know the target branch+- [wt switch](@/switch.md) — Direct switching to a known target branch"#)]Select,@@ -2411,7 +2411,7 @@ wt merge --no-commit6. **Cleanup** — Removes the worktree and branch. Use `--no-remove` to keep the worktree. When already on the target branch or in the main worktree, the worktree is preserved.7. **Post-merge hooks** — Project commands run after cleanup. Failures are logged but don't abort.-Use `--no-commit` to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless you pass `--no-rebase`. Useful after preparing commits manually with `wt step`. Requires a clean working tree.+Use `--no-commit` to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless `--no-rebase` is passed. Useful after preparing commits manually with `wt step`. Requires a clean working tree.## Local CIdiff --git a/src/llm.rs b/src/llm.rsindex 0ce518c38..fedfdd78e 100644--- a/src/llm.rs+++ b/src/llm.rs@@ -633,7 +633,7 @@ pub fn test_commit_generation() -> anyhow::Result<String> {if !commit_generation_config.is_configured() {anyhow::bail!(- "Commit generation is not configured. Add [commit-generation] to your config."+ "Commit generation is not configured. Add [commit-generation] to the config.");}diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 934642e35..a75f15b79 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -355,7 +355,7 @@ pub fn handle_switch_output({// Shell wrapper is configured but user ran binary directlysuper::print(warning_message(cformat!(- "Worktree for <bold>{branch}</> @ <bold>{path_display}</>, but cannot change directory — restart your shell to activate"+ "Worktree for <bold>{branch}</> @ <bold>{path_display}</>, but cannot change directory — restart the shell to activate")))?;if let Some(warning) = path_mismatch_warning {super::print(warning)?;diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snapindex 3dd4b3039..5f27d74a8 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap@@ -9,7 +9,7 @@ info:env:CLICOLOR_FORCE: "1"COLUMNS: "150"- GIT_CONFIG_GLOBAL: ""+ GIT_EDITOR: ""RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml@@ -112,7 +112,7 @@ Creates [2m~/.config/worktrunk/config.toml[0m with the following content:[2m[2m# Approved Commands[2m# Commands approved for project hooks in this repo- [2m# Auto-populated when you approve hooks (prompt on first run) or run: wt hook approvals add+ [2m# Auto-populated when approving hooks (prompt on first run) or via `wt hook approvals add`[2m[projects."github.com/user/repo"][2mapproved-commands = ["npm install"][2mdiff --git a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap b/tests/snapshots/integration__integration_tests__help__help_md_merge.snapindex 7cb4a95dd..d667fee00 100644--- a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap@@ -119,8 +119,8 @@ changes become a separate commit and individual commits are preserved.the worktree is preserved.7. **Post-merge hooks** — Project commands run after cleanup. Failures are logged but don't abort.-Use `--no-commit` to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless you pass-`--no-rebase`. Useful after preparing commits manually with `wt step`. Requires a clean working tree.+Use `--no-commit` to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless `--no-rebase` is+passed. Useful after preparing commits manually with `wt step`. Requires a clean working tree.## Local CIdiff --git a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap b/tests/snapshots/integration__integration_tests__help__help_merge_long.snapindex 7f122ae4e..ef6b9fe76 100644--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap@@ -110,8 +110,8 @@ changes become a separate commit and individual commits are preserved.the worktree is preserved.7. [1mPost-merge hooks[0m — Project commands run after cleanup. Failures are logged but don't abort.-Use [2m--no-commit[0m to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless you pass-[2m--no-rebase[0m. Useful after preparing commits manually with [2mwt step[0m. Requires a clean working tree.+Use [2m--no-commit[0m to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless [2m--no-rebase[0m is+passed. Useful after preparing commits manually with [2mwt step[0m. Requires a clean working tree.[32mLocal CIdiff --git a/tests/snapshots/integration__integration_tests__help__help_page_merge.snap b/tests/snapshots/integration__integration_tests__help__help_page_merge.snapindex f2e850975..f9691f38a 100644--- a/tests/snapshots/integration__integration_tests__help__help_page_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_page_merge.snap@@ -71,7 +71,7 @@ wt merge --no-commit6. **Cleanup** — Removes the worktree and branch. Use `--no-remove` to keep the worktree. When already on the target branch or in the main worktree, the worktree is preserved.7. **Post-merge hooks** — Project commands run after cleanup. Failures are logged but don't abort.-Use `--no-commit` to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless you pass `--no-rebase`. Useful after preparing commits manually with `wt step`. Requires a clean working tree.+Use `--no-commit` to skip committing uncommitted changes and squashing; rebase still runs by default and can rewrite commits unless `--no-rebase` is passed. Useful after preparing commits manually with `wt step`. Requires a clean working tree.## Local CIdiff --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.snapindex 252bab6db..d4f6f724d 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@@ -14,7 +14,6 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- GIT_FETCH_ARGS: ""GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -31,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------[33m▲[39m [33mWorktree for [1mshell-configured[22m @ [1m_REPO_.shell-configured[22m, but cannot change directory — restart your shell to activate[39m+[33m▲[39m [33mWorktree for [1mshell-configured[22m @ [1m_REPO_.shell-configured[22m, but cannot change directory — restart the shell to activate[39m