Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Replace parentheticals with prose in after_long_help docs (#1764)
Maximilian Roosacff4cd03b0e
diff --git a/docs/content/config.md b/docs/content/config.mdindex 66ad5ba84..dafabcede 100644--- a/docs/content/config.md+++ b/docs/content/config.md@@ -427,7 +427,7 @@ WORKTRUNK_COMMIT__GENERATION__COMMAND="echo 'test: automated commit'" wt merge| Variable | Purpose ||----------|---------|-| `WORKTRUNK_BIN` | Override binary path for shell wrappers (useful for testing dev builds) |+| `WORKTRUNK_BIN` | Override binary path for shell wrappers; useful for testing dev builds || `WORKTRUNK_CONFIG_PATH` | Override user config file location || `WORKTRUNK_SYSTEM_CONFIG_PATH` | Override system config file location || `XDG_CONFIG_DIRS` | Colon-separated system config directories (default: `/etc/xdg`) |diff --git a/docs/content/hook.md b/docs/content/hook.mdindex 146338d2a..417ddb84f 100644--- a/docs/content/hook.md+++ b/docs/content/hook.md@@ -15,7 +15,7 @@ Hooks are shell commands that run at key points in the worktree lifecycle — au# Hook Types-| Event | `pre-` (blocking) | `post-` (background) |+| Event | `pre-` — blocking | `post-` — background ||-------|-------------------|---------------------|| **switch** | `pre-switch` | `post-switch` || **start** | `pre-start` | `post-start` |@@ -127,7 +127,7 @@ kill-server = "lsof -ti :{{ branch | hash_port }} -sTCP:LISTEN | xargs kill 2>/dremove-db = "docker stop {{ repo }}-{{ branch | sanitize }}-postgres 2>/dev/null || true"```-During `wt merge`, hooks run in this order: pre-commit → post-commit (background) → pre-merge → pre-remove → post-remove + post-merge (background). See [`wt merge`](@/merge.md#pipeline) for the complete pipeline.+During `wt merge`, hooks run in this order: pre-commit → post-commit → pre-merge → pre-remove → post-remove + post-merge. As usual, post-* hooks run in the background. See [`wt merge`](@/merge.md#pipeline) for the complete pipeline.# Security@@ -144,7 +144,7 @@ Project commands require approval on first run:- Approvals are saved to user config (`~/.config/worktrunk/config.toml`)- If a command changes, new approval is required-- Use `--yes` to bypass prompts (useful for CI/automation)+- Use `--yes` to bypass prompts — useful for CI and automation- Use `--no-verify` to skip hooksManage approvals with `wt hook approvals add` and `wt hook approvals clear`.@@ -210,7 +210,7 @@ Bare variables (`branch`, `worktree_path`, `commit`) refer to the branch the ope| merge | feature being merged | = bare vars | merge target || remove | branch being removed | = bare vars | where you end up |-Pre and post hooks share the same perspective — `{{ branch | hash_port }}` produces the same port in `post-start` and `post-remove`. `cwd` is the worktree root where the hook command runs. It differs from `worktree_path` in three cases: pre-switch (hook runs in the source, `worktree_path` is the destination), post-remove (active worktree is gone, hook runs in primary), and post-merge with removal (same — active is gone, hook runs in target).+Pre and post hooks share the same perspective — `{{ branch | hash_port }}` produces the same port in `post-start` and `post-remove`. `cwd` is the worktree root where the hook command runs. It differs from `worktree_path` in three cases: pre-switch, where the hook runs in the source but `worktree_path` is the destination; post-remove, where the active worktree is gone so the hook runs in primary; and post-merge with removal, same — the active worktree is gone, so the hook runs in target.Some variables are conditional: `upstream` requires remote tracking; `base`/`target` are only in two-worktree hooks. Undefined variables error — use conditionals:@@ -239,7 +239,7 @@ Templates support Jinja2 filters for transforming values:| `sanitize_db` | `{{ branch \| sanitize_db }}` | Database-safe identifier with hash suffix (`[a-z0-9_]`, max 63 chars) || `hash_port` | `{{ branch \| hash_port }}` | Hash to port 10000-19999 |-The `sanitize` filter makes branch names safe for filesystem paths. The `sanitize_db` filter produces database-safe identifiers (lowercase alphanumeric and underscores, no leading digits, with a 3-character hash suffix to avoid collisions and reserved words). The `hash_port` filter is useful for running dev servers on unique ports per worktree:+The `sanitize` filter makes branch names safe for filesystem paths. The `sanitize_db` filter produces database-safe identifiers — lowercase alphanumeric and underscores, no leading digits, with a 3-character hash suffix to avoid collisions and reserved words. The `hash_port` filter is useful for running dev servers on unique ports per worktree:```toml[post-start]@@ -490,7 +490,7 @@ fi## Python virtual environments-Use `uv sync` to recreate virtual environments (or `python -m venv .venv && .venv/bin/pip install -r requirements.txt` for pip-based projects):+Use `uv sync` to recreate virtual environments, or `python -m venv .venv && .venv/bin/pip install -r requirements.txt` for pip-based projects:```toml[pre-start]diff --git a/docs/content/list.md b/docs/content/list.mdindex 2e59fc6de..46c6962c8 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -89,17 +89,17 @@ $ 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`) |-| Summary | LLM-generated branch summary (`--full` + `summary = true`, requires [`commit.generation`](@/config.md#commit)) <span class="badge-experimental"></span> |+| main…± | Line diffs since the merge-base 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`) |+| CI | Pipeline status; `--full` only || Path | Worktree directory |-| URL | Dev server URL from project config (dimmed if port not listening) |+| URL | Dev server URL from project config; dimmed if port is not listening || Commit | Short hash (8 chars) || Age | Time since last commit || Message | Last commit message (truncated) |-Note: `main↕` and `main…±` refer to the default branch (header label stays `main` for compactness). `main…±` uses a merge-base (three-dot) diff.+Note: `main↕` and `main…±` refer to the default branch — the header label stays `main` for compactness. `main…±` uses a merge-base (three-dot) diff.### CI status@@ -115,7 +115,7 @@ The CI column shows GitHub/GitLab pipeline status:| <span style='color:#a60'>⚠</span> yellow | Fetch error (rate limit, network) || (blank) | No upstream or no PR/MR |-CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when there are unpushed local changes (stale status). 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.+CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when unpushed local changes make the status 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@@ -141,7 +141,7 @@ The Status column has multiple subcolumns. Within each, only the first matching| | `⊞` | Locked worktree || Default branch | `^` | Is the default branch || | `∅` | Orphan branch (no common ancestor with the default branch) |-| | `✗` | Would conflict if merged to the default branch (with `--full`, includes uncommitted changes) |+| | `✗` | Would conflict if merged to the default branch; with `--full`, includes uncommitted changes || | `_` | Same commit as the default branch, clean || | `–` | Same commit as the default branch, uncommitted changes || | `⊂` | Content [integrated](@/remove.md#branch-cleanup) into the default branch or target |@@ -207,17 +207,17 @@ wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'| `working_tree` | object | Working tree state (see below) || `main_state` | string | Relation to the default branch (see below) || `integration_reason` | string | Why branch is integrated (see below) |-| `operation_state` | string | `"conflicts"`, `"rebase"`, or `"merge"` (absent when clean) |-| `main` | object | Relationship to the default branch (see below, absent when is_main) |-| `remote` | object | Tracking branch info (see below, absent when no tracking) |+| `operation_state` | string | `"conflicts"`, `"rebase"`, or `"merge"`; absent when clean |+| `main` | object | Relationship to the default branch (see below); absent when is_main |+| `remote` | object | Tracking branch info (see below); absent when no tracking || `worktree` | object | Worktree metadata (see below) || `is_main` | boolean | Is the main worktree || `is_current` | boolean | Is the current worktree || `is_previous` | boolean | Previous worktree from wt switch |-| `ci` | object | CI status (see below, absent when no CI) |-| `url` | string | Dev server URL from project config (absent when not configured) |-| `url_active` | boolean | Whether the URL's port is listening (absent when not configured) |-| `summary` | string | LLM-generated branch summary (absent when not configured or no summary) |+| `ci` | object | CI status (see below); absent when no CI |+| `url` | string | Dev server URL from project config; absent when not configured |+| `url_active` | boolean | Whether the URL's port is listening; absent when not configured |+| `summary` | string | LLM-generated branch summary; absent when not configured or no summary || `statusline` | string | Pre-formatted status with ANSI colors || `symbols` | string | Raw status symbols without colors (e.g., `"!?↓"`) |diff --git a/docs/content/merge.md b/docs/content/merge.mdindex a21f8f590..cb5b956e4 100644--- a/docs/content/merge.md+++ b/docs/content/merge.md@@ -11,7 +11,7 @@ group = "Commands"Merge current branch into target. Squash & rebase, fast-forward target, remove the worktree.-Unlike `git merge`, this merges current into target (not target into current). Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.+Unlike `git merge`, this merges current into target — not target into current. Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.<figure class="demo"><picture>@@ -46,7 +46,7 @@ Preserve commit history (no squash):wt merge --no-squash```-Create a merge commit (semi-linear history):+Create a merge commit — semi-linear history:```bashwt merge --no-ff@@ -62,11 +62,11 @@ wt merge --no-commit`wt merge` runs these steps:-1. **Commit** — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With `--no-squash`, this is the only commit step; with squash (default), this is skipped and changes are staged during squash instead.+1. **Commit** — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With `--no-squash`, this is the only commit step; with squash — the default — this is skipped and changes are staged during squash instead.2. **Squash** — Combines all commits since target into one (like GitHub's "Squash and merge"). Use `--stage` to control what gets staged: `all` (default), `tracked`, or `none`. A backup ref is saved to `refs/wt-backup/<branch>`. With `--no-squash`, individual commits are preserved.3. **Rebase** — Rebases onto target if behind. Skipped if already up-to-date. Conflicts abort immediately.4. **Pre-merge hooks** — Hooks run after rebase, before merge. Failures abort. See [`wt hook`](@/hook.md).-5. **Merge** — Fast-forward merge to the target branch. With `--no-ff`, a merge commit is created instead (semi-linear history: rebased commits plus a merge commit). Non-fast-forward merges are rejected.+5. **Merge** — Fast-forward merge to the target branch. With `--no-ff`, a merge commit is created instead — semi-linear history with rebased commits plus a merge commit. Non-fast-forward merges are rejected.6. **Pre-remove hooks** — Hooks run before removing worktree. Failures abort.7. **Cleanup** — Removes the worktree and branch. Use `--no-remove` to keep the worktree. When already on the target branch or in the primary worktree, the worktree is preserved.8. **Post-remove + post-merge hooks** — Run in background after cleanup.diff --git a/docs/content/remove.md b/docs/content/remove.mdindex a2807579e..94aaeed0a 100644--- a/docs/content/remove.md+++ b/docs/content/remove.md@@ -73,7 +73,7 @@ Without `--force`, removal fails if the worktree contains untracked files. Witho## Background removal-Removal runs in the background by default (returns immediately). Logs are written to `.git/wt/logs/{branch}-remove.log`. Use `--foreground` to run in the foreground.+Removal runs in the background by default — the command returns immediately. Logs are written to `.git/wt/logs/{branch}-remove.log`. Use `--foreground` to run in the foreground.## Hooksdiff --git a/docs/content/step.md b/docs/content/step.mdindex 697b43562..c7eeb037f 100644--- a/docs/content/step.md+++ b/docs/content/step.md@@ -871,7 +871,7 @@ wt step deploy --var env=staging # pass extra template variableswt step deploy --yes # skip approval prompt```-When defined in both user and project config, both run (user first, then project). Project-config aliases require [command approval](@/hook.md#security) on first run (same as project hooks). User-config aliases are trusted.+When defined in both user and project config, both run — user first, then project. Project-config aliases require [command approval](@/hook.md#security) on first run, same as project hooks. User-config aliases are trusted.Alias names that match a built-in step command (`commit`, `squash`, etc.) are shadowed by the built-in and will never run.diff --git a/docs/content/switch.md b/docs/content/switch.mdindex 6f148b87f..18cb6b5c5 100644--- a/docs/content/switch.md+++ b/docs/content/switch.md@@ -32,7 +32,7 @@ wt switch pr:123 # Switch to PR #123's branch## Creating a branch-The `--create` flag creates a new branch from the `--base` branch (defaults to default branch). Without `--create`, the branch must already exist. Switching to a remote branch (e.g., `wt switch feature` when only `origin/feature` exists) creates a local tracking branch.+The `--create` flag creates a new branch from `--base` — the default branch unless specified. Without `--create`, the branch must already exist. Switching to a remote branch (e.g., `wt switch feature` when only `origin/feature` exists) creates a local tracking branch.## Creating worktrees@@ -95,13 +95,13 @@ When called without arguments, `wt switch` opens an interactive picker to browse| `Alt-p` | Toggle preview panel || `Ctrl-u`/`Ctrl-d` | Scroll preview up/down |-**Preview tabs** (toggle with number keys):+**Preview tabs** — toggle with number keys:1. **HEAD±** — Diff of uncommitted changes2. **log** — Recent commits; commits already on the default branch have dimmed hashes3. **main…±** — Diff of changes since the merge-base with the default branch-4. **remote⇅** — Diff vs upstream tracking branch (ahead/behind)-5. **summary** — LLM-generated branch summary (requires `[list] summary = true` and `[commit.generation]`)+4. **remote⇅** — Ahead/behind diff vs upstream tracking branch+5. **summary** — LLM-generated branch summary; requires `[list] summary = true` and `[commit.generation]`**Pager configuration:** The preview panel pipes diff output through git's pager. Override in user config:diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.mdindex 6847149e9..91d98476e 100644--- a/skills/worktrunk/reference/config.md+++ b/skills/worktrunk/reference/config.md@@ -418,7 +418,7 @@ WORKTRUNK_COMMIT__GENERATION__COMMAND="echo 'test: automated commit'" wt merge| Variable | Purpose ||----------|---------|-| `WORKTRUNK_BIN` | Override binary path for shell wrappers (useful for testing dev builds) |+| `WORKTRUNK_BIN` | Override binary path for shell wrappers; useful for testing dev builds || `WORKTRUNK_CONFIG_PATH` | Override user config file location || `WORKTRUNK_SYSTEM_CONFIG_PATH` | Override system config file location || `XDG_CONFIG_DIRS` | Colon-separated system config directories (default: `/etc/xdg`) |diff --git a/skills/worktrunk/reference/hook.md b/skills/worktrunk/reference/hook.mdindex 8f7084c32..e06e38dd1 100644--- a/skills/worktrunk/reference/hook.md+++ b/skills/worktrunk/reference/hook.md@@ -6,7 +6,7 @@ Hooks are shell commands that run at key points in the worktree lifecycle — au# Hook Types-| Event | `pre-` (blocking) | `post-` (background) |+| Event | `pre-` — blocking | `post-` — background ||-------|-------------------|---------------------|| **switch** | `pre-switch` | `post-switch` || **start** | `pre-start` | `post-start` |@@ -118,7 +118,7 @@ kill-server = "lsof -ti :{{ branch | hash_port }} -sTCP:LISTEN | xargs kill 2>/dremove-db = "docker stop {{ repo }}-{{ branch | sanitize }}-postgres 2>/dev/null || true"```-During `wt merge`, hooks run in this order: pre-commit → post-commit (background) → pre-merge → pre-remove → post-remove + post-merge (background). See [`wt merge`](https://worktrunk.dev/merge/#pipeline) for the complete pipeline.+During `wt merge`, hooks run in this order: pre-commit → post-commit → pre-merge → pre-remove → post-remove + post-merge. As usual, post-* hooks run in the background. See [`wt merge`](https://worktrunk.dev/merge/#pipeline) for the complete pipeline.# Security@@ -135,7 +135,7 @@ Project commands require approval on first run:- Approvals are saved to user config (`~/.config/worktrunk/config.toml`)- If a command changes, new approval is required-- Use `--yes` to bypass prompts (useful for CI/automation)+- Use `--yes` to bypass prompts — useful for CI and automation- Use `--no-verify` to skip hooksManage approvals with `wt hook approvals add` and `wt hook approvals clear`.@@ -201,7 +201,7 @@ Bare variables (`branch`, `worktree_path`, `commit`) refer to the branch the ope| merge | feature being merged | = bare vars | merge target || remove | branch being removed | = bare vars | where you end up |-Pre and post hooks share the same perspective — `{{ branch | hash_port }}` produces the same port in `post-start` and `post-remove`. `cwd` is the worktree root where the hook command runs. It differs from `worktree_path` in three cases: pre-switch (hook runs in the source, `worktree_path` is the destination), post-remove (active worktree is gone, hook runs in primary), and post-merge with removal (same — active is gone, hook runs in target).+Pre and post hooks share the same perspective — `{{ branch | hash_port }}` produces the same port in `post-start` and `post-remove`. `cwd` is the worktree root where the hook command runs. It differs from `worktree_path` in three cases: pre-switch, where the hook runs in the source but `worktree_path` is the destination; post-remove, where the active worktree is gone so the hook runs in primary; and post-merge with removal, same — the active worktree is gone, so the hook runs in target.Some variables are conditional: `upstream` requires remote tracking; `base`/`target` are only in two-worktree hooks. Undefined variables error — use conditionals:@@ -230,7 +230,7 @@ Templates support Jinja2 filters for transforming values:| `sanitize_db` | `{{ branch \| sanitize_db }}` | Database-safe identifier with hash suffix (`[a-z0-9_]`, max 63 chars) || `hash_port` | `{{ branch \| hash_port }}` | Hash to port 10000-19999 |-The `sanitize` filter makes branch names safe for filesystem paths. The `sanitize_db` filter produces database-safe identifiers (lowercase alphanumeric and underscores, no leading digits, with a 3-character hash suffix to avoid collisions and reserved words). The `hash_port` filter is useful for running dev servers on unique ports per worktree:+The `sanitize` filter makes branch names safe for filesystem paths. The `sanitize_db` filter produces database-safe identifiers — lowercase alphanumeric and underscores, no leading digits, with a 3-character hash suffix to avoid collisions and reserved words. The `hash_port` filter is useful for running dev servers on unique ports per worktree:```toml[post-start]@@ -481,7 +481,7 @@ fi## Python virtual environments-Use `uv sync` to recreate virtual environments (or `python -m venv .venv && .venv/bin/pip install -r requirements.txt` for pip-based projects):+Use `uv sync` to recreate virtual environments, or `python -m venv .venv && .venv/bin/pip install -r requirements.txt` for pip-based projects:```toml[pre-start]diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.mdindex 18a55c866..b6cb6121a 100644--- a/skills/worktrunk/reference/list.md+++ b/skills/worktrunk/reference/list.md@@ -61,17 +61,17 @@ $ 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`) |-| Summary | LLM-generated branch summary (`--full` + `summary = true`, requires [`commit.generation`](https://worktrunk.dev/config/#commit)) [experimental] |+| main…± | Line diffs since the merge-base 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`) |+| CI | Pipeline status; `--full` only || Path | Worktree directory |-| URL | Dev server URL from project config (dimmed if port not listening) |+| URL | Dev server URL from project config; dimmed if port is not listening || Commit | Short hash (8 chars) || Age | Time since last commit || Message | Last commit message (truncated) |-Note: `main↕` and `main…±` refer to the default branch (header label stays `main` for compactness). `main…±` uses a merge-base (three-dot) diff.+Note: `main↕` and `main…±` refer to the default branch — the header label stays `main` for compactness. `main…±` uses a merge-base (three-dot) diff.### CI status@@ -87,7 +87,7 @@ The CI column shows GitHub/GitLab pipeline status:| <span style='color:#a60'>⚠</span> yellow | Fetch error (rate limit, network) || (blank) | No upstream or no PR/MR |-CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when there are unpushed local changes (stale status). 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.+CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when unpushed local changes make the status 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@@ -113,7 +113,7 @@ The Status column has multiple subcolumns. Within each, only the first matching| | `⊞` | Locked worktree || Default branch | `^` | Is the default branch || | `∅` | Orphan branch (no common ancestor with the default branch) |-| | `✗` | Would conflict if merged to the default branch (with `--full`, includes uncommitted changes) |+| | `✗` | Would conflict if merged to the default branch; with `--full`, includes uncommitted changes || | `_` | Same commit as the default branch, clean || | `–` | Same commit as the default branch, uncommitted changes || | `⊂` | Content [integrated](https://worktrunk.dev/remove/#branch-cleanup) into the default branch or target |@@ -179,17 +179,17 @@ wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'| `working_tree` | object | Working tree state (see below) || `main_state` | string | Relation to the default branch (see below) || `integration_reason` | string | Why branch is integrated (see below) |-| `operation_state` | string | `"conflicts"`, `"rebase"`, or `"merge"` (absent when clean) |-| `main` | object | Relationship to the default branch (see below, absent when is_main) |-| `remote` | object | Tracking branch info (see below, absent when no tracking) |+| `operation_state` | string | `"conflicts"`, `"rebase"`, or `"merge"`; absent when clean |+| `main` | object | Relationship to the default branch (see below); absent when is_main |+| `remote` | object | Tracking branch info (see below); absent when no tracking || `worktree` | object | Worktree metadata (see below) || `is_main` | boolean | Is the main worktree || `is_current` | boolean | Is the current worktree || `is_previous` | boolean | Previous worktree from wt switch |-| `ci` | object | CI status (see below, absent when no CI) |-| `url` | string | Dev server URL from project config (absent when not configured) |-| `url_active` | boolean | Whether the URL's port is listening (absent when not configured) |-| `summary` | string | LLM-generated branch summary (absent when not configured or no summary) |+| `ci` | object | CI status (see below); absent when no CI |+| `url` | string | Dev server URL from project config; absent when not configured |+| `url_active` | boolean | Whether the URL's port is listening; absent when not configured |+| `summary` | string | LLM-generated branch summary; absent when not configured or no summary || `statusline` | string | Pre-formatted status with ANSI colors || `symbols` | string | Raw status symbols without colors (e.g., `"!?↓"`) |diff --git a/skills/worktrunk/reference/merge.md b/skills/worktrunk/reference/merge.mdindex 6e0297e1f..6caa2d589 100644--- a/skills/worktrunk/reference/merge.md+++ b/skills/worktrunk/reference/merge.md@@ -2,7 +2,7 @@Merge current branch into target. Squash & rebase, fast-forward target, remove the worktree.-Unlike `git merge`, this merges current into target (not target into current). Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.+Unlike `git merge`, this merges current into target — not target into current. Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.## Examples@@ -30,7 +30,7 @@ Preserve commit history (no squash):wt merge --no-squash```-Create a merge commit (semi-linear history):+Create a merge commit — semi-linear history:```bashwt merge --no-ff@@ -46,11 +46,11 @@ wt merge --no-commit`wt merge` runs these steps:-1. **Commit** — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With `--no-squash`, this is the only commit step; with squash (default), this is skipped and changes are staged during squash instead.+1. **Commit** — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With `--no-squash`, this is the only commit step; with squash — the default — this is skipped and changes are staged during squash instead.2. **Squash** — Combines all commits since target into one (like GitHub's "Squash and merge"). Use `--stage` to control what gets staged: `all` (default), `tracked`, or `none`. A backup ref is saved to `refs/wt-backup/<branch>`. With `--no-squash`, individual commits are preserved.3. **Rebase** — Rebases onto target if behind. Skipped if already up-to-date. Conflicts abort immediately.4. **Pre-merge hooks** — Hooks run after rebase, before merge. Failures abort. See [`wt hook`](https://worktrunk.dev/hook/).-5. **Merge** — Fast-forward merge to the target branch. With `--no-ff`, a merge commit is created instead (semi-linear history: rebased commits plus a merge commit). Non-fast-forward merges are rejected.+5. **Merge** — Fast-forward merge to the target branch. With `--no-ff`, a merge commit is created instead — semi-linear history with rebased commits plus a merge commit. Non-fast-forward merges are rejected.6. **Pre-remove hooks** — Hooks run before removing worktree. Failures abort.7. **Cleanup** — Removes the worktree and branch. Use `--no-remove` to keep the worktree. When already on the target branch or in the primary worktree, the worktree is preserved.8. **Post-remove + post-merge hooks** — Run in background after cleanup.diff --git a/skills/worktrunk/reference/remove.md b/skills/worktrunk/reference/remove.mdindex 688d89156..3ce99b956 100644--- a/skills/worktrunk/reference/remove.md+++ b/skills/worktrunk/reference/remove.md@@ -64,7 +64,7 @@ Without `--force`, removal fails if the worktree contains untracked files. Witho## Background removal-Removal runs in the background by default (returns immediately). Logs are written to `.git/wt/logs/{branch}-remove.log`. Use `--foreground` to run in the foreground.+Removal runs in the background by default — the command returns immediately. Logs are written to `.git/wt/logs/{branch}-remove.log`. Use `--foreground` to run in the foreground.## Hooksdiff --git a/skills/worktrunk/reference/step.md b/skills/worktrunk/reference/step.mdindex 13584580c..85e4873a9 100644--- a/skills/worktrunk/reference/step.md+++ b/skills/worktrunk/reference/step.md@@ -837,6 +837,6 @@ wt step deploy --var env=staging # pass extra template variableswt step deploy --yes # skip approval prompt```-When defined in both user and project config, both run (user first, then project). Project-config aliases require [command approval](https://worktrunk.dev/hook/#security) on first run (same as project hooks). User-config aliases are trusted.+When defined in both user and project config, both run — user first, then project. Project-config aliases require [command approval](https://worktrunk.dev/hook/#security) on first run, same as project hooks. User-config aliases are trusted.Alias names that match a built-in step command (`commit`, `squash`, etc.) are shadowed by the built-in and will never run.diff --git a/skills/worktrunk/reference/switch.md b/skills/worktrunk/reference/switch.mdindex 81e559065..55d95a32f 100644--- a/skills/worktrunk/reference/switch.md+++ b/skills/worktrunk/reference/switch.md@@ -16,7 +16,7 @@ wt switch pr:123 # Switch to PR #123's branch## Creating a branch-The `--create` flag creates a new branch from the `--base` branch (defaults to default branch). Without `--create`, the branch must already exist. Switching to a remote branch (e.g., `wt switch feature` when only `origin/feature` exists) creates a local tracking branch.+The `--create` flag creates a new branch from `--base` — the default branch unless specified. Without `--create`, the branch must already exist. Switching to a remote branch (e.g., `wt switch feature` when only `origin/feature` exists) creates a local tracking branch.## Creating worktrees@@ -72,13 +72,13 @@ When called without arguments, `wt switch` opens an interactive picker to browse| `Alt-p` | Toggle preview panel || `Ctrl-u`/`Ctrl-d` | Scroll preview up/down |-**Preview tabs** (toggle with number keys):+**Preview tabs** — toggle with number keys:1. **HEAD±** — Diff of uncommitted changes2. **log** — Recent commits; commits already on the default branch have dimmed hashes3. **main…±** — Diff of changes since the merge-base with the default branch-4. **remote⇅** — Diff vs upstream tracking branch (ahead/behind)-5. **summary** — LLM-generated branch summary (requires `[list] summary = true` and `[commit.generation]`)+4. **remote⇅** — Ahead/behind diff vs upstream tracking branch+5. **summary** — LLM-generated branch summary; requires `[list] summary = true` and `[commit.generation]`**Pager configuration:** The preview panel pipes diff output through git's pager. Override in user config:diff --git a/src/cli/mod.rs b/src/cli/mod.rsindex dc528ef6e..5a8c80786 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -264,7 +264,7 @@ wt switch pr:123 # Switch to PR #123's branch## Creating a branch-The `--create` flag creates a new branch from the `--base` branch (defaults to default branch). Without `--create`, the branch must already exist. Switching to a remote branch (e.g., `wt switch feature` when only `origin/feature` exists) creates a local tracking branch.+The `--create` flag creates a new branch from `--base` — the default branch unless specified. Without `--create`, the branch must already exist. Switching to a remote branch (e.g., `wt switch feature` when only `origin/feature` exists) creates a local tracking branch.## Creating worktrees@@ -321,13 +321,13 @@ When called without arguments, `wt switch` opens an interactive picker to browse| `Alt-p` | Toggle preview panel || `Ctrl-u`/`Ctrl-d` | Scroll preview up/down |-**Preview tabs** (toggle with number keys):+**Preview tabs** — toggle with number keys:1. **HEAD±** — Diff of uncommitted changes2. **log** — Recent commits; commits already on the default branch have dimmed hashes3. **main…±** — Diff of changes since the merge-base with the default branch-4. **remote⇅** — Diff vs upstream tracking branch (ahead/behind)-5. **summary** — LLM-generated branch summary (requires `[list] summary = true` and `[commit.generation]`)+4. **remote⇅** — Ahead/behind diff vs upstream tracking branch+5. **summary** — LLM-generated branch summary; requires `[list] summary = true` and `[commit.generation]`**Pager configuration:** The preview panel pipes diff output through git's pager. Override in user config:@@ -502,17 +502,17 @@ $ 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`) |-| Summary | LLM-generated branch summary (`--full` + `summary = true`, requires [`commit.generation`](@/config.md#commit)) [experimental] |+| main…± | Line diffs since the merge-base 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`) |+| CI | Pipeline status; `--full` only || Path | Worktree directory |-| URL | Dev server URL from project config (dimmed if port not listening) |+| URL | Dev server URL from project config; dimmed if port is not listening || Commit | Short hash (8 chars) || Age | Time since last commit || Message | Last commit message (truncated) |-Note: `main↕` and `main…±` refer to the default branch (header label stays `main` for compactness). `main…±` uses a merge-base (three-dot) diff.+Note: `main↕` and `main…±` refer to the default branch — the header label stays `main` for compactness. `main…±` uses a merge-base (three-dot) diff.### CI status@@ -528,7 +528,7 @@ The CI column shows GitHub/GitLab pipeline status:| `⚠` yellow | Fetch error (rate limit, network) || (blank) | No upstream or no PR/MR |-CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when there are unpushed local changes (stale status). 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.+CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when unpushed local changes make the status 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]@@ -552,7 +552,7 @@ The Status column has multiple subcolumns. Within each, only the first matching| | `⊞` | Locked worktree || Default branch | `^` | Is the default branch || | `∅` | Orphan branch (no common ancestor with the default branch) |-| | `✗` | Would conflict if merged to the default branch (with `--full`, includes uncommitted changes) |+| | `✗` | Would conflict if merged to the default branch; with `--full`, includes uncommitted changes || | `_` | Same commit as the default branch, clean || | `–` | Same commit as the default branch, uncommitted changes || | `⊂` | Content [integrated](@/remove.md#branch-cleanup) into the default branch or target |@@ -618,17 +618,17 @@ wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'| `working_tree` | object | Working tree state (see below) || `main_state` | string | Relation to the default branch (see below) || `integration_reason` | string | Why branch is integrated (see below) |-| `operation_state` | string | `"conflicts"`, `"rebase"`, or `"merge"` (absent when clean) |-| `main` | object | Relationship to the default branch (see below, absent when is_main) |-| `remote` | object | Tracking branch info (see below, absent when no tracking) |+| `operation_state` | string | `"conflicts"`, `"rebase"`, or `"merge"`; absent when clean |+| `main` | object | Relationship to the default branch (see below); absent when is_main |+| `remote` | object | Tracking branch info (see below); absent when no tracking || `worktree` | object | Worktree metadata (see below) || `is_main` | boolean | Is the main worktree || `is_current` | boolean | Is the current worktree || `is_previous` | boolean | Previous worktree from wt switch |-| `ci` | object | CI status (see below, absent when no CI) |-| `url` | string | Dev server URL from project config (absent when not configured) |-| `url_active` | boolean | Whether the URL's port is listening (absent when not configured) |-| `summary` | string | LLM-generated branch summary (absent when not configured or no summary) |+| `ci` | object | CI status (see below); absent when no CI |+| `url` | string | Dev server URL from project config; absent when not configured |+| `url_active` | boolean | Whether the URL's port is listening; absent when not configured |+| `summary` | string | LLM-generated branch summary; absent when not configured or no summary || `statusline` | string | Pre-formatted status with ANSI colors || `symbols` | string | Raw status symbols without colors (e.g., `"!?↓"`) |@@ -810,7 +810,7 @@ Without `--force`, removal fails if the worktree contains untracked files. Witho## Background removal-Removal runs in the background by default (returns immediately). Logs are written to `.git/wt/logs/{branch}-remove.log`. Use `--foreground` to run in the foreground.+Removal runs in the background by default — the command returns immediately. Logs are written to `.git/wt/logs/{branch}-remove.log`. Use `--foreground` to run in the foreground.## Hooks@@ -862,7 +862,7 @@ Detached worktrees have no branch name. Pass the worktree path instead: `wt remo////// Squash & rebase, fast-forward target, remove the worktree.#[command(- after_long_help = r#"Unlike `git merge`, this merges current into target (not target into current). Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.+ after_long_help = r#"Unlike `git merge`, this merges current into target — not target into current. Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.<!-- demo: wt-merge.gif 1600x900 -->## Examples@@ -891,7 +891,7 @@ Preserve commit history (no squash):wt merge --no-squash```-Create a merge commit (semi-linear history):+Create a merge commit — semi-linear history:```consolewt merge --no-ff@@ -907,11 +907,11 @@ wt merge --no-commit`wt merge` runs these steps:-1. **Commit** — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With `--no-squash`, this is the only commit step; with squash (default), this is skipped and changes are staged during squash instead.+1. **Commit** — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With `--no-squash`, this is the only commit step; with squash — the default — this is skipped and changes are staged during squash instead.2. **Squash** — Combines all commits since target into one (like GitHub's "Squash and merge"). Use `--stage` to control what gets staged: `all` (default), `tracked`, or `none`. A backup ref is saved to `refs/wt-backup/<branch>`. With `--no-squash`, individual commits are preserved.3. **Rebase** — Rebases onto target if behind. Skipped if already up-to-date. Conflicts abort immediately.4. **Pre-merge hooks** — Hooks run after rebase, before merge. Failures abort. See [`wt hook`](@/hook.md).-5. **Merge** — Fast-forward merge to the target branch. With `--no-ff`, a merge commit is created instead (semi-linear history: rebased commits plus a merge commit). Non-fast-forward merges are rejected.+5. **Merge** — Fast-forward merge to the target branch. With `--no-ff`, a merge commit is created instead — semi-linear history with rebased commits plus a merge commit. Non-fast-forward merges are rejected.6. **Pre-remove hooks** — Hooks run before removing worktree. Failures abort.7. **Cleanup** — Removes the worktree and branch. Use `--no-remove` to keep the worktree. When already on the target branch or in the primary worktree, the worktree is preserved.8. **Post-remove + post-merge hooks** — Run in background after cleanup.@@ -1089,7 +1089,7 @@ wt step deploy --var env=staging # pass extra template variableswt step deploy --yes # skip approval prompt```-When defined in both user and project config, both run (user first, then project). Project-config aliases require [command approval](@/hook.md#security) on first run (same as project hooks). User-config aliases are trusted.+When defined in both user and project config, both run — user first, then project. Project-config aliases require [command approval](@/hook.md#security) on first run, same as project hooks. User-config aliases are trusted.Alias names that match a built-in step command (`commit`, `squash`, etc.) are shadowed by the built-in and will never run."#)]@@ -1105,7 +1105,7 @@ Alias names that match a built-in step command (`commit`, `squash`, etc.) are sh# Hook Types-| Event | `pre-` (blocking) | `post-` (background) |+| Event | `pre-` — blocking | `post-` — background ||-------|-------------------|---------------------|| **switch** | `pre-switch` | `post-switch` || **start** | `pre-start` | `post-start` |@@ -1217,7 +1217,7 @@ kill-server = "lsof -ti :{{ branch | hash_port }} -sTCP:LISTEN | xargs kill 2>/dremove-db = "docker stop {{ repo }}-{{ branch | sanitize }}-postgres 2>/dev/null || true"```-During `wt merge`, hooks run in this order: pre-commit → post-commit (background) → pre-merge → pre-remove → post-remove + post-merge (background). See [`wt merge`](@/merge.md#pipeline) for the complete pipeline.+During `wt merge`, hooks run in this order: pre-commit → post-commit → pre-merge → pre-remove → post-remove + post-merge. As usual, post-* hooks run in the background. See [`wt merge`](@/merge.md#pipeline) for the complete pipeline.# Security@@ -1234,7 +1234,7 @@ Project commands require approval on first run:- Approvals are saved to user config (`~/.config/worktrunk/config.toml`)- If a command changes, new approval is required-- Use `--yes` to bypass prompts (useful for CI/automation)+- Use `--yes` to bypass prompts — useful for CI and automation- Use `--no-verify` to skip hooksManage approvals with `wt hook approvals add` and `wt hook approvals clear`.@@ -1300,7 +1300,7 @@ Bare variables (`branch`, `worktree_path`, `commit`) refer to the branch the ope| merge | feature being merged | = bare vars | merge target || remove | branch being removed | = bare vars | where you end up |-Pre and post hooks share the same perspective — `{{ branch | hash_port }}` produces the same port in `post-start` and `post-remove`. `cwd` is the worktree root where the hook command runs. It differs from `worktree_path` in three cases: pre-switch (hook runs in the source, `worktree_path` is the destination), post-remove (active worktree is gone, hook runs in primary), and post-merge with removal (same — active is gone, hook runs in target).+Pre and post hooks share the same perspective — `{{ branch | hash_port }}` produces the same port in `post-start` and `post-remove`. `cwd` is the worktree root where the hook command runs. It differs from `worktree_path` in three cases: pre-switch, where the hook runs in the source but `worktree_path` is the destination; post-remove, where the active worktree is gone so the hook runs in primary; and post-merge with removal, same — the active worktree is gone, so the hook runs in target.Some variables are conditional: `upstream` requires remote tracking; `base`/`target` are only in two-worktree hooks. Undefined variables error — use conditionals:@@ -1329,7 +1329,7 @@ Templates support Jinja2 filters for transforming values:| `sanitize_db` | `{{ branch \| sanitize_db }}` | Database-safe identifier with hash suffix (`[a-z0-9_]`, max 63 chars) || `hash_port` | `{{ branch \| hash_port }}` | Hash to port 10000-19999 |-The `sanitize` filter makes branch names safe for filesystem paths. The `sanitize_db` filter produces database-safe identifiers (lowercase alphanumeric and underscores, no leading digits, with a 3-character hash suffix to avoid collisions and reserved words). The `hash_port` filter is useful for running dev servers on unique ports per worktree:+The `sanitize` filter makes branch names safe for filesystem paths. The `sanitize_db` filter produces database-safe identifiers — lowercase alphanumeric and underscores, no leading digits, with a 3-character hash suffix to avoid collisions and reserved words. The `hash_port` filter is useful for running dev servers on unique ports per worktree:```toml[post-start]@@ -1578,7 +1578,7 @@ fi## Python virtual environments-Use `uv sync` to recreate virtual environments (or `python -m venv .venv && .venv/bin/pip install -r requirements.txt` for pip-based projects):+Use `uv sync` to recreate virtual environments, or `python -m venv .venv && .venv/bin/pip install -r requirements.txt` for pip-based projects:```toml[pre-start]@@ -2020,7 +2020,7 @@ WORKTRUNK_COMMIT__GENERATION__COMMAND="echo 'test: automated commit'" wt merge| Variable | Purpose ||----------|---------|-| `WORKTRUNK_BIN` | Override binary path for shell wrappers (useful for testing dev builds) |+| `WORKTRUNK_BIN` | Override binary path for shell wrappers; useful for testing dev builds || `WORKTRUNK_CONFIG_PATH` | Override user config file location || `WORKTRUNK_SYSTEM_CONFIG_PATH` | Override system config file location || `XDG_CONFIG_DIRS` | Colon-separated system config directories (default: `/etc/xdg`) |diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snapindex f249aa84c..1ff842376 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap@@ -418,7 +418,7 @@ Override the LLM command in CI to use a mock:Variable Purpose───────────────────────────────── ─────────────────────────────────────────────────────────────────────────────────- [2mWORKTRUNK_BIN[0m Override binary path for shell wrappers (useful for testing dev builds)+ [2mWORKTRUNK_BIN[0m Override binary path for shell wrappers; useful for testing dev builds[2mWORKTRUNK_CONFIG_PATH[0m Override user config file location[2mWORKTRUNK_SYSTEM_CONFIG_PATH[0m Override system config file location[2mXDG_CONFIG_DIRS[0m Colon-separated system config directories (default: [2m/etc/xdg[0m)diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex e29e17e1e..d0290b64d 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -100,23 +100,23 @@ Output as JSON for scripting:[1m[32mColumns[0m- Column Shows- ─────── ─────────────────────────────────────────────────────────────────────────────────────────────────- Branch Branch name- 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 ([2m--full[0m)- Summary LLM-generated branch summary ([2m--full[0m + [2msummary = true[0m, requires [2mcommit.generation[0m) [experimental]- Remote⇅ Commits ahead/behind tracking branch- CI Pipeline status ([2m--full[0m)- Path Worktree directory- URL Dev server URL from project config (dimmed if port not listening)- Commit Short hash (8 chars)- Age Time since last commit- Message Last commit message (truncated)--Note: [2mmain↕[0m and [2mmain…±[0m refer to the default branch (header label stays [2mmain[0m for compactness). [2mmain…±[0m uses a merge-base (three-dot) diff.+ Column Shows+ ─────── ───────────────────────────────────────────────────────────────────────────────────────────────────+ Branch Branch name+ 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; [2m--full[0m only+ Summary LLM-generated branch summary; requires [2m--full[0m, [2msummary = true[0m, and [2mcommit.generation[0m [experimental]+ Remote⇅ Commits ahead/behind tracking branch+ CI Pipeline status; [2m--full[0m only+ Path Worktree directory+ URL Dev server URL from project config; dimmed if port is not listening+ Commit Short hash (8 chars)+ Age Time since last commit+ Message 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.[32mCI status[0m@@ -132,7 +132,7 @@ The CI column shows GitHub/GitLab pipeline status:[33m⚠[0m yellow Fetch error (rate limit, network)(blank) No upstream or no PR/MR-CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when there are unpushed local changes (stale status). 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.+CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when unpushed local changes make the status 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 [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@@ -142,31 +142,31 @@ Reuses the [2mcommit.generation[0m command — the same LLM that generates comThe Status column has multiple subcolumns. Within each, only the first matching symbol is shown (listed in priority order):- Subcolumn Symbol Meaning- ──────────────── ────── ──────────────────────────────────────────────────────────────────────────────────────────- Working tree (1) [36m+[0m Staged files- Working tree (2) [36m![0m Modified files (unstaged)- Working tree (3) [36m?[0m Untracked files- Worktree [31m✘[0m Merge conflicts- [33m⤴[0m Rebase in progress- [33m⤵[0m Merge in progress- [2m/[0m Branch without worktree- [31m⚑[0m Branch-worktree mismatch (branch name doesn't match worktree path)- [33m⊟[0m Prunable (directory missing)- [33m⊞[0m Locked worktree- Default branch [2m^[0m Is the default branch- [2m∅[0m Orphan branch (no common ancestor with the default branch)- [33m✗[0m Would conflict if merged to the default branch (with [2m--full[0m, includes uncommitted changes)- [2m_[0m Same commit as the default branch, clean- [2m–[0m Same commit as the default branch, uncommitted changes- [2m⊂[0m Content integrated into the default branch or target- [2m↕[0m Diverged from the default branch- [2m↑[0m Ahead of the default branch- [2m↓[0m Behind the default branch- Remote [2m|[0m In sync with remote- [2m⇅[0m Diverged from remote- [2m⇡[0m Ahead of remote- [2m⇣[0m Behind remote+ Subcolumn Symbol Meaning+ ──────────────── ────── ─────────────────────────────────────────────────────────────────────────────────────────+ Working tree (1) [36m+[0m Staged files+ Working tree (2) [36m![0m Modified files (unstaged)+ Working tree (3) [36m?[0m Untracked files+ Worktree [31m✘[0m Merge conflicts+ [33m⤴[0m Rebase in progress+ [33m⤵[0m Merge in progress+ [2m/[0m Branch without worktree+ [31m⚑[0m Branch-worktree mismatch (branch name doesn't match worktree path)+ [33m⊟[0m Prunable (directory missing)+ [33m⊞[0m Locked worktree+ Default branch [2m^[0m Is the default branch+ [2m∅[0m Orphan branch (no common ancestor with the default branch)+ [33m✗[0m Would conflict if merged to the default branch; with [2m--full[0m, includes uncommitted changes+ [2m_[0m Same commit as the default branch, clean+ [2m–[0m Same commit as the default branch, uncommitted changes+ [2m⊂[0m Content integrated into the default branch or target+ [2m↕[0m Diverged from the default branch+ [2m↑[0m Ahead of the default branch+ [2m↓[0m Behind the default branch+ Remote [2m|[0m In sync with remote+ [2m⇅[0m Diverged from remote+ [2m⇡[0m Ahead of remote+ [2m⇣[0m Behind remoteRows are dimmed when safe to delete ([2m_[0m same commit with clean working tree or [2m⊂[0m content integrated).@@ -211,28 +211,28 @@ Query structured data with [2m--format=json[0m:[1mFields:[0m- Field Type Description- ────────────────── ─────────── ───────────────────────────────────────────────────────────────────────- [2mbranch[0m string/null Branch name (null for detached HEAD)- [2mpath[0m string Worktree path (absent for branches without worktrees)- [2mkind[0m string [2m"worktree"[0m or [2m"branch"[0m- [2mcommit[0m object Commit info (see below)- [2mworking_tree[0m object Working tree state (see below)- [2mmain_state[0m string Relation to the default branch (see below)- [2mintegration_reason[0m string Why branch is integrated (see below)- [2moperation_state[0m string [2m"conflicts"[0m, [2m"rebase"[0m, or [2m"merge"[0m (absent when clean)- [2mmain[0m object Relationship to the default branch (see below, absent when is_main)- [2mremote[0m object Tracking branch info (see below, absent when no tracking)- [2mworktree[0m object Worktree metadata (see below)- [2mis_main[0m boolean Is the main worktree- [2mis_current[0m boolean Is the current worktree- [2mis_previous[0m boolean Previous worktree from wt switch- [2mci[0m object CI status (see below, absent when no CI)- [2murl[0m string Dev server URL from project config (absent when not configured)- [2murl_active[0m boolean Whether the URL's port is listening (absent when not configured)- [2msummary[0m string LLM-generated branch summary (absent when not configured or no summary)- [2mstatusline[0m string Pre-formatted status with ANSI colors- [2msymbols[0m string Raw status symbols without colors (e.g., [2m"!?↓"[0m)+ Field Type Description+ ────────────────── ─────────── ──────────────────────────────────────────────────────────────────────+ [2mbranch[0m string/null Branch name (null for detached HEAD)+ [2mpath[0m string Worktree path (absent for branches without worktrees)+ [2mkind[0m string [2m"worktree"[0m or [2m"branch"[0m+ [2mcommit[0m object Commit info (see below)+ [2mworking_tree[0m object Working tree state (see below)+ [2mmain_state[0m string Relation to the default branch (see below)+ [2mintegration_reason[0m string Why branch is integrated (see below)+ [2moperation_state[0m string [2m"conflicts"[0m, [2m"rebase"[0m, or [2m"merge"[0m; absent when clean+ [2mmain[0m object Relationship to the default branch (see below); absent when is_main+ [2mremote[0m object Tracking branch info (see below); absent when no tracking+ [2mworktree[0m object Worktree metadata (see below)+ [2mis_main[0m boolean Is the main worktree+ [2mis_current[0m boolean Is the current worktree+ [2mis_previous[0m boolean Previous worktree from wt switch+ [2mci[0m object CI status (see below); absent when no CI+ [2murl[0m string Dev server URL from project config; absent when not configured+ [2murl_active[0m boolean Whether the URL's port is listening; absent when not configured+ [2msummary[0m string LLM-generated branch summary; absent when not configured or no summary+ [2mstatusline[0m string Pre-formatted status with ANSI colors+ [2msymbols[0m string Raw status symbols without colors (e.g., [2m"!?↓"[0m)[32mCommit object[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 4b3a44219..d7fb82e84 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@@ -114,19 +114,19 @@ 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)- Summary LLM-generated branch summary ([2m--full[0m + [2msummary = true[0m, requires- [2mcommit.generation[0m) [experimental]+ main…± Line diffs since the merge-base with the default branch; [2m--full[0m only+ Summary LLM-generated branch summary; requires [2m--full[0m, [2msummary = true[0m, and+ [2mcommit.generation[0m [experimental]Remote⇅ Commits ahead/behind tracking branch- CI Pipeline status ([2m--full[0m)+ CI Pipeline status; [2m--full[0m onlyPath Worktree directory- URL Dev server URL from project config (dimmed if port not listening)+ URL Dev server URL from project config; dimmed if port is not listeningCommit Short hash (8 chars)Age Time since last commitMessage Last commit message (truncated)-Note: [2mmain↕[0m and [2mmain…±[0m refer to the default branch (header label stays [2mmain[0m for-compactness). [2mmain…±[0m uses a merge-base (three-dot) diff.+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.[32mCI status[0m@@ -143,11 +143,11 @@ The CI column shows GitHub/GitLab pipeline status:(blank) No upstream or no PR/MRCI indicators are clickable links to the PR or pipeline page. Any CI dot appears- dimmed when there are unpushed local changes (stale status). 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-[2mstate[0m to view or clear.+ dimmed when unpushed local changes make the status 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 [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@@ -176,8 +176,8 @@ symbol is shown (listed in priority order):Default branch [2m^[0m Is the default branch[2m∅[0m Orphan branch (no common ancestor with the defaultbranch)- [33m✗[0m Would conflict if merged to the default branch (with- [2m--full[0m, includes uncommitted changes)+ [33m✗[0m Would conflict if merged to the default branch; with+ [2m--full[0m, includes uncommitted changes[2m_[0m Same commit as the default branch, clean[2m–[0m Same commit as the default branch, uncommitted changes[2m⊂[0m Content integrated into the default branch or target@@ -246,23 +246,23 @@ Query structured data with [2m--format=json[0m:[2mworking_tree[0m object Working tree state (see below)[2mmain_state[0m string Relation to the default branch (see below)[2mintegration_reason[0m string Why branch is integrated (see below)- [2moperation_state[0m string [2m"conflicts"[0m, [2m"rebase"[0m, or [2m"merge"[0m (absent when- clean)- [2mmain[0m object Relationship to the default branch (see below,- absent when is_main)- [2mremote[0m object Tracking branch info (see below, absent when no- tracking)+ [2moperation_state[0m string [2m"conflicts"[0m, [2m"rebase"[0m, or [2m"merge"[0m; absent when+ clean+ [2mmain[0m object Relationship to the default branch (see below);+ absent when is_main+ [2mremote[0m object Tracking branch info (see below); absent when+ no tracking[2mworktree[0m object Worktree metadata (see below)[2mis_main[0m boolean Is the main worktree[2mis_current[0m boolean Is the current worktree[2mis_previous[0m boolean Previous worktree from wt switch- [2mci[0m object CI status (see below, absent when no CI)- [2murl[0m string Dev server URL from project config (absent when- not configured)- [2murl_active[0m boolean Whether the URL's port is listening (absent- when not configured)- [2msummary[0m string LLM-generated branch summary (absent when not- configured or no summary)+ [2mci[0m object CI status (see below); absent when no CI+ [2murl[0m string Dev server URL from project config; absent when+ not configured+ [2murl_active[0m boolean Whether the URL's port is listening; absent+ when not configured+ [2msummary[0m string LLM-generated branch summary; absent when not+ configured or no summary[2mstatusline[0m string Pre-formatted status with ANSI colors[2msymbols[0m string Raw status symbols without colors (e.g., [2m"!?↓"[0m)diff --git a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap b/tests/snapshots/integration__integration_tests__help__help_md_merge.snapindex 57b3d341f..32388cece 100644--- a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap@@ -85,7 +85,7 @@ Global Options:-v, --verbose...Verbose output (-v: hooks, templates; -vv: debug report)-Unlike `git merge`, this merges current into target (not target into current). Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.+Unlike `git merge`, this merges current into target — not target into current. Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.<!-- demo: wt-merge.gif 1600x900 -->## Examples@@ -114,7 +114,7 @@ Preserve commit history (no squash):wt merge --no-squash```-Create a merge commit (semi-linear history):+Create a merge commit — semi-linear history:```bashwt merge --no-ff@@ -130,11 +130,11 @@ wt merge --no-commit`wt merge` runs these steps:-1. **Commit** — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With `--no-squash`, this is the only commit step; with squash (default), this is skipped and changes are staged during squash instead.+1. **Commit** — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With `--no-squash`, this is the only commit step; with squash — the default — this is skipped and changes are staged during squash instead.2. **Squash** — Combines all commits since target into one (like GitHub's "Squash and merge"). Use `--stage` to control what gets staged: `all` (default), `tracked`, or `none`. A backup ref is saved to `refs/wt-backup/<branch>`. With `--no-squash`, individual commits are preserved.3. **Rebase** — Rebases onto target if behind. Skipped if already up-to-date. Conflicts abort immediately.4. **Pre-merge hooks** — Hooks run after rebase, before merge. Failures abort. See [`wt hook`](@/hook.md).-5. **Merge** — Fast-forward merge to the target branch. With `--no-ff`, a merge commit is created instead (semi-linear history: rebased commits plus a merge commit). Non-fast-forward merges are rejected.+5. **Merge** — Fast-forward merge to the target branch. With `--no-ff`, a merge commit is created instead — semi-linear history with rebased commits plus a merge commit. Non-fast-forward merges are rejected.6. **Pre-remove hooks** — Hooks run before removing worktree. Failures abort.7. **Cleanup** — Removes the worktree and branch. Use `--no-remove` to keep the worktree. When already on the target branch or in the primary worktree, the worktree is preserved.8. **Post-remove + post-merge hooks** — Run in background after cleanup.diff --git a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap b/tests/snapshots/integration__integration_tests__help__help_merge_long.snapindex 56e211893..3ef8c35f1 100644--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap@@ -87,7 +87,7 @@ Usage: [1m[36mwt merge[0m [36m[OPTIONS][0m [36m[TARGET][0m[1m[36m-v[0m, [1m[36m--verbose[0m[36m...[0mVerbose output (-v: hooks, templates; -vv: debug report)-Unlike [2mgit merge[0m, this merges current into target (not target into current). Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.+Unlike [2mgit merge[0m, this merges current into target — not target into current. Similar to clicking "Merge pull request" on GitHub, but locally. Target defaults to the default branch.[1m[32mExamples[0m@@ -107,7 +107,7 @@ Preserve commit history (no squash):[107m [0m [2m[0m[2m[34mwt[0m[2m merge [0m[2m[36m--no-squash[0m[2m[0m-Create a merge commit (semi-linear history):+Create a merge commit — semi-linear history:[107m [0m [2m[0m[2m[34mwt[0m[2m merge [0m[2m[36m--no-ff[0m[2m[0m@@ -119,11 +119,11 @@ Skip committing/squashing (rebase still runs unless --no-rebase):[2mwt merge[0m runs these steps:-1. [1mCommit[0m — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With [2m--no-squash[0m, this is the only commit step; with squash (default), this is skipped and changes are staged during squash instead.+1. [1mCommit[0m — Pre-commit hooks run, then uncommitted changes are committed. Post-commit hooks run in background. With [2m--no-squash[0m, this is the only commit step; with squash — the default — this is skipped and changes are staged during squash instead.2. [1mSquash[0m — Combines all commits since target into one (like GitHub's "Squash and merge"). Use [2m--stage[0m to control what gets staged: [2mall[0m (default), [2mtracked[0m, or [2mnone[0m. A backup ref is saved to [2mrefs/wt-backup/<branch>[0m. With [2m--no-squash[0m, individual commits are preserved.3. [1mRebase[0m — Rebases onto target if behind. Skipped if already up-to-date. Conflicts abort immediately.4. [1mPre-merge hooks[0m — Hooks run after rebase, before merge. Failures abort. See [2mwt hook[0m.-5. [1mMerge[0m — Fast-forward merge to the target branch. With [2m--no-ff[0m, a merge commit is created instead (semi-linear history: rebased commits plus a merge commit). Non-fast-forward merges are rejected.+5. [1mMerge[0m — Fast-forward merge to the target branch. With [2m--no-ff[0m, a merge commit is created instead — semi-linear history with rebased commits plus a merge commit. Non-fast-forward merges are rejected.6. [1mPre-remove hooks[0m — Hooks run before removing worktree. Failures abort.7. [1mCleanup[0m — Removes the worktree and branch. Use [2m--no-remove[0m to keep the worktree. When already on the target branch or in the primary worktree, the worktree is preserved.8. [1mPost-remove + post-merge hooks[0m — Run in background after cleanup.diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snapindex 59696c7ce..7cb1c8906 100644--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap@@ -128,7 +128,7 @@ Without [2m--force[0m, removal fails if the worktree contains untracked files.[1m[32mBackground removal[0m-Removal runs in the background by default (returns immediately). Logs are written to [2m.git/wt/logs/{branch}-remove.log[0m. Use [2m--foreground[0m to run in the foreground.+Removal runs in the background by default — the command returns immediately. Logs are written to [2m.git/wt/logs/{branch}-remove.log[0m. Use [2m--foreground[0m to run in the foreground.[1m[32mHooks[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_step_long.snap b/tests/snapshots/integration__integration_tests__help__help_step_long.snapindex 278357b22..fc171dd88 100644--- a/tests/snapshots/integration__integration_tests__help__help_step_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_step_long.snap@@ -111,6 +111,6 @@ Custom command templates configured in user config ([2m~/.config/worktrunk/conf[107m [0m [2m[0m[2m[34mwt[0m[2m step deploy [0m[2m[36m--var[0m[2m env=staging # pass extra template variables[0m[2m[0m[107m [0m [2m[0m[2m[34mwt[0m[2m step deploy [0m[2m[36m--yes[0m[2m # skip approval prompt[0m[2m[0m-When defined in both user and project config, both run (user first, then project). Project-config aliases require command approval on first run (same as project hooks). User-config aliases are trusted.+When defined in both user and project config, both run — user first, then project. Project-config aliases require command approval on first run, same as project hooks. User-config aliases are trusted.Alias names that match a built-in step command ([2mcommit[0m, [2msquash[0m, etc.) are shadowed by the built-in and will never run.diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snapindex 728fcc09b..c7f70d6e5 100644--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap@@ -120,7 +120,7 @@ Worktrees are addressed by branch name; paths are computed from a configurable t[1m[32mCreating a branch[0m-The [2m--create[0m flag creates a new branch from the [2m--base[0m branch (defaults to default branch). Without [2m--create[0m, the branch must already exist. Switching to a remote branch (e.g., [2mwt switch feature[0m when only [2morigin/feature[0m exists) creates a local tracking branch.+The [2m--create[0m flag creates a new branch from [2m--base[0m — the default branch unless specified. Without [2m--create[0m, the branch must already exist. Switching to a remote branch (e.g., [2mwt switch feature[0m when only [2morigin/feature[0m exists) creates a local tracking branch.[1m[32mCreating worktrees[0m@@ -172,13 +172,13 @@ When called without arguments, [2mwt switch[0m opens an interactive picker to[2mAlt-p[0m Toggle preview panel[2mCtrl-u[0m/[2mCtrl-d[0m Scroll preview up/down-[1mPreview tabs[0m (toggle with number keys):+[1mPreview tabs[0m — toggle with number keys:1. [1mHEAD±[0m — Diff of uncommitted changes2. [1mlog[0m — Recent commits; commits already on the default branch have dimmed hashes3. [1mmain…±[0m — Diff of changes since the merge-base with the default branch-4. [1mremote⇅[0m — Diff vs upstream tracking branch (ahead/behind)-5. [1msummary[0m — LLM-generated branch summary (requires [2m[list] summary = true[0m and [2m[commit.generation][0m)+4. [1mremote⇅[0m — Ahead/behind diff vs upstream tracking branch+5. [1msummary[0m — LLM-generated branch summary; requires [2m[list] summary = true[0m and [2m[commit.generation][0m[1mPager configuration:[0m The preview panel pipes diff output through git's pager. Override in user config: