Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
docs: writing-prose cleanup (faq, config, list, remove) (#2925)
Maximilian Roos2617348b220c
diff --git a/dev/config.example.toml b/dev/config.example.tomlindex 6ca84620a..b41090aae 100644--- a/dev/config.example.toml+++ b/dev/config.example.toml@@ -153,11 +153,7 @@## ### User project-specific settings#-# For context:-#-# - Project config (https://worktrunk.dev/config/#project-configuration) settings are shared with teammates.-# - User configs generally apply to all projects.-# - User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.+# User config can include a `[projects]` table for project-specific settings — worktree layout, setting overrides, anything else — separate from the project config (https://worktrunk.dev/config/#project-configuration) shared with teammates.## Entries are keyed by project identifier — `<host>/<owner>/<repo>` derived from the primary remote URL (no `.git` suffix), or the canonical repo path when there is no remote. Run `wt config show` inside the repo to see the identifier for the current project; it appears in the `PROJECT CONFIG` section as `Identifier: …`.#diff --git a/docs/content/config.md b/docs/content/config.mdindex 359d21996..f3edf02ff 100644--- a/docs/content/config.md+++ b/docs/content/config.md@@ -36,7 +36,7 @@ Show current configuration and file locations:| **User config** | `~/.config/worktrunk/config.toml` | Worktree path template, LLM commit configs, etc | ✗ || **Project config** | `.config/wt.toml` | Project hooks, dev server URL | ✓ |-Organizations can also deploy a system-wide config file for shared defaults — run `wt config show` for the platform-specific location.+Organizations can deploy a system-wide config file for shared defaults — run `wt config show` for the platform-specific location.**User config** — personal preferences:@@ -253,11 +253,7 @@ Aliases defined here apply to all projects. For project-specific aliases, use th### User project-specific settings-For context:--- [Project config](@/config.md#project-configuration) settings are shared with teammates.-- User configs generally apply to all projects.-- User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.+User config can include a `[projects]` table for project-specific settings — worktree layout, setting overrides, anything else — separate from the [project config](@/config.md#project-configuration) shared with teammates.Entries are keyed by project identifier — `<host>/<owner>/<repo>` derived from the primary remote URL (no `.git` suffix), or the canonical repo path when there is no remote. Run `wt config show` inside the repo to see the identifier for the current project; it appears in the `PROJECT CONFIG` section as `Identifier: …`.@@ -513,7 +509,7 @@ Without shell integration, `wt switch` prints the target directory but cannot `c### First-run prompts-On first run without shell integration, Worktrunk offers to install it. Similarly, on first commit without LLM configuration, it offers to configure a detected tool (`claude`, `codex`). Declining sets `skip-shell-integration-prompt` or `skip-commit-generation-prompt` automatically.+On first run without shell integration, Worktrunk offers to install it. On first commit without LLM configuration, it offers to configure a detected tool (`claude`, `codex`). Declining sets `skip-shell-integration-prompt` or `skip-commit-generation-prompt` automatically.# Other@@ -533,8 +529,6 @@ For nested config sections, use double underscores to separate levels:| `commit.generation.command` | `WORKTRUNK_COMMIT__GENERATION__COMMAND` || `commit.stage` | `WORKTRUNK_COMMIT__STAGE` |-Note the single underscore after `WORKTRUNK` and double underscores between nested keys.-### Example: CI/testing overrideOverride the LLM command in CI to use a mock:diff --git a/docs/content/faq.md b/docs/content/faq.mdindex 95f692d63..bf08cf5b3 100644--- a/docs/content/faq.md+++ b/docs/content/faq.md@@ -95,8 +95,6 @@ The three `-vv` files have distinct audiences:## What files does Worktrunk create?-Worktrunk creates files in four categories.-### 1. Worktree directoriesCreated by `wt switch <branch>` when switching to a branch that doesn't have a worktree. Use `wt switch --create <branch>` to create a new branch. Default location is `../<repo>.<branch>` (sibling to main repo), configurable via `worktree-path` in user config.diff --git a/docs/content/list.md b/docs/content/list.mdindex ed7f319df..dcaf35376 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -78,7 +78,7 @@ Output as JSON for scripting:| Status | Compact symbols (see below) || HEAD± | Uncommitted changes: +added -deleted lines || main↕ | Commits ahead/behind default branch |-| main…± | Line diffs since the merge-base with the default branch; `--full` only |+| main…± | Line diffs since the merge-base (three-dot) with the default branch; `--full` only || Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](@/config.md#commit) <span class="badge-experimental"></span> || Remote⇅ | Commits ahead/behind tracking branch || CI | Pipeline status; `--full` only |@@ -88,7 +88,7 @@ Output as JSON for scripting:| Age | Time since last commit || Message | Last commit message (truncated) |-Note: `main↕` and `main…±` refer to the default branch — the header label stays `main` for compactness. `main…±` uses a merge-base (three-dot) diff.+The `main` header label is used regardless of the default branch's actual name.### CI statusdiff --git a/docs/content/remove.md b/docs/content/remove.mdindex 186127790..0c0fb48f7 100644--- a/docs/content/remove.md+++ b/docs/content/remove.md@@ -46,7 +46,9 @@ Worktrunk checks six conditions (in order of cost):3. **No added changes** — Three-dot diff (`target...branch`) is empty. Shows `⊂`.4. **Trees match** — Branch tree SHA equals target tree SHA. Shows `⊂`.5. **Merge adds nothing** — Simulated merge produces the same tree as target. Handles squash-merged branches where target has advanced with changes to different files. Shows `⊂`.-6. **Patch-id match** — Branch's entire diff matches a single squash-merge commit on target. Fallback for when the simulated merge conflicts because target later modified the same files the branch touched. Shows `⊂`. The default-branch walk is capped so a single check stays fast; a squash merge with hundreds of commits landed since the merge point falls outside the cap and needs `-D` to remove.+6. **Patch-id match** — Branch's entire diff matches a single squash-merge commit on target. Fallback for when the simulated merge conflicts because target later modified the same files the branch touched. Shows `⊂`.++The default-branch walk is capped so a single check stays fast; a squash merge with hundreds of commits landed since the merge point falls outside the cap and needs `-D` to remove.The 'same commit' check uses the local default branch; for other checks, 'target' means the default branch, or its upstream (e.g., `origin/main`) when strictly ahead.@@ -63,7 +65,7 @@ Worktrunk has two force flags for different situations:{{ terminal(cmd="wt remove feature --force # Remove dirty worktree|||wt remove feature -D # Delete unmerged branch|||wt remove feature --force -D # Both") }}-Without `--force`, removal fails if the worktree has staged, modified, or untracked files. Without `--force-delete`, removal keeps branches with unmerged changes. Use `--no-delete-branch` to keep the branch regardless of merge status.+Use `--no-delete-branch` to keep the branch regardless of merge status.## Background removaldiff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.mdindex 07a601d4f..5ce296a78 100644--- a/skills/worktrunk/reference/config.md+++ b/skills/worktrunk/reference/config.md@@ -35,7 +35,7 @@ $ wt config show| **User config** | `~/.config/worktrunk/config.toml` | Worktree path template, LLM commit configs, etc | ✗ || **Project config** | `.config/wt.toml` | Project hooks, dev server URL | ✓ |-Organizations can also deploy a system-wide config file for shared defaults — run `wt config show` for the platform-specific location.+Organizations can deploy a system-wide config file for shared defaults — run `wt config show` for the platform-specific location.**User config** — personal preferences:@@ -252,11 +252,7 @@ Aliases defined here apply to all projects. For project-specific aliases, use th### User project-specific settings-For context:--- [Project config](https://worktrunk.dev/config/#project-configuration) settings are shared with teammates.-- User configs generally apply to all projects.-- User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.+User config can include a `[projects]` table for project-specific settings — worktree layout, setting overrides, anything else — separate from the [project config](https://worktrunk.dev/config/#project-configuration) shared with teammates.Entries are keyed by project identifier — `<host>/<owner>/<repo>` derived from the primary remote URL (no `.git` suffix), or the canonical repo path when there is no remote. Run `wt config show` inside the repo to see the identifier for the current project; it appears in the `PROJECT CONFIG` section as `Identifier: …`.@@ -510,7 +506,7 @@ Without shell integration, `wt switch` prints the target directory but cannot `c### First-run prompts-On first run without shell integration, Worktrunk offers to install it. Similarly, on first commit without LLM configuration, it offers to configure a detected tool (`claude`, `codex`). Declining sets `skip-shell-integration-prompt` or `skip-commit-generation-prompt` automatically.+On first run without shell integration, Worktrunk offers to install it. On first commit without LLM configuration, it offers to configure a detected tool (`claude`, `codex`). Declining sets `skip-shell-integration-prompt` or `skip-commit-generation-prompt` automatically.# Other@@ -530,8 +526,6 @@ For nested config sections, use double underscores to separate levels:| `commit.generation.command` | `WORKTRUNK_COMMIT__GENERATION__COMMAND` || `commit.stage` | `WORKTRUNK_COMMIT__STAGE` |-Note the single underscore after `WORKTRUNK` and double underscores between nested keys.-### Example: CI/testing overrideOverride the LLM command in CI to use a mock:diff --git a/skills/worktrunk/reference/faq.md b/skills/worktrunk/reference/faq.mdindex 3144b3643..f2485a341 100644--- a/skills/worktrunk/reference/faq.md+++ b/skills/worktrunk/reference/faq.md@@ -88,8 +88,6 @@ The three `-vv` files have distinct audiences:## What files does Worktrunk create?-Worktrunk creates files in four categories.-### 1. Worktree directoriesCreated by `wt switch <branch>` when switching to a branch that doesn't have a worktree. Use `wt switch --create <branch>` to create a new branch. Default location is `../<repo>.<branch>` (sibling to main repo), configurable via `worktree-path` in user config.diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.mdindex ded1929da..a2e8ef8a3 100644--- a/skills/worktrunk/reference/list.md+++ b/skills/worktrunk/reference/list.md@@ -67,7 +67,7 @@ $ wt list --format=json| Status | Compact symbols (see below) || HEAD± | Uncommitted changes: +added -deleted lines || main↕ | Commits ahead/behind default branch |-| main…± | Line diffs since the merge-base with the default branch; `--full` only |+| main…± | Line diffs since the merge-base (three-dot) with the default branch; `--full` only || Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](https://worktrunk.dev/config/#commit) [experimental] || Remote⇅ | Commits ahead/behind tracking branch || CI | Pipeline status; `--full` only |@@ -77,7 +77,7 @@ $ wt list --format=json| Age | Time since last commit || Message | Last commit message (truncated) |-Note: `main↕` and `main…±` refer to the default branch — the header label stays `main` for compactness. `main…±` uses a merge-base (three-dot) diff.+The `main` header label is used regardless of the default branch's actual name.### CI statusdiff --git a/skills/worktrunk/reference/remove.md b/skills/worktrunk/reference/remove.mdindex a868b4a5f..6aad86e8a 100644--- a/skills/worktrunk/reference/remove.md+++ b/skills/worktrunk/reference/remove.md@@ -45,7 +45,9 @@ Worktrunk checks six conditions (in order of cost):3. **No added changes** — Three-dot diff (`target...branch`) is empty. Shows `⊂`.4. **Trees match** — Branch tree SHA equals target tree SHA. Shows `⊂`.5. **Merge adds nothing** — Simulated merge produces the same tree as target. Handles squash-merged branches where target has advanced with changes to different files. Shows `⊂`.-6. **Patch-id match** — Branch's entire diff matches a single squash-merge commit on target. Fallback for when the simulated merge conflicts because target later modified the same files the branch touched. Shows `⊂`. The default-branch walk is capped so a single check stays fast; a squash merge with hundreds of commits landed since the merge point falls outside the cap and needs `-D` to remove.+6. **Patch-id match** — Branch's entire diff matches a single squash-merge commit on target. Fallback for when the simulated merge conflicts because target later modified the same files the branch touched. Shows `⊂`.++The default-branch walk is capped so a single check stays fast; a squash merge with hundreds of commits landed since the merge point falls outside the cap and needs `-D` to remove.The 'same commit' check uses the local default branch; for other checks, 'target' means the default branch, or its upstream (e.g., `origin/main`) when strictly ahead.@@ -66,7 +68,7 @@ $ wt remove feature -D # Delete unmerged branch$ wt remove feature --force -D # Both```-Without `--force`, removal fails if the worktree has staged, modified, or untracked files. Without `--force-delete`, removal keeps branches with unmerged changes. Use `--no-delete-branch` to keep the branch regardless of merge status.+Use `--no-delete-branch` to keep the branch regardless of merge status.## Background removaldiff --git a/src/cli/mod.rs b/src/cli/mod.rsindex 5c0b48ff3..7905ecbee 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -745,7 +745,7 @@ $ wt list --format=json| Status | Compact symbols (see below) || HEAD± | Uncommitted changes: +added -deleted lines || main↕ | Commits ahead/behind default branch |-| main…± | Line diffs since the merge-base with the default branch; `--full` only |+| main…± | Line diffs since the merge-base (three-dot) with the default branch; `--full` only || Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](@/config.md#commit) [experimental] || Remote⇅ | Commits ahead/behind tracking branch || CI | Pipeline status; `--full` only |@@ -755,7 +755,7 @@ $ wt list --format=json| Age | Time since last commit || Message | Last commit message (truncated) |-Note: `main↕` and `main…±` refer to the default branch — the header label stays `main` for compactness. `main…±` uses a merge-base (three-dot) diff.+The `main` header label is used regardless of the default branch's actual name.### CI status@@ -1004,7 +1004,9 @@ Worktrunk checks six conditions (in order of cost):3. **No added changes** — Three-dot diff (`target...branch`) is empty. Shows `⊂`.4. **Trees match** — Branch tree SHA equals target tree SHA. Shows `⊂`.5. **Merge adds nothing** — Simulated merge produces the same tree as target. Handles squash-merged branches where target has advanced with changes to different files. Shows `⊂`.-6. **Patch-id match** — Branch's entire diff matches a single squash-merge commit on target. Fallback for when the simulated merge conflicts because target later modified the same files the branch touched. Shows `⊂`. The default-branch walk is capped so a single check stays fast; a squash merge with hundreds of commits landed since the merge point falls outside the cap and needs `-D` to remove.+6. **Patch-id match** — Branch's entire diff matches a single squash-merge commit on target. Fallback for when the simulated merge conflicts because target later modified the same files the branch touched. Shows `⊂`.++The default-branch walk is capped so a single check stays fast; a squash merge with hundreds of commits landed since the merge point falls outside the cap and needs `-D` to remove.The 'same commit' check uses the local default branch; for other checks, 'target' means the default branch, or its upstream (e.g., `origin/main`) when strictly ahead.@@ -1025,7 +1027,7 @@ $ wt remove feature -D # Delete unmerged branch$ wt remove feature --force -D # Both```-Without `--force`, removal fails if the worktree has staged, modified, or untracked files. Without `--force-delete`, removal keeps branches with unmerged changes. Use `--no-delete-branch` to keep the branch regardless of merge status.+Use `--no-delete-branch` to keep the branch regardless of merge status.## Background removal@@ -1601,7 +1603,7 @@ $ wt config show| **User config** | `~/.config/worktrunk/config.toml` | Worktree path template, LLM commit configs, etc | ✗ || **Project config** | `.config/wt.toml` | Project hooks, dev server URL | ✓ |-Organizations can also deploy a system-wide config file for shared defaults — run `wt config show` for the platform-specific location.+Organizations can deploy a system-wide config file for shared defaults — run `wt config show` for the platform-specific location.**User config** — personal preferences:@@ -1818,11 +1820,7 @@ Aliases defined here apply to all projects. For project-specific aliases, use th### User project-specific settings-For context:--- [Project config](@/config.md#project-configuration) settings are shared with teammates.-- User configs generally apply to all projects.-- User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.+User config can include a `[projects]` table for project-specific settings — worktree layout, setting overrides, anything else — separate from the [project config](@/config.md#project-configuration) shared with teammates.Entries are keyed by project identifier — `<host>/<owner>/<repo>` derived from the primary remote URL (no `.git` suffix), or the canonical repo path when there is no remote. Run `wt config show` inside the repo to see the identifier for the current project; it appears in the `PROJECT CONFIG` section as `Identifier: …`.@@ -2076,7 +2074,7 @@ Without shell integration, `wt switch` prints the target directory but cannot `c### First-run prompts-On first run without shell integration, Worktrunk offers to install it. Similarly, on first commit without LLM configuration, it offers to configure a detected tool (`claude`, `codex`). Declining sets `skip-shell-integration-prompt` or `skip-commit-generation-prompt` automatically.+On first run without shell integration, Worktrunk offers to install it. On first commit without LLM configuration, it offers to configure a detected tool (`claude`, `codex`). Declining sets `skip-shell-integration-prompt` or `skip-commit-generation-prompt` automatically.# Other@@ -2096,8 +2094,6 @@ For nested config sections, use double underscores to separate levels:| `commit.generation.command` | `WORKTRUNK_COMMIT__GENERATION__COMMAND` || `commit.stage` | `WORKTRUNK_COMMIT__STAGE` |-Note the single underscore after `WORKTRUNK` and double underscores between nested keys.-### Example: CI/testing overrideOverride the LLM command in CI to use a mock:diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snapindex bf63fad59..0024a0a8b 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap@@ -220,11 +220,7 @@ Creates [2m~/.config/worktrunk/config.toml[0m with the following content:[107m [0m [2m#[0m[107m [0m [2m# ### User project-specific settings[0m[107m [0m [2m#[0m-[107m [0m [2m# For context:[0m-[107m [0m [2m#[0m-[107m [0m [2m# - Project config (https://worktrunk.dev/config/#project-configuration) settings are shared with teammates.[0m-[107m [0m [2m# - User configs generally apply to all projects.[0m-[107m [0m [2m# - User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.[0m+[107m [0m [2m# User config can include a `[projects]` table for project-specific settings — worktree layout, setting overrides, anything else — separate from the project config (https://worktrunk.dev/config/#project-configuration) shared with teammates.[0m[107m [0m [2m#[0m[107m [0m [2m# Entries are keyed by project identifier — `<host>/<owner>/<repo>` derived from the primary remote URL (no `.git` suffix), or the canonical repo path when there is no remote. Run `wt config show` inside the repo to see the identifier for the current project; it appears in the `PROJECT CONFIG` section as `Identifier: …`.[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 0a38f2057..88110bce6 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap@@ -94,7 +94,7 @@ Show current configuration and file locations:User config [2m~/.config/worktrunk/config.toml[0m Worktree path template, LLM commit configs, etc ✗Project config [2m.config/wt.toml[0m Project hooks, dev server URL ✓-Organizations can also deploy a system-wide config file for shared defaults — run [2mwt config show[0m for the platform-specific location.+Organizations can deploy a system-wide config file for shared defaults — run [2mwt config show[0m for the platform-specific location.[1mUser config[0m — personal preferences:@@ -268,11 +268,7 @@ Aliases defined here apply to all projects. For project-specific aliases, use th[32mUser project-specific settings[0m-For context:--- Project config settings are shared with teammates.-- User configs generally apply to all projects.-- User configs _also_ has a [2m[projects][0m table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.+User config can include a [2m[projects][0m table for project-specific settings — worktree layout, setting overrides, anything else — separate from the project config shared with teammates.Entries are keyed by project identifier — [2m<host>/<owner>/<repo>[0m derived from the primary remote URL (no [2m.git[0m suffix), or the canonical repo path when there is no remote. Run [2mwt config show[0m inside the repo to see the identifier for the current project; it appears in the [2mPROJECT CONFIG[0m section as [2mIdentifier: …[0m.@@ -495,7 +491,7 @@ Without shell integration, [2mwt switch[0m prints the target directory but can[32mFirst-run prompts[0m-On first run without shell integration, Worktrunk offers to install it. Similarly, on first commit without LLM configuration, it offers to configure a detected tool ([2mclaude[0m, [2mcodex[0m). Declining sets [2mskip-shell-integration-prompt[0m or [2mskip-commit-generation-prompt[0m automatically.+On first run without shell integration, Worktrunk offers to install it. On first commit without LLM configuration, it offers to configure a detected tool ([2mclaude[0m, [2mcodex[0m). Declining sets [2mskip-shell-integration-prompt[0m or [2mskip-commit-generation-prompt[0m automatically.[32mOTHER[0m@@ -515,8 +511,6 @@ For nested config sections, use double underscores to separate levels:[2mcommit.generation.command[0m [2mWORKTRUNK_COMMIT__GENERATION__COMMAND[0m[2mcommit.stage[0m [2mWORKTRUNK_COMMIT__STAGE[0m-Note the single underscore after [2mWORKTRUNK[0m and double underscores between nested keys.-[32mExample: CI/testing override[0mOverride the LLM command in CI to use a mock:diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex 5fcb392f5..a61d7ef92 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -137,7 +137,7 @@ Output as JSON for scripting:Status Compact symbols (see below)HEAD± Uncommitted changes: +added -deleted linesmain↕ Commits ahead/behind default branch- main…± Line diffs since the merge-base with the default branch; [2m--full[0m only+ main…± Line diffs since the merge-base (three-dot) with the default branch; [2m--full[0m onlySummary LLM-generated branch summary; requires [2m--full[0m, [2msummary = true[0m, and [2mcommit.generation[0m [experimental]Remote⇅ Commits ahead/behind tracking branchCI Pipeline status; [2m--full[0m only@@ -147,7 +147,7 @@ Output as JSON for scripting:Age Time since last commitMessage Last commit message (truncated)-Note: [2mmain↕[0m and [2mmain…±[0m refer to the default branch — the header label stays [2mmain[0m for compactness. [2mmain…±[0m uses a merge-base (three-dot) diff.+The [2mmain[0m header label is used regardless of the default branch's actual name.[32mCI status[0mdiff --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 14187fb82..cb7c687a3 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@@ -162,7 +162,8 @@ Output as JSON for scripting:Status Compact symbols (see below)HEAD± Uncommitted changes: +added -deleted linesmain↕ Commits ahead/behind default branch- main…± Line diffs since the merge-base with the default branch; [2m--full[0m only+ main…± Line diffs since the merge-base (three-dot) with the default branch;+ [2m--full[0m onlySummary LLM-generated branch summary; requires [2m--full[0m, [2msummary = true[0m, and[2mcommit.generation[0m [experimental]Remote⇅ Commits ahead/behind tracking branch@@ -173,8 +174,7 @@ Output as JSON for scripting:Age Time since last commitMessage Last commit message (truncated)-Note: [2mmain↕[0m and [2mmain…±[0m refer to the default branch — the header label stays [2mmain[0m- for compactness. [2mmain…±[0m uses a merge-base (three-dot) diff.+The [2mmain[0m header label is used regardless of the default branch's actual name.[32mCI status[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snapindex a2365a102..bfae5a642 100644--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap@@ -127,7 +127,9 @@ Worktrunk checks six conditions (in order of cost):3. [1mNo added changes[0m — Three-dot diff ([2mtarget...branch[0m) is empty. Shows [2m⊂[0m.4. [1mTrees match[0m — Branch tree SHA equals target tree SHA. Shows [2m⊂[0m.5. [1mMerge adds nothing[0m — Simulated merge produces the same tree as target. Handles squash-merged branches where target has advanced with changes to different files. Shows [2m⊂[0m.-6. [1mPatch-id match[0m — Branch's entire diff matches a single squash-merge commit on target. Fallback for when the simulated merge conflicts because target later modified the same files the branch touched. Shows [2m⊂[0m. The default-branch walk is capped so a single check stays fast; a squash merge with hundreds of commits landed since the merge point falls outside the cap and needs [2m-D[0m to remove.+6. [1mPatch-id match[0m — Branch's entire diff matches a single squash-merge commit on target. Fallback for when the simulated merge conflicts because target later modified the same files the branch touched. Shows [2m⊂[0m.++The default-branch walk is capped so a single check stays fast; a squash merge with hundreds of commits landed since the merge point falls outside the cap and needs [2m-D[0m to remove.The 'same commit' check uses the local default branch; for other checks, 'target' means the default branch, or its upstream (e.g., [2morigin/main[0m) when strictly ahead.@@ -146,7 +148,7 @@ Worktrunk has two force flags for different situations:[107m [0m [2m[0m[2m[34mwt[0m[2m remove feature [0m[2m[36m-D[0m[2m # Delete unmerged branch[0m[2m[0m[107m [0m [2m[0m[2m[34mwt[0m[2m remove feature [0m[2m[36m--force[0m[2m [0m[2m[36m-D[0m[2m # Both[0m[2m[0m-Without [2m--force[0m, removal fails if the worktree has staged, modified, or untracked files. Without [2m--force-delete[0m, removal keeps branches with unmerged changes. Use [2m--no-delete-branch[0m to keep the branch regardless of merge status.+Use [2m--no-delete-branch[0m to keep the branch regardless of merge status.[1m[32mBackground removal[0m