Skip to content

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

docs: Rename LLM-authored messages to LLM messages

Maximilian Roos99e15e56327a
diff --git a/.claude-plugin/skills/worktrunk/reference/README.md b/.claude-plugin/skills/worktrunk/reference/README.md
index fbc9ac6b4..d2929790e 100644
--- a/.claude-plugin/skills/worktrunk/reference/README.md
+++ b/.claude-plugin/skills/worktrunk/reference/README.md
@@ -93,7 +93,7 @@ everything — standard `git worktree` commands continue working fine.
## Automation Features
-### LLM-Authored Commit Messages
+### LLM Commit Messages
Worktrunk can invoke external commands during merge operations to generate
commit messages. Simon Willison's [llm](https://llm.datasette.io/) tool reads
@@ -269,8 +269,8 @@ instructions: [Custom Worktree Status](#custom-worktree-status).
**Auto-generated commit messages** - Simon Willison's
[llm](https://llm.datasette.io/) tool works with worktrunk's
commit generation. Install it, configure the command, and `wt merge` will
-automatically generate contextual commit messages. Setup guide: [LLM-Authored
-Commit Messages](#llm-authored-commit-messages).
+automatically generate contextual commit messages. Setup guide: [LLM Commit
+Messages](#llm-commit-messages).
**Environment setup with hooks** - Use `post-create-command` (or
`post-start-command` for non-blocking) to run setup for that
@@ -422,11 +422,11 @@ The merge operation follows a strict order designed for fail-fast execution:
2. **Auto-commit uncommitted changes**
If working tree has uncommitted changes, stages all changes (git add -A) and commits
- with LLM-generated message.
+ with LLM message.
3. **Squash commits (default)**
By default, counts commits since merge base with target branch. When multiple
- commits exist, squashes them into one with LLM-generated message. Skip squashing
+ commits exist, squashes them into one with LLM message. Skip squashing
with --no-squash.
A safety backup is created before squashing if there are working tree changes.
@@ -704,7 +704,7 @@ Options:
**LLM SETUP GUIDE:**
-Enable AI-generated commit messages
+Enable LLM commit messages
1. Install an LLM tool (llm, aichat)
@@ -754,8 +754,8 @@ Docs: https://llm.datasette.io/ | https://github.com/sigoden/aichat
These commands are subject to change:
-- `wt beta commit` - Commit changes with LLM-generated message
-- `wt beta squash [target]` - Squash commits with LLM-generated message
+- `wt beta commit` - Commit changes with LLM message
+- `wt beta squash [target]` - Squash commits with LLM message
- `wt beta push [target]` - Push changes to target branch (auto-stashes non-conflicting edits)
- `wt beta rebase [target]` - Rebase current branch onto target
- `wt beta ask-approvals` - Approve commands in project config
diff --git a/.claude-plugin/skills/worktrunk/reference/user-config.md b/.claude-plugin/skills/worktrunk/reference/user-config.md
index 3bf3a9fa0..0554bed4e 100644
--- a/.claude-plugin/skills/worktrunk/reference/user-config.md
+++ b/.claude-plugin/skills/worktrunk/reference/user-config.md
@@ -14,7 +14,7 @@ Never install tools (llm, aichat) automatically. Provide installation commands f
## LLM Setup
-Most users want this for LLM-powered commit messages. Follow this sequence:
+Most users want this for LLM commit messages. Follow this sequence:
### Step 1: Check if LLM Tool Exists
diff --git a/README.md b/README.md
index fbc9ac6b4..d2929790e 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ everything — standard `git worktree` commands continue working fine.
## Automation Features
-### LLM-Authored Commit Messages
+### LLM Commit Messages
Worktrunk can invoke external commands during merge operations to generate
commit messages. Simon Willison's [llm](https://llm.datasette.io/) tool reads
@@ -269,8 +269,8 @@ instructions: [Custom Worktree Status](#custom-worktree-status).
**Auto-generated commit messages** - Simon Willison's
[llm](https://llm.datasette.io/) tool works with worktrunk's
commit generation. Install it, configure the command, and `wt merge` will
-automatically generate contextual commit messages. Setup guide: [LLM-Authored
-Commit Messages](#llm-authored-commit-messages).
+automatically generate contextual commit messages. Setup guide: [LLM Commit
+Messages](#llm-commit-messages).
**Environment setup with hooks** - Use `post-create-command` (or
`post-start-command` for non-blocking) to run setup for that
@@ -422,11 +422,11 @@ The merge operation follows a strict order designed for fail-fast execution:
2. **Auto-commit uncommitted changes**
If working tree has uncommitted changes, stages all changes (git add -A) and commits
- with LLM-generated message.
+ with LLM message.
3. **Squash commits (default)**
By default, counts commits since merge base with target branch. When multiple
- commits exist, squashes them into one with LLM-generated message. Skip squashing
+ commits exist, squashes them into one with LLM message. Skip squashing
with --no-squash.
A safety backup is created before squashing if there are working tree changes.
@@ -704,7 +704,7 @@ Options:
**LLM SETUP GUIDE:**
-Enable AI-generated commit messages
+Enable LLM commit messages
1. Install an LLM tool (llm, aichat)
@@ -754,8 +754,8 @@ Docs: https://llm.datasette.io/ | https://github.com/sigoden/aichat
These commands are subject to change:
-- `wt beta commit` - Commit changes with LLM-generated message
-- `wt beta squash [target]` - Squash commits with LLM-generated message
+- `wt beta commit` - Commit changes with LLM message
+- `wt beta squash [target]` - Squash commits with LLM message
- `wt beta push [target]` - Push changes to target branch (auto-stashes non-conflicting edits)
- `wt beta rebase [target]` - Rebase current branch onto target
- `wt beta ask-approvals` - Approve commands in project config
diff --git a/dev/wt-demo-build.sh b/dev/wt-demo-build.sh
index 9f8f0b9b2..d2b28f968 100755
--- a/dev/wt-demo-build.sh
+++ b/dev/wt-demo-build.sh
@@ -275,7 +275,7 @@ A demo repository for showcasing worktrunk features.
- Fast worktree switching
- Integrated merge workflow
- Pre-merge test hooks
-- LLM-generated commit messages
+- LLM commit messages
## Getting Started
diff --git a/src/cli.rs b/src/cli.rs
index 8dbab994e..f64b71725 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -294,7 +294,7 @@ pub enum StandaloneCommand {
force: bool,
},
- /// Commit changes with LLM-generated message
+ /// Commit changes with LLM message
Commit {
/// Skip approval prompts
#[arg(short, long)]
@@ -305,7 +305,7 @@ pub enum StandaloneCommand {
verify: bool,
},
- /// Squash commits with LLM-generated message
+ /// Squash commits with LLM message
Squash {
/// Target branch
///
@@ -696,10 +696,10 @@ wt remove # (when already in main worktree)
Commit → Squash → Rebase → Pre-merge hooks → Push → Cleanup → Post-merge hooks
-**Commit**: Uncommitted changes are staged and committed with LLM-generated message.
+**Commit**: Uncommitted changes are staged and committed with LLM message.
Use `--tracked-only` to stage only tracked files.
-**Squash**: Multiple commits are squashed into one with LLM-generated message.
+**Squash**: Multiple commits are squashed into one with LLM message.
Skip with `--no-squash`. Safety backup: `git reflog show refs/wt-backup/<branch>`
**Rebase**: Branch is rebased onto target. Conflicts abort the merge immediately.
diff --git a/tests/CLAUDE.md b/tests/CLAUDE.md
index b5d5cbabc..1d68e4099 100644
--- a/tests/CLAUDE.md
+++ b/tests/CLAUDE.md
@@ -84,7 +84,7 @@ assert_snapshot!("readme_example_name", combined_output);
**README examples using standard snapshots (working, but require manual editing):**
- `test_readme_example_simple()` - Quick start merge example
-- `test_readme_example_complex()` - LLM-powered commit example
+- `test_readme_example_complex()` - LLM commit example
- `test_readme_example_hooks_post_create()` - Post-create hooks
- `test_readme_example_hooks_pre_merge()` - Pre-merge hooks
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 22281c6e5..33a1d03d1 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -799,7 +799,7 @@ fn test_merge_auto_commit_with_llm() {
std::fs::write(feature_wt.join("auth.txt"), "improved auth with validation")
.expect("Failed to write file");
- // Merge with LLM configured - should auto-commit with LLM-generated message
+ // Merge with LLM configured - should auto-commit with LLM message
snapshot_merge_with_env(
"merge_auto_commit_with_llm",
&repo,
diff --git a/tests/snapshots/integration__integration_tests__help__help_beta.snap b/tests/snapshots/integration__integration_tests__help__help_beta.snap
index 0d14dc12e..62de4c1c4 100644
--- a/tests/snapshots/integration__integration_tests__help__help_beta.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_beta.snap
@@ -18,8 +18,8 @@ Usage: wt beta [OPTIONS] <COMMAND>
Commands:
run-hook Run project hook
- commit Commit changes with LLM-generated message
- squash Squash commits with LLM-generated message
+ commit Commit changes with LLM message
+ squash Squash commits with LLM message
push Push changes to local target branch
rebase Rebase onto target
select Interactive worktree selector
diff --git a/tests/snapshots/integration__integration_tests__help__help_merge.snap b/tests/snapshots/integration__integration_tests__help__help_merge.snap
index 0138cba5a..540fcf11a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_merge.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_merge.snap
@@ -58,10 +58,10 @@ Global Options:
Commit → Squash → Rebase → Pre-merge hooks → Push → Cleanup → Post-merge hooks
-Commit: Uncommitted changes are staged and committed with LLM-generated message.
+Commit: Uncommitted changes are staged and committed with LLM message.
Use --tracked-only to stage only tracked files.
-Squash: Multiple commits are squashed into one with LLM-generated message.
+Squash: Multiple commits are squashed into one with LLM message.
Skip with --no-squash. Safety backup: git reflog show refs/wt-backup/<branch>
Rebase: Branch is rebased onto target. Conflicts abort the merge immediately.
diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snap
index 146c3d56f..76aa55429 100644
--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap
@@ -12,13 +12,13 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1suEFj/test-gitconfig
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPPjZB2/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1suEFj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPPjZB2/test-config.toml
---
success: true
exit_code: 0
@@ -242,8 +242,8 @@ complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcomma
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -s h -l help -d 'Print help'
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -f -a "run-hook" -d 'Run project hook'
-complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -f -a "commit" -d 'Commit changes with LLM-generated message'
-complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -f -a "squash" -d 'Squash commits with LLM-generated message'
+complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -f -a "commit" -d 'Commit changes with LLM message'
+complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -f -a "squash" -d 'Squash commits with LLM message'
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -f -a "push" -d 'Push changes to local target branch'
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -f -a "rebase" -d 'Rebase onto target'
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase select" -f -a "select" -d 'Interactive worktree selector'
diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
index e8ddf93ec..db5d59602 100644
--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
@@ -12,13 +12,13 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzDD4PX/test-gitconfig
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmps6u1c7/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzDD4PX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmps6u1c7/test-config.toml
---
success: true
exit_code: 0
@@ -578,8 +578,8 @@ _wt_commands() {
_wt__beta_commands() {
local commands; commands=(
'run-hook:Run project hook' \
-'commit:Commit changes with LLM-generated message' \
-'squash:Squash commits with LLM-generated message' \
+'commit:Commit changes with LLM message' \
+'squash:Squash commits with LLM message' \
'push:Push changes to local target branch' \
'rebase:Rebase onto target' \
'select:Interactive worktree selector' \