Skip to content

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

docs: remove incidental details from public documentation (#4355)

Maximilian Roose505d33f25d8
diff --git a/dev/config.example.toml b/dev/config.example.toml
index 5cadcfbcc..8aa6c17ae 100644
--- a/dev/config.example.toml
+++ b/dev/config.example.toml
@@ -84,8 +84,6 @@
#
# ### aichat
#
-# `--code` drops the `<think>` block aichat prints before the message when the model reasons.
-#
# [commit.generation]
# command = "aichat -m claude:claude-haiku-4.5 --code"
#
diff --git a/docs/src/content/docs/claude-code.md b/docs/src/content/docs/claude-code.md
index 938137c66..a76cefd8c 100644
--- a/docs/src/content/docs/claude-code.md
+++ b/docs/src/content/docs/claude-code.md
@@ -11,9 +11,7 @@ Worktrunk ships a plugin for each supported agent CLI. What a plugin provides de
| Configuration skill | ✓ | ✓ | | | | ✓ |
| Activity tracking (🤖/💬 in `wt list`) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Worktree isolation | ✓ | | | | | |
-| `/wt-switch-create` skill\* | ✓ | | | | | |
-
-\* Codex and Gemini also load the `/wt-switch-create` skill from the shared skill set, but neither lets a skill change the session's working directory, so it does nothing there.
+| `/wt-switch-create` skill | ✓ | | | | | |
The configuration skill is documentation the agent reads to help set up LLM commits, hooks, and troubleshooting. Activity tracking shows which worktrees have running sessions. Worktree isolation needs worktree-lifecycle hooks, which only Claude Code exposes, so Codex, OpenCode, Pi, oh-my-pi, and Gemini users invoke `wt switch --create` and `wt remove` directly. Codex tracks activity through its own `Stop` and `SessionEnd` hooks.
diff --git a/docs/src/content/docs/config.md b/docs/src/content/docs/config.md
index 7d35423a0..92df41f17 100644
--- a/docs/src/content/docs/config.md
+++ b/docs/src/content/docs/config.md
@@ -173,8 +173,6 @@ command = "llm -m claude-haiku-4.5"
### aichat
-`--code` drops the `<think>` block aichat prints before the message when the model reasons.
-
```toml
[commit.generation]
command = "aichat -m claude:claude-haiku-4.5 --code"
diff --git a/docs/src/content/docs/faq.md b/docs/src/content/docs/faq.md
index 6a8688c7d..0282ddb05 100644
--- a/docs/src/content/docs/faq.md
+++ b/docs/src/content/docs/faq.md
@@ -59,7 +59,7 @@ Git TUIs operate on a single repository. Worktrunk manages multiple worktrees, r
Worktrees share one `.git`. Each adds a checkout of the tracked files, plus whatever gitignored build output you copy in.
-On APFS, btrfs, and XFS (not ext4 or NTFS), [`wt step copy-ignored`](/step/#wt-step-copy-ignored--copy-on-write) reflinks that output, so a new worktree shares the primary worktree's disk blocks. A later build rewrites only what changed, and the rest stays shared. On one machine, 56 worktrees of a Rust repository with a 40GB `target/` came to 2.6TB by `du` and 0.7TB on disk.
+On APFS, btrfs, and XFS (not ext4 or NTFS), [`wt step copy-ignored`](/step/#wt-step-copy-ignored--copy-on-write) reflinks that output, so a new worktree shares the primary worktree's disk blocks. A later build rewrites only what changed, and the rest stays shared.
## Does Worktrunk support stacked branches?
diff --git a/docs/src/content/docs/llm-commits.md b/docs/src/content/docs/llm-commits.md
index af55a7cc7..e0d8f1d2a 100644
--- a/docs/src/content/docs/llm-commits.md
+++ b/docs/src/content/docs/llm-commits.md
@@ -38,7 +38,7 @@ Create `~/.codex/worktrunk-commit-instructions.txt` containing just `.` (no newl
command = "codex exec -m gpt-6-luna -c model_reasoning_effort='none' -c project_doc_max_bytes=0 -c skills.max_context_tokens=1 -c agents.enabled=false -c features.goals=false -c web_search=disabled -c 'model_instructions_file=\"~/.codex/worktrunk-commit-instructions.txt\"' -c features.shell_tool=false -c features.unified_exec=false -c features.apps=false -c features.plugins=false --ephemeral --sandbox=read-only --json - | jq -sr '[.[] | select(.item.type? == \"agent_message\")] | last.item.text'"
```
-`model_instructions_file` replaces Codex's built-in instructions with that one character. `project_doc_max_bytes=0` limits project instructions, and `skills.max_context_tokens=1` limits the skills catalog. The command disables web search, shell tools, apps, plugins, subagents, and goals. It keeps user provider settings and authentication and skips session persistence. Codex can still load global `AGENTS.md` and other agent context, so a short commit prompt can use thousands of input tokens. Requires `jq` for JSON parsing. See [Codex CLI docs](https://developers.openai.com/codex/cli/).
+Requires `jq` for JSON parsing. See [Codex CLI docs](https://developers.openai.com/codex/cli/).
### Other tools
@@ -51,7 +51,7 @@ command = "opencode run -m anthropic/claude-haiku-4.5 --variant fast"
# llm
command = "llm -m claude-haiku-4.5"
-# aichat — --code drops the <think> block reasoning models print
+# aichat
command = "aichat -m claude:claude-haiku-4.5 --code"
```
diff --git a/docs/src/content/docs/remove.md b/docs/src/content/docs/remove.md
index a9538970b..b60eec74a 100644
--- a/docs/src/content/docs/remove.md
+++ b/docs/src/content/docs/remove.md
@@ -59,8 +59,6 @@ The 'same commit' check uses the local default branch; for other checks, 'target
Branches matching these conditions and with empty working trees are dimmed in `wt list` as safe to delete.
-If a detached worktree remains at the branch's configured path, removing the branch reports that directory and the command to remove it by path.
-
## Force flags
Worktrunk has two force flags for different situations:
@@ -106,7 +104,7 @@ Unix only; on Windows `--reap` is rejected.
## JSON output
-`--format=json` prints one object per removal to stdout: `{kind, branch, path, branch_outcome, branch_checked_out_at}` for a worktree, with `pruned` in place of `path` for a branch-only removal, plus `detached_worktree` — the directory left at that branch's path with a detached HEAD, which the branch no longer names and this removal therefore leaves alone.
+`--format=json` prints one object per removal to stdout: `{kind, branch, path, branch_outcome, branch_checked_out_at}` for a worktree, with `pruned` in place of `path` for a branch-only removal, plus `detached_worktree` — a detached worktree left at the branch's configured path.
`branch_outcome` names what happened to the branch, so a caller can tell a deletion the removal declined from one it was never asked to make:
diff --git a/docs/src/content/docs/step.md b/docs/src/content/docs/step.md
index de26b9632..111efccca 100644
--- a/docs/src/content/docs/step.md
+++ b/docs/src/content/docs/step.md
@@ -201,7 +201,7 @@ See [LLM-generated commit messages](/llm-commits/) for configuration and prompt
`pre-commit` hooks run before the squash commit and abort it on failure; `post-commit` hooks run after it, in the background with their output logged. `--no-hooks` skips both. See [`wt hook`](/hook/).
-The squash commit is made on a detached HEAD, as `git rebase` does, so git's own commit hooks run and see no current branch. The branch moves to the squash commit once it exists — a commit that fails leaves the branch and its history untouched.
+The squash commit is made on a detached HEAD, as `git rebase` does, so git's own commit hooks run and see no current branch.
### Options
@@ -819,11 +819,11 @@ In `wt list`, candidates show `_` (same commit) or `⊂` (content integrated). R
Locked worktrees, worktrees with uncommitted changes, and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).
-Removals and their hooks may run concurrently across worktrees. Each worktree's pre-remove hooks finish before its removal begins. Hooks must coordinate writes to shared resources and avoid writing into other worktrees being pruned. On Windows, rewriting shared Git configuration from a hook can cause concurrent Git reads to fail.
+Removals and their hooks may run concurrently across worktrees. Each worktree's pre-remove hooks finish before its removal begins. Hooks must coordinate writes to shared resources and avoid writing into other worktrees being pruned.
### Min-age guard
-Candidates younger than `--min-age` (default: 1 day) are skipped. A worktree's age comes from its creation time. A branch with no worktree takes its age from its oldest reflog entry, or, when it has none (common in bare repositories), from when git last wrote its ref. Operations such as `git gc` or deleting a branch can rewrite many refs at once, so afterwards older branches without a reflog are skipped until `--min-age` has passed. This prevents removing a worktree just created from the default branch: it looks "merged" because its branch points at the same commit.
+Candidates younger than `--min-age` (default: 1 day) are skipped. A worktree's age comes from its creation time. For branches without a reflog, Git maintenance or branch deletion can restart the age guard, even on older branches. This prevents removing a worktree just created from the default branch: it looks "merged" because its branch points at the same commit.
```console
$ wt step prune --min-age=0s # no age guard
diff --git a/plugins/worktrunk/skills/worktrunk/reference/claude-code.md b/plugins/worktrunk/skills/worktrunk/reference/claude-code.md
index b9a47a767..c334b5802 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/claude-code.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/claude-code.md
@@ -7,9 +7,7 @@ Worktrunk ships a plugin for each supported agent CLI. What a plugin provides de
| Configuration skill | ✓ | ✓ | | | | ✓ |
| Activity tracking (🤖/💬 in `wt list`) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Worktree isolation | ✓ | | | | | |
-| `/wt-switch-create` skill\* | ✓ | | | | | |
-
-\* Codex and Gemini also load the `/wt-switch-create` skill from the shared skill set, but neither lets a skill change the session's working directory, so it does nothing there.
+| `/wt-switch-create` skill | ✓ | | | | | |
The configuration skill is documentation the agent reads to help set up LLM commits, hooks, and troubleshooting. Activity tracking shows which worktrees have running sessions. Worktree isolation needs worktree-lifecycle hooks, which only Claude Code exposes, so Codex, OpenCode, Pi, oh-my-pi, and Gemini users invoke `wt switch --create` and `wt remove` directly. Codex tracks activity through its own `Stop` and `SessionEnd` hooks.
diff --git a/plugins/worktrunk/skills/worktrunk/reference/config.md b/plugins/worktrunk/skills/worktrunk/reference/config.md
index 8416aca7d..195afe19e 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/config.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/config.md
@@ -167,8 +167,6 @@ command = "llm -m claude-haiku-4.5"
### aichat
-`--code` drops the `<think>` block aichat prints before the message when the model reasons.
-
```toml
[commit.generation]
command = "aichat -m claude:claude-haiku-4.5 --code"
diff --git a/plugins/worktrunk/skills/worktrunk/reference/faq.md b/plugins/worktrunk/skills/worktrunk/reference/faq.md
index 69f60e666..0d5228b8e 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/faq.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/faq.md
@@ -55,7 +55,7 @@ Git TUIs operate on a single repository. Worktrunk manages multiple worktrees, r
Worktrees share one `.git`. Each adds a checkout of the tracked files, plus whatever gitignored build output you copy in.
-On APFS, btrfs, and XFS (not ext4 or NTFS), [`wt step copy-ignored`](https://worktrunk.dev/step/#wt-step-copy-ignored--copy-on-write) reflinks that output, so a new worktree shares the primary worktree's disk blocks. A later build rewrites only what changed, and the rest stays shared. On one machine, 56 worktrees of a Rust repository with a 40GB `target/` came to 2.6TB by `du` and 0.7TB on disk.
+On APFS, btrfs, and XFS (not ext4 or NTFS), [`wt step copy-ignored`](https://worktrunk.dev/step/#wt-step-copy-ignored--copy-on-write) reflinks that output, so a new worktree shares the primary worktree's disk blocks. A later build rewrites only what changed, and the rest stays shared.
## Does Worktrunk support stacked branches?
diff --git a/plugins/worktrunk/skills/worktrunk/reference/llm-commits.md b/plugins/worktrunk/skills/worktrunk/reference/llm-commits.md
index 0dc770149..ae426d516 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/llm-commits.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/llm-commits.md
@@ -26,7 +26,7 @@ Create `~/.codex/worktrunk-commit-instructions.txt` containing just `.` (no newl
command = "codex exec -m gpt-6-luna -c model_reasoning_effort='none' -c project_doc_max_bytes=0 -c skills.max_context_tokens=1 -c agents.enabled=false -c features.goals=false -c web_search=disabled -c 'model_instructions_file=\"~/.codex/worktrunk-commit-instructions.txt\"' -c features.shell_tool=false -c features.unified_exec=false -c features.apps=false -c features.plugins=false --ephemeral --sandbox=read-only --json - | jq -sr '[.[] | select(.item.type? == \"agent_message\")] | last.item.text'"
```
-`model_instructions_file` replaces Codex's built-in instructions with that one character. `project_doc_max_bytes=0` limits project instructions, and `skills.max_context_tokens=1` limits the skills catalog. The command disables web search, shell tools, apps, plugins, subagents, and goals. It keeps user provider settings and authentication and skips session persistence. Codex can still load global `AGENTS.md` and other agent context, so a short commit prompt can use thousands of input tokens. Requires `jq` for JSON parsing. See [Codex CLI docs](https://developers.openai.com/codex/cli/).
+Requires `jq` for JSON parsing. See [Codex CLI docs](https://developers.openai.com/codex/cli/).
### Other tools
@@ -39,7 +39,7 @@ command = "opencode run -m anthropic/claude-haiku-4.5 --variant fast"
# llm
command = "llm -m claude-haiku-4.5"
-# aichat — --code drops the <think> block reasoning models print
+# aichat
command = "aichat -m claude:claude-haiku-4.5 --code"
```
diff --git a/plugins/worktrunk/skills/worktrunk/reference/remove.md b/plugins/worktrunk/skills/worktrunk/reference/remove.md
index f66bd895d..27389e235 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/remove.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/remove.md
@@ -53,8 +53,6 @@ The 'same commit' check uses the local default branch; for other checks, 'target
Branches matching these conditions and with empty working trees are dimmed in `wt list` as safe to delete.
-If a detached worktree remains at the branch's configured path, removing the branch reports that directory and the command to remove it by path.
-
## Force flags
Worktrunk has two force flags for different situations:
@@ -98,7 +96,7 @@ Unix only; on Windows `--reap` is rejected.
## JSON output
-`--format=json` prints one object per removal to stdout: `{kind, branch, path, branch_outcome, branch_checked_out_at}` for a worktree, with `pruned` in place of `path` for a branch-only removal, plus `detached_worktree` — the directory left at that branch's path with a detached HEAD, which the branch no longer names and this removal therefore leaves alone.
+`--format=json` prints one object per removal to stdout: `{kind, branch, path, branch_outcome, branch_checked_out_at}` for a worktree, with `pruned` in place of `path` for a branch-only removal, plus `detached_worktree` — a detached worktree left at the branch's configured path.
`branch_outcome` names what happened to the branch, so a caller can tell a deletion the removal declined from one it was never asked to make:
diff --git a/plugins/worktrunk/skills/worktrunk/reference/step.md b/plugins/worktrunk/skills/worktrunk/reference/step.md
index cc2cd1379..bfec94bd5 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/step.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/step.md
@@ -189,7 +189,7 @@ See [LLM-generated commit messages](https://worktrunk.dev/llm-commits/) for conf
`pre-commit` hooks run before the squash commit and abort it on failure; `post-commit` hooks run after it, in the background with their output logged. `--no-hooks` skips both. See [`wt hook`](https://worktrunk.dev/hook/).
-The squash commit is made on a detached HEAD, as `git rebase` does, so git's own commit hooks run and see no current branch. The branch moves to the squash commit once it exists — a commit that fails leaves the branch and its history untouched.
+The squash commit is made on a detached HEAD, as `git rebase` does, so git's own commit hooks run and see no current branch.
### Options
@@ -807,11 +807,11 @@ In `wt list`, candidates show `_` (same commit) or `⊂` (content integrated). R
Locked worktrees, worktrees with uncommitted changes, and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).
-Removals and their hooks may run concurrently across worktrees. Each worktree's pre-remove hooks finish before its removal begins. Hooks must coordinate writes to shared resources and avoid writing into other worktrees being pruned. On Windows, rewriting shared Git configuration from a hook can cause concurrent Git reads to fail.
+Removals and their hooks may run concurrently across worktrees. Each worktree's pre-remove hooks finish before its removal begins. Hooks must coordinate writes to shared resources and avoid writing into other worktrees being pruned.
### Min-age guard
-Candidates younger than `--min-age` (default: 1 day) are skipped. A worktree's age comes from its creation time. A branch with no worktree takes its age from its oldest reflog entry, or, when it has none (common in bare repositories), from when git last wrote its ref. Operations such as `git gc` or deleting a branch can rewrite many refs at once, so afterwards older branches without a reflog are skipped until `--min-age` has passed. This prevents removing a worktree just created from the default branch: it looks "merged" because its branch points at the same commit.
+Candidates younger than `--min-age` (default: 1 day) are skipped. A worktree's age comes from its creation time. For branches without a reflog, Git maintenance or branch deletion can restart the age guard, even on older branches. This prevents removing a worktree just created from the default branch: it looks "merged" because its branch points at the same commit.
```console
$ wt step prune --min-age=0s # no age guard
diff --git a/skills/worktrunk/reference/claude-code.md b/skills/worktrunk/reference/claude-code.md
index b9a47a767..c334b5802 100644
--- a/skills/worktrunk/reference/claude-code.md
+++ b/skills/worktrunk/reference/claude-code.md
@@ -7,9 +7,7 @@ Worktrunk ships a plugin for each supported agent CLI. What a plugin provides de
| Configuration skill | ✓ | ✓ | | | | ✓ |
| Activity tracking (🤖/💬 in `wt list`) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Worktree isolation | ✓ | | | | | |
-| `/wt-switch-create` skill\* | ✓ | | | | | |
-
-\* Codex and Gemini also load the `/wt-switch-create` skill from the shared skill set, but neither lets a skill change the session's working directory, so it does nothing there.
+| `/wt-switch-create` skill | ✓ | | | | | |
The configuration skill is documentation the agent reads to help set up LLM commits, hooks, and troubleshooting. Activity tracking shows which worktrees have running sessions. Worktree isolation needs worktree-lifecycle hooks, which only Claude Code exposes, so Codex, OpenCode, Pi, oh-my-pi, and Gemini users invoke `wt switch --create` and `wt remove` directly. Codex tracks activity through its own `Stop` and `SessionEnd` hooks.
diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.md
index 8416aca7d..195afe19e 100644
--- a/skills/worktrunk/reference/config.md
+++ b/skills/worktrunk/reference/config.md
@@ -167,8 +167,6 @@ command = "llm -m claude-haiku-4.5"
### aichat
-`--code` drops the `<think>` block aichat prints before the message when the model reasons.
-
```toml
[commit.generation]
command = "aichat -m claude:claude-haiku-4.5 --code"
diff --git a/skills/worktrunk/reference/faq.md b/skills/worktrunk/reference/faq.md
index 69f60e666..0d5228b8e 100644
--- a/skills/worktrunk/reference/faq.md
+++ b/skills/worktrunk/reference/faq.md
@@ -55,7 +55,7 @@ Git TUIs operate on a single repository. Worktrunk manages multiple worktrees, r
Worktrees share one `.git`. Each adds a checkout of the tracked files, plus whatever gitignored build output you copy in.
-On APFS, btrfs, and XFS (not ext4 or NTFS), [`wt step copy-ignored`](https://worktrunk.dev/step/#wt-step-copy-ignored--copy-on-write) reflinks that output, so a new worktree shares the primary worktree's disk blocks. A later build rewrites only what changed, and the rest stays shared. On one machine, 56 worktrees of a Rust repository with a 40GB `target/` came to 2.6TB by `du` and 0.7TB on disk.
+On APFS, btrfs, and XFS (not ext4 or NTFS), [`wt step copy-ignored`](https://worktrunk.dev/step/#wt-step-copy-ignored--copy-on-write) reflinks that output, so a new worktree shares the primary worktree's disk blocks. A later build rewrites only what changed, and the rest stays shared.
## Does Worktrunk support stacked branches?
diff --git a/skills/worktrunk/reference/llm-commits.md b/skills/worktrunk/reference/llm-commits.md
index 0dc770149..ae426d516 100644
--- a/skills/worktrunk/reference/llm-commits.md
+++ b/skills/worktrunk/reference/llm-commits.md
@@ -26,7 +26,7 @@ Create `~/.codex/worktrunk-commit-instructions.txt` containing just `.` (no newl
command = "codex exec -m gpt-6-luna -c model_reasoning_effort='none' -c project_doc_max_bytes=0 -c skills.max_context_tokens=1 -c agents.enabled=false -c features.goals=false -c web_search=disabled -c 'model_instructions_file=\"~/.codex/worktrunk-commit-instructions.txt\"' -c features.shell_tool=false -c features.unified_exec=false -c features.apps=false -c features.plugins=false --ephemeral --sandbox=read-only --json - | jq -sr '[.[] | select(.item.type? == \"agent_message\")] | last.item.text'"
```
-`model_instructions_file` replaces Codex's built-in instructions with that one character. `project_doc_max_bytes=0` limits project instructions, and `skills.max_context_tokens=1` limits the skills catalog. The command disables web search, shell tools, apps, plugins, subagents, and goals. It keeps user provider settings and authentication and skips session persistence. Codex can still load global `AGENTS.md` and other agent context, so a short commit prompt can use thousands of input tokens. Requires `jq` for JSON parsing. See [Codex CLI docs](https://developers.openai.com/codex/cli/).
+Requires `jq` for JSON parsing. See [Codex CLI docs](https://developers.openai.com/codex/cli/).
### Other tools
@@ -39,7 +39,7 @@ command = "opencode run -m anthropic/claude-haiku-4.5 --variant fast"
# llm
command = "llm -m claude-haiku-4.5"
-# aichat — --code drops the <think> block reasoning models print
+# aichat
command = "aichat -m claude:claude-haiku-4.5 --code"
```
diff --git a/skills/worktrunk/reference/remove.md b/skills/worktrunk/reference/remove.md
index f66bd895d..27389e235 100644
--- a/skills/worktrunk/reference/remove.md
+++ b/skills/worktrunk/reference/remove.md
@@ -53,8 +53,6 @@ The 'same commit' check uses the local default branch; for other checks, 'target
Branches matching these conditions and with empty working trees are dimmed in `wt list` as safe to delete.
-If a detached worktree remains at the branch's configured path, removing the branch reports that directory and the command to remove it by path.
-
## Force flags
Worktrunk has two force flags for different situations:
@@ -98,7 +96,7 @@ Unix only; on Windows `--reap` is rejected.
## JSON output
-`--format=json` prints one object per removal to stdout: `{kind, branch, path, branch_outcome, branch_checked_out_at}` for a worktree, with `pruned` in place of `path` for a branch-only removal, plus `detached_worktree` — the directory left at that branch's path with a detached HEAD, which the branch no longer names and this removal therefore leaves alone.
+`--format=json` prints one object per removal to stdout: `{kind, branch, path, branch_outcome, branch_checked_out_at}` for a worktree, with `pruned` in place of `path` for a branch-only removal, plus `detached_worktree` — a detached worktree left at the branch's configured path.
`branch_outcome` names what happened to the branch, so a caller can tell a deletion the removal declined from one it was never asked to make:
diff --git a/skills/worktrunk/reference/step.md b/skills/worktrunk/reference/step.md
index cc2cd1379..bfec94bd5 100644
--- a/skills/worktrunk/reference/step.md
+++ b/skills/worktrunk/reference/step.md
@@ -189,7 +189,7 @@ See [LLM-generated commit messages](https://worktrunk.dev/llm-commits/) for conf
`pre-commit` hooks run before the squash commit and abort it on failure; `post-commit` hooks run after it, in the background with their output logged. `--no-hooks` skips both. See [`wt hook`](https://worktrunk.dev/hook/).
-The squash commit is made on a detached HEAD, as `git rebase` does, so git's own commit hooks run and see no current branch. The branch moves to the squash commit once it exists — a commit that fails leaves the branch and its history untouched.
+The squash commit is made on a detached HEAD, as `git rebase` does, so git's own commit hooks run and see no current branch.
### Options
@@ -807,11 +807,11 @@ In `wt list`, candidates show `_` (same commit) or `⊂` (content integrated). R
Locked worktrees, worktrees with uncommitted changes, and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).
-Removals and their hooks may run concurrently across worktrees. Each worktree's pre-remove hooks finish before its removal begins. Hooks must coordinate writes to shared resources and avoid writing into other worktrees being pruned. On Windows, rewriting shared Git configuration from a hook can cause concurrent Git reads to fail.
+Removals and their hooks may run concurrently across worktrees. Each worktree's pre-remove hooks finish before its removal begins. Hooks must coordinate writes to shared resources and avoid writing into other worktrees being pruned.
### Min-age guard
-Candidates younger than `--min-age` (default: 1 day) are skipped. A worktree's age comes from its creation time. A branch with no worktree takes its age from its oldest reflog entry, or, when it has none (common in bare repositories), from when git last wrote its ref. Operations such as `git gc` or deleting a branch can rewrite many refs at once, so afterwards older branches without a reflog are skipped until `--min-age` has passed. This prevents removing a worktree just created from the default branch: it looks "merged" because its branch points at the same commit.
+Candidates younger than `--min-age` (default: 1 day) are skipped. A worktree's age comes from its creation time. For branches without a reflog, Git maintenance or branch deletion can restart the age guard, even on older branches. This prevents removing a worktree just created from the default branch: it looks "merged" because its branch points at the same commit.
```console
$ wt step prune --min-age=0s # no age guard
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 193f522e6..3f90a9358 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1357,8 +1357,6 @@ The 'same commit' check uses the local default branch; for other checks, 'target
Branches matching these conditions and with empty working trees are dimmed in `wt list` as safe to delete.
-If a detached worktree remains at the branch's configured path, removing the branch reports that directory and the command to remove it by path.
-
## Force flags
Worktrunk has two force flags for different situations:
@@ -1402,7 +1400,7 @@ Unix only; on Windows `--reap` is rejected.
## JSON output
-`--format=json` prints one object per removal to stdout: `{kind, branch, path, branch_outcome, branch_checked_out_at}` for a worktree, with `pruned` in place of `path` for a branch-only removal, plus `detached_worktree` — the directory left at that branch's path with a detached HEAD, which the branch no longer names and this removal therefore leaves alone.
+`--format=json` prints one object per removal to stdout: `{kind, branch, path, branch_outcome, branch_checked_out_at}` for a worktree, with `pruned` in place of `path` for a branch-only removal, plus `detached_worktree` — a detached worktree left at the branch's configured path.
`branch_outcome` names what happened to the branch, so a caller can tell a deletion the removal declined from one it was never asked to make:
@@ -2136,8 +2134,6 @@ command = "llm -m claude-haiku-4.5"
### aichat
-`--code` drops the `<think>` block aichat prints before the message when the model reasons.
-
```toml
[commit.generation]
command = "aichat -m claude:claude-haiku-4.5 --code"
diff --git a/src/cli/step.rs b/src/cli/step.rs
index 804a9bce2..e56650d85 100644
--- a/src/cli/step.rs
+++ b/src/cli/step.rs
@@ -132,7 +132,7 @@ Three sections are printed: the rendered prompt, the shell command that would in
`pre-commit` hooks run before the squash commit and abort it on failure; `post-commit` hooks run after it, in the background with their output logged. `--no-hooks` skips both. See [`wt hook`](/hook/).
-The squash commit is made on a detached HEAD, as `git rebase` does, so git's own commit hooks run and see no current branch. The branch moves to the squash commit once it exists — a commit that fails leaves the branch and its history untouched.
+The squash commit is made on a detached HEAD, as `git rebase` does, so git's own commit hooks run and see no current branch.
## Options
@@ -621,11 +621,11 @@ In `wt list`, candidates show `_` (same commit) or `⊂` (content integrated). R
Locked worktrees, worktrees with uncommitted changes, and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).
-Removals and their hooks may run concurrently across worktrees. Each worktree's pre-remove hooks finish before its removal begins. Hooks must coordinate writes to shared resources and avoid writing into other worktrees being pruned. On Windows, rewriting shared Git configuration from a hook can cause concurrent Git reads to fail.
+Removals and their hooks may run concurrently across worktrees. Each worktree's pre-remove hooks finish before its removal begins. Hooks must coordinate writes to shared resources and avoid writing into other worktrees being pruned.
## Min-age guard
-Candidates younger than `--min-age` (default: 1 day) are skipped. A worktree's age comes from its creation time. A branch with no worktree takes its age from its oldest reflog entry, or, when it has none (common in bare repositories), from when git last wrote its ref. Operations such as `git gc` or deleting a branch can rewrite many refs at once, so afterwards older branches without a reflog are skipped until `--min-age` has passed. This prevents removing a worktree just created from the default branch: it looks "merged" because its branch points at the same commit.
+Candidates younger than `--min-age` (default: 1 day) are skipped. A worktree's age comes from its creation time. For branches without a reflog, Git maintenance or branch deletion can restart the age guard, even on older branches. This prevents removing a worktree just created from the default branch: it looks "merged" because its branch points at the same commit.
```console
$ wt step prune --min-age=0s # no age guard
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
index 760389df9..7652a4c7b 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
@@ -161,8 +161,6 @@ Creates ~/.config/worktrunk/config.toml with the following content:
  #
  # ### aichat
  #
-  # `--code` drops the `<think>` block aichat prints before the message when the model reasons.
-  #
  # [commit.generation]
  # command = "aichat -m claude:claude-haiku-4.5 --code"
  #
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
index 467407635..763049d0d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -208,8 +208,6 @@ Create ~/.codex/worktrunk-commit-instructions.txt containing just .
aichat
---code drops the <think> block aichat prints before the message when the model reasons.
-
  [commit.generation]
  command = "aichat -m claude:claude-haiku-4.5 --code"
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
index b35c018d6..e82a17e06 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
@@ -146,8 +146,6 @@ The 'same commit' check uses the local default branch; for other checks, 'target
Branches matching these conditions and with empty working trees are dimmed in wt list as safe to delete.
-If a detached worktree remains at the branch's configured path, removing the branch reports that directory and the command to remove it by path.
-
Force flags
Worktrunk has two force flags for different situations:
@@ -187,7 +185,7 @@ Unix only; on Windows --reap is rejected.
JSON output
---format=json prints one object per removal to stdout: {kind, branch, path, branch_outcome, branch_checked_out_at} for a worktree, with pruned in place of path for a branch-only removal, plus detached_worktree — the directory left at that branch's path with a detached HEAD, which the branch no longer names and this removal therefore leaves alone.
+--format=json prints one object per removal to stdout: {kind, branch, path, branch_outcome, branch_checked_out_at} for a worktree, with pruned in place of path for a branch-only removal, plus detached_worktree — a detached worktree left at the branch's configured path.
branch_outcome names what happened to the branch, so a caller can tell a deletion the removal declined from one it was never asked to make: