refactor: restructure commit-generation config to [commit.generation]

.claude-plugin/skills/worktrunk/reference/config.md

@@ -80,25 +80,9 @@ worktree-path = "../{{ branch | sanitize }}"
 
 ## LLM commit messages
 
-Generate commit messages automatically during merge. Requires an external CLI tool. See [LLM commits docs](https://worktrunk.dev/llm-commits/) for setup and template customization.
+Generate commit messages automatically during merge. Requires an external CLI tool.
 
-Using [llm](https://github.com/simonw/llm) (install: `pip install llm llm-anthropic`):
-
-```toml
-[commit-generation]
-command = "llm"
-args = ["-m", "claude-haiku-4.5"]
-```
-
-Using [aichat](https://github.com/sigoden/aichat):
-
-```toml
-[commit-generation]
-command = "aichat"
-args = ["-m", "claude:claude-haiku-4.5"]
-```
-
-See [Custom prompt templates](#custom-prompt-templates) for inline template options.
+See [LLM commits docs](https://worktrunk.dev/llm-commits/) for setup and [Custom prompt templates](#custom-prompt-templates) for template customization.
 
 ## Commands
 
@@ -182,7 +166,7 @@ Default template:
 
 <!-- DEFAULT_TEMPLATE_START -->
 ```toml
-[commit-generation]
+[commit.generation]
 template = """
 Write a commit message for the staged changes below.
 
@@ -227,7 +211,7 @@ Default template:
 
 <!-- DEFAULT_SQUASH_TEMPLATE_START -->
 ```toml
-[commit-generation]
+[commit.generation]
 squash-template = """
 Combine these commits into a single commit message.
 
@@ -352,27 +336,17 @@ For nested config sections, use double underscores to separate levels:
 | Config | Environment Variable |
 |--------|---------------------|
 | `worktree-path` | `WORKTRUNK_WORKTREE_PATH` |
-| `commit-generation.command` | `WORKTRUNK_COMMIT_GENERATION__COMMAND` |
-| `commit-generation.args` | `WORKTRUNK_COMMIT_GENERATION__ARGS` |
+| `commit.generation.command` | `WORKTRUNK_COMMIT__GENERATION__COMMAND` |
+| `commit.stage` | `WORKTRUNK_COMMIT__STAGE` |
 
 Note the single underscore after `WORKTRUNK` and double underscores between nested keys.
 
-### Array values
-
-Array config values like `args = ["-m", "claude-haiku"]` can be specified as a single string in environment variables:
-
-```bash
-export WORKTRUNK_COMMIT_GENERATION__ARGS="-m claude-haiku"
-```
-
 ### Example: CI/testing override
 
 Override the LLM command in CI to use a mock:
 
 ```bash
-WORKTRUNK_COMMIT_GENERATION__COMMAND=echo \
-WORKTRUNK_COMMIT_GENERATION__ARGS="test: automated commit" \
-  wt merge
+WORKTRUNK_COMMIT__GENERATION__COMMAND="echo 'test: automated commit'" wt merge
 ```
 
 ### Other environment variables

.claude-plugin/skills/worktrunk/reference/llm-commits.md

@@ -4,56 +4,38 @@ Worktrunk generates commit messages by building a templated prompt and piping it
 
 ## Setup
 
-### Install llm
+Any command that reads a prompt from stdin and outputs a commit message works. Add to `~/.config/worktrunk/config.toml`:
 
-[llm](https://llm.datasette.io/) from Simon Willison is recommended:
+### Claude Code
 
-```bash
-$ uv tool install -U llm
+```toml
+[commit.generation]
+command = "claude -p --model haiku"
 ```
 
-### Configure an API key
-
-For Claude (recommended):
-
-```bash
-$ llm install llm-anthropic
-$ llm keys set anthropic
-```
+See [Claude Code docs](https://docs.anthropic.com/en/docs/build-with-claude/claude-code) for installation.
 
-For OpenAI:
+### llm
 
-```bash
-$ llm keys set openai
+```toml
+[commit.generation]
+command = "llm -m claude-haiku-4.5"
 ```
 
-### Add to user config
-
-Create the config file if it doesn't exist:
+Install with `uv tool install llm llm-anthropic && llm keys set anthropic`. See [llm docs](https://llm.datasette.io/).
 
-```bash
-$ wt config create
-```
-
-Then add the commit generation settings to `~/.config/worktrunk/config.toml`:
+### aichat
 
 ```toml
-[commit-generation]
-command = "llm"
-args = ["-m", "claude-haiku-4.5"]
+[commit.generation]
+command = "aichat -m claude:claude-haiku-4.5"
 ```
 
-Or for OpenAI:
-
-```toml
-[commit-generation]
-command = "llm"
-args = ["-m", "gpt-5-nano"]
-```
+See [aichat docs](https://github.com/sigoden/aichat).
 
 ## How it works
 
-When worktrunk needs a commit message, it builds a prompt from a template and pipes it to the configured LLM command. The default templates include the git diff and style guidance.
+When worktrunk needs a commit message, it builds a prompt from a template and pipes it to the configured command via shell (`sh -c`). Environment variables can be set inline in the command string.
 
 ## Usage
 
@@ -111,9 +93,8 @@ All variables are available in both templates:
 Override the defaults with inline templates or external files:
 
 ```toml
-[commit-generation]
-command = "llm"
-args = ["-m", "claude-haiku-4.5"]
+[commit.generation]
+command = "llm -m claude-haiku-4.5"
 
 template = """
 Write a commit message for this diff. One line, under 50 chars.
@@ -147,23 +128,6 @@ Templates use [minijinja](https://docs.rs/minijinja/latest/minijinja/syntax/inde
 
 See `wt config create --help` for the full default templates.
 
-## Alternative tools
-
-Any command that reads a prompt from stdin and outputs a commit message works:
-
-```toml
-# aichat
-[commit-generation]
-command = "aichat"
-args = ["-m", "claude:claude-haiku-4.5"]
-
-# Custom script
-[commit-generation]
-command = "./scripts/generate-commit.sh"
-```
-
-See [llm documentation](https://llm.datasette.io/) and [aichat](https://github.com/sigoden/aichat).
-
 ## Fallback behavior
 
 When no LLM is configured, worktrunk generates deterministic messages based on changed filenames (e.g., "Changes to auth.rs & config.rs").

.claude/skills/writing-user-outputs/SKILL.md

@@ -639,8 +639,9 @@ output::print(hint_message("Run 'wt list' to see worktrees"))?;
 - **`cformat!` for styling** — Never manual escape codes (`\x1b[...`)
 - **`cformat!` variables are safe** — Tags like `<bold>` are processed at compile
   time only. Runtime variable values are NOT interpreted as markup, so user
-  content (branch names, commit messages, paths) can be interpolated directly
-  without escaping. Do NOT escape `<`/`>` in variables — it adds extra chars.
+  content (branch names, commit messages, paths, shell commands with `<`/`>`
+  redirects) can be interpolated directly without escaping. Do NOT escape
+  `<`/`>` in variables — it adds extra chars.
 - **`output::` for printing** — Preferred for consistency; direct `println!`/`eprintln!` acceptable
 - **YAGNI** — Most output needs no styling
 - **Graceful degradation** — Colors auto-adjust (NO_COLOR, TTY detection)

dev/config.example.toml

@@ -38,21 +38,9 @@
 #
 # ## LLM commit messages
 #
-# Generate commit messages automatically during merge. Requires an external CLI tool. See LLM commits docs (https://worktrunk.dev/llm-commits/) for setup and template customization.
+# Generate commit messages automatically during merge. Requires an external CLI tool.
 #
-# Using llm (https://github.com/simonw/llm) (install: `pip install llm llm-anthropic`):
-#
-# [commit-generation]
-# command = "llm"
-# args = ["-m", "claude-haiku-4.5"]
-#
-# Using aichat (https://github.com/sigoden/aichat):
-#
-# [commit-generation]
-# command = "aichat"
-# args = ["-m", "claude:claude-haiku-4.5"]
-#
-# See Custom prompt templates (#custom-prompt-templates) for inline template options.
+# See LLM commits docs (https://worktrunk.dev/llm-commits/) for setup and Custom prompt templates (#custom-prompt-templates) for template customization.
 #
 # ## Commands
 #
@@ -125,7 +113,7 @@
 # Default template:
 #
 # <!-- DEFAULT_TEMPLATE_START -->
-# [commit-generation]
+# [commit.generation]
 # template = """
 # Write a commit message for the staged changes below.
 #
@@ -168,7 +156,7 @@
 # Default template:
 #
 # <!-- DEFAULT_SQUASH_TEMPLATE_START -->
-# [commit-generation]
+# [commit.generation]
 # squash-template = """
 # Combine these commits into a single commit message.
 #

docs/content/config.md

@@ -88,25 +88,9 @@ worktree-path = "../{{ branch | sanitize }}"
 
 ## LLM commit messages
 
-Generate commit messages automatically during merge. Requires an external CLI tool. See [LLM commits docs](@/llm-commits.md) for setup and template customization.
+Generate commit messages automatically during merge. Requires an external CLI tool.
 
-Using [llm](https://github.com/simonw/llm) (install: `pip install llm llm-anthropic`):
-
-```toml
-[commit-generation]
-command = "llm"
-args = ["-m", "claude-haiku-4.5"]
-```
-
-Using [aichat](https://github.com/sigoden/aichat):
-
-```toml
-[commit-generation]
-command = "aichat"
-args = ["-m", "claude:claude-haiku-4.5"]
-```
-
-See [Custom prompt templates](#custom-prompt-templates) for inline template options.
+See [LLM commits docs](@/llm-commits.md) for setup and [Custom prompt templates](#custom-prompt-templates) for template customization.
 
 ## Commands
 
@@ -190,7 +174,7 @@ Default template:
 
 <!-- DEFAULT_TEMPLATE_START -->
 ```toml
-[commit-generation]
+[commit.generation]
 template = """
 Write a commit message for the staged changes below.
 
@@ -235,7 +219,7 @@ Default template:
 
 <!-- DEFAULT_SQUASH_TEMPLATE_START -->
 ```toml
-[commit-generation]
+[commit.generation]
 squash-template = """
 Combine these commits into a single commit message.
 
@@ -360,27 +344,17 @@ For nested config sections, use double underscores to separate levels:
 | Config | Environment Variable |
 |--------|---------------------|
 | `worktree-path` | `WORKTRUNK_WORKTREE_PATH` |
-| `commit-generation.command` | `WORKTRUNK_COMMIT_GENERATION__COMMAND` |
-| `commit-generation.args` | `WORKTRUNK_COMMIT_GENERATION__ARGS` |
+| `commit.generation.command` | `WORKTRUNK_COMMIT__GENERATION__COMMAND` |
+| `commit.stage` | `WORKTRUNK_COMMIT__STAGE` |
 
 Note the single underscore after `WORKTRUNK` and double underscores between nested keys.
 
-### Array values
-
-Array config values like `args = ["-m", "claude-haiku"]` can be specified as a single string in environment variables:
-
-```bash
-export WORKTRUNK_COMMIT_GENERATION__ARGS="-m claude-haiku"
-```
-
 ### Example: CI/testing override
 
 Override the LLM command in CI to use a mock:
 
 ```bash
-WORKTRUNK_COMMIT_GENERATION__COMMAND=echo \
-WORKTRUNK_COMMIT_GENERATION__ARGS="test: automated commit" \
-  wt merge
+WORKTRUNK_COMMIT__GENERATION__COMMAND="echo 'test: automated commit'" wt merge
 ```
 
 ### Other environment variables