Skip to content

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

docs: use tool-agnostic terminology for LLM commit messages (#891)

Maximilian Roos2067ac495737
diff --git a/.claude-plugin/README.md b/.claude-plugin/README.md
index d7858a333..2ae9ad91b 100644
--- a/.claude-plugin/README.md
+++ b/.claude-plugin/README.md
@@ -15,9 +15,9 @@ The plugin installs Claude Code hooks that track session activity per branch. Wh
These markers appear in `wt list` output, making it easy to see which worktrees have active Claude sessions — useful when running multiple instances in parallel.
-**Set up LLM for commit message generation**
+**Set up LLM commit message generation**
-The configuration skill guides through installing the `llm` CLI tool, setting API keys, and adding `[commit-generation]` to the user config so `wt merge` can auto-generate commit messages.
+The configuration skill guides through configuring an AI tool (Claude Code, Codex, llm, or aichat) and adding `[commit.generation]` to the user config so `wt merge` can auto-generate commit messages.
**Add post-create hooks to run npm install automatically**
diff --git a/.claude-plugin/skills/worktrunk/SKILL.md b/.claude-plugin/skills/worktrunk/SKILL.md
index 2ebf428b9..58b267496 100644
--- a/.claude-plugin/skills/worktrunk/SKILL.md
+++ b/.claude-plugin/skills/worktrunk/SKILL.md
@@ -1,6 +1,6 @@
---
name: worktrunk
-description: Guidance for Worktrunk, a CLI tool for managing git worktrees. Covers configuration (user config at ~/.config/worktrunk/config.toml and project hooks at .config/wt.toml), usage, and troubleshooting. Use for "setting up LLM", "configuring hooks", "automating tasks", or general worktrunk questions.
+description: Guidance for Worktrunk, a CLI tool for managing git worktrees. Covers configuration (user config at ~/.config/worktrunk/config.toml and project hooks at .config/wt.toml), usage, and troubleshooting. Use for "setting up commit message generation", "configuring hooks", "automating tasks", or general worktrunk questions.
---
<!-- worktrunk-skill-version: 0.9.3 -->
@@ -57,51 +57,39 @@ When a user asks for configuration help, determine which type based on:
- "run tests before merge"
- Affects the entire team
-**Both configs may be needed**: For example, setting up LLM integration requires user config, but automating quality checks requires project config.
+**Both configs may be needed**: For example, setting up commit message generation requires user config, but automating quality checks requires project config.
## Core Workflows
-### Setting Up LLM Integration (User Config)
+### Setting Up Commit Message Generation (User Config)
-Most common request. Follow this sequence:
+Most common request. See `reference/llm-commits.md` for supported tools and exact command syntax.
-1. **Check if LLM tool exists**
+1. **Detect available tools**
```bash
- which llm # or: which aichat
+ which claude codex llm aichat 2>/dev/null
```
-2. **If not installed, guide installation (don't run it)**
- ```bash
- uv tool install -U llm
- ```
-
-3. **Guide API key setup (don't run it)**
- ```bash
- llm install llm-anthropic
- llm keys set anthropic
- llm models default claude-haiku-4.5
- ```
+2. **If none installed, recommend Claude Code** (already available in Claude Code sessions)
-4. **Propose config change**
+3. **Propose config change** — Get the exact command from `reference/llm-commits.md`
```toml
- [commit-generation]
- command = "llm"
+ [commit.generation]
+ command = "..." # see reference/llm-commits.md for tool-specific commands
```
Ask: "Should I add this to your config?"
-5. **After approval, apply**
+4. **After approval, apply**
- Check if config exists: `wt config show`
- If not, guide through `wt config create`
- Read, modify, write preserving structure
-6. **Suggest testing**
+5. **Suggest testing**
```bash
- llm "say hello"
+ wt step commit --show-prompt | head # verify prompt builds
wt merge # in a repo with uncommitted changes
```
-**See `reference/config.md` and `reference/llm-commits.md` for complete details.**
-
### Setting Up Project Hooks (Project Config)
Common request for workflow automation. Follow discovery process:
@@ -221,7 +209,7 @@ bash -n -c "if [ true ]; then echo ok; fi"
## Common Tasks Reference
### User Config Tasks
-- Set up LLM integration → `reference/llm-commits.md`
+- Set up commit message generation → `reference/llm-commits.md`
- Customize worktree paths → `reference/config.md#worktree-path-template`
- Custom commit templates → `reference/llm-commits.md#templates`
- Configure command defaults → `reference/config.md#command-settings`
diff --git a/.claude-plugin/skills/worktrunk/reference/config.md b/.claude-plugin/skills/worktrunk/reference/config.md
index fb6496736..f073d9e0c 100644
--- a/.claude-plugin/skills/worktrunk/reference/config.md
+++ b/.claude-plugin/skills/worktrunk/reference/config.md
@@ -42,7 +42,7 @@ wt config show
worktree-path = ".worktrees/{{ branch | sanitize }}"
[commit.generation]
-command = "llm -m claude-haiku-4.5"
+command = "MAX_THINKING_TOKENS=0 claude -p --model=haiku --tools='' --disable-slash-commands --setting-sources='' --system-prompt=''"
```
**Project config** — shared team settings:
diff --git a/.claude-plugin/skills/worktrunk/reference/troubleshooting.md b/.claude-plugin/skills/worktrunk/reference/troubleshooting.md
index de8dbfddb..30f9fe838 100644
--- a/.claude-plugin/skills/worktrunk/reference/troubleshooting.md
+++ b/.claude-plugin/skills/worktrunk/reference/troubleshooting.md
@@ -2,27 +2,30 @@
Claude-specific troubleshooting guidance for common worktrunk issues.
-## LLM Commit Messages
+## Commit Message Generation
-### LLM command not found
+### Command not found
+
+Check if the configured tool is installed:
```bash
-$ which llm
+$ wt config show # shows the configured command
+$ which claude # or: which codex, which llm, which aichat
```
-If empty, the tool isn't installed or not in PATH. Install with `uv tool install -U llm`.
+If empty, install one of the supported tools. See [LLM commits docs](https://worktrunk.dev/llm-commits/) for setup instructions.
-### LLM returns an error
+### Command returns an error
-Test the command directly:
+Test the configured command directly by piping a prompt to it. See `reference/llm-commits.md` for the exact command syntax for each tool.
```bash
-$ echo "say hello" | llm
+$ echo "say hello" | <your-configured-command>
```
Common issues:
-- **API key not set**: Run `llm keys set anthropic` (or `openai`)
-- **Model not available**: Check model name with `llm models`
+- **API key not set**: Each tool has its own auth mechanism
+- **Model not available**: Check model name with the tool's help
- **Network issues**: Check internet connectivity
### Config not loading
diff --git a/.claude-plugin/skills/worktrunk/reference/worktrunk.md b/.claude-plugin/skills/worktrunk/reference/worktrunk.md
index f67d9a5ed..c2500dc3a 100644
--- a/.claude-plugin/skills/worktrunk/reference/worktrunk.md
+++ b/.claude-plugin/skills/worktrunk/reference/worktrunk.md
@@ -69,7 +69,7 @@ git branch -d feat{% end %}</td>
> Expand into the more advanced commands as needed
- **[Hooks](https://worktrunk.dev/hook/)** — run commands on create, pre-merge, post-merge, etc
-- **[LLM commit messages](https://worktrunk.dev/llm-commits/)** — generate commit messages from diffs via [llm](https://llm.datasette.io/)
+- **[LLM commit messages](https://worktrunk.dev/llm-commits/)** — generate commit messages from diffs
- **[Merge workflow](https://worktrunk.dev/merge/)** — squash, rebase, merge, clean up in one command
- ...and **[lots more](#next-steps)**
diff --git a/README.md b/README.md
index 489da4871..69b2da0ba 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ git branch -d feat</pre></td>
> Expand into the more advanced commands as needed
- **[Hooks](https://worktrunk.dev/hook/)** — run commands on create, pre-merge, post-merge, etc
-- **[LLM commit messages](https://worktrunk.dev/llm-commits/)** — generate commit messages from diffs via [llm](https://llm.datasette.io/)
+- **[LLM commit messages](https://worktrunk.dev/llm-commits/)** — generate commit messages from diffs
- **[Merge workflow](https://worktrunk.dev/merge/)** — squash, rebase, merge, clean up in one command
- ...and **[lots more](#next-steps)**
diff --git a/docs/content/config.md b/docs/content/config.md
index 0e71cbaf1..d6a79e038 100644
--- a/docs/content/config.md
+++ b/docs/content/config.md
@@ -50,7 +50,7 @@ wt config show
worktree-path = ".worktrees/{{ branch | sanitize }}"
[commit.generation]
-command = "llm -m claude-haiku-4.5"
+command = "MAX_THINKING_TOKENS=0 claude -p --model=haiku --tools='' --disable-slash-commands --setting-sources='' --system-prompt=''"
```
**Project config** — shared team settings:
diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.md
index 3afa888da..0844e569a 100644
--- a/docs/content/worktrunk.md
+++ b/docs/content/worktrunk.md
@@ -80,7 +80,7 @@ git branch -d feat{% end %}</td>
> Expand into the more advanced commands as needed
- **[Hooks](@/hook.md)** — run commands on create, pre-merge, post-merge, etc
-- **[LLM commit messages](@/llm-commits.md)** — generate commit messages from diffs via [llm](https://llm.datasette.io/)
+- **[LLM commit messages](@/llm-commits.md)** — generate commit messages from diffs
- **[Merge workflow](@/merge.md)** — squash, rebase, merge, clean up in one command
- ...and **[lots more](#next-steps)**
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index b3a3910ec..541d6b974 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1494,7 +1494,7 @@ wt config show
worktree-path = ".worktrees/{{ branch | sanitize }}"
[commit.generation]
-command = "llm -m claude-haiku-4.5"
+command = "MAX_THINKING_TOKENS=0 claude -p --model=haiku --tools='' --disable-slash-commands --setting-sources='' --system-prompt=''"
```
**Project config** — shared team settings:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
index 60e21dced..a0a4aed04 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -15,6 +15,7 @@ info:
SHELL: ""
TERM: alacritty
WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
WT_TEST_DELAYED_STREAM_MS: "-1"
WT_TEST_EPOCH: "1735776000"
@@ -81,7 +82,7 @@ Show current configuration and file locations:
worktree-path = ".worktrees/{{ branch | sanitize }}"

[commit.generation]
- command = "llm -m claude-haiku-4.5"
+ command = "MAX_THINKING_TOKENS=0 claude -p --model=haiku --tools='' --disable-slash-commands --setting-sources='' --system-prompt=''"
Project config — shared team settings: