Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Stabilize mature interfaces and remove retired config (#3949)
Maximilian Roos48b8b3802a5b
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex e97777074..f71e7324d 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -4,6 +4,10 @@### Improved+- **Established automation and LLM customization interfaces are now stable**: `wt step eval`, `wt step for-each`, `wt step prune`, LLM branch summaries, `wt config state vars`, and `commit.generation.template-append` are no longer marked experimental. ([#3949](https://github.com/max-sixty/worktrunk/pull/3949))++- **Deprecated config compatibility has been removed**: `commit.generation.template-file` and `squash-template-file` are no longer supported; put the file contents in `template` or `squash-template` instead. `switch.picker.timeout-ms` now follows the generic unknown-field path instead of being removed by `wt config update`. (Breaking.) ([#3949](https://github.com/max-sixty/worktrunk/pull/3949))+- **The `wt switch` picker opens on one unified diff**: local rows combine committed, staged, unstaged, and untracked changes. Tab skips empty subsidiary views, while `Alt-1` through `Alt-8` retain direct access. [Docs](https://worktrunk.dev/switch/#interactive-picker) ([#3865](https://github.com/max-sixty/worktrunk/pull/3865))- **Git 2.43 is now the minimum supported version**: older Git exits with an upgrade message before Git-dependent commands run; `wt config shell` remains available so shell startup continues. (Breaking.) ([#3895](https://github.com/max-sixty/worktrunk/pull/3895))diff --git a/dev/config.example.toml b/dev/config.example.tomlindex 26cff5b2a..95c306457 100644--- a/dev/config.example.toml+++ b/dev/config.example.toml@@ -399,7 +399,7 @@# """# <!-- DEFAULT_SQUASH_TEMPLATE_END -->#-# #### Appending to the prompt [experimental]+# #### Appending to the prompt## `template-append` adds personal conventions to the commit and squash prompts without restating the whole template:#diff --git a/dev/wt.example.toml b/dev/wt.example.tomlindex e69e8565f..2b73802d2 100644--- a/dev/wt.example.toml+++ b/dev/wt.example.toml@@ -29,7 +29,7 @@## When many repositories share one self-hosted host, name it once in user config with a pattern-keyed `[projects]` entry (https://worktrunk.dev/config/#user-project-specific-settings) instead of repeating this block in each repo. A repository's own `[forge]` still wins, field by field.#-# ## Commit-message append [experimental]+# ## Commit-message append## `template-append` adds project-wide conventions to the LLM commit and squash prompts, shared so every teammate's LLM sees the same style guide:#diff --git a/docs/src/content/docs/config.md b/docs/src/content/docs/config.mdindex 9d8791d11..e9961a34b 100644--- a/docs/src/content/docs/config.md+++ b/docs/src/content/docs/config.md@@ -524,8 +524,6 @@ squash-template = """#### Appending to the prompt-<span class="badge-experimental"></span>-`template-append` adds personal conventions to the commit and squash prompts without restating the whole template:```toml@@ -581,8 +579,6 @@ When many repositories share one self-hosted host, name it once in user config w## Commit-message append-<span class="badge-experimental"></span>-`template-append` adds project-wide conventions to the LLM commit and squash prompts, shared so every teammate's LLM sees the same style guide:```toml@@ -987,7 +983,7 @@ State is stored in `.git/` (config entries and log files), separate from configu- **cache**: [Regenerable caches — CI status, summaries, git commands, hints, and the `wt switch -` target](/config/#wt-config-state-cache)- **default-branch**: [The repository's default branch (`main`, `master`, etc.)](/config/#wt-config-state-default-branch)- **marker**: [Custom status marker for a branch (shown in `wt list`)](/config/#wt-config-state-marker)-- **vars**: <span class="badge-experimental"></span> [Custom variables per branch](/config/#wt-config-state-vars)+- **vars**: [Custom variables per branch](/config/#wt-config-state-vars)- **logs**: [Operation and debug logs](/config/#wt-config-state-logs)### Examples@@ -1041,7 +1037,7 @@ Commands:default-branch Default branch detection and overridelogs Operation and debug logsmarker Branch markers- vars [experimental] Custom variables per branch+ vars Custom variables per branchOptions:-h, --help@@ -1453,8 +1449,6 @@ Global Options:## wt config state vars-<span class="badge-experimental"></span>-Custom variables per branch.Store custom variables per branch. Values are stored as-is — plain strings or JSON.@@ -1508,7 +1502,7 @@ Stored in git config as `worktrunk.state.<branch>.vars.<key>`. Keys must contain### Command reference```text wt-command-reference-wt config state vars - [experimental] Custom variables per branch+wt config state vars - Custom variables per branchUsage: wt config state vars [OPTIONS] <COMMAND>diff --git a/docs/src/content/docs/list.md b/docs/src/content/docs/list.mdindex 298e520db..6015fca40 100644--- a/docs/src/content/docs/list.md+++ b/docs/src/content/docs/list.md@@ -81,7 +81,7 @@ $ wt list --format=json| HEAD± | Uncommitted changes, including untracked files: +added -deleted lines || main↕ | Commits ahead/behind default branch || main…± | Line diffs since the merge-base (three-dot) with the default branch |-| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](/config/#commit) <span class="badge-experimental"></span> |+| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](/config/#commit) || Remote⇅ | Commits ahead/behind tracking branch || CI | PR/MR number colored by pipeline status; `--full` only || Path | Worktree directory |@@ -131,8 +131,6 @@ CI cells are clickable links to the PR or pipeline page, and appear dimmed for a### LLM summaries-<span class="badge-experimental"></span>-Reuses the [`commit.generation`](/config/#commit) command — the same LLM that generates commit messages. Enable with `summary = true` in `[list]` config; requires `--full`. Results are cached until the branch's diff changes.### Custom columnsdiff --git a/docs/src/content/docs/llm-commits.md b/docs/src/content/docs/llm-commits.mdindex b521ff8c2..a478fea67 100644--- a/docs/src/content/docs/llm-commits.md+++ b/docs/src/content/docs/llm-commits.md@@ -120,8 +120,6 @@ See [`wt merge`](/merge/) and [`wt step`](/step/) for full documentation.## Branch summaries-<span class="badge-experimental"></span>-With `summary = true` and a `[commit.generation] command` configured, Worktrunk generates LLM branch summaries — one-line descriptions of each branch's changes since the default branch.Summaries appear in:@@ -198,8 +196,6 @@ See `wt config create --help` for the full default templates.## Appending to the prompt-<span class="badge-experimental"></span>-`template-append` adds to the commit and squash prompts instead of replacing them. It lives in both user config (personal preferences) and project config (`.config/wt.toml`, shared so every teammate's LLM sees the same style guide). Each fragment is itself a [minijinja](https://docs.rs/minijinja/) template — Worktrunk renders it with the same variables as the main template (`{{ branch }}`, `{{ git_diff }}`, …), then appends the result after `<style>`. The user fragment renders into a `<user-guidance>` block and the project fragment into a `<project-guidance>` block, so the LLM can tell personal preference from shared convention:```tomldiff --git a/docs/src/content/docs/step.md b/docs/src/content/docs/step.mdindex 08b90dd72..7429ddc81 100644--- a/docs/src/content/docs/step.md+++ b/docs/src/content/docs/step.md@@ -36,8 +36,8 @@ $ wt step push- [`push`](#wt-step-push) — Fast-forward target to current branch- [`diff`](#wt-step-diff) — Show all changes since branching (committed, staged, unstaged, untracked)- [`copy-ignored`](#wt-step-copy-ignored) — Copy gitignored files between worktrees-- [`eval`](#wt-step-eval) — <span class="badge-experimental"></span> Evaluate a template expression-- [`for-each`](#wt-step-for-each) — <span class="badge-experimental"></span> Run a command in every worktree+- [`eval`](#wt-step-eval) — Evaluate a template expression+- [`for-each`](#wt-step-for-each) — Run a command in every worktree- [`promote`](#wt-step-promote) — <span class="badge-experimental"></span> Swap a branch into the main worktree- [`prune`](#wt-step-prune) — Remove worktrees and branches merged into the default branch- [`relocate`](#wt-step-relocate) — <span class="badge-experimental"></span> Move worktrees to expected paths@@ -66,10 +66,10 @@ Commands:push Fast-forward target to current branchdiff Show all changes since branchingcopy-ignored Copy gitignored files to another worktree- eval [experimental] Evaluate a template expression- for-each [experimental] Run command in each worktree+ eval Evaluate a template expression+ for-each Run command in each worktreepromote [experimental] Swap a branch into the main worktree- prune [experimental] Remove worktrees merged into the default branch+ prune Remove worktrees merged into the default branchrelocate [experimental] Move worktrees to expected pathstether [experimental] Run a command; kill its whole process tree when its worktree isremoved@@ -690,8 +690,6 @@ Global Options:## wt step eval-<span class="badge-experimental"></span>-Evaluate a template expression. Prints the result to stdout for use in scripts and shell substitutions.All [hook template variables and filters](/hook/#template-variables) are available.@@ -743,7 +741,7 @@ feature/auth-oauth2### Command reference```text wt-command-reference-wt step eval - [experimental] Evaluate a template expression+wt step eval - Evaluate a template expressionPrints the result to stdout for use in scripts and shell substitutions.@@ -787,8 +785,6 @@ Global Options:## wt step for-each-<span class="badge-experimental"></span>-Run command in each worktree. Executes sequentially with real-time output; continues past command failures.A summary of successes and failures is shown at the end. A template-expansion error (a malformed `{{ … }}` argument) aborts the whole run; only command failures are tolerated and reported. Context JSON — a flat object of every template variable — is piped to stdin for scripts that need structured data.@@ -830,7 +826,7 @@ $ git fetch --prune && wt step for-each -- sh -c '[ "$(git rev-parse @{u} 2>/dev### Command reference```text wt-command-reference-wt step for-each - [experimental] Run command in each worktree+wt step for-each - Run command in each worktreeExecutes sequentially with real-time output; continues past command failures.@@ -965,8 +961,6 @@ Global Options:## wt step prune-<span class="badge-experimental"></span>-Remove worktrees merged into the default branch.Bulk-removes worktrees and branches that are integrated into the default branch, using the same criteria as `wt remove`'s branch cleanup. Stale worktree entries are cleaned up too.@@ -1005,7 +999,7 @@ $ wt step prune### Command reference```text wt-command-reference-wt step prune - [experimental] Remove worktrees merged into the default branch+wt step prune - Remove worktrees merged into the default branchUsage: wt step prune [OPTIONS]diff --git a/plugins/worktrunk/skills/worktrunk/reference/config.md b/plugins/worktrunk/skills/worktrunk/reference/config.mdindex 954084c17..fb3cd8f62 100644--- a/plugins/worktrunk/skills/worktrunk/reference/config.md+++ b/plugins/worktrunk/skills/worktrunk/reference/config.md@@ -514,7 +514,7 @@ squash-template = """```<!-- DEFAULT_SQUASH_TEMPLATE_END -->-#### Appending to the prompt [experimental]+#### Appending to the prompt`template-append` adds personal conventions to the commit and squash prompts without restating the whole template:@@ -569,7 +569,7 @@ hostname = "github.example.com" # Example: API host (GHE / self-hosted GitLab)When many repositories share one self-hosted host, name it once in user config with a [pattern-keyed `[projects]` entry](https://worktrunk.dev/config/#user-project-specific-settings) instead of repeating this block in each repo. A repository's own `[forge]` still wins, field by field.-## Commit-message append [experimental]+## Commit-message append`template-append` adds project-wide conventions to the LLM commit and squash prompts, shared so every teammate's LLM sees the same style guide:@@ -975,7 +975,7 @@ State is stored in `.git/` (config entries and log files), separate from configu- **cache**: [Regenerable caches — CI status, summaries, git commands, hints, and the `wt switch -` target](https://worktrunk.dev/config/#wt-config-state-cache)- **default-branch**: [The repository's default branch (`main`, `master`, etc.)](https://worktrunk.dev/config/#wt-config-state-default-branch)- **marker**: [Custom status marker for a branch (shown in `wt list`)](https://worktrunk.dev/config/#wt-config-state-marker)-- **vars**: [experimental] [Custom variables per branch](https://worktrunk.dev/config/#wt-config-state-vars)+- **vars**: [Custom variables per branch](https://worktrunk.dev/config/#wt-config-state-vars)- **logs**: [Operation and debug logs](https://worktrunk.dev/config/#wt-config-state-logs)### Examples@@ -1029,7 +1029,7 @@ Commands:default-branch Default branch detection and overridelogs Operation and debug logsmarker Branch markers- vars [experimental] Custom variables per branch+ vars Custom variables per branchOptions:-h, --help@@ -1441,8 +1441,6 @@ Global Options:## wt config state vars-[experimental]-Custom variables per branch.Store custom variables per branch. Values are stored as-is — plain strings or JSON.@@ -1496,7 +1494,7 @@ Stored in git config as `worktrunk.state.<branch>.vars.<key>`. Keys must contain### Command reference```-wt config state vars - [experimental] Custom variables per branch+wt config state vars - Custom variables per branchUsage: wt config state vars [OPTIONS] <COMMAND>diff --git a/plugins/worktrunk/skills/worktrunk/reference/list.md b/plugins/worktrunk/skills/worktrunk/reference/list.mdindex 3d4a102b8..34b9d1381 100644--- a/plugins/worktrunk/skills/worktrunk/reference/list.md+++ b/plugins/worktrunk/skills/worktrunk/reference/list.md@@ -68,7 +68,7 @@ $ wt list --format=json| HEAD± | Uncommitted changes, including untracked files: +added -deleted lines || main↕ | Commits ahead/behind default branch || main…± | Line diffs since the merge-base (three-dot) with the default branch |-| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](https://worktrunk.dev/config/#commit) [experimental] |+| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](https://worktrunk.dev/config/#commit) || Remote⇅ | Commits ahead/behind tracking branch || CI | PR/MR number colored by pipeline status; `--full` only || Path | Worktree directory |@@ -116,7 +116,7 @@ Color precedence resolves the fold: changes-requested (magenta) outranks runningCI cells are clickable links to the PR or pipeline page, and appear dimmed for a draft PR/MR (`"draft"`) or when unpushed local changes make the status stale (`ci.stale`). PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with `--remotes` — get CI status detection. Results are cached for 30-60 seconds; use `wt config state` to view or clear.-### LLM summaries [experimental]+### LLM summariesReuses the [`commit.generation`](https://worktrunk.dev/config/#commit) command — the same LLM that generates commit messages. Enable with `summary = true` in `[list]` config; requires `--full`. Results are cached until the branch's diff changes.diff --git a/plugins/worktrunk/skills/worktrunk/reference/llm-commits.md b/plugins/worktrunk/skills/worktrunk/reference/llm-commits.mdindex e3225f729..ae777e127 100644--- a/plugins/worktrunk/skills/worktrunk/reference/llm-commits.md+++ b/plugins/worktrunk/skills/worktrunk/reference/llm-commits.md@@ -97,8 +97,6 @@ See [`wt merge`](https://worktrunk.dev/merge/) and [`wt step`](https://worktrunk## Branch summaries-[experimental]-With `summary = true` and a `[commit.generation] command` configured, Worktrunk generates LLM branch summaries — one-line descriptions of each branch's changes since the default branch.Summaries appear in:@@ -175,8 +173,6 @@ See `wt config create --help` for the full default templates.## Appending to the prompt-[experimental]-`template-append` adds to the commit and squash prompts instead of replacing them. It lives in both user config (personal preferences) and project config (`.config/wt.toml`, shared so every teammate's LLM sees the same style guide). Each fragment is itself a [minijinja](https://docs.rs/minijinja/) template — Worktrunk renders it with the same variables as the main template (`{{ branch }}`, `{{ git_diff }}`, …), then appends the result after `<style>`. The user fragment renders into a `<user-guidance>` block and the project fragment into a `<project-guidance>` block, so the LLM can tell personal preference from shared convention:```tomldiff --git a/plugins/worktrunk/skills/worktrunk/reference/step.md b/plugins/worktrunk/skills/worktrunk/reference/step.mdindex 05cba928b..b6b306cec 100644--- a/plugins/worktrunk/skills/worktrunk/reference/step.md+++ b/plugins/worktrunk/skills/worktrunk/reference/step.md@@ -30,8 +30,8 @@ $ wt step push- [`push`](#wt-step-push) — Fast-forward target to current branch- [`diff`](#wt-step-diff) — Show all changes since branching (committed, staged, unstaged, untracked)- [`copy-ignored`](#wt-step-copy-ignored) — Copy gitignored files between worktrees-- [`eval`](#wt-step-eval) — [experimental] Evaluate a template expression-- [`for-each`](#wt-step-for-each) — [experimental] Run a command in every worktree+- [`eval`](#wt-step-eval) — Evaluate a template expression+- [`for-each`](#wt-step-for-each) — Run a command in every worktree- [`promote`](#wt-step-promote) — [experimental] Swap a branch into the main worktree- [`prune`](#wt-step-prune) — Remove worktrees and branches merged into the default branch- [`relocate`](#wt-step-relocate) — [experimental] Move worktrees to expected paths@@ -54,10 +54,10 @@ Commands:push Fast-forward target to current branchdiff Show all changes since branchingcopy-ignored Copy gitignored files to another worktree- eval [experimental] Evaluate a template expression- for-each [experimental] Run command in each worktree+ eval Evaluate a template expression+ for-each Run command in each worktreepromote [experimental] Swap a branch into the main worktree- prune [experimental] Remove worktrees merged into the default branch+ prune Remove worktrees merged into the default branchrelocate [experimental] Move worktrees to expected pathstether [experimental] Run a command; kill its whole process tree when its worktree isremoved@@ -678,8 +678,6 @@ Global Options:## wt step eval-[experimental]-Evaluate a template expression. Prints the result to stdout for use in scripts and shell substitutions.All [hook template variables and filters](https://worktrunk.dev/hook/#template-variables) are available.@@ -731,7 +729,7 @@ feature/auth-oauth2### Command reference```-wt step eval - [experimental] Evaluate a template expression+wt step eval - Evaluate a template expressionPrints the result to stdout for use in scripts and shell substitutions.@@ -775,8 +773,6 @@ Global Options:## wt step for-each-[experimental]-Run command in each worktree. Executes sequentially with real-time output; continues past command failures.A summary of successes and failures is shown at the end. A template-expansion error (a malformed `{{ … }}` argument) aborts the whole run; only command failures are tolerated and reported. Context JSON — a flat object of every template variable — is piped to stdin for scripts that need structured data.@@ -818,7 +814,7 @@ $ git fetch --prune && wt step for-each -- sh -c '[ "$(git rev-parse @{u} 2>/dev### Command reference```-wt step for-each - [experimental] Run command in each worktree+wt step for-each - Run command in each worktreeExecutes sequentially with real-time output; continues past command failures.@@ -953,8 +949,6 @@ Global Options:## wt step prune-[experimental]-Remove worktrees merged into the default branch.Bulk-removes worktrees and branches that are integrated into the default branch, using the same criteria as `wt remove`'s branch cleanup. Stale worktree entries are cleaned up too.@@ -993,7 +987,7 @@ $ wt step prune### Command reference```-wt step prune - [experimental] Remove worktrees merged into the default branch+wt step prune - Remove worktrees merged into the default branchUsage: wt step prune [OPTIONS]diff --git a/plugins/worktrunk/skills/worktrunk/reference/troubleshooting.md b/plugins/worktrunk/skills/worktrunk/reference/troubleshooting.mdindex c61bb9760..7c4c8e4c5 100644--- a/plugins/worktrunk/skills/worktrunk/reference/troubleshooting.md+++ b/plugins/worktrunk/skills/worktrunk/reference/troubleshooting.md@@ -35,13 +35,11 @@ Common issues:3. Check TOML syntax: `cat ~/.config/worktrunk/config.toml`4. Look for validation errors (path must be relative, not absolute)-### Template conflicts+### Template config errors-Check for mutually exclusive options:-- `template` and `template-file` cannot both be set-- `squash-template` and `squash-template-file` cannot both be set--If a template file is used, verify it exists at the specified path.+Only inline `template` and `squash-template` values are supported. If the+config still uses the retired `template-file` or `squash-template-file` keys,+paste each file's contents into the corresponding inline setting.## Hooksdiff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.mdindex 954084c17..fb3cd8f62 100644--- a/skills/worktrunk/reference/config.md+++ b/skills/worktrunk/reference/config.md@@ -514,7 +514,7 @@ squash-template = """```<!-- DEFAULT_SQUASH_TEMPLATE_END -->-#### Appending to the prompt [experimental]+#### Appending to the prompt`template-append` adds personal conventions to the commit and squash prompts without restating the whole template:@@ -569,7 +569,7 @@ hostname = "github.example.com" # Example: API host (GHE / self-hosted GitLab)When many repositories share one self-hosted host, name it once in user config with a [pattern-keyed `[projects]` entry](https://worktrunk.dev/config/#user-project-specific-settings) instead of repeating this block in each repo. A repository's own `[forge]` still wins, field by field.-## Commit-message append [experimental]+## Commit-message append`template-append` adds project-wide conventions to the LLM commit and squash prompts, shared so every teammate's LLM sees the same style guide:@@ -975,7 +975,7 @@ State is stored in `.git/` (config entries and log files), separate from configu- **cache**: [Regenerable caches — CI status, summaries, git commands, hints, and the `wt switch -` target](https://worktrunk.dev/config/#wt-config-state-cache)- **default-branch**: [The repository's default branch (`main`, `master`, etc.)](https://worktrunk.dev/config/#wt-config-state-default-branch)- **marker**: [Custom status marker for a branch (shown in `wt list`)](https://worktrunk.dev/config/#wt-config-state-marker)-- **vars**: [experimental] [Custom variables per branch](https://worktrunk.dev/config/#wt-config-state-vars)+- **vars**: [Custom variables per branch](https://worktrunk.dev/config/#wt-config-state-vars)- **logs**: [Operation and debug logs](https://worktrunk.dev/config/#wt-config-state-logs)### Examples@@ -1029,7 +1029,7 @@ Commands:default-branch Default branch detection and overridelogs Operation and debug logsmarker Branch markers- vars [experimental] Custom variables per branch+ vars Custom variables per branchOptions:-h, --help@@ -1441,8 +1441,6 @@ Global Options:## wt config state vars-[experimental]-Custom variables per branch.Store custom variables per branch. Values are stored as-is — plain strings or JSON.@@ -1496,7 +1494,7 @@ Stored in git config as `worktrunk.state.<branch>.vars.<key>`. Keys must contain### Command reference```-wt config state vars - [experimental] Custom variables per branch+wt config state vars - Custom variables per branchUsage: wt config state vars [OPTIONS] <COMMAND>diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.mdindex 3d4a102b8..34b9d1381 100644--- a/skills/worktrunk/reference/list.md+++ b/skills/worktrunk/reference/list.md@@ -68,7 +68,7 @@ $ wt list --format=json| HEAD± | Uncommitted changes, including untracked files: +added -deleted lines || main↕ | Commits ahead/behind default branch || main…± | Line diffs since the merge-base (three-dot) with the default branch |-| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](https://worktrunk.dev/config/#commit) [experimental] |+| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](https://worktrunk.dev/config/#commit) || Remote⇅ | Commits ahead/behind tracking branch || CI | PR/MR number colored by pipeline status; `--full` only || Path | Worktree directory |@@ -116,7 +116,7 @@ Color precedence resolves the fold: changes-requested (magenta) outranks runningCI cells are clickable links to the PR or pipeline page, and appear dimmed for a draft PR/MR (`"draft"`) or when unpushed local changes make the status stale (`ci.stale`). PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with `--remotes` — get CI status detection. Results are cached for 30-60 seconds; use `wt config state` to view or clear.-### LLM summaries [experimental]+### LLM summariesReuses the [`commit.generation`](https://worktrunk.dev/config/#commit) command — the same LLM that generates commit messages. Enable with `summary = true` in `[list]` config; requires `--full`. Results are cached until the branch's diff changes.diff --git a/skills/worktrunk/reference/llm-commits.md b/skills/worktrunk/reference/llm-commits.mdindex e3225f729..ae777e127 100644--- a/skills/worktrunk/reference/llm-commits.md+++ b/skills/worktrunk/reference/llm-commits.md@@ -97,8 +97,6 @@ See [`wt merge`](https://worktrunk.dev/merge/) and [`wt step`](https://worktrunk## Branch summaries-[experimental]-With `summary = true` and a `[commit.generation] command` configured, Worktrunk generates LLM branch summaries — one-line descriptions of each branch's changes since the default branch.Summaries appear in:@@ -175,8 +173,6 @@ See `wt config create --help` for the full default templates.## Appending to the prompt-[experimental]-`template-append` adds to the commit and squash prompts instead of replacing them. It lives in both user config (personal preferences) and project config (`.config/wt.toml`, shared so every teammate's LLM sees the same style guide). Each fragment is itself a [minijinja](https://docs.rs/minijinja/) template — Worktrunk renders it with the same variables as the main template (`{{ branch }}`, `{{ git_diff }}`, …), then appends the result after `<style>`. The user fragment renders into a `<user-guidance>` block and the project fragment into a `<project-guidance>` block, so the LLM can tell personal preference from shared convention:```tomldiff --git a/skills/worktrunk/reference/step.md b/skills/worktrunk/reference/step.mdindex 05cba928b..b6b306cec 100644--- a/skills/worktrunk/reference/step.md+++ b/skills/worktrunk/reference/step.md@@ -30,8 +30,8 @@ $ wt step push- [`push`](#wt-step-push) — Fast-forward target to current branch- [`diff`](#wt-step-diff) — Show all changes since branching (committed, staged, unstaged, untracked)- [`copy-ignored`](#wt-step-copy-ignored) — Copy gitignored files between worktrees-- [`eval`](#wt-step-eval) — [experimental] Evaluate a template expression-- [`for-each`](#wt-step-for-each) — [experimental] Run a command in every worktree+- [`eval`](#wt-step-eval) — Evaluate a template expression+- [`for-each`](#wt-step-for-each) — Run a command in every worktree- [`promote`](#wt-step-promote) — [experimental] Swap a branch into the main worktree- [`prune`](#wt-step-prune) — Remove worktrees and branches merged into the default branch- [`relocate`](#wt-step-relocate) — [experimental] Move worktrees to expected paths@@ -54,10 +54,10 @@ Commands:push Fast-forward target to current branchdiff Show all changes since branchingcopy-ignored Copy gitignored files to another worktree- eval [experimental] Evaluate a template expression- for-each [experimental] Run command in each worktree+ eval Evaluate a template expression+ for-each Run command in each worktreepromote [experimental] Swap a branch into the main worktree- prune [experimental] Remove worktrees merged into the default branch+ prune Remove worktrees merged into the default branchrelocate [experimental] Move worktrees to expected pathstether [experimental] Run a command; kill its whole process tree when its worktree isremoved@@ -678,8 +678,6 @@ Global Options:## wt step eval-[experimental]-Evaluate a template expression. Prints the result to stdout for use in scripts and shell substitutions.All [hook template variables and filters](https://worktrunk.dev/hook/#template-variables) are available.@@ -731,7 +729,7 @@ feature/auth-oauth2### Command reference```-wt step eval - [experimental] Evaluate a template expression+wt step eval - Evaluate a template expressionPrints the result to stdout for use in scripts and shell substitutions.@@ -775,8 +773,6 @@ Global Options:## wt step for-each-[experimental]-Run command in each worktree. Executes sequentially with real-time output; continues past command failures.A summary of successes and failures is shown at the end. A template-expansion error (a malformed `{{ … }}` argument) aborts the whole run; only command failures are tolerated and reported. Context JSON — a flat object of every template variable — is piped to stdin for scripts that need structured data.@@ -818,7 +814,7 @@ $ git fetch --prune && wt step for-each -- sh -c '[ "$(git rev-parse @{u} 2>/dev### Command reference```-wt step for-each - [experimental] Run command in each worktree+wt step for-each - Run command in each worktreeExecutes sequentially with real-time output; continues past command failures.@@ -953,8 +949,6 @@ Global Options:## wt step prune-[experimental]-Remove worktrees merged into the default branch.Bulk-removes worktrees and branches that are integrated into the default branch, using the same criteria as `wt remove`'s branch cleanup. Stale worktree entries are cleaned up too.@@ -993,7 +987,7 @@ $ wt step prune### Command reference```-wt step prune - [experimental] Remove worktrees merged into the default branch+wt step prune - Remove worktrees merged into the default branchUsage: wt step prune [OPTIONS]diff --git a/skills/worktrunk/reference/troubleshooting.md b/skills/worktrunk/reference/troubleshooting.mdindex c61bb9760..7c4c8e4c5 100644--- a/skills/worktrunk/reference/troubleshooting.md+++ b/skills/worktrunk/reference/troubleshooting.md@@ -35,13 +35,11 @@ Common issues:3. Check TOML syntax: `cat ~/.config/worktrunk/config.toml`4. Look for validation errors (path must be relative, not absolute)-### Template conflicts+### Template config errors-Check for mutually exclusive options:-- `template` and `template-file` cannot both be set-- `squash-template` and `squash-template-file` cannot both be set--If a template file is used, verify it exists at the specified path.+Only inline `template` and `squash-template` values are supported. If the+config still uses the retired `template-file` or `squash-template-file` keys,+paste each file's contents into the corresponding inline setting.## Hooksdiff --git a/src/cli/config.rs b/src/cli/config.rsindex f3ac8a47b..7b6d09e65 100644--- a/src/cli/config.rs+++ b/src/cli/config.rs@@ -693,7 +693,7 @@ $ wt config plugins opencode install- **cache**: [Regenerable caches — CI status, summaries, git commands, hints, and the `wt switch -` target](/config/#wt-config-state-cache)- **default-branch**: [The repository's default branch (`main`, `master`, etc.)](/config/#wt-config-state-default-branch)- **marker**: [Custom status marker for a branch (shown in `wt list`)](/config/#wt-config-state-marker)-- **vars**: [experimental] [Custom variables per branch](/config/#wt-config-state-vars)+- **vars**: [Custom variables per branch](/config/#wt-config-state-vars)- **logs**: [Operation and debug logs](/config/#wt-config-state-logs)## Examples@@ -1070,7 +1070,7 @@ Without a subcommand, runs `get` for the current branch. For `--branch`, use `geformat: GlobalFormatFlag,},- /// \[experimental\] Custom variables per branch+ /// Custom variables per branch#[command(name = "vars",after_long_help = r#"Store custom variables per branch. Values are stored as-is — plain strings or JSON.diff --git a/src/cli/mod.rs b/src/cli/mod.rsindex 9aa058eef..511ce034b 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -835,7 +835,7 @@ $ wt list --format=json| HEAD± | Uncommitted changes, including untracked files: +added -deleted lines || main↕ | Commits ahead/behind default branch || main…± | Line diffs since the merge-base (three-dot) with the default branch |-| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](/config/#commit) [experimental] |+| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](/config/#commit) || Remote⇅ | Commits ahead/behind tracking branch || CI | PR/MR number colored by pipeline status; `--full` only || Path | Worktree directory |@@ -883,7 +883,7 @@ Color precedence resolves the fold: changes-requested (magenta) outranks runningCI cells are clickable links to the PR or pipeline page, and appear dimmed for a draft PR/MR (`"draft"`) or when unpushed local changes make the status stale (`ci.stale`). PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with `--remotes` — get CI status detection. Results are cached for 30-60 seconds; use `wt config state` to view or clear.-### LLM summaries [experimental]+### LLM summariesReuses the [`commit.generation`](/config/#commit) command — the same LLM that generates commit messages. Enable with `summary = true` in `[list]` config; requires `--full`. Results are cached until the branch's diff changes.@@ -1516,8 +1516,8 @@ $ wt step push- [`push`](#wt-step-push) — Fast-forward target to current branch- [`diff`](#wt-step-diff) — Show all changes since branching (committed, staged, unstaged, untracked)- [`copy-ignored`](#wt-step-copy-ignored) — Copy gitignored files between worktrees-- [`eval`](#wt-step-eval) — [experimental] Evaluate a template expression-- [`for-each`](#wt-step-for-each) — [experimental] Run a command in every worktree+- [`eval`](#wt-step-eval) — Evaluate a template expression+- [`for-each`](#wt-step-for-each) — Run a command in every worktree- [`promote`](#wt-step-promote) — [experimental] Swap a branch into the main worktree- [`prune`](#wt-step-prune) — Remove worktrees and branches merged into the default branch- [`relocate`](#wt-step-relocate) — [experimental] Move worktrees to expected paths@@ -2411,7 +2411,7 @@ squash-template = """```<!-- DEFAULT_SQUASH_TEMPLATE_END -->-#### Appending to the prompt [experimental]+#### Appending to the prompt`template-append` adds personal conventions to the commit and squash prompts without restating the whole template:@@ -2466,7 +2466,7 @@ hostname = "github.example.com" # Example: API host (GHE / self-hosted GitLab)When many repositories share one self-hosted host, name it once in user config with a [pattern-keyed `[projects]` entry](/config/#user-project-specific-settings) instead of repeating this block in each repo. A repository's own `[forge]` still wins, field by field.-## Commit-message append [experimental]+## Commit-message append`template-append` adds project-wide conventions to the LLM commit and squash prompts, shared so every teammate's LLM sees the same style guide:diff --git a/src/cli/step.rs b/src/cli/step.rsindex b24c245b6..b40e53a28 100644--- a/src/cli/step.rs+++ b/src/cli/step.rs@@ -428,7 +428,7 @@ The `.worktreeinclude` pattern is shared with [Claude Code on desktop](https://cformat: crate::cli::SwitchFormat,},- /// \[experimental\] Evaluate a template expression+ /// Evaluate a template expression////// Prints the result to stdout for use in scripts and shell substitutions.#[command(@@ -490,7 +490,7 @@ feature/auth-oauth2format: crate::cli::SwitchFormat,},- /// \[experimental\] Run command in each worktree+ /// Run command in each worktree////// Executes sequentially with real-time output; continues past command failures.#[command(@@ -601,7 +601,7 @@ The swap uses `rename()` for each entry — fast regardless of entry size, sinceformat: crate::cli::SwitchFormat,},- /// \[experimental\] Remove worktrees merged into the default branch+ /// Remove worktrees merged into the default branch#[command(after_long_help = r#"Bulk-removes worktrees and branches that are integrated into the default branch, using the same criteria as `wt remove`'s branch cleanup. Stale worktree entries are cleaned up too.diff --git a/src/config/deprecation.rs b/src/config/deprecation.rsindex d42c2ca9a..d789665bb 100644--- a/src/config/deprecation.rs+++ b/src/config/deprecation.rs@@ -482,8 +482,6 @@ pub enum DeprecationKind {NoFf,/// `no-cd` in `[switch]` (use `cd` instead).NoCd,- /// `timeout-ms` under `[switch.picker]` (removed — picker renders progressively).- SwitchPickerTimeout,/// `task-timeout-ms` under `[list]` (removed — `[list] timeout-ms` bounds/// the collect phase).ListTaskTimeout,@@ -575,16 +573,7 @@ enum RulePass {/// bottom, so a row's position is both its warning-emission position and its/// migration position. Detection applies each rule to a scratch copy that/// earlier rules have already migrated, so a rule reports a pattern in its-/// post-migration shape — e.g. a `timeout-ms` written under `[select]` is-/// reported by the timeout rule after the `[select]` rule moves it under-/// `[switch.picker]`.-///-/// Most rows rewrite disjoint keys, but one ordering is load-bearing:-/// - `[select]` → `[switch.picker]` precedes the `timeout-ms` strip rule so a-/// `timeout-ms` written under `[select]` is first moved to `switch.picker`,-/// where the strip rule then removes it. The `no-cd` and `timeout-ms` rules-/// both match an inline `switch` directly, so the move is the only ordering-/// dependency — no inline-to-standard conversion is relied on.+/// post-migration shape.////// The `[ci]` → `[forge]` rule is order-independent: `[forge]` takes over/// `[ci]`'s explicit document position (see [`migrate_ci_doc`]), so its@@ -642,14 +631,6 @@ const DEPRECATION_RULES: &[DeprecationRule] = &[DeprecationRule::Structural(|doc| {migrate_negated_bool_doc(doc, "switch", "no-cd", "cd", DeprecationKind::NoCd)}),- // switch.picker.timeout-ms — removed; the picker renders progressively.- DeprecationRule::Structural(|doc| {- if for_each_config_table_mut(doc, |_, table| remove_switch_picker_timeout_in(table)) {- vec![DeprecationKind::SwitchPickerTimeout]- } else {- Vec::new()- }- }),// list.task-timeout-ms — removed; `[list] timeout-ms` bounds the collect// phase, and the drain has its own fallback bound.DeprecationRule::Structural(|doc| {@@ -1109,7 +1090,7 @@ fn migrate_negated_bool(table: &mut toml_edit::Table, old_key: &str, new_key: &s/// The inline-table counterpart of [`migrate_negated_bool`], for a section/// written inline as `merge = { no-ff = true }`. `toml_edit` surfaces a regular/// `[merge]` section and an inline `merge = { … }` as different node types, so-/// both forms need their own walk (mirroring [`remove_switch_picker_timeout_in`]).+/// both forms need their own walk.fn migrate_negated_bool_inline(table: &mut toml_edit::InlineTable,old_key: &str,@@ -1190,40 +1171,13 @@ fn rename_hook_key(doc: &mut toml_edit::DocumentMut, old_key: &str, new_key: &stmodified}-/// Remove `timeout-ms` from `switch.picker` in a table (top-level or project).-/// An emptied `picker` is left in place — it round-trips harmlessly.-///-/// Both `switch` and its `picker` can be written as a section table or inline-/// (`switch = { picker = { ... } }`); `toml_edit` surfaces these as different-/// node types, so every shape gets its own branch — matching the inline-aware-/// `no-cd`/`no-ff` rules. A `picker` nested inside an inline `switch` is itself-/// always inline.-fn remove_switch_picker_timeout_in(table: &mut toml_edit::Table) -> bool {- match table.get_mut("switch") {- // `[switch]` section: `picker` may be a section or inline table.- Some(toml_edit::Item::Table(switch)) => match switch.get_mut("picker") {- Some(toml_edit::Item::Table(t)) => t.remove("timeout-ms").is_some(),- Some(toml_edit::Item::Value(toml_edit::Value::InlineTable(it))) => {- it.remove("timeout-ms").is_some()- }- _ => false,- },- // Inline `switch = { picker = { ... } }`: `picker` is itself inline.- Some(toml_edit::Item::Value(toml_edit::Value::InlineTable(switch))) => switch- .get_mut("picker")- .and_then(|p| p.as_inline_table_mut())- .is_some_and(|it| it.remove("timeout-ms").is_some()),- _ => false,- }-}-/// Remove `key` from a top-level `section` in a table (top-level or project)./// An emptied section is left in place — it round-trips harmlessly.////// A section can be written as a section table (`[list]`) or inline/// (`list = { … }`); `toml_edit` surfaces these as different node types, so/// each shape gets its own branch — matching the inline-aware `no-cd`/`no-ff`-/// rules and the two-level [`remove_switch_picker_timeout_in`].+/// rules.fn remove_section_key_in(table: &mut toml_edit::Table, section: &str, key: &str) -> bool {match table.get_mut(section) {Some(toml_edit::Item::Table(t)) => t.remove(key).is_some(),@@ -1697,15 +1651,6 @@ fn format_warning_lines<'a>()));}- DeprecationKind::SwitchPickerTimeout => {- let _ = writeln!(- out,- "{}",- warning_message(cformat!(- "{label}: <bold>switch.picker.timeout-ms</> is no longer used — the picker now renders progressively"- ))- );- }DeprecationKind::ListTaskTimeout => {let _ = writeln!(out,@@ -1808,9 +1753,7 @@ pub fn key_belongs_in<C: WorktrunkConfig>(key: &str) -> Option<&'static str> {const USER_ONLY_COMMIT_GENERATION_PATHS: &[&str] = &["commit.generation.command","commit.generation.template",- "commit.generation.template-file","commit.generation.squash-template",- "commit.generation.squash-template-file",];/// Returns the config where a misplaced *nested* key belongs.@@ -3291,6 +3234,8 @@ json-schema = 1"[merge]\nno-ff = \"yes\"\n","[merge]\nff = true\nno-ff = \"yes\"\n","merge = { no-ff = \"yes\" }\n",+ // retired deprecations are left for generic unknown-field handling+ "switch = { picker = { timeout-ms = 500 } }\n",// empty approved-commands is not deprecated"[projects.\"github.com/u/r\"]\napproved-commands = []\n",];@@ -3314,8 +3259,6 @@ json-schema = 1// like the section form"merge = { no-ff = true }\n","switch = { no-cd = true }\n",- // timeout-ms under an inline `switch` is stripped like the section form- "switch = { picker = { timeout-ms = 500 } }\n","[select]\ntimeout-ms = 500\n",// list.task-timeout-ms, section and inline forms (project-scoped so// the appended `[list]` below isn't a duplicate table)@@ -3445,11 +3388,10 @@ json-schema = 1assert_eq!(migrate_content(""), "");}- /// A `timeout-ms` written under `[select]` is reported by the timeout- /// rule after the `[select]` rule moves it under `[switch.picker]`.- /// (Previously it was dropped on load with only the `[select]` warning.)+ /// A retired `timeout-ms` key under `[select]` does not add a second+ /// deprecation after the section is migrated to `[switch.picker]`.#[test]- fn test_select_timeout_ms_warns_both_kinds() {+ fn test_select_timeout_ms_warns_for_select() {let deprecations = detect_deprecations("[select]\npager = \"delta\"\ntimeout-ms = 500\n",ConfigFileKind::User,@@ -3458,10 +3400,13 @@ json-schema = 1k,DeprecationKind::Select)));- assert!(has_kind(&deprecations, |k| matches!(- k,- DeprecationKind::SwitchPickerTimeout- )));+ assert_eq!(+ deprecations+ .iter()+ .filter(|kind| !kind.is_pending_default())+ .count(),+ 1+ );}#[test]@@ -4228,117 +4173,22 @@ json-schema = 1}#[test]- fn test_detect_switch_picker_timeout_top_level() {+ fn test_switch_picker_timeout_is_left_for_unknown_field_handling() {let content = r#"[switch.picker]pager = "delta"timeout-ms = 500-"#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);- assert!(has_kind(&deprecations, |k| matches!(- k,- DeprecationKind::SwitchPickerTimeout- )));- assert!(!deprecations.is_empty());- }- #[test]- fn test_detect_switch_picker_timeout_project_level() {- let content = r#"-[projects."github.com/user/repo".switch.picker]-timeout-ms = 300-"#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);- assert!(has_kind(&deprecations, |k| matches!(- k,- DeprecationKind::SwitchPickerTimeout- )));- }-- #[test]- fn test_detect_switch_picker_timeout_inline_table() {- let content = r#"-[switch]-picker = { pager = "delta", timeout-ms = 500 }-"#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);- assert!(has_kind(&deprecations, |k| matches!(- k,- DeprecationKind::SwitchPickerTimeout- )));- }-- #[test]- fn test_migrate_switch_picker_timeout_inline_table() {- let content = r#"-[switch]-picker = { pager = "delta", timeout-ms = 500 }-"#;- let result = migrate_content(content);- assert!(!result.contains("timeout-ms"));- assert!(result.contains("pager"));- }-- #[test]- fn test_detect_switch_picker_timeout_absent() {- let content = r#"-[switch.picker]-pager = "delta"-"#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);- assert!(!has_kind(&deprecations, |k| matches!(- k,- DeprecationKind::SwitchPickerTimeout- )));- }-- #[test]- fn test_migrate_switch_picker_timeout_removes_key() {- let content = r#"-[switch.picker]-pager = "delta"-timeout-ms = 500+[list]+json-schema = 1"#;- let result = migrate_content(content);- assert!(- !result.contains("timeout-ms"),- "Should strip timeout-ms: {result}"- );- assert!(- result.contains("pager"),- "Should preserve sibling keys: {result}"+ assert!(detect_deprecations(content, ConfigFileKind::User).is_empty());+ assert_eq!(+ compute_migrated_content(content, ConfigFileKind::User),+ content);}- #[test]- fn test_migrate_switch_picker_timeout_project_level() {- let content = r#"-[projects."github.com/user/repo".switch.picker]-pager = "bat"-timeout-ms = 100-"#;- let result = migrate_content(content);- assert!(!result.contains("timeout-ms"));- assert!(result.contains("pager"));- }-- #[test]- fn test_migrate_switch_picker_timeout_noop_when_absent() {- let content = r#"-[switch.picker]-pager = "delta"-"#;- let result = migrate_content(content);- assert_eq!(result, content);- }-- #[test]- fn test_migrate_switch_picker_timeout_invalid_toml() {- let content = "this is { not valid toml";- let result = migrate_content(content);- assert_eq!(result, content);- }-#[test]fn test_detect_list_task_timeout_top_level() {let content = r#"@@ -4441,7 +4291,6 @@ timeout-ms = 500DeprecationKind::CiSection,DeprecationKind::NoFf,DeprecationKind::NoCd,- DeprecationKind::SwitchPickerTimeout,DeprecationKind::ListTaskTimeout,DeprecationKind::JsonSchemaUnset,],@@ -4457,7 +4306,6 @@ timeout-ms = 500▲ User config: [ci] is deprecated in favor of [forge]▲ User config: merge.no-ff is deprecated in favor of merge.ff (inverted)▲ User config: switch.no-cd is deprecated in favor of switch.cd (inverted)- ▲ User config: switch.picker.timeout-ms is no longer used — the picker now renders progressively▲ User config: list.task-timeout-ms is no longer used — list.timeout-ms bounds the collect phase▲ User config: [list] json-schema is unset; a future release switches the JSON default to schema 2"#);diff --git a/src/config/mod.rs b/src/config/mod.rsindex 38867bd43..09f38c941 100644--- a/src/config/mod.rs+++ b/src/config/mod.rs@@ -577,9 +577,7 @@ task2 = "echo 'Task 2 running' > task2.txt"let config = CommitGenerationConfig {command: Some("llm -m model".to_string()),template: Some("template content".to_string()),- template_file: None,squash_template: None,- squash_template_file: None,template_append: None,};diff --git a/src/config/project.rs b/src/config/project.rsindex 4c4f9209a..2054c9077 100644--- a/src/config/project.rs+++ b/src/config/project.rs@@ -59,8 +59,7 @@ pub struct ProjectCiConfig {pub platform: Option<String>,}-/// Project-level commit message configuration. *(Experimental — fields may-/// change in future releases.)*+/// Project-level commit message configuration.////// Only fields appropriate as shared, checked-in settings live here. The LLM/// command and full prompt template stay in user/system config — they@@ -133,19 +132,12 @@ impl ProjectListConfig {}impl ProjectConfig {- /// The CI platform set in `[ci]`, if any.- ///- /// Deprecated: use [`forge_platform()`](Self::forge_platform) instead.- pub fn ci_platform(&self) -> Option<&str> {- self.ci.platform.as_deref()- }-/// The configured forge platform, checking `[forge]` first then `[ci]`.pub fn forge_platform(&self) -> Option<&str> {self.forge.platform.as_deref()- .or_else(|| self.ci_platform())+ .or(self.ci.platform.as_deref())}/// Get the forge API hostname if configured.@@ -488,8 +480,7 @@ platform = "github"let config: ProjectConfig = toml::from_str(contents).unwrap();// forge.platform takes precedenceassert_eq!(config.forge_platform(), Some("github"));- // ci.platform still accessible directly- assert_eq!(config.ci_platform(), Some("gitlab"));+ assert_eq!(config.ci.platform.as_deref(), Some("gitlab"));}#[test]diff --git a/src/config/snapshots/worktrunk__config__deprecation__tests__snapshot_migrate_all_rules_combined.snap b/src/config/snapshots/worktrunk__config__deprecation__tests__snapshot_migrate_all_rules_combined.snapindex 8d84b9445..3b4319cbf 100644--- a/src/config/snapshots/worktrunk__config__deprecation__tests__snapshot_migrate_all_rules_combined.snap+++ b/src/config/snapshots/worktrunk__config__deprecation__tests__snapshot_migrate_all_rules_combined.snap@@ -23,7 +23,7 @@ expression: "migration_diff(content, &migrated)"++[switch.picker]pager = "delta"--timeout-ms = 500+ timeout-ms = 500[merge]-no-ff = truediff --git a/src/config/user/mod.rs b/src/config/user/mod.rsindex 15336345f..ea6153e5c 100644--- a/src/config/user/mod.rs+++ b/src/config/user/mod.rs@@ -311,9 +311,9 @@ fn deep_merge_table(base: &mut toml::Table, overlay: toml::Table) {/// would silently stop it running.////// Only removals precede the merge, but a removal can still leave a document-/// that no longer deserializes: [`exclusive_sibling`] and [`is_atomic_section`]-/// name the sections that have to go as a unit, and the removals degrade as a-/// unit behind them — they land on a candidate, and a candidate that stops+/// that no longer deserializes: [`is_atomic_section`] names the sections that+/// have to go as a unit, and the removals degrade as a unit behind them — they+/// land on a candidate, and a candidate that stops/// deserializing or validating is dropped for the plain merge rather than/// handed to [`UserConfig::finalize`], which would answer a stranded required/// field by wiping the config to defaults. The layer itself applies either way.@@ -370,7 +370,7 @@ fn deserialize_and_validate(table: &toml::Table) -> Result<(), String> {}/// Remove from `entry` every leaf `overlay` sets. `section` tracks the path-/// walked so far, for [`exclusive_sibling`] and the predicates beside it.+/// walked so far for the predicates beside it.fn drop_overridden_keys<'a>(entry: &mut toml::Table,overlay: &'a toml::Table,@@ -381,12 +381,6 @@ fn drop_overridden_keys<'a>(continue;}- // An exclusive pair goes as a unit, whether or not `entry` carries- // `key` itself: the project's partner alone would still win the merge.- if let Some(sibling) = exclusive_sibling(section, key) {- entry.remove(sibling);- }-match (entry.get_mut(key.as_str()), value) {// Both sides are sections: recurse, so an override of one leaf// leaves the project's sibling leaves alone. An atomic section's@@ -410,28 +404,6 @@ fn drop_overridden_keys<'a>(}}-/// The key that `key` clears when both are set under `section`.-///-/// `[commit.generation]` rejects `template` alongside `template-file`-/// (`UserConfig::validate`), and setting either clears the other when a-/// project entry merges over the global one-/// (`CommitGenerationConfig::merge_with`).-/// So a layer that sets one member has to displace *both* at-/// project scope: dropping only its own key would leave the project's partner-/// to win the merge — the ranking this pass exists to remove.-fn exclusive_sibling(section: &[&str], key: &str) -> Option<&'static str> {- if section != ["commit", "generation"] {- return None;- }- match key {- "template" => Some("template-file"),- "template-file" => Some("template"),- "squash-template" => Some("squash-template-file"),- "squash-template-file" => Some("squash-template"),- _ => None,- }-}-/// A table whose entries the merge replaces whole, so removing one of an/// entry's leaves neither removes the precedence nor leaves the entry usable.///@@ -443,7 +415,7 @@ fn exclusive_sibling(section: &[&str], key: &str) -> Option<&'static str> {/// strand a column that no longer deserializes.////// `section` is the path of the containing table, so this asks "are this-/// table's children atomic", the way [`exclusive_sibling`] asks about a pair.+/// table's children atomic".fn is_atomic_section(section: &[&str]) -> bool {section == ["list", "custom-columns"]}diff --git a/src/config/user/persistence.rs b/src/config/user/persistence.rsindex fea0b7896..117b57a4b 100644--- a/src/config/user/persistence.rs+++ b/src/config/user/persistence.rs@@ -11,7 +11,6 @@use crate::config::{ConfigError, UnknownTree, compute_unknown_tree};use super::UserConfig;-use super::sections::CommitGenerationConfig;impl UserConfig {/// Recursively convert inline tables to standard tables for readability.@@ -220,43 +219,8 @@ impl UserConfig {"projects.{project}.worktree-path cannot be empty")));}-- if let Some(ref cg) = project_config.commit.generation {- Self::validate_commit_generation(cg, &format!("projects.{project}"))?;- }- }-- if let Some(ref cg) = self.commit.generation {- if cg.template.is_some() && cg.template_file.is_some() {- return Err(ConfigError(- "commit.generation.template and commit.generation.template-file are mutually exclusive".into(),- ));- }-- if cg.squash_template.is_some() && cg.squash_template_file.is_some() {- return Err(ConfigError(- "commit.generation.squash-template and commit.generation.squash-template-file are mutually exclusive".into(),- ));- }}Ok(())}-- fn validate_commit_generation(- cg: &CommitGenerationConfig,- prefix: &str,- ) -> Result<(), ConfigError> {- if cg.template.is_some() && cg.template_file.is_some() {- return Err(ConfigError(format!(- "{prefix}.commit-generation.template and template-file are mutually exclusive"- )));- }- if cg.squash_template.is_some() && cg.squash_template_file.is_some() {- return Err(ConfigError(format!(- "{prefix}.commit-generation.squash-template and squash-template-file are mutually exclusive"- )));- }- Ok(())- }}diff --git a/src/config/user/sections.rs b/src/config/user/sections.rsindex fc89b0772..9a2c189d3 100644--- a/src/config/user/sections.rs+++ b/src/config/user/sections.rs@@ -67,21 +67,11 @@ pub struct CommitGenerationConfig {#[serde(default)]pub template: Option<String>,- /// Path to template file (mutually exclusive with template)- /// Supports tilde expansion (e.g., "~/.config/worktrunk/commit-template.txt")- #[serde(default, rename = "template-file")]- pub template_file: Option<String>,-/// Inline template for squash commit message prompt/// Available variables: {{ commits }}, {{ target_branch }}, {{ branch }}, {{ repo }}#[serde(default, rename = "squash-template")]pub squash_template: Option<String>,- /// Path to squash template file (mutually exclusive with squash-template)- /// Supports tilde expansion (e.g., "~/.config/worktrunk/squash-template.txt")- #[serde(default, rename = "squash-template-file")]- pub squash_template_file: Option<String>,-/// Inline text appended to the commit and squash prompts inside a/// `<user-guidance>` block, after the main template's `<style>`/// section. Rendered as a minijinja template with the same variables@@ -91,8 +81,6 @@ pub struct CommitGenerationConfig {/// template. The project config has a `[commit.generation]/// template-append` of its own; it renders into a separate/// `<project-guidance>` block right after this one.- ///- /// *(Experimental — may change in future releases.)*#[serde(default, rename = "template-append")]pub template_append: Option<String>,}@@ -109,33 +97,13 @@ impl CommitGenerationConfig {impl Merge for CommitGenerationConfig {fn merge_with(&self, other: &Self) -> Self {- // For template/template_file pairs: if project sets one, it clears the other- // This prevents violating mutual exclusivity when global has one and project has the other- let (template, template_file) = if other.template.is_some() {- (other.template.clone(), None)- } else if other.template_file.is_some() {- (None, other.template_file.clone())- } else {- (self.template.clone(), self.template_file.clone())- };-- let (squash_template, squash_template_file) = if other.squash_template.is_some() {- (other.squash_template.clone(), None)- } else if other.squash_template_file.is_some() {- (None, other.squash_template_file.clone())- } else {- (- self.squash_template.clone(),- self.squash_template_file.clone(),- )- };-Self {command: other.command.clone().or_else(|| self.command.clone()),- template,- template_file,- squash_template,- squash_template_file,+ template: other.template.clone().or_else(|| self.template.clone()),+ squash_template: other+ .squash_template+ .clone()+ .or_else(|| self.squash_template.clone()),template_append: other.template_append.clone()diff --git a/src/config/user/tests.rs b/src/config/user/tests.rsindex cd117ac03..8e0fc3be1 100644--- a/src/config/user/tests.rs+++ b/src/config/user/tests.rs@@ -852,26 +852,20 @@ fn test_merge_merge_config() {fn test_merge_commit_generation_config() {let base = CommitGenerationConfig {command: Some("llm -m claude-haiku-4.5".to_string()),- template: None,- template_file: Some("~/.config/template.txt".to_string()),+ template: Some("base template".to_string()),squash_template: None,- squash_template_file: None,template_append: None,};let override_config = CommitGenerationConfig {command: Some("claude -p --model=haiku".to_string()), // Override- template: Some("custom".to_string()), // Override (was None)- template_file: None, // Fall back to base+ template: Some("custom".to_string()), // Overridesquash_template: None,- squash_template_file: None,template_append: None,};let merged = base.merge_with(&override_config);assert_eq!(merged.command, Some("claude -p --model=haiku".to_string()));assert_eq!(merged.template, Some("custom".to_string()));- // When project sets template, template_file is cleared to maintain mutual exclusivity- assert_eq!(merged.template_file, None);}#[test]@@ -896,84 +890,6 @@ fn test_merge_commit_generation_template_append() {);}-#[test]-fn test_commit_generation_merge_mutual_exclusivity() {- // Global has template_file, project has template- // Merged result should only have template (project wins, clears template_file)- let global = CommitGenerationConfig {- template_file: Some("~/.config/template.txt".to_string()),- ..Default::default()- };- let project = CommitGenerationConfig {- template: Some("inline template".to_string()),- ..Default::default()- };-- let merged = global.merge_with(&project);- assert_eq!(merged.template, Some("inline template".to_string()));- assert_eq!(merged.template_file, None); // Cleared because project set template-- // Reverse: global has template, project has template_file- let global = CommitGenerationConfig {- template: Some("global template".to_string()),- ..Default::default()- };- let project = CommitGenerationConfig {- template_file: Some("project-file.txt".to_string()),- ..Default::default()- };-- let merged = global.merge_with(&project);- assert_eq!(merged.template, None); // Cleared because project set template_file- assert_eq!(merged.template_file, Some("project-file.txt".to_string()));-- // Neither set in project: inherit both from global- let global = CommitGenerationConfig {- template: Some("global template".to_string()),- ..Default::default()- };- let project = CommitGenerationConfig::default();-- let merged = global.merge_with(&project);- assert_eq!(merged.template, Some("global template".to_string()));- assert_eq!(merged.template_file, None);-}--#[test]-fn test_commit_generation_merge_squash_template_mutual_exclusivity() {- // Global has squash_template_file, project has squash_template- // Merged result should only have squash_template (project wins)- let global = CommitGenerationConfig {- squash_template_file: Some("~/.config/squash.txt".to_string()),- ..Default::default()- };- let project = CommitGenerationConfig {- squash_template: Some("inline squash".to_string()),- ..Default::default()- };-- let merged = global.merge_with(&project);- assert_eq!(merged.squash_template, Some("inline squash".to_string()));- assert_eq!(merged.squash_template_file, None);-- // Reverse: global has squash_template, project has squash_template_file- let global = CommitGenerationConfig {- squash_template: Some("global squash".to_string()),- ..Default::default()- };- let project = CommitGenerationConfig {- squash_template_file: Some("project-squash.txt".to_string()),- ..Default::default()- };-- let merged = global.merge_with(&project);- assert_eq!(merged.squash_template, None);- assert_eq!(- merged.squash_template_file,- Some("project-squash.txt".to_string())- );-}-// =========================================================================// Effective config methods tests// =========================================================================@@ -1763,27 +1679,6 @@ worktree-path = "/worktrees/{{ branch | sanitize }}");}-#[test]-fn test_validation_template_mutual_exclusivity() {- let cases = [- ("[commit-generation]\ntemplate = \"inline\"\ntemplate-file = \"path\""),- ("[commit-generation]\nsquash-template = \"inline\"\nsquash-template-file = \"path\""),- ("[projects.\"github.com/user/repo\".commit-generation]\ntemplate = \"inline\"\ntemplate-file = \"path\""),- ("[projects.\"github.com/user/repo\".commit-generation]\nsquash-template = \"inline\"\nsquash-template-file = \"path\""),- ("[commit.generation]\ntemplate = \"inline\"\ntemplate-file = \"path\""),- ("[commit.generation]\nsquash-template = \"inline\"\nsquash-template-file = \"path\""),- ("[projects.\"github.com/user/repo\".commit.generation]\ntemplate = \"inline\"\ntemplate-file = \"path\""),- ("[projects.\"github.com/user/repo\".commit.generation]\nsquash-template = \"inline\"\nsquash-template-file = \"path\""),- ];- for content in cases {- let err = UserConfig::load_from_str(content).unwrap_err().to_string();- assert!(- err.contains("mutually exclusive"),- "{content}: expected 'mutually exclusive', got: {err}"- );- }-}-// =========================================================================// save_to() tests// =========================================================================@@ -2937,53 +2832,6 @@ width = 30assert_eq!(column.width, None, "the column went as a unit here too");}-#[test]-fn test_layer_displaces_exclusive_sibling() {- // Each `[commit.generation]` pair clears itself, so overriding one member- // has to displace both at project scope: leaving the project's partner- // would let it win the merge, and it would fail validation next to the- // global key the same entry now answers with.- let pairs = [- ("template", "template-file"),- ("template-file", "template"),- ("squash-template", "squash-template-file"),- ("squash-template-file", "squash-template"),- ];- for (overridden, partner) in pairs {- let base = base_with_project(&format!(- "[projects.\"{PROJECT}\".commit.generation]\n{partner} = \"/project.txt\"\n"- ));- let (table, warnings) = apply_overrides(- base,- &[&format!("commit.generation.{overridden} = \"from-cli\"")],- );- assert!(warnings.is_empty(), "{overridden}: {warnings:?}");- let config = loaded(table);- config- .validate()- .unwrap_or_else(|e| panic!("{overridden}: {e}"));- let generation = config.commit_generation(Some(PROJECT));- let value = |key: &str| match key {- "template" => generation.template.as_deref(),- "template-file" => generation.template_file.as_deref(),- "squash-template" => generation.squash_template.as_deref(),- _ => generation.squash_template_file.as_deref(),- };- assert_eq!(value(overridden), Some("from-cli"), "{overridden}");- assert_eq!(value(partner), None, "{overridden} should clear {partner}");- }-- // A `[commit.generation]` key that is in no pair displaces only itself.- let base = base_with_project(&format!(- "[projects.\"{PROJECT}\".commit.generation]\ncommand = \"project-llm\"\ntemplate-file = \"/project.txt\"\n"- ));- let (table, warnings) = apply_overrides(base, &["commit.generation.command = \"cli-llm\""]);- assert!(warnings.is_empty());- let generation = loaded(table).commit_generation(Some(PROJECT));- assert_eq!(generation.command.as_deref(), Some("cli-llm"));- assert_eq!(generation.template_file.as_deref(), Some("/project.txt"));-}-#[test]fn test_layer_noop_without_overrides() {// No higher layer, no change: a project entry keeps every key.diff --git a/src/llm.rs b/src/llm.rsindex 469a3f95f..1e2642363 100644--- a/src/llm.rs+++ b/src/llm.rs@@ -1,16 +1,12 @@use anyhow::Context;-use color_print::cformat;use shell_escape::unix::escape;use std::borrow::Cow;use std::fmt;-use std::path::{Path, PathBuf};+use std::path::Path;use std::sync::Arc;-use std::sync::atomic::{AtomicBool, Ordering};use worktrunk::config::CommitGenerationConfig;use worktrunk::git::{CommandError, CommitMessageDetail, ErrorExt, Repository};-use worktrunk::path::format_path_for_display;use worktrunk::shell_exec::{Cmd, ShellConfig};-use worktrunk::styling::{eprintln, warning_message};use minijinja::Environment;use minijinja::value::{Enumerator, Object, Value};@@ -127,9 +123,6 @@ fn format_reproduction_command(base_cmd: &str, llm_command: &str) -> String {}}-/// Track whether template-file deprecation warning has been shown this session-static TEMPLATE_FILE_WARNING_SHOWN: AtomicBool = AtomicBool::new(false);-/// Byte budget for the diff embedded in a prompt. ~25k tokens for typical/// code; syntax-dense content (hashes, minified assets) tokenizes as low as/// ~2 bytes/token, so the worst case is ~50k tokens — bounded well under@@ -555,48 +548,6 @@ enum TemplateType {Squash,}-/// Load template from inline, file, or default-fn load_template(- inline: Option<&String>,- file: Option<&String>,- default: &str,- file_type_name: &str,-) -> anyhow::Result<String> {- match (inline, file) {- (Some(inline), None) => Ok(inline.clone()),- (None, Some(path)) => {- // Show deprecation warning once per session- if !TEMPLATE_FILE_WARNING_SHOWN.swap(true, Ordering::Relaxed) {- eprintln!(- "{}",- warning_message(format!(- "{file_type_name} is deprecated and will be removed in a future release. Use inline template instead. To request this feature, comment on: https://github.com/max-sixty/worktrunk/issues/444"- ))- );- }-- let expanded_path = PathBuf::from(shellexpand::tilde(path).as_ref());- std::fs::read_to_string(&expanded_path).map_err(|e| {- anyhow::Error::from(worktrunk::git::GitError::Other {- message: cformat!(- "Failed to read {} <bold>{}</>: {}",- file_type_name,- format_path_for_display(&expanded_path),- e- ),- })- })- }- (None, None) => Ok(default.to_string()),- (Some(_), Some(_)) => {- unreachable!(- "Config validation should prevent both {} options",- file_type_name- )- }- }-}-/// Build prompt from template using minijinja////// Template variables available to both commit and squash templates:@@ -621,21 +572,14 @@ fn build_prompt(// Get template source based on typelet (template, type_name) = match template_type {TemplateType::Commit => (- load_template(- config.template.as_ref(),- config.template_file.as_ref(),- DEFAULT_TEMPLATE,- "template-file",- )?,+ config.template.as_deref().unwrap_or(DEFAULT_TEMPLATE),"Template",),TemplateType::Squash => (- load_template(- config.squash_template.as_ref(),- config.squash_template_file.as_ref(),- DEFAULT_SQUASH_TEMPLATE,- "squash-template-file",- )?,+ config+ .squash_template+ .as_deref()+ .unwrap_or(DEFAULT_SQUASH_TEMPLATE),"Squash template",),};@@ -650,7 +594,7 @@ fn build_prompt(// Render template with minijinja - all variables available to all templateslet env = Environment::new();- let tmpl = env.template_from_str(&template)?;+ let tmpl = env.template_from_str(template)?;// Reverse commits so they're in chronological order (oldest first).//@@ -1310,9 +1254,7 @@ mod tests {let config = CommitGenerationConfig {command: None,template: Some("Branch: {{ branch }}\nDiff: {{ git_diff }}".to_string()),- template_file: None,squash_template: None,- squash_template_file: None,template_append: None,};let context = commit_context("my diff", "feature", None, "repo");@@ -1326,9 +1268,7 @@ mod tests {let config = CommitGenerationConfig {command: None,template: Some("{{ unclosed".to_string()),- template_file: None,squash_template: None,- squash_template_file: None,template_append: None,};let context = commit_context("diff", "main", None, "repo");@@ -1341,9 +1281,7 @@ mod tests {let config = CommitGenerationConfig {command: None,template: Some(" ".to_string()),- template_file: None,squash_template: None,- squash_template_file: None,template_append: None,};let context = commit_context("diff", "main", None, "repo");@@ -1359,9 +1297,7 @@ mod tests {"Repo: {{ repo }}\nBranch: {{ branch }}\nDiff: {{ git_diff }}\n{% for c in recent_commits %}{{ c }}\n{% endfor %}".to_string(),),- template_file: None,squash_template: None,- squash_template_file: None,template_append: None,};let commits = vec!["commit1".to_string(), "commit2".to_string()];@@ -1637,12 +1573,10 @@ mod tests {let config = CommitGenerationConfig {command: None,template: None,- template_file: None,squash_template: Some("Target: {{ target_branch }}\n{% for c in commits %}{{ c }}\n{% endfor %}".to_string(),),- squash_template_file: None,template_append: None,};let commit_details = vec![@@ -1667,14 +1601,12 @@ mod tests {let config = CommitGenerationConfig {command: None,template: None,- template_file: None,squash_template: Some(r#"{% for detail in commit_details %}{{ loop.index }}. {{ detail.subject }}{{ detail.body }}{% endfor %}"#.to_string(),),- squash_template_file: None,template_append: None,};let commit_details = vec![@@ -1711,9 +1643,7 @@ mod tests {let config = CommitGenerationConfig {command: None,template: None,- template_file: None,squash_template: Some("{% for x in commits %}{{ x }".to_string()),- squash_template_file: None,template_append: None,};let commit_details = vec![];@@ -1727,9 +1657,7 @@ mod tests {let config = CommitGenerationConfig {command: None,template: None,- template_file: None,squash_template: Some(" \n ".to_string()),- squash_template_file: None,template_append: None,};let commit_details = vec![];@@ -1744,12 +1672,10 @@ mod tests {let config = CommitGenerationConfig {command: None,template: None,- template_file: None,squash_template: Some("Repo: {{ repo }}\nBranch: {{ branch }}\nTarget: {{ target_branch }}\nDiff: {{ git_diff }}\n{% for c in commits %}{{ c }}\n{% endfor %}{% for r in recent_commits %}style: {{ r }}\n{% endfor %}".to_string(),),- squash_template_file: None,template_append: None,};let commit_details = vec![@@ -1801,9 +1727,7 @@ Diff follows:{{ git_diff }}"#.to_string(),),- template_file: None,squash_template: None,- squash_template_file: None,template_append: None,};@@ -1846,7 +1770,6 @@ Diff follows:let config = CommitGenerationConfig {command: None,template: None,- template_file: None,squash_template: Some(r#"Squashing {{ commits | length }} commit(s) from {{ branch }} to {{ target_branch }}{% if commits | length > 1 -%}@@ -1859,7 +1782,6 @@ Single commit: {{ commits[0] }}{%- endif %}"#.to_string(),),- squash_template_file: None,template_append: None,};@@ -1901,113 +1823,6 @@ Single commit: {{ commits[0] }}");}- #[test]- fn test_build_commit_prompt_with_template_file() {- let temp_dir = std::env::temp_dir();- let template_path = temp_dir.join("test_commit_template.txt");- std::fs::write(- &template_path,- "Branch: {{ branch }}\nRepo: {{ repo }}\nDiff: {{ git_diff }}",- )- .unwrap();-- let config = CommitGenerationConfig {- command: None,- template: None,- template_file: Some(template_path.to_string_lossy().to_string()),- squash_template: None,- squash_template_file: None,- template_append: None,- };- let context = commit_context("my diff", "feature", None, "myrepo");- let result = build_prompt(&config, TemplateType::Commit, &context);- assert!(result.is_ok());- assert_eq!(- result.unwrap(),- "Branch: feature\nRepo: myrepo\nDiff: my diff"- );-- // Cleanup- std::fs::remove_file(&template_path).ok();- }-- #[test]- fn test_build_commit_prompt_with_missing_template_file() {- let config = CommitGenerationConfig {- command: None,- template: None,- template_file: Some("/nonexistent/path/template.txt".to_string()),- squash_template: None,- squash_template_file: None,- template_append: None,- };- let context = commit_context("diff", "main", None, "repo");- let result = build_prompt(&config, TemplateType::Commit, &context);- // OS error text varies by platform, so use contains- let err = result.unwrap_err().to_string();- assert!(err.contains("Failed to read template-file"), "{err}");- assert!(err.contains("/nonexistent/path/template.txt"), "{err}");- }-- #[test]- fn test_build_squash_prompt_with_template_file() {- let temp_dir = std::env::temp_dir();- let template_path = temp_dir.join("test_squash_template.txt");- std::fs::write(- &template_path,- "Target: {{ target_branch }}\nBranch: {{ branch }}\n{% for c in commits %}{{ c }}\n{% endfor %}",- )- .unwrap();-- let config = CommitGenerationConfig {- command: None,- template: None,- template_file: None,- squash_template: None,- squash_template_file: Some(template_path.to_string_lossy().to_string()),- template_append: None,- };- let commit_details = vec![- CommitMessageDetail {- subject: "A".to_string(),- body: String::new(),- },- CommitMessageDetail {- subject: "B".to_string(),- body: String::new(),- },- ];- let context = squash_context("diff", "feature", None, "repo", &commit_details, "main");- let result = build_prompt(&config, TemplateType::Squash, &context);- assert!(result.is_ok());- // Commits are reversed for chronological order- assert_eq!(result.unwrap(), "Target: main\nBranch: feature\nB\nA\n");-- // Cleanup- std::fs::remove_file(&template_path).ok();- }-- #[test]- fn test_build_commit_prompt_with_tilde_expansion() {- // This test verifies tilde expansion works - it should attempt to read- // from the expanded home directory path- let config = CommitGenerationConfig {- command: None,- template: None,- template_file: Some("~/nonexistent_template_for_test.txt".to_string()),- squash_template: None,- squash_template_file: None,- template_append: None,- };- let context = commit_context("diff", "main", None, "repo");- let result = build_prompt(&config, TemplateType::Commit, &context);- // Should fail because file doesn't exist- // OS error text varies by platform, so use contains- let err = result.unwrap_err().to_string();- assert!(err.contains("Failed to read template-file"), "{err}");- assert!(err.contains("~/nonexistent_template_for_test.txt"), "{err}");- }-#[test]fn test_commit_template_can_access_squash_variables() {// Verify that commit templates can access squash-specific variables without errors@@ -2018,9 +1833,7 @@ Single commit: {{ commits[0] }}"Branch: {{ branch }}\nTarget: {{ target_branch }}\nCommit subjects: {{ commits | length }}\nCommit details: {{ commit_details | length }}".to_string(),),- template_file: None,squash_template: None,- squash_template_file: None,template_append: None,};let context = commit_context("diff", "feature", None, "repo");diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rsindex 75aed854c..be6d232ab 100644--- a/tests/integration_tests/config_show.rs+++ b/tests/integration_tests/config_show.rs@@ -3193,6 +3193,63 @@ json-schema = 1});}+/// Retired settings are ordinary unknown fields: loading warns, while+/// `wt config update` leaves the file untouched instead of treating them as+/// migrations it still owns.+#[rstest]+fn test_config_update_leaves_retired_keys_for_unknown_field_warnings(repo: TestRepo) {+ let content = r#"[commit.generation]+template-file = "/tmp/commit-template"+squash-template-file = "/tmp/squash-template"++[switch.picker]+timeout-ms = 500++[list]+json-schema = 1+"#;+ fs::write(repo.test_config_path(), content).unwrap();++ let load_output = repo.wt_command().arg("list").output().unwrap();+ assert!(+ load_output.status.success(),+ "config load should succeed: {}",+ String::from_utf8_lossy(&load_output.stderr)+ );+ let stderr = String::from_utf8_lossy(&load_output.stderr);+ for key in [+ "commit.generation.template-file",+ "commit.generation.squash-template-file",+ "switch.picker.timeout-ms",+ ] {+ assert!(+ stderr.contains("has unknown field") && stderr.contains(key),+ "expected an unknown-field warning for {key}, got: {stderr}"+ );+ }++ let output = repo+ .wt_command()+ .args(["config", "update", "--yes"])+ .output()+ .unwrap();++ assert!(+ output.status.success(),+ "config update should succeed: {}",+ String::from_utf8_lossy(&output.stderr)+ );+ assert!(+ String::from_utf8_lossy(&output.stderr).contains("No deprecated settings found"),+ "{}",+ String::from_utf8_lossy(&output.stderr)+ );+ assert_eq!(+ fs::read_to_string(repo.test_config_path()).unwrap(),+ content+ );+}+/// `wt config update` writes `[list] json-schema = 2` when the key is unset,/// adopting the upcoming default, and a second run has nothing left to do —/// the pending-default loop closes.diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snapindex b733f7c3c..f8d3df2b8 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap@@ -476,7 +476,7 @@ Creates [2m~/.config/worktrunk/config.toml[0m with the following content:[107m [0m [2m# """[0m[107m [0m [2m# <!-- DEFAULT_SQUASH_TEMPLATE_END -->[0m[107m [0m [2m#[0m-[107m [0m [2m# #### Appending to the prompt [experimental][0m+[107m [0m [2m# #### Appending to the prompt[0m[107m [0m [2m#[0m[107m [0m [2m# `template-append` adds personal conventions to the commit and squash prompts without restating the whole template:[0m[107m [0m [2m#[0m@@ -526,7 +526,7 @@ With [2m--project[0m, creates [2m.config/wt.toml[0m in the current repositor[107m [0m [2m#[0m[107m [0m [2m# When many repositories share one self-hosted host, name it once in user config with a pattern-keyed `[projects]` entry (https://worktrunk.dev/config/#user-project-specific-settings) instead of repeating this block in each repo. A repository's own `[forge]` still wins, field by field.[0m[107m [0m [2m#[0m-[107m [0m [2m# ## Commit-message append [experimental][0m+[107m [0m [2m# ## Commit-message append[0m[107m [0m [2m#[0m[107m [0m [2m# `template-append` adds project-wide conventions to the LLM commit and squash prompts, shared so every teammate's LLM sees the same style guide:[0m[107m [0m [2m#[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snapindex 10eba5d6a..af726a349 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap@@ -520,7 +520,7 @@ Default template:[107m [0m[107m [0m [2m[32m"[0m[2m[32m""[0m-[1mAppending to the prompt [experimental][0m+[1mAppending to the prompt[0m[2mtemplate-append[0m adds personal conventions to the commit and squash prompts without restating the whole template:@@ -565,7 +565,7 @@ The forge is read from the remote's hostname: any host carrying [2mgithub[0m,When many repositories share one self-hosted host, name it once in user config with a pattern-keyed [2m[projects][0m entry instead of repeating this block in each repo. A repository's own [2m[forge][0m still wins, field by field.-[1m[32mCommit-message append [experimental][0m+[1m[32mCommit-message append[0m[2mtemplate-append[0m adds project-wide conventions to the LLM commit and squash prompts, shared so every teammate's LLM sees the same style guide:diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state.snap b/tests/snapshots/integration__integration_tests__help__help_config_state.snapindex 9c64c2117..481553df7 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_state.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_state.snap@@ -9,6 +9,14 @@ info:env:CLICOLOR_FORCE: "1"COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"LANG: CLC_ALL: CLLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"@@ -25,8 +33,10 @@ info:WORKTRUNK_TEST_GEMINI_INSTALLED: "0"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WORKTRUNK_TEST_ZSH_INSTALLED: "0"---@@ -44,7 +54,7 @@ Usage: [1m[36mwt config state[0m [36m[OPTIONS][0m [36m<COMMAND>[0m[1m[36mdefault-branch[0m Default branch detection and override[1m[36mlogs[0m Operation and debug logs[1m[36mmarker[0m Branch markers- [1m[36mvars[0m [experimental] Custom variables per branch+ [1m[36mvars[0m Custom variables per branch[1m[32mOptions:[0m[1m[36m-h[0m, [1m[36m--help[0m@@ -73,7 +83,7 @@ State is stored in [2m.git/[0m (config entries and log files), separate from c- [1mcache[0m: Regenerable caches — CI status, summaries, git commands, hints, and the [2mwt switch -[0m target- [1mdefault-branch[0m: The repository's default branch ([2mmain[0m, [2mmaster[0m, etc.)- [1mmarker[0m: Custom status marker for a branch (shown in [2mwt list[0m)-- [1mvars[0m: [experimental] Custom variables per branch+- [1mvars[0m: Custom variables per branch- [1mlogs[0m: Operation and debug logs[1m[32mExamples[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex 7d7060de5..17f0b8366 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -141,22 +141,22 @@ Output as JSON for scripting:[1m[32mColumns[0m- Column Shows- ──────── ───────────────────────────────────────────────────────────────────────────────────────────────────- Branch Branch name; a detached worktree has none, so it shows its short hash in dim yellow- Status Compact symbols (see below)- HEAD± Uncommitted changes, including untracked files: +added -deleted lines- main↕ Commits ahead/behind default branch- main…± Line diffs since the merge-base (three-dot) with the default branch- Summary LLM-generated branch summary; requires [2m--full[0m, [2msummary = true[0m, and [2mcommit.generation[0m [experimental]- Remote⇅ Commits ahead/behind tracking branch- CI PR/MR number colored by pipeline status; [2m--full[0m only- Path Worktree directory- URL Dev server URL from project config; dimmed if port is not listening- (custom) User-defined custom columns from [2m[list.custom-columns][0m user config [experimental]- Commit Short hash, abbreviated per [2mcore.abbrev[0m- Age Time since last commit- Message Last commit message (truncated)+ Column Shows+ ──────── ────────────────────────────────────────────────────────────────────────────────────+ Branch Branch name; a detached worktree has none, so it shows its short hash in dim yellow+ Status Compact symbols (see below)+ HEAD± Uncommitted changes, including untracked files: +added -deleted lines+ main↕ Commits ahead/behind default branch+ main…± Line diffs since the merge-base (three-dot) with the default branch+ Summary LLM-generated branch summary; requires [2m--full[0m, [2msummary = true[0m, and [2mcommit.generation[0m+ Remote⇅ Commits ahead/behind tracking branch+ CI PR/MR number colored by pipeline status; [2m--full[0m only+ Path Worktree directory+ URL Dev server URL from project config; dimmed if port is not listening+ (custom) User-defined custom columns from [2m[list.custom-columns][0m user config [experimental]+ Commit Short hash, abbreviated per [2mcore.abbrev[0m+ Age Time since last commit+ Message Last commit message (truncated)The [2mmain[0m header label is used regardless of the default branch's actual name.@@ -197,7 +197,7 @@ approved or changes-requested signal.CI cells are clickable links to the PR or pipeline page, and appear dimmed for a draft PR/MR ([2m"draft"[0m) or when unpushed local changes make the status stale ([2mci.stale[0m). PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with [2m--remotes[0m — get CI status detection. Results are cached for 30-60 seconds; use [2mwt config state[0m to view or clear.-[32mLLM summaries [experimental][0m+[32mLLM summaries[0mReuses the [2mcommit.generation[0m command — the same LLM that generates commit messages. Enable with [2msummary = true[0m in [2m[list][0m config; requires [2m--full[0m. Results are cached until the branch's diff changes.diff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snapindex b9bf41cb0..2b7a73e7f 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap@@ -161,7 +161,7 @@ Output as JSON for scripting:main↕ Commits ahead/behind default branchmain…± Line diffs since the merge-base (three-dot) with the default branchSummary LLM-generated branch summary; requires [2m--full[0m, [2msummary = true[0m, and- [2mcommit.generation[0m [experimental]+ [2mcommit.generation[0mRemote⇅ Commits ahead/behind tracking branchCI PR/MR number colored by pipeline status; [2m--full[0m onlyPath Worktree directory@@ -233,7 +233,7 @@ branches with an upstream. Local-only branches show blank; remote-only branches— visible with [2m--remotes[0m — get CI status detection. Results are cached for 30-60seconds; use [2mwt config state[0m to view or clear.-[32mLLM summaries [experimental][0m+[32mLLM summaries[0mReuses the [2mcommit.generation[0m command — the same LLM that generates commitmessages. Enable with [2msummary = true[0m in [2m[list][0m config; requires [2m--full[0m. Resultsdiff --git a/tests/snapshots/integration__integration_tests__help__help_step_long.snap b/tests/snapshots/integration__integration_tests__help__help_step_long.snapindex 662a199ae..c347baeb3 100644--- a/tests/snapshots/integration__integration_tests__help__help_step_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_step_long.snap@@ -8,6 +8,14 @@ info:env:CLICOLOR_FORCE: "1"COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"LANG: CLC_ALL: CLLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"@@ -24,8 +32,10 @@ info:WORKTRUNK_TEST_GEMINI_INSTALLED: "0"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WORKTRUNK_TEST_ZSH_INSTALLED: "0"---@@ -45,10 +55,10 @@ Usage: [1m[36mwt step[0m [36m[OPTIONS][0m [36m<COMMAND>[0m[1m[36mpush[0m Fast-forward target to current branch[1m[36mdiff[0m Show all changes since branching[1m[36mcopy-ignored[0m Copy gitignored files to another worktree- [1m[36meval[0m [experimental] Evaluate a template expression- [1m[36mfor-each[0m [experimental] Run command in each worktree+ [1m[36meval[0m Evaluate a template expression+ [1m[36mfor-each[0m Run command in each worktree[1m[36mpromote[0m [experimental] Swap a branch into the main worktree- [1m[36mprune[0m [experimental] Remove worktrees merged into the default branch+ [1m[36mprune[0m Remove worktrees merged into the default branch[1m[36mrelocate[0m [experimental] Move worktrees to expected paths[1m[36mtether[0m [experimental] Run a command; kill its whole process tree when its worktree is removed@@ -96,8 +106,8 @@ Manual merge workflow with review between steps:- [2mpush[0m — Fast-forward target to current branch- [2mdiff[0m — Show all changes since branching (committed, staged, unstaged, untracked)- [2mcopy-ignored[0m — Copy gitignored files between worktrees-- [2meval[0m — [experimental] Evaluate a template expression-- [2mfor-each[0m — [experimental] Run a command in every worktree+- [2meval[0m — Evaluate a template expression+- [2mfor-each[0m — Run a command in every worktree- [2mpromote[0m — [experimental] Swap a branch into the main worktree- [2mprune[0m — Remove worktrees and branches merged into the default branch- [2mrelocate[0m — [experimental] Move worktrees to expected pathsdiff --git a/tests/snapshots/integration__integration_tests__help__help_step_short.snap b/tests/snapshots/integration__integration_tests__help__help_step_short.snapindex c33d355b2..081a99aff 100644--- a/tests/snapshots/integration__integration_tests__help__help_step_short.snap+++ b/tests/snapshots/integration__integration_tests__help__help_step_short.snap@@ -8,6 +8,14 @@ info:env:CLICOLOR_FORCE: "1"COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"LANG: CLC_ALL: CLLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"@@ -24,8 +32,10 @@ info:WORKTRUNK_TEST_GEMINI_INSTALLED: "0"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WORKTRUNK_TEST_ZSH_INSTALLED: "0"---@@ -43,10 +53,10 @@ Usage: [1m[36mwt step[0m [36m[OPTIONS][0m [36m<COMMAND>[0m[1m[36mpush[0m Fast-forward target to current branch[1m[36mdiff[0m Show all changes since branching[1m[36mcopy-ignored[0m Copy gitignored files to another worktree- [1m[36meval[0m [experimental] Evaluate a template expression- [1m[36mfor-each[0m [experimental] Run command in each worktree+ [1m[36meval[0m Evaluate a template expression+ [1m[36mfor-each[0m Run command in each worktree[1m[36mpromote[0m [experimental] Swap a branch into the main worktree- [1m[36mprune[0m [experimental] Remove worktrees merged into the default branch+ [1m[36mprune[0m Remove worktrees merged into the default branch[1m[36mrelocate[0m [experimental] Move worktrees to expected paths[1m[36mtether[0m [experimental] Run a command; kill its whole process tree when its worktree is removeddiff --git a/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap b/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snapindex 8a6ebf2d3..2991641b6 100644--- a/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap+++ b/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap@@ -7,12 +7,23 @@ info:- "-h"env:APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"CLICOLOR_FORCE: "1"COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: fileGIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test UserGIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"- GIT_CONFIG_SYSTEM: /dev/null+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -35,8 +46,10 @@ info:WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WORKTRUNK_TEST_ZSH_INSTALLED: "0"XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"@@ -55,10 +68,10 @@ Usage: [1m[36mwt step[0m [36m[OPTIONS][0m [36m<COMMAND>[0m[1m[36mpush[0m Fast-forward target to current branch[1m[36mdiff[0m Show all changes since branching[1m[36mcopy-ignored[0m Copy gitignored files to another worktree- [1m[36meval[0m [experimental] Evaluate a template expression- [1m[36mfor-each[0m [experimental] Run command in each worktree+ [1m[36meval[0m Evaluate a template expression+ [1m[36mfor-each[0m Run command in each worktree[1m[36mpromote[0m [experimental] Swap a branch into the main worktree- [1m[36mprune[0m [experimental] Remove worktrees merged into the default branch+ [1m[36mprune[0m Remove worktrees merged into the default branch[1m[36mrelocate[0m [experimental] Move worktrees to expected paths[1m[36mtether[0m [experimental] Run a command; kill its whole process tree when its worktree is removeddiff --git a/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap b/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snapindex e58f84ca8..e39002de8 100644--- a/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap+++ b/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap@@ -6,12 +6,23 @@ info:- stepenv:APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"CLICOLOR_FORCE: "1"COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: fileGIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test UserGIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"- GIT_CONFIG_SYSTEM: /dev/null+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -34,8 +45,10 @@ info:WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WORKTRUNK_TEST_ZSH_INSTALLED: "0"XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"@@ -54,10 +67,10 @@ Usage: [1m[36mwt step[0m [36m[OPTIONS][0m [36m<COMMAND>[0m[1m[36mpush[0m Fast-forward target to current branch[1m[36mdiff[0m Show all changes since branching[1m[36mcopy-ignored[0m Copy gitignored files to another worktree- [1m[36meval[0m [experimental] Evaluate a template expression- [1m[36mfor-each[0m [experimental] Run command in each worktree+ [1m[36meval[0m Evaluate a template expression+ [1m[36mfor-each[0m Run command in each worktree[1m[36mpromote[0m [experimental] Swap a branch into the main worktree- [1m[36mprune[0m [experimental] Remove worktrees merged into the default branch+ [1m[36mprune[0m Remove worktrees merged into the default branch[1m[36mrelocate[0m [experimental] Move worktrees to expected paths[1m[36mtether[0m [experimental] Run a command; kill its whole process tree when its worktree is removeddiff --git a/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap b/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snapindex 19ab11f9d..d87f6a3b0 100644--- a/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap+++ b/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap@@ -6,12 +6,23 @@ info:- stepenv:APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"CLICOLOR_FORCE: "1"COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: fileGIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test UserGIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"- GIT_CONFIG_SYSTEM: /dev/null+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -34,8 +45,10 @@ info:WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WORKTRUNK_TEST_ZSH_INSTALLED: "0"XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"@@ -54,10 +67,10 @@ Usage: [1m[36mwt step[0m [36m[OPTIONS][0m [36m<COMMAND>[0m[1m[36mpush[0m Fast-forward target to current branch[1m[36mdiff[0m Show all changes since branching[1m[36mcopy-ignored[0m Copy gitignored files to another worktree- [1m[36meval[0m [experimental] Evaluate a template expression- [1m[36mfor-each[0m [experimental] Run command in each worktree+ [1m[36meval[0m Evaluate a template expression+ [1m[36mfor-each[0m Run command in each worktree[1m[36mpromote[0m [experimental] Swap a branch into the main worktree- [1m[36mprune[0m [experimental] Remove worktrees merged into the default branch+ [1m[36mprune[0m Remove worktrees merged into the default branch[1m[36mrelocate[0m [experimental] Move worktrees to expected paths[1m[36mtether[0m [experimental] Run a command; kill its whole process tree when its worktree is removed