Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Add GitHub Pages deployment workflows (#65)
Maximilian Roos1be558a785d7
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.ymlnew file mode 100644index 000000000..d7611dd61--- /dev/null+++ b/.github/workflows/build-docs.yml@@ -0,0 +1,27 @@+name: build-docs++on:+ workflow_call:+ workflow_dispatch:++jobs:+ build-docs:+ runs-on: ubuntu-latest++ steps:+ - name: π Checkout code+ uses: actions/checkout@v5++ - name: Setup Zola+ uses: taiki-e/install-action@v2+ with:+ tool: [email protected]++ - name: π·οΈ Build docs+ run: zola build+ working-directory: docs++ - uses: actions/upload-pages-artifact@v4+ with:+ path: docs/public/+ retention-days: 1diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.ymlnew file mode 100644index 000000000..66421c41b--- /dev/null+++ b/.github/workflows/publish-docs.yml@@ -0,0 +1,41 @@+name: publish-docs++on:+ push:+ branches:+ - main+ paths:+ - 'docs/**'+ workflow_dispatch:++concurrency:+ group: ${{ github.workflow }}-${{ github.ref }}+ cancel-in-progress: true++jobs:+ build-docs:+ uses: ./.github/workflows/build-docs.yml++ deploy-docs:+ needs: build-docs+ runs-on: ubuntu-latest++ # Don't attempt to publish if on a fork+ if: ${{ github.repository_owner == 'max-sixty' }}++ permissions:+ pages: write+ id-token: write++ environment:+ name: github-pages+ url: ${{ steps.deployment.outputs.page_url }}++ steps:+ - name: Setup Pages+ id: pages+ uses: actions/configure-pages@v5++ - name: Deploy to GitHub Pages+ id: deployment+ uses: actions/deploy-pages@v4diff --git a/CLAUDE.md b/CLAUDE.mdindex e3eba3f68..8f83740c7 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -128,6 +128,17 @@ Output messages should acknowledge user-supplied arguments (flags, options, valu"Committing with default message... (3 files, +45, -12)"```+**Avoid pronouns with cross-message referents:** Hints appear as separate messages from errors. Don't use pronouns like "it" that refer to something mentioned in the error message.++```rust+// β BAD - "it" refers to branch name in error message+// Error: "Branch 'feature' not found"+// Hint: "Use --create to create it"+// β GOOD - self-contained hint+// Error: "Branch 'feature' not found"+// Hint: "Use --create to create a new branch"+```+### Message Consistency PatternsUse consistent punctuation and structure for related messages:@@ -296,7 +307,7 @@ Use `output::` functions with `cformat!` for styled content. The output function// β GOOD - output:: handles emoji + outer color, cformat! handles inner stylingoutput::success(cformat!("Created <bold>{branch}</> from <bold>{base}</>"))?;output::warning(cformat!("Branch <bold>{name}</> has <dim>uncommitted changes</>"))?;-output::hint(cformat!("Run '<bold>wt merge</>' to continue"))?;+output::hint(cformat!("<dim>Run </>wt merge<dim> to continue</>"))?;// β GOOD - plain strings work too (no inner styling needed)output::progress("Rebasing onto main...")?;@@ -312,6 +323,24 @@ cformat!("{ERROR_EMOJI} <red>Branch <bold>{branch}</> not found</>")Branch names in messages should be bolded. Tables (`wt list`) use `StyledLine` with conditional styling for branch names.+### Commands and Branches in Messages++Never quote commands or branch names. Use styling to make them stand out:++- **In normal font context**: Use `<bold>` for commands and branches+- **In dim font context** (hints): Close dim, show in normal font, reopen dim++```rust+// β GOOD - bold in normal context+output::info(cformat!("Use <bold>wt merge</> to continue"))?;++// β GOOD - normal font in dim context (close/reopen dim)+output::hint(cformat!("<dim>Run </>wt list<dim> to see worktrees</>"))?;++// β BAD - quoted commands+output::hint("Run 'wt list' to see worktrees")?;+```+### Color DetectionColors automatically adjust based on environment (NO_COLOR, CLICOLOR_FORCE, TTY detection). When using `output::` functions, this is handled automatically.diff --git a/docs/.gitignore b/docs/.gitignorenew file mode 100644index 000000000..364fdec1a--- /dev/null+++ b/docs/.gitignore@@ -0,0 +1 @@+public/diff --git a/docs/CLAUDE.md b/docs/CLAUDE.mdnew file mode 100644index 000000000..25d4be817--- /dev/null+++ b/docs/CLAUDE.md@@ -0,0 +1,12 @@+# Docs Site++This is an initial scaffolding of the documentation site. The content was auto-generated from the main README and has not been reviewed for accuracy.++**Do not trust any content here.** Before this is production-ready:++- Survey all pages for accuracy+- Verify code examples work+- Check command output matches current behavior+- Review configuration options against actual implementation++This is being merged to enable iteration, not as finished documentation.diff --git a/docs/config.toml b/docs/config.tomlnew file mode 100644index 000000000..c7b540df5--- /dev/null+++ b/docs/config.toml@@ -0,0 +1,25 @@+# Zola configuration for Worktrunk documentation+base_url = "https://worktrunk.dev/"++compile_sass = true+build_search_index = true++theme = "juice"+title = "Worktrunk"++[markdown]+highlight_code = true+highlight_theme = "inspired-github"++[extra]+juice_logo_name = "Worktrunk"+juice_logo_path = "logo.svg"+rust_crate = "worktrunk"+github_repo = "max-sixty/worktrunk"+site_description = "CLI for Git worktree management, designed for parallel AI agent workflows."+juice_exclude_menu = ["Quick Start", "Concepts", "Configuration", "Commands Reference", "Advanced Features", "FAQ"]+juice_extra_menu = [+ { title = "Docs", link = "/" },+ { title = "GitHub", link = "https://github.com/max-sixty/worktrunk" },+ { title = "Crate", link = "https://crates.io/crates/worktrunk" },+]diff --git a/docs/content/_index.md b/docs/content/_index.mdnew file mode 100644index 000000000..e965982e7--- /dev/null+++ b/docs/content/_index.md@@ -0,0 +1,4 @@+++++title = "Worktrunk"+sort_by = "weight"++++diff --git a/docs/content/advanced.md b/docs/content/advanced.mdnew file mode 100644index 000000000..2f2f4c4c0--- /dev/null+++ b/docs/content/advanced.md@@ -0,0 +1,151 @@+++++title = "Advanced Features"+weight = 5++++++## Claude Code Integration++Worktrunk includes a Claude Code plugin for tracking agent status across worktrees.++### Status tracking++The plugin adds status indicators to `wt list`:++```bash+$ wt list+ Branch Status HEADΒ± mainβ Path Remoteβ Commit Age Message+@ main ^ ./repo b834638e 1d Initial commit++ feature-api β π€ β1 ./repo.feature-api 9606cd0f 1d Add REST API endpoints++ review-ui ? β π¬ β1 ./repo.review-ui afd3b353 1d Add dashboard component++ wip-docs ?_ ./repo.wip-docs b834638e 1d Initial commit+```++- `π€` β Claude is working+- `π¬` β Claude is waiting for input++### Install the plugin++```bash+$ claude plugin marketplace add max-sixty/worktrunk+$ claude plugin install worktrunk@worktrunk+```++### Manual status markers++Set status markers manually for any workflow:++```bash+$ wt config status set "π§" # Current branch+$ wt config status set "β " --branch feature # Specific branch+$ git config worktrunk.status.feature "π¬" # Direct git config+```++## Statusline Integration++`wt list statusline` outputs a single-line status for shell prompts, starship, or editor integrations.++### Claude Code statusline++For Claude Code, outputs directory, branch status, and model:++```+~/w/myproject.feature-auth !π€ Β±+42 -8 β3 β‘1 β | Opus+```++Add to `~/.claude/settings.json`:++```json+{+ "statusLine": {+ "type": "command",+ "command": "wt list statusline --claude-code"+ }+}+```++## Interactive Worktree Picker++`wt select` opens a fzf-like fuzzy-search worktree picker with diff preview.++### Preview tabs++Toggle with number keys:++1. **Tab 1**: Working tree changes (uncommitted)+2. **Tab 2**: Commit history (commits not on main highlighted)+3. **Tab 3**: Branch diff (changes ahead of main)++## Tips & Patterns++### Alias for new worktree + agent++```bash+alias wsc='wt switch --create --execute=claude'+wsc new-feature # Creates worktree, runs hooks, launches Claude+```++### Eliminate cold starts++Use `post-create` hooks to install dependencies and copy caches:++```toml+[post-create]+"cache" = "cp -r ../.cache .cache" # Copy shared cache+"install" = "npm ci"+```++For copy-on-write on macOS:++```toml+[post-create]+"cache" = "cp -c -r ../.cache .cache" # Uses APFS clones+```++### Local CI gate++`pre-merge` hooks run before merging. Failures abort:++```toml+[pre-merge]+"test" = "cargo test"+"lint" = "cargo clippy -- -D warnings"+"format" = "cargo fmt --check"+```++### Monitor CI across branches++```bash+$ wt list --full --branches+```++Shows PR/CI status for all branches, including those without worktrees. CI column links to PR pages in terminals with hyperlink support.++### JSON API for scripting++```bash+$ wt list --format=json+```++Useful for dashboards, statuslines, and custom scripts.++### Task runners in hooks++Reference your existing task runner:++```toml+[post-create]+"setup" = "task install"++[pre-merge]+"validate" = "just test lint"+```++### Working with stacked branches++Create a branch from the current one:++```bash+$ wt switch --create feature-part2 --base=@+```++This branches from your current HEAD, not from main.diff --git a/docs/content/commands.md b/docs/content/commands.mdnew file mode 100644index 000000000..07c04df83--- /dev/null+++ b/docs/content/commands.md@@ -0,0 +1,255 @@+++++title = "Commands Reference"+weight = 4++++++## wt switch++Switch to an existing worktree or create a new one.++```bash+$ wt switch [OPTIONS] <BRANCH>+```++### Arguments++- `<BRANCH>` β Branch, path, `@` (HEAD), `-` (previous), or `^` (main)++### Options++- `-c, --create` β Create a new branch+- `-b, --base <BASE>` β Base branch (defaults to default branch)+- `-x, --execute <EXECUTE>` β Command to run after switch+- `-f, --force` β Skip approval prompts+- `--no-verify` β Skip all project hooks++### Examples++```bash+# Switch to existing worktree+wt switch feature-branch++# Create new worktree from main+wt switch --create new-feature++# Switch to previous worktree+wt switch -++# Create from specific base+wt switch --create hotfix --base production++# Create and run command+wt switch --create docs --execute "code ."+```++### Hooks++- **post-create** (sequential, blocking) β Runs after creation, before success message+- **post-start** (parallel, background) β Spawned after success, logs to `.git/wt-logs/`++---++## wt merge++Merge worktree into target branch with full workflow automation.++```bash+$ wt merge [OPTIONS] [TARGET]+```++### Arguments++- `[TARGET]` β Target branch (defaults to default branch)++### Options++- `--no-squash` β Skip commit squashing+- `--no-commit` β Skip commit, squash, and rebase+- `--no-remove` β Keep worktree after merge+- `--no-verify` β Skip all project hooks+- `-f, --force` β Skip approval prompts+- `--stage <STAGE>` β What to stage: `all` (default), `tracked`, `none`++### Operation++1. **Commit** β Stage and commit with LLM message+2. **Squash** β Combine commits into one+3. **Rebase** β Rebase onto target+4. **Pre-merge hooks** β Run tests/lints+5. **Push** β Fast-forward to target+6. **Cleanup** β Remove worktree and branch+7. **Post-merge hooks** β Final automation++### Examples++```bash+# Full merge to main+wt merge++# Keep worktree after merging+wt merge --no-remove++# Skip hooks+wt merge --no-verify++# Merge without squashing+wt merge --no-squash+```++---++## wt remove++Remove worktree and optionally delete branch.++```bash+$ wt remove [OPTIONS] [WORKTREES]...+```++### Arguments++- `[WORKTREES]...` β Worktree or branch (`@` for current)++### Options++- `--no-delete-branch` β Keep branch after removal+- `-D, --force-delete` β Delete unmerged branches+- `--no-background` β Run removal in foreground++### Branch deletion++By default, branches are deleted only when their content is already in the target branch:++- No changes beyond the common ancestor+- Same content as target (handles squash/rebase merges)++Use `-D` to force delete unmerged branches.++### Examples++```bash+# Remove current worktree+wt remove++# Remove specific worktree+wt remove feature-branch++# Keep the branch+wt remove --no-delete-branch feature-branch++# Remove multiple+wt remove old-feature another-branch+```++---++## wt list++Show all worktrees and optionally branches.++```bash+$ wt list [OPTIONS]+```++### Options++- `--format <FORMAT>` β Output format: `table` (default), `json`+- `--branches` β Include branches without worktrees+- `--remotes` β Include remote branches+- `--full` β Show CI, conflicts, diffs+- `--progressive` β Show fast info first, update with slow info++### Columns++| Column | Description |+|--------|-------------|+| Branch | Branch name |+| Status | Quick status symbols |+| HEADΒ± | Uncommitted changes vs HEAD |+| mainβ | Commits ahead/behind main |+| mainβ¦Β± | Line diffs ahead of main (with `--full`) |+| Path | Worktree directory |+| Remoteβ | Commits ahead/behind remote |+| CI | Pipeline status (with `--full`) |+| Commit | Short hash |+| Age | Time since last commit |+| Message | Last commit message |++### Status Symbols++- `+` Staged files+- `!` Modified files+- `?` Untracked files+- `β` Merge conflicts+- `β` Would conflict with main+- `β‘` Matches main content+- `_` No commits+- `βββ` Ahead/behind/diverged from main+- `β‘β£β ` Ahead/behind/diverged from remote++### JSON Output++```bash+# Get current worktree+wt list --format=json | jq '.[] | select(.is_current)'++# Find worktrees with conflicts+wt list --format=json | jq '.[] | select(.status.branch_state == "Conflicts")'++# Find branches ahead of main+wt list --format=json | jq '.[] | select(.status.main_divergence == "Ahead")'+```++---++## wt config++Manage configuration and shell integration.++```bash+$ wt config <COMMAND>+```++### Subcommands++- `shell install` β Install shell integration+- `shell init <SHELL>` β Output shell init script+- `create` β Create user config file with examples+- `show` β Show config file locations+- `cache` β Manage caches+- `status` β Manage branch status markers+- `approvals` β Manage command approvals++---++## wt step++Building blocks for custom workflows.++```bash+$ wt step <COMMAND>+```++### Subcommands++- `commit` β Commit changes with LLM message+- `squash` β Squash commits with LLM message+- `push` β Push to local target branch+- `rebase` β Rebase onto target+- `post-create` β Run post-create hook+- `post-start` β Run post-start hook+- `pre-commit` β Run pre-commit hook+- `pre-merge` β Run pre-merge hook+- `post-merge` β Run post-merge hook++---++## wt select++Interactive worktree picker with diff preview. Unix only.++Preview tabs (toggle with `1`/`2`/`3`):++1. Working tree changes (uncommitted)+2. Commit history (commits not on main highlighted)+3. Branch diff (changes ahead of main)diff --git a/docs/content/concepts.md b/docs/content/concepts.mdnew file mode 100644index 000000000..7ba770ec6--- /dev/null+++ b/docs/content/concepts.md@@ -0,0 +1,79 @@+++++title = "Concepts"+weight = 2++++++## Why git worktrees?++When working with multiple AI agents (or multiple tasks), you have a few options:++| Approach | Pros | Cons |+|----------|------|------|+| **One working tree, many branches** | Simple setup | Agents step on each other, can't use git for staging/committing |+| **Multiple clones** | Full isolation | Slow to set up, drift out of sync |+| **Git worktrees** | Isolation + shared history | Requires management |++Git worktrees give you multiple directories backed by a single `.git` directory. Each worktree has its own branch and working tree, but shares the repository history and refs.++## Why Worktrunk?++Git's built-in `worktree` commands require remembering worktree locations and composing git + `cd` commands. Worktrunk bundles creation, navigation, status, and cleanup into simple commands.++### Comparison++| Task | Worktrunk | Plain git |+|------|-----------|-----------|+| Switch worktrees | `wt switch feature` | `cd ../repo.feature` |+| Create + start Claude | `wt switch -c -x claude feature` | `git worktree add -b feature ../repo.feature main && cd ../repo.feature && claude` |+| Clean up | `wt remove` | `cd ../repo && git worktree remove ../repo.feature && git branch -d feature` |+| List | `wt list` (with diffstats & status) | `git worktree list` (just names & paths) |+| List with CI status | `wt list --full` | N/A |++### What Worktrunk adds++- **Branch-based navigation**: Address worktrees by branch name, not path+- **Consistent directory naming**: Predictable locations for all worktrees+- **Lifecycle hooks**: Run commands on create, start, pre-merge, post-merge+- **Unified status**: See changes, commits, CI status across all worktrees+- **Safe cleanup**: Validates changes are merged before deleting branches++## Worktree addressing++Worktrunk uses **path-first lookup** when resolving arguments:++1. Compute the expected path for the argument (using the configured path template)+2. If a worktree exists at that path, use it (regardless of what branch it's on)+3. Otherwise, treat the argument as a branch name++This means `wt switch foo` will switch to `repo.foo/` even if that worktree is on a different branch.++## Branch lifecycle++Typical workflow:++```+ βββββββββββββββββββ+ β wt switch -c β+ β (create) β+ ββββββββββ¬βββββββββ+ β+ βΌ+ βββββββββββββββββββ+ β Work on branch β+ β (commits) β+ ββββββββββ¬βββββββββ+ β+ βΌ+ βββββββββββββββββββ+ β wt merge β+ β (or CI merge) β+ ββββββββββ¬βββββββββ+ β+ βΌ+ βββββββββββββββββββ+ β wt remove β+ β (cleanup) β+ βββββββββββββββββββ+```++With `wt merge`, the entire workflow from working tree β main branch is automated: stage, commit, squash, rebase, run tests, merge, cleanup.diff --git a/docs/content/configuration.md b/docs/content/configuration.mdnew file mode 100644index 000000000..82af3ab8e--- /dev/null+++ b/docs/content/configuration.md@@ -0,0 +1,151 @@+++++title = "Configuration"+weight = 3++++++Worktrunk uses two configuration files:++- **User config**: `~/.config/worktrunk/config.toml` β Personal settings, LLM commands, saved approvals+- **Project config**: `.config/wt.toml` β Project-specific hooks (checked into version control)++## Project Hooks++Automate setup and validation at worktree lifecycle events:++| Hook | When | Example |+|------|------|---------|+| **post-create** | After worktree created | `cp -r .cache`, `ln -s` |+| **post-start** | After worktree created (background) | `npm install`, `cargo build` |+| **pre-commit** | Before creating any commit | `pre-commit run` |+| **pre-merge** | After squash, before push | `cargo test`, `pytest` |+| **post-merge** | After successful merge | `cargo install --path .` |++### Example project config++Create `.config/wt.toml` in your repository:++```toml+# Install dependencies, build setup (blocking)+[post-create]+"install" = "uv sync"++# Dev servers, file watchers (runs in background)+[post-start]+"dev" = "uv run dev"++# Tests and lints before merging (blocks on failure)+[pre-merge]+"lint" = "uv run ruff check"+"test" = "uv run pytest"++# After merge completes+[post-merge]+"install" = "cargo install --path ."+```++### Hook execution++```bash+$ wt switch --create feature-x+π Running post-create install:+ uv sync++ Resolved 24 packages in 145ms+ Installed 24 packages in 1.2s+β Created new worktree for feature-x from main at ../repo.feature-x+π Running post-start dev:+ uv run dev+```++**Security**: Project commands require approval on first run. Approvals are saved to user config. Use `--force` to bypass prompts or `--no-verify` to skip hooks entirely.++### Template variables++Hooks can use these variables:++- `{{ repo }}` β Repository name+- `{{ branch }}` β Branch name+- `{{ worktree }}` β Worktree path+- `{{ repo_root }}` β Repository root path+- `{{ target }}` β Target branch (for merge hooks)++## LLM Commit Messages++Worktrunk can invoke external commands to generate commit messages. [llm](https://llm.datasette.io/) from Simon Willison is recommended.++### Setup++1. Install llm:+ ```bash+ $ uv tool install -U llm+ ```++2. Configure your API key:+ ```bash+ $ llm install llm-anthropic+ $ llm keys set anthropic+ ```++3. Add to user config (`~/.config/worktrunk/config.toml`):+ ```toml+ [commit-generation]+ command = "llm"+ args = ["-m", "claude-haiku-4-5-20251001"]+ ```++### Usage++`wt merge` generates commit messages automatically, or run `wt step commit` for just the commit step.++For custom prompt templates, see `wt config --help`.++## User Config Reference++Create the user config with defaults:++```bash+$ wt config create+```++This creates `~/.config/worktrunk/config.toml` with documented examples.++### Key settings++```toml+# Worktree path template+# Default: "../{{ main_worktree }}.{{ branch }}"+path-template = "../{{ main_worktree }}.{{ branch }}"++# LLM commit message generation+[commit-generation]+command = "llm"+args = ["-m", "claude-haiku-4-5-20251001"]++# Per-project command approvals (auto-populated)+[approved-commands."my-project"]+"post-create.install" = "npm install"+```++## Shell Integration++Worktrunk needs shell integration to change directories. Install with:++```bash+$ wt config shell install+```++Or manually add to your shell config:++```bash+# bash/zsh+eval "$(wt config shell init bash)"++# fish+wt config shell init fish | source+```++## Environment Variables++- `WORKTRUNK_CONFIG_PATH` β Override user config location+- `NO_COLOR` β Disable colored output+- `CLICOLOR_FORCE` β Force colored outputdiff --git a/docs/content/faq.md b/docs/content/faq.mdnew file mode 100644index 000000000..b2da00096--- /dev/null+++ b/docs/content/faq.md@@ -0,0 +1,125 @@+++++title = "FAQ"+weight = 6++++++## What commands does Worktrunk execute?++Worktrunk executes commands in three contexts:++1. **Project hooks** (`.config/wt.toml`) β Automation for worktree lifecycle+2. **LLM commands** (`~/.config/worktrunk/config.toml`) β Commit message generation+3. **--execute flag** β Commands you provide explicitly++Commands from project hooks and LLM configuration require approval on first run. Approved commands are saved to user config. If a command changes, Worktrunk requires new approval.++### Example approval prompt++```+π‘ repo needs approval to execute 3 commands:++βͺ post-create install:+ echo 'Installing dependencies...'++βͺ post-create build:+ echo 'Building project...'++βͺ post-create test:+ echo 'Running tests...'++π‘ Allow and remember? [y/N]+```++Use `--force` to bypass prompts (useful for CI/automation).++## How does Worktrunk compare to alternatives?++### vs. Branch Switching++Branch switching uses one directory, so only one agent can work at a time. Worktrees give each agent its own directory.++### vs. Plain `git worktree`++Git's built-in worktree commands work but require manual lifecycle management:++```bash+# Plain git worktree workflow+git worktree add -b feature-branch ../myapp-feature main+cd ../myapp-feature+# ...work, commit, push...+cd ../myapp+git merge feature-branch+git worktree remove ../myapp-feature+git branch -d feature-branch+```++Worktrunk automates the full lifecycle:++```bash+wt switch --create feature-branch # Creates worktree, runs setup hooks+# ...work...+wt merge # Squashes, merges, removes worktree+```++What `git worktree` doesn't provide:++- Consistent directory naming and cleanup validation+- Project-specific automation (install dependencies, start services)+- Unified status across all worktrees (commits, CI, conflicts, changes)++### vs. git-machete / git-town++Different scopes:++- **git-machete**: Branch stack management in a single directory+- **git-town**: Git workflow automation in a single directory+- **worktrunk**: Multi-worktree management with hooks and status aggregation++These tools can be used togetherβrun git-machete or git-town inside individual worktrees.++### vs. Git TUIs (lazygit, gh-dash, etc.)++Git TUIs operate on a single repository. Worktrunk manages multiple worktrees, runs automation hooks, and aggregates status across branches. TUIs work inside each worktree directory.++## Installation fails with C compilation errors++Errors related to tree-sitter or C compilation (C99 mode, `le16toh` undefined) can be avoided by installing without syntax highlighting:++```bash+$ cargo install worktrunk --no-default-features+```++This disables bash syntax highlighting in command output but keeps all core functionality. The syntax highlighting feature requires C99 compiler support and can fail on older systems or minimal Docker images.++## How can I contribute?++- Star the repo+- Try it out and [open an issue](https://github.com/max-sixty/worktrunk/issues) with feedback+- Send to a friend+- Post about it on [X](https://twitter.com/intent/tweet?text=Worktrunk%20%E2%80%94%20CLI%20for%20git%20worktree%20management&url=https%3A%2F%2Fgithub.com%2Fmax-sixty%2Fworktrunk), [Reddit](https://www.reddit.com/submit?url=https%3A%2F%2Fgithub.com%2Fmax-sixty%2Fworktrunk&title=Worktrunk%20%E2%80%94%20CLI%20for%20git%20worktree%20management), or [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fgithub.com%2Fmax-sixty%2Fworktrunk)++## Running tests (for contributors)++### Quick tests++```bash+$ cargo test --lib --bins # Unit tests (~200 tests)+$ cargo test --test integration # Integration tests (~300 tests)+```++### Full integration tests++Requires bash, zsh, and fish:++```bash+$ cargo test --test integration --features shell-integration-tests+```++### Releases++Use [cargo-release](https://github.com/crate-ci/cargo-release):++```bash+$ cargo release patch --execute # 0.1.0 -> 0.1.1+$ cargo release minor --execute # 0.1.0 -> 0.2.0+```diff --git a/docs/content/quickstart.md b/docs/content/quickstart.mdnew file mode 100644index 000000000..196cf2f7c--- /dev/null+++ b/docs/content/quickstart.md@@ -0,0 +1,76 @@+++++title = "Quick Start"+weight = 1++++++Get up and running with Worktrunk in under a minute.++## Install++```bash+$ cargo install worktrunk+$ wt config shell install # allows commands to change directories+```++## Create a worktree++```bash+$ wt switch --create fix-auth+β Created new worktree for fix-auth from main at ../repo.fix-auth+```++This creates `../repo.fix-auth` on branch `fix-auth`.++## Switch between worktrees++```bash+$ wt switch feature-api+β Switched to worktree for feature-api at ../repo.feature-api+```++Use branch names, not paths. Worktrunk handles the navigation.++## List worktrees++```bash+$ wt list+ Branch Status HEADΒ± mainβ Path Remoteβ Commit Age Message+@ feature-api + ββ‘ +36 -11 β4 ./repo.feature-api β‘3 b1554967 30m Add API tests+^ main ^β£ ./repo β£1 b834638e 1d Initial commit++ fix-auth _ ./repo.fix-auth b834638e 1d Initial commit++βͺ Showing 3 worktrees, 1 with changes, 1 ahead+```++Add `--full` for CI status and conflicts. Add `--branches` to include all branches.++## Clean up++When you're done with a worktree (e.g., after merging via CI):++```bash+$ wt remove+π Removing feature-api worktree & branch in background (no marginal contribution to main)+```++Worktrunk checks if your changes are already on main before deleting the branch.++## Shortcuts++Use these shortcuts for common targets:++- `@` β current branch/worktree+- `-` β previous worktree (like `cd -`)+- `^` β main/default branch++```bash+$ wt switch - # Switch to previous worktree+$ wt switch --create hotfix --base=@ # Branch from current HEAD+$ wt remove @ # Remove current worktree+```++## Next steps++- Learn [why worktrees](/concepts/) and how Worktrunk improves on plain git+- Set up [project hooks](/configuration/) for automated setup+- Use [LLM commit messages](/configuration/#llm-commit-messages) for auto-generated commitsdiff --git a/docs/sass/custom.scss b/docs/sass/custom.scssnew file mode 100644index 000000000..ff86d8777--- /dev/null+++ b/docs/sass/custom.scss@@ -0,0 +1,162 @@+// Custom styles for Worktrunk docs++// Better code block styling+.content {+ pre {+ border: 1px solid #e0e0e0;+ border-radius: 6px;+ padding: 1rem;+ overflow-x: auto;+ margin: 1rem 0;+ }++ code {+ background-color: #f5f5f5;+ border-radius: 3px;+ padding: 0.15em 0.4em;+ font-size: 0.9em;+ }++ pre code {+ background-color: transparent;+ padding: 0;+ }+}++// Better table styling+table {+ border-collapse: collapse;+ width: 100%;+ margin: 1.5rem 0;++ th, td {+ border: 1px solid #e0e0e0;+ padding: 0.75rem 1rem;+ text-align: left;+ }++ th {+ background-color: #f8f8f8;+ font-weight: 600;+ }++ tr:nth-child(even) {+ background-color: #fafafa;+ }+}++// Sidebar improvements+.toc {+ .toc-item {+ margin: 0.35rem 0;+ }++ .toc-item-child {+ margin: 0.25rem 0;+ padding-left: 1rem;++ &.nested {+ padding-left: 1.5rem;+ }+ }++ .toc-divider {+ border-top: 1px solid #e0e0e0;+ margin: 0.5rem 0;+ }++ a.active {+ color: var(--toc-highlight-text-color);+ font-weight: 600;+ }+}++// Better heading styling+.heading-text {+ font-size: 2rem;+ margin-bottom: 1rem;+ color: var(--primary-text-color);+}++// Page navigation at bottom+.page-nav {+ display: flex;+ justify-content: space-between;+ margin-top: 3rem;+ padding-top: 1.5rem;+ border-top: 1px solid #e0e0e0;++ a {+ text-decoration: none;+ color: var(--primary-link-color);++ &:hover {+ text-decoration: underline;+ }+ }+}++// Better list styling+.content ul, .content ol {+ margin: 1rem 0;+ padding-left: 1.5rem;++ li {+ margin: 0.5rem 0;+ }+}++// Improve blockquote+blockquote {+ border-left: 4px solid var(--primary-color);+ margin: 1.5rem 0;+ padding: 0.5rem 1rem;+ background-color: #f8f8f8;++ p {+ margin: 0;+ }+}++// Button styling+.button {+ display: inline-block;+ padding: 0.75rem 1.5rem;+ background-color: var(--primary-color, #00d4aa);+ color: white !important;+ text-decoration: none;+ border-radius: 6px;+ font-weight: 600;+ transition: background-color 0.2s, transform 0.2s;++ &:hover {+ background-color: darken(#00d4aa, 10%);+ transform: translateY(-1px);+ text-decoration: none;+ }+}++// Footer styling+footer {+ margin-top: 3rem;+ padding: 1.5rem 0;+ border-top: 1px solid #e0e0e0;+ text-align: center;+ display: flex;+ justify-content: center;+ gap: 2rem;+ flex-wrap: wrap;++ span {+ a {+ color: var(--secondary-text-color);+ text-decoration: none;+ opacity: 0.8;++ &:hover {+ opacity: 1;+ text-decoration: underline;+ }+ }+ }+}diff --git a/docs/static/favicon.svg b/docs/static/favicon.svgnew file mode 100644index 000000000..f9cc81ed4--- /dev/null+++ b/docs/static/favicon.svg@@ -0,0 +1,10 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32" height="32">+ <rect width="32" height="32" rx="4" fill="#1a1a2e"/>+ <g fill="#00d4aa">+ <rect x="14" y="16" width="4" height="10" rx="1"/>+ <rect x="9" y="11" width="14" height="3" rx="1"/>+ <rect x="11" y="7" width="10" height="2" rx="1"/>+ <circle cx="7" cy="12.5" r="1.5"/>+ <circle cx="25" cy="12.5" r="1.5"/>+ </g>+</svg>diff --git a/docs/static/logo.svg b/docs/static/logo.svgnew file mode 100644index 000000000..a6a2ae8cd--- /dev/null+++ b/docs/static/logo.svg@@ -0,0 +1,16 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="100" height="100">+ <rect width="100" height="100" rx="12" fill="#1a1a2e"/>+ <g fill="#00d4aa">+ <!-- Tree trunk -->+ <rect x="45" y="50" width="10" height="30" rx="2"/>+ <!-- Branches -->+ <rect x="30" y="35" width="40" height="8" rx="2"/>+ <rect x="35" y="25" width="30" height="6" rx="2"/>+ <rect x="40" y="17" width="20" height="5" rx="2"/>+ <!-- Work indicators -->+ <circle cx="25" cy="39" r="4"/>+ <circle cx="75" cy="39" r="4"/>+ <circle cx="30" cy="28" r="3"/>+ <circle cx="70" cy="28" r="3"/>+ </g>+</svg>diff --git a/docs/templates/base.html b/docs/templates/base.htmlnew file mode 100644index 000000000..6fa39d908--- /dev/null+++ b/docs/templates/base.html@@ -0,0 +1,31 @@+{% import "juice/templates/_macros.html" as macros %}+{% extends "juice/templates/index.html" %}++{% block favicon %}+<link rel="icon" type="image/svg+xml" href="/favicon.svg">+{% endblock favicon %}++{% block head %}+<link rel="stylesheet" href="{{ get_url(path='custom.css') }}">+{% endblock head %}++{% block header %}+<header class="box-shadow">+ {{ macros::render_header() }}+</header>+{% endblock header %}++{% block hero %}+{% endblock hero %}++{% block sidebar %}+{% endblock sidebar %}++{% block footer %}+<footer>+ <span><a href="https://github.com/max-sixty/worktrunk">GitHub</a></span>+ <span><a href="https://crates.io/crates/worktrunk">Crates.io</a></span>+ <span><a href="/">Documentation</a></span>+ <span><a href="https://github.com/max-sixty/worktrunk/issues">Issues</a></span>+</footer>+{% endblock footer %}diff --git a/docs/templates/index.html b/docs/templates/index.htmlnew file mode 100644index 000000000..98d8f4281--- /dev/null+++ b/docs/templates/index.html@@ -0,0 +1,128 @@+{% extends "base.html" %}++{% block hero %}+<script async defer src="https://buttons.github.io/buttons.js"></script>+<style>+ .welcome {+ animation: welcome-animation 1s cubic-bezier(0.25, 0.1, 0.25, 1) both;+ animation-delay: 0.25s;+ }++ .hero-image {+ animation: logo-animation 2s cubic-bezier(0.25, 0.1, 0.25, 1) both;+ }++ .explore-more, .logo, nav {+ animation: fade-in-animation 1.5s cubic-bezier(0.25, 0.1, 0.25, 1) both;+ animation-delay: 0.5s;+ }++ @keyframes logo-animation {+ 0% {+ transform: rotateY(-40deg) rotateZ(90deg) translateX(-50%);+ filter: blur(50px);+ opacity: 0;+ }+ 50% {+ filter: blur(0);+ }+ 70% {+ opacity: 1;+ transform: rotateY(-10deg) rotateZ(10deg) translateX(5%);+ }+ 100% {+ transform: rotateY(0) rotateZ(0) translateX(0);+ }+ }++ @keyframes fade-in-animation {+ 0% {+ filter: blur(10px);+ opacity: 0;+ }+ 30% {+ filter: blur(0);+ }+ 100% {+ opacity: 1;+ }+ }++ @keyframes welcome-animation {+ 0% {+ transform: translateY(60%);+ filter: blur(10px);+ opacity: 0;+ }+ 100% {+ transform: translateY(0);+ filter: blur(0);+ opacity: 1;+ }+ }++ .hero section {+ padding: 0 5rem;+ }+ @media screen and (max-width: 768px) {+ .hero section {+ padding: 0 2rem;+ }++ .hero-image {+ display: none;+ }+ }+</style>+<section class="text-center welcome">+ <h1 class="heading-text" style="font-size: 50px">Worktrunk</h1>+ <h3 class="title-text">+ Git worktree management for <b>parallel AI agent workflows</b>+ </h3>+ <div style="display: flex; gap: 1rem; justify-content: center; align-items: center; margin-top: 1.5rem;">+ <a href="/quickstart/" class="button">Get Started</a>+ <a class="github-button" href="https://github.com/max-sixty/worktrunk" data-size="large" data-show-count="true"+ aria-label="Star max-sixty/worktrunk on GitHub">Star</a>+ </div>+</section>+<img class="hero-image" style="width: 40%" src="{{ get_url(path='logo.svg') }}" alt="Worktrunk logo">+<div class="explore-more text" onclick="document.getElementById('features').scrollIntoView({behavior: 'smooth'})">+ Explore More β©+</div>+{% endblock hero %}++{% block toc %}+{% set docs_section = get_section(path="_index.md") %}+<div class="toc">+ <div class="toc-sticky">+ <div class="toc-item" style="margin-bottom: 0.5rem;">+ <a class="subtext active" href="/" style="font-weight: 600;">+ Documentation+ </a>+ </div>++ <div class="toc-divider"></div>++ {% for doc_page in docs_section.pages %}+ <div class="toc-item">+ <a class="subtext" href="{{ doc_page.permalink | safe }}">+ {{ doc_page.title }}+ </a>+ </div>+ {% endfor %}+ </div>+</div>+{% endblock toc %}++{% block content %}+{# Display quickstart content directly on homepage - relies on quickstart.md existing #}+{% set docs_section = get_section(path="_index.md") %}+{% set quickstart = docs_section.pages | filter(attribute="slug", value="quickstart") | first %}+<div class="heading-text">{{ quickstart.title }}</div>+{{ quickstart.content | safe }}++<div class="page-nav" style="justify-content: flex-end;">+ {% set concepts = docs_section.pages | filter(attribute="slug", value="concepts") | first %}+ <a href="{{ concepts.permalink | safe }}">{{ concepts.title }} β</a>+</div>+{% endblock content %}diff --git a/docs/templates/page.html b/docs/templates/page.htmlnew file mode 100644index 000000000..94cde41e8--- /dev/null+++ b/docs/templates/page.html@@ -0,0 +1,79 @@+{% extends "base.html" %}++{% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}++{% block toc %}+{% set docs_section = get_section(path="_index.md") %}+<div class="toc">+ <div class="toc-sticky">+ <div class="toc-item" style="margin-bottom: 0.5rem;">+ <a class="subtext" href="{{ docs_section.permalink | safe }}" style="font-weight: 600;">+ β Home+ </a>+ </div>++ <div class="toc-divider"></div>++ {% for doc_page in docs_section.pages %}+ {% set is_current = doc_page.permalink == page.permalink %}+ <div class="toc-item">+ <a class="subtext {% if is_current %}active{% endif %}" href="{{ doc_page.permalink | safe }}">+ {{ doc_page.title }}+ </a>+ </div>++ {% if is_current and page.toc %}+ {% for h in page.toc %}+ <div class="toc-item-child">+ <a class="subtext" href="{{ h.permalink | safe }}">+ <small>{{ h.title }}</small>+ </a>+ </div>+ {% if h.children %}+ {% for h2 in h.children %}+ <div class="toc-item-child nested">+ <a class="subtext" href="{{ h2.permalink | safe }}">+ <small>{{ h2.title }}</small>+ </a>+ </div>+ {% endfor %}+ {% endif %}+ {% endfor %}+ {% endif %}+ {% endfor %}+ </div>+</div>+{% endblock toc %}++{% block content %}+<div class="heading-text">{{ page.title }}</div>+{{ page.content | safe }}++{# Calculate prev/next from section pages #}+{% set prev_page = false %}+{% set next_page = false %}+{% set found_current = false %}+{% for doc_page in docs_section.pages %}+ {% if found_current and not next_page %}+ {% set_global next_page = doc_page %}+ {% endif %}+ {% if doc_page.permalink == page.permalink %}+ {% set_global found_current = true %}+ {% endif %}+ {% if not found_current %}+ {% set_global prev_page = doc_page %}+ {% endif %}+{% endfor %}++<div class="page-nav">+ {% if prev_page %}+ <a href="{{ prev_page.permalink | safe }}">β {{ prev_page.title }}</a>+ {% else %}+ <span></span>+ {% endif %}++ {% if next_page %}+ <a href="{{ next_page.permalink | safe }}">{{ next_page.title }} β</a>+ {% endif %}+</div>+{% endblock content %}diff --git a/docs/themes/juice/.gitignore b/docs/themes/juice/.gitignorenew file mode 100644index 000000000..9ab155705--- /dev/null+++ b/docs/themes/juice/.gitignore@@ -0,0 +1,5 @@+.idea+.DS_Store+public++.verceldiff --git a/docs/themes/juice/LICENSE b/docs/themes/juice/LICENSEnew file mode 100644index 000000000..ded5ff38f--- /dev/null+++ b/docs/themes/juice/LICENSE@@ -0,0 +1,21 @@+MIT License++Copyright (c) 2020 Huhu++Permission is hereby granted, free of charge, to any person obtaining a copy+of this software and associated documentation files (the "Software"), to deal+in the Software without restriction, including without limitation the rights+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+copies of the Software, and to permit persons to whom the Software is+furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included in all+copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE+SOFTWARE.diff --git a/docs/themes/juice/README.md b/docs/themes/juice/README.mdnew file mode 100644index 000000000..f8d610726--- /dev/null+++ b/docs/themes/juice/README.md@@ -0,0 +1,129 @@+# Juice++<img align="right" width="150" height="150" src="/content/juice.svg">++**Juice** is an intuitive, elegant, and responsive Zola theme for product sites.++- Build for product sites+- Simple and intuitive structure+- Clean and elegant design+- Responsive and mobile device compatible+- Customize and extend friendly++https://juice.huhu.io++# Installation++First download this theme to your `themes` directory:++```bash+$ cd themes+$ git clone https://github.com/huhu/juice.git+```++or add as a submodule+```bash+$ git submodule add https://github.com/huhu/juice themes/juice+```++and then enable it in your `config.toml`:++```toml+theme = "juice"+```++# Structure++### Hero++**Juice** is designed for product websites, hence we let **hero** part fills whole of screen.+You can customize your **hero** by using `hero` block in the `templates/index.html`.++```html+{% extends "juice/templates/index.html" %}+{% block hero %}+ <div>+ Your cool hero html...+ </div>+{% endblock hero %}+```++### Page++Every markdown file located in `content` directory will become a **Page**. There also will display as+a navigate link on the top-right corner.+You can change the frontmatter's `weight` value to sort the order (ascending order).++```+++++title = "Changelog"+description = "Changelog"+weight = 2++++++```++### CSS variables++You can override theme variable by creating a file named `_variables.html` in your `templates` directory.++See the default value [here](./templates/_variables.html)++### Favicon+The same way as changing the `hero` block in the `templates/index.html`, you can change the **favicon**.++```html+{% extends "juice/templates/index.html" %}+{% block favicon %}+ <link rel="icon" type="image/png" href="/favicon.ico">+{% endblock favicon %}+```++### Fonts+If you changed the `--xy-font-family`-variable in `_variables.html`, you have to load the mentioned fonts in the `templates/index.html`.++```html+{% extends "juice/templates/index.html" %}+{% block fonts %}+ <link href="https://cdn.jsdelivr.net/npm/[email protected]/css/fork-awesome.min.css" rel="stylesheet" crossorigin="anonymous">+ <link href="https://fonts.googleapis.com/css2?family=Babylonica&display=swap" rel="stylesheet">+{% endblock fonts %}+```++# Configuration++You can customize some builtin property in `config.toml` file:++```toml+[extra]+juice_logo_name = "Juice"+juice_logo_path = "juice.svg"+juice_extra_menu = [+ { title = "Github", link = "https://github.com/huhu/juice"}+]+juice_exclude_menu = [+ "exclude_from_nav"+]+repository_url = "https://github.com/huhu/juice"+```++# Shortcodes++**Juice** have some builtin shortcodes available in `templates/shortcodes` directory.++- `issue(id)` - A shortcode to render issue url, e.g. `issue(id=1)` would render to the link `https://github.com/huhu/juice/issue/1`.++> The `repository_url` is required.++# Showcases++Please see the [showcases page](https://juice.huhu.io/showcases).++# Contributing++Thank you very much for considering contributing to this project!++We appreciate any form of contribution:++- New issues (feature requests, bug reports, questions, ideas, ...)+- Pull requests (documentation improvements, code improvements, new features, ...)diff --git a/docs/themes/juice/config.toml b/docs/themes/juice/config.tomlnew file mode 100644index 000000000..f12efc8ad--- /dev/null+++ b/docs/themes/juice/config.toml@@ -0,0 +1,30 @@+# The URL the site will be built for+base_url = "/"++title = "Juice - An intuitive, elegant, and lightweight Zola theme for product sites."+# default_language = "en"++# Whether to automatically compile all Sass files in the sass directory+compile_sass = true++# Whether to build a search index to be used later on by a JavaScript library+build_search_index = false++# Configuration of the Markdown rendering+[markdown]+# Whether to do syntax highlighting+# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola+highlight_code = true+highlight_theme = "inspired-github"++[extra]+juice_logo_name = "Juice"+juice_logo_path = "juice.svg"+juice_extra_menu = [+ { title = "Github", link = "https://github.com/huhu/juice" }+]+# Add page titles here to exclude them from the nav section (case sensitive)+juice_exclude_menu = [+ "exclude_from_nav"+]+repository_url = "https://github.com/huhu/juice"diff --git a/docs/themes/juice/sass/_markdown.scss b/docs/themes/juice/sass/_markdown.scssnew file mode 100644index 000000000..94cae0b25--- /dev/null+++ b/docs/themes/juice/sass/_markdown.scss@@ -0,0 +1,45 @@+.content {+ padding: 0 40px;+ display: flex;+ flex-direction: column;+ overflow-x: auto;+}++.content pre {+ overflow-x: auto;+ padding: 1.25em 1.5em;+ white-space: pre;+ word-wrap: normal;+ background-color: var(--code-background-color);+ color: var(--code-color);+ font-size: .875em;+ font-family: monospace;+}++.content code {+ background-color: var(--code-background-color);+ color: var(--code-color);+ font-size: .875em;+ font-weight: normal;+ padding: 0.25em 0.5em;+ font-family: monospace;+}++.content pre code {+ padding: 0;+}++.content a {+ color: var(--primary-link-color);++ &:hover {+ text-decoration: underline;+ }+}++.content blockquote {+ border-left: #e2dede 8px solid;+ margin: 0;+ background-color: #f2f1f0;+ padding: 0 20px;+}diff --git a/docs/themes/juice/sass/_text.scss b/docs/themes/juice/sass/_text.scssnew file mode 100644index 000000000..f55072b2e--- /dev/null+++ b/docs/themes/juice/sass/_text.scss@@ -0,0 +1,39 @@+.heading-text {+ font-family: var(--header-font-family);+ font-size: 32px;+ font-weight: 600;+ padding: 10px 0 25px 0;+ color: var(--primary-text-color);+}++h1, .title-text {+ font-family: var(--header-font-family);+ font-size: 25px;+ font-weight: 500;+ color: var(--primary-text-color);+ border-left: var(--primary-color) 8px solid;+ padding-left: 10px;+}++h2, .subtitle-text {+ font-family: var(--header-font-family);+ font-size: 20px;+ font-weight: 500;+ color: var(--primary-text-color);+}++.text {+ font-family: var(--text-font-family);+ font-size: 18px;+ font-weight: 400;+ line-height: 26px;+ letter-spacing: 0.2px;+ color: var(--primary-text-color);+}++.subtext {+ font-family: var(--text-font-family);+ font-size: 16px;+ font-weight: 400;+ letter-spacing: 0.1px;+}diff --git a/docs/themes/juice/sass/_utility.scss b/docs/themes/juice/sass/_utility.scssnew file mode 100644index 000000000..59b76e9aa--- /dev/null+++ b/docs/themes/juice/sass/_utility.scss@@ -0,0 +1,13 @@+.text-center {+ text-align: center;+}++.pos-absolute {+ right: 0;+ left: 0;+ position: absolute;+}++.box-shadow {+ box-shadow: 0 2px 10px 2px var(--shadow-color);+}diff --git a/docs/themes/juice/sass/carbon.scss b/docs/themes/juice/sass/carbon.scssnew file mode 100644index 000000000..4d00ebe82--- /dev/null+++ b/docs/themes/juice/sass/carbon.scss@@ -0,0 +1,65 @@+#carbonads * {+ margin: initial;+ padding: initial;+}+#carbonads {+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,+ Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Helvetica, Arial,+ sans-serif;+}+#carbonads {+ position: sticky;+ top: 10px;+ display: flex;+ max-width: 330px;+ z-index: 100;+}+#carbonads a {+ color: inherit;+ text-decoration: none;+}+#carbonads a:hover {+ color: inherit;+}+#carbonads span {+ position: relative;+ display: block;+ overflow: hidden;+}+#carbonads .carbon-wrap {+ display: flex;+ flex-direction: column;+ justify-content: center;+ align-items: center;+ padding: 20px 10px;+ text-align: center;+}+#carbonads .carbon-img {+ display: block;+ margin: 0;+ line-height: 1;+}+#carbonads .carbon-img img {+ display: block;+}+#carbonads .carbon-text {+ font-size: 13px;+ padding: 10px;+ margin-bottom: 16px;+ line-height: 1.5;+}+#carbonads .carbon-poweredby {+ display: block;+ padding: 6px 8px;+ background: #f1f1f2;+ text-align: center;+ text-transform: uppercase;+ letter-spacing: 0.5px;+ font-weight: 600;+ font-size: 8px;+ line-height: 1;+ border-top-left-radius: 3px;+ position: absolute;+ bottom: 0;+ right: 0;+}diff --git a/docs/themes/juice/sass/juice.scss b/docs/themes/juice/sass/juice.scssnew file mode 100644index 000000000..a1ed9a434--- /dev/null+++ b/docs/themes/juice/sass/juice.scss@@ -0,0 +1,206 @@+@import "_utility.scss";+@import "_text.scss";+@import "_markdown.scss";++body {+ padding: 0;+ margin: 0;+ box-sizing: border-box;+ background-color: var(--secondary-color);+ display: flex;+ flex-direction: column;+ min-height: 100vh;+}++a {+ text-decoration: none;+}++ul {+ margin-top: 0.5rem;+}++ul > li {+ padding: 0.3rem 0;+}++p > img {+ width: 100%;+ height: auto;+}++header {+ background-color: var(--primary-color);+ color: var(--primary-text-color);+ padding: 20px 50px;+ display: flex;+ align-items: center;+ justify-content: space-between;+}++.logo {+ font-family: "Alfa Slab One", serif;+ font-size: 32px;+ color: var(--primary-text-color);+ display: flex;+ align-items: center;+ margin: 0 40px;++ img {+ width: 60px;+ margin: 0 25px;+ }+}++.nav-item {+ margin: 0 10px;+ text-decoration: none;+ font-size: 18px;+ font-weight: bold;++ &:hover {+ color: var(--primary-text-color-over);+ text-decoration: underline;+ }+}++.hero {+ display: flex;+ align-items: center;+ justify-content: space-evenly;+ height: 100vh;+ background-color: var(--primary-color);+ overflow-x: hidden;+ padding: 0 40px;++ .explore-more {+ position: absolute;+ bottom: 20px;+ cursor: pointer;+ }+}++main {+ display: flex;+ padding: 50px 100px;+ flex-grow: 1;++ .toc {+ max-width: 260px;+ min-width: 240px;+ }++ .toc-item {+ padding: 10px 20px;+ color: #424242;+ }++ .toc-item a, .toc-item-child a {+ color: var(--secondary-text-color);++ &:hover {+ cursor: pointer;+ text-decoration: underline;+ }+ }++ .toc-item a.active, .toc-item-child a.active {+ color: var(--toc-highlight-text-color);+ }++ .toc-item-child {+ padding: 0 30px 5px;+ color: #424242;+ }++}++.toc-sticky {+ border-radius: 3px;+ border-top: 5px solid var(--primary-color);+ background-color: var(--toc-background-color);+ position: sticky;+ position: -webkit-sticky;+ position: -moz-sticky;+ position: -ms-sticky;+ position: -o-sticky;+ top: 10px;+ padding: 10px 0 20px;+ max-height: 100vh;+ overflow: auto;+}++footer {+ padding: 50px;+ display: flex;+ flex-direction: column;+ justify-content: center;+ align-items: center;+ background-color: #202020;+ color: #fcfcfc;++ a {+ color: #fcfcfc;+ text-decoration: underline;+ }+}++@media screen and (min-width: 1280px) {+ .content {+ max-width: 60%;+ min-width: 800px;+ }+}++@media screen and (max-width: 768px) {+ header {+ padding: 10px 30px;+ flex-direction: column;+ align-items: center;+ justify-content: center;+ }++ .logo {+ font-size: 28px;+ margin: 10px;++ img {+ width: 45px;+ margin: 0 10px 0 0;+ }+ }++ .nav-item {+ margin: 0 5px;+ font-size: 14px;+ }++ .hero {+ padding: 40px 30px;+ }++ main {+ padding: 30px;+ }++ .content {+ padding: 0;+ }++ .explore-more, .toc {+ display: none;+ }++ main {+ padding: 30px;+ display: flex;+ flex-direction: column;+ }++ .sidebar {+ position: relative;+ width: 215px;+ margin: 2rem auto 0;+ }++}diff --git a/docs/themes/juice/screenshot.png b/docs/themes/juice/screenshot.pngnew file mode 100644index 000000000..3150b2159Binary files /dev/null and b/docs/themes/juice/screenshot.png differdiff --git a/docs/themes/juice/static/normalize.css b/docs/themes/juice/static/normalize.cssnew file mode 100644index 000000000..192eb9ce4--- /dev/null+++ b/docs/themes/juice/static/normalize.css@@ -0,0 +1,349 @@+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */++/* Document+ ========================================================================== */++/**+ * 1. Correct the line height in all browsers.+ * 2. Prevent adjustments of font size after orientation changes in iOS.+ */++html {+ line-height: 1.15; /* 1 */+ -webkit-text-size-adjust: 100%; /* 2 */+}++/* Sections+ ========================================================================== */++/**+ * Remove the margin in all browsers.+ */++body {+ margin: 0;+}++/**+ * Render the `main` element consistently in IE.+ */++main {+ display: block;+}++/**+ * Correct the font size and margin on `h1` elements within `section` and+ * `article` contexts in Chrome, Firefox, and Safari.+ */++h1 {+ font-size: 2em;+ margin: 0.67em 0;+}++/* Grouping content+ ========================================================================== */++/**+ * 1. Add the correct box sizing in Firefox.+ * 2. Show the overflow in Edge and IE.+ */++hr {+ box-sizing: content-box; /* 1 */+ height: 0; /* 1 */+ overflow: visible; /* 2 */+}++/**+ * 1. Correct the inheritance and scaling of font size in all browsers.+ * 2. Correct the odd `em` font sizing in all browsers.+ */++pre {+ font-family: monospace, monospace; /* 1 */+ font-size: 1em; /* 2 */+}++/* Text-level semantics+ ========================================================================== */++/**+ * Remove the gray background on active links in IE 10.+ */++a {+ background-color: transparent;+}++/**+ * 1. Remove the bottom border in Chrome 57-+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.+ */++abbr[title] {+ border-bottom: none; /* 1 */+ text-decoration: underline; /* 2 */+ text-decoration: underline dotted; /* 2 */+}++/**+ * Add the correct font weight in Chrome, Edge, and Safari.+ */++b,+strong {+ font-weight: bolder;+}++/**+ * 1. Correct the inheritance and scaling of font size in all browsers.+ * 2. Correct the odd `em` font sizing in all browsers.+ */++code,+kbd,+samp {+ font-family: monospace, monospace; /* 1 */+ font-size: 1em; /* 2 */+}++/**+ * Add the correct font size in all browsers.+ */++small {+ font-size: 80%;+}++/**+ * Prevent `sub` and `sup` elements from affecting the line height in+ * all browsers.+ */++sub,+sup {+ font-size: 75%;+ line-height: 0;+ position: relative;+ vertical-align: baseline;+}++sub {+ bottom: -0.25em;+}++sup {+ top: -0.5em;+}++/* Embedded content+ ========================================================================== */++/**+ * Remove the border on images inside links in IE 10.+ */++img {+ border-style: none;+}++/* Forms+ ========================================================================== */++/**+ * 1. Change the font styles in all browsers.+ * 2. Remove the margin in Firefox and Safari.+ */++button,+input,+optgroup,+select,+textarea {+ font-family: inherit; /* 1 */+ font-size: 100%; /* 1 */+ line-height: 1.15; /* 1 */+ margin: 0; /* 2 */+}++/**+ * Show the overflow in IE.+ * 1. Show the overflow in Edge.+ */++button,+input { /* 1 */+ overflow: visible;+}++/**+ * Remove the inheritance of text transform in Edge, Firefox, and IE.+ * 1. Remove the inheritance of text transform in Firefox.+ */++button,+select { /* 1 */+ text-transform: none;+}++/**+ * Correct the inability to style clickable types in iOS and Safari.+ */++button,+[type="button"],+[type="reset"],+[type="submit"] {+ -webkit-appearance: button;+}++/**+ * Remove the inner border and padding in Firefox.+ */++button::-moz-focus-inner,+[type="button"]::-moz-focus-inner,+[type="reset"]::-moz-focus-inner,+[type="submit"]::-moz-focus-inner {+ border-style: none;+ padding: 0;+}++/**+ * Restore the focus styles unset by the previous rule.+ */++button:-moz-focusring,+[type="button"]:-moz-focusring,+[type="reset"]:-moz-focusring,+[type="submit"]:-moz-focusring {+ outline: 1px dotted ButtonText;+}++/**+ * Correct the padding in Firefox.+ */++fieldset {+ padding: 0.35em 0.75em 0.625em;+}++/**+ * 1. Correct the text wrapping in Edge and IE.+ * 2. Correct the color inheritance from `fieldset` elements in IE.+ * 3. Remove the padding so developers are not caught out when they zero out+ * `fieldset` elements in all browsers.+ */++legend {+ box-sizing: border-box; /* 1 */+ color: inherit; /* 2 */+ display: table; /* 1 */+ max-width: 100%; /* 1 */+ padding: 0; /* 3 */+ white-space: normal; /* 1 */+}++/**+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.+ */++progress {+ vertical-align: baseline;+}++/**+ * Remove the default vertical scrollbar in IE 10+.+ */++textarea {+ overflow: auto;+}++/**+ * 1. Add the correct box sizing in IE 10.+ * 2. Remove the padding in IE 10.+ */++[type="checkbox"],+[type="radio"] {+ box-sizing: border-box; /* 1 */+ padding: 0; /* 2 */+}++/**+ * Correct the cursor style of increment and decrement buttons in Chrome.+ */++[type="number"]::-webkit-inner-spin-button,+[type="number"]::-webkit-outer-spin-button {+ height: auto;+}++/**+ * 1. Correct the odd appearance in Chrome and Safari.+ * 2. Correct the outline style in Safari.+ */++[type="search"] {+ -webkit-appearance: textfield; /* 1 */+ outline-offset: -2px; /* 2 */+}++/**+ * Remove the inner padding in Chrome and Safari on macOS.+ */++[type="search"]::-webkit-search-decoration {+ -webkit-appearance: none;+}++/**+ * 1. Correct the inability to style clickable types in iOS and Safari.+ * 2. Change font properties to `inherit` in Safari.+ */++::-webkit-file-upload-button {+ -webkit-appearance: button; /* 1 */+ font: inherit; /* 2 */+}++/* Interactive+ ========================================================================== */++/*+ * Add the correct display in Edge, IE 10+, and Firefox.+ */++details {+ display: block;+}++/*+ * Add the correct display in all browsers.+ */++summary {+ display: list-item;+}++/* Misc+ ========================================================================== */++/**+ * Add the correct display in IE 10+.+ */++template {+ display: none;+}++/**+ * Add the correct display in IE 10.+ */++[hidden] {+ display: none;+}diff --git a/docs/themes/juice/templates/_macros.html b/docs/themes/juice/templates/_macros.htmlnew file mode 100644index 000000000..7cde02c37--- /dev/null+++ b/docs/themes/juice/templates/_macros.html@@ -0,0 +1,23 @@+{% macro render_header() %}+{% set section = get_section(path="_index.md") %}+<a href="{{ section.permalink | safe }}">+ <div class="logo">+ <img src="{{ get_url(path=config.extra.juice_logo_path) }}" alt="logo">+ {{ config.extra.juice_logo_name }}+ </div>+</a>++<nav>+ {% for page in section.pages %}+ {% set exclude_menu = config.extra.juice_exclude_menu | default(value=[]) %}+ {% if exclude_menu is not containing(page.title) %}+ <a class="nav-item subtitle-text" href="{{ page.permalink | safe }}">{{ page.title }}</a>+ {% endif %}+ {% endfor %}+ {% if config.extra.juice_extra_menu %}+ {% for menu in config.extra.juice_extra_menu %}+ <a class="nav-item subtitle-text" href="{{ menu.link | safe }}">{{ menu.title }}</a>+ {% endfor %}+ {% endif %}+</nav>+{% endmacro render_header %}diff --git a/docs/themes/juice/templates/_variables.html b/docs/themes/juice/templates/_variables.htmlnew file mode 100644index 000000000..5fe3faa10--- /dev/null+++ b/docs/themes/juice/templates/_variables.html@@ -0,0 +1,45 @@+<style>+ :root {+ /* Primary theme color */+ --primary-color: #FED43F;+ /* Primary theme text color */+ --primary-text-color: #543631;+ --primary-text-color-over: #000;+ /* Primary theme link color */+ --primary-link-color: #F9BB2D;+ /* Secondary color: the background body color */+ --secondary-color: #fcfaf6;+ --secondary-text-color: #303030;+ /* Highlight text color of table of content */+ --toc-highlight-text-color: #d46e13;+ --toc-background-color: white;+ --code-color: #4a4a4a;+ --code-background-color: white;++ --shadow-color: #ddd;++ /* Font used for headers (h1 & h2) */+ --header-font-family: "Fira Sans", sans-serif;+ /* Font used for text */+ --text-font-family: "Fira Sans", sans-serif;+ }++ @media (prefers-color-scheme: dark) {+ :root {+ --primary-color: #382929;+ --primary-text-color: #d7d7d7;+ --primary-text-color-over: #FFF;+ --primary-link-color: #9b9b9b;+ --secondary-color: #282828;+ --secondary-text-color: #f2f2f2;+ --toc-highlight-text-color: #f2f2f2;+ --toc-background-color: #3a3a3a;+ --code-color: white;+ --code-background-color: #4a4a4a;++ --shadow-color: #202020;+ --header-font-family: "Fira Sans", sans-serif;+ --text-font-family: "Fira Sans", sans-serif;+ }+ }+</style>diff --git a/docs/themes/juice/templates/index.html b/docs/themes/juice/templates/index.htmlnew file mode 100644index 000000000..d2567452d--- /dev/null+++ b/docs/themes/juice/templates/index.html@@ -0,0 +1,149 @@+{% import "_macros.html" as macros %}+<!DOCTYPE html>+<html lang="{{ lang }}">++<head>+ <meta charset="UTF-8">+ <title>{% block title %}{{ config.title }}{% endblock title %}</title>+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">+ {% block favicon %}+ <link rel="icon" type="image/png" href="/favicon.ico">+ {% endblock favicon %}+ {% include "_variables.html" %}+ {% block fonts %}+ <link href="https://fonts.googleapis.com/css?family=Alfa+Slab+One&display=swap" rel="stylesheet">+ <link href="https://fonts.googleapis.com/css?family=Fira+Sans:400,500,600&display=swap" rel="stylesheet">+ {% endblock fonts %}+ <link rel="stylesheet" href="/normalize.css">+ <link rel="stylesheet" href="{{ get_url(path="juice.css") }}">+ {% block head %}+ <link rel="stylesheet" href="{{ get_url(path="carbon.css") }}">+ {% endblock head %}+</head>++<body>+ {% block header %}++ <header class="pos-absolute" style="background-color: transparent">+ {{ macros::render_header() }}+ </header>++ <div class="hero">+ {% block hero %}+ <script async defer src="https://buttons.github.io/buttons.js"></script>+ <section class="text-center">+ <h1 class="heading-text" style="font-size: 50px">+ Build your static website+ </h1>+ <h3 class="title-text">+ <b>Juice</b> is an intuitive, elegant, and lightweight Zola theme for product websites.+ </h3>+ <div>+ <a class="github-button" href="https://github.com/huhu/juice" data-size="large" data-show-count="true"+ aria-label="Star huhu/juice on GitHub">Star</a>+ <a class="github-button" href="https://github.com/huhu/juice/fork" data-size="large"+ data-show-count="true" aria-label="Fork huhu/juice on GitHub">Fork</a>+ </div>+ </section>+ <img class="hero-image" style="width: 50%" src="{{ get_url(path="juice.svg") }}">++ <div class="explore-more text"+ onclick="document.getElementById('features').scrollIntoView({behavior: 'smooth'})">+ Explore More β©+ </div>+ <style>+ .hero section {+ padding: 0 5rem;+ }++ @media screen and (max-width: 768px) {+ .hero section {+ padding: 0 2rem;+ }++ .hero-image {+ display: none+ }+ }+ </style>+ {% endblock hero %}+ </div>++ {% endblock header %}++ <main>+ {% block toc %}+ {% if section.toc %}+ {% set toc = section.toc %}+ {% elif page.toc %}+ {% set toc = page.toc %}+ {% endif %}+ {% if toc %}+ <div class="toc">+ <div class="toc-sticky">+ {% for h in toc %}+ <div class="toc-item">+ <a class="subtext" href="{{h.permalink | safe}}">{{ h.title }}</a>+ </div>+ {% if h.children %}+ {% for h2 in h.children %}+ <div class="toc-item-child">+ <a class="subtext" href="{{h2.permalink | safe}}"><small>- {{ h2.title }}</small></a>+ </div>+ {% endfor %}+ {% endif %}+ {% endfor %}+ </div>+ </div>+ {% endif %}+ {% endblock toc %}++ <div class="content text">+ {% block content %}+ <div id="features" class="heading-text">Overview</div>+ {{ section.content | safe }}+ {% endblock content %}+ </div>++ {% block sidebar %}+ <div class="sidebar">+ Your can customize the sidebar.+ <script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIL27E&placement=extensionsh" id="_carbonads_js"></script>+ </div>+ {% endblock sidebar %}+ </main>++ {% block footer %}+ <footer>+ <small class="subtext">+ <a href="https://huhu.io">Huhu.io</a> Β© 2021+ </small>+ </footer>+ {% endblock footer %}+</body>+<script>+ const scrollHandler = entries => {+ // Find the first entry which intersecting and ratio > 0.9 to highlight.+ let entry = entries.find(entry => {+ return entry.isIntersecting && entry.intersectionRatio > 0.9;+ });+ if (!entry) return;++ document.querySelectorAll(".toc a").forEach((item) => {+ item.classList.remove("active");+ });++ // let url = new URL(`#${entry.target.id}`);+ let link = document.querySelector(`.toc a[href$="${decodeURIComponent(`#${entry.target.id}`)}"]`)+ if (link) {+ link.classList.add("active");+ link.scrollIntoView({ behavior: "auto", block: "nearest" });+ }+ };+ // Set -100px root margin to improve highlight experience.+ const observer = new IntersectionObserver(scrollHandler, { threshold: 1 });+ let items = document.querySelectorAll('h1,h2,h3,h4,h5,h6');+ items.forEach(item => observer.observe(item));+</script>++</html>diff --git a/docs/themes/juice/templates/page.html b/docs/themes/juice/templates/page.htmlnew file mode 100644index 000000000..61e8811e2--- /dev/null+++ b/docs/themes/juice/templates/page.html@@ -0,0 +1,15 @@+{% import "_macros.html" as macros %}+{% extends "index.html" %}++{% block title %}{{ page.title }} | {{ super() }} {% endblock title %}++{% block header %}+<header class="box-shadow">+ {{ macros::render_header() }}+</header>+{% endblock header %}++{% block content %}+<div class="heading-text">{{ page.description }}</div>+{{ page.content | safe }}+{% endblock content %}diff --git a/docs/themes/juice/templates/shortcodes/issue.html b/docs/themes/juice/templates/shortcodes/issue.htmlnew file mode 100644index 000000000..d6f279e84--- /dev/null+++ b/docs/themes/juice/templates/shortcodes/issue.html@@ -0,0 +1 @@+<a href="{{ config.extra.repository_url }}/issues/{{ id }}">#{{ id }}</a>diff --git a/docs/themes/juice/theme.toml b/docs/themes/juice/theme.tomlnew file mode 100644index 000000000..79e59f50f--- /dev/null+++ b/docs/themes/juice/theme.toml@@ -0,0 +1,12 @@+name = "juice"+description = "An intuitive, elegant, and lightweight Zola theme for product sites."+license = "MIT"+homepage = "https://github.com/huhu/juice"+min_version = "0.11.0"+demo = "https://juice.huhu.io"++[extra]++[author]+name = "Huhu teams"+homepage = "https://huhu.io"diff --git a/docs/themes/juice/vercel.json b/docs/themes/juice/vercel.jsonnew file mode 100644index 000000000..7ae9a3de5--- /dev/null+++ b/docs/themes/juice/vercel.json@@ -0,0 +1,5 @@+{+ "github": {+ "silent": true+ }+}diff --git a/src/commands/commit.rs b/src/commands/commit.rsindex f70b26684..e6017f6e7 100644--- a/src/commands/commit.rs+++ b/src/commands/commit.rs@@ -2,7 +2,7 @@ use anyhow::Context;use color_print::cformat;use worktrunk::config::CommitGenerationConfig;use worktrunk::git::Repository;-use worktrunk::styling::format_with_gutter;+use worktrunk::styling::{HINT_EMOJI, format_with_gutter};use super::command_executor::CommandContext;use super::hooks::HookPipeline;@@ -67,9 +67,9 @@ impl<'a> CommitGenerator<'a> {pub fn emit_hint_if_needed(&self) -> anyhow::Result<()> {if !self.config.is_configured() {- crate::output::hint(- "Using fallback commit message. Run 'wt config --help' for LLM setup guide",- )?;+ crate::output::print(cformat!(+ "{HINT_EMOJI} <dim>Using fallback commit message. Run </>wt config --help<dim> for LLM setup guide</>"+ ))?;}Ok(())}diff --git a/src/commands/config.rs b/src/commands/config.rsindex 6537a3e0d..cafd97d01 100644--- a/src/commands/config.rs+++ b/src/commands/config.rs@@ -51,8 +51,12 @@ pub fn handle_config_create() -> anyhow::Result<()> {format_path_for_display(&config_path)))?;output::blank()?;- output::hint("Use 'wt config show' to view existing configuration")?;- output::hint("Use 'wt config create --help' for config format reference")?;+ output::print(cformat!(+ "{HINT_EMOJI} <dim>Use </>wt config show<dim> to view existing configuration</>"+ ))?;+ output::print(cformat!(+ "{HINT_EMOJI} <dim>Use </>wt config create --help<dim> for config format reference</>"+ ))?;return Ok(());}@@ -124,7 +128,7 @@ fn render_user_config(out: &mut String) -> anyhow::Result<()> {writeln!(out,"{}",- cformat!("{HINT_EMOJI} <dim>Run 'wt config create' to create a config file</>")+ cformat!("{HINT_EMOJI} <dim>Run </>wt config create<dim> to create a config file</>"))?;writeln!(out)?;let default_config =@@ -323,7 +327,7 @@ fn render_shell_status(out: &mut String) -> anyhow::Result<()> {out,"{}",cformat!(- "{HINT_EMOJI} <dim>Run 'wt config shell install' to enable shell integration</>"+ "{HINT_EMOJI} <dim>Run </>wt config shell install<dim> to enable shell integration</>"))?;}diff --git a/src/commands/configure_shell.rs b/src/commands/configure_shell.rsindex 1e2c4183f..a7c0a5b82 100644--- a/src/commands/configure_shell.rs+++ b/src/commands/configure_shell.rs@@ -174,10 +174,12 @@ pub fn handle_configure_shell(// If detection fails (None), stay silent - we can't be sure.if shell::detect_zsh_compinit() == Some(false) {let _ = crate::output::warning(- "Completions won't work: zsh's compinit is not enabled.\n\- Add this to ~/.zshrc before the wt line:\n\- autoload -Uz compinit && compinit",+ "Completions won't work; add to ~/.zshrc before the wt line:",);+ let _ = crate::output::gutter(format_bash_with_gutter(+ "autoload -Uz compinit && compinit",+ "",+ ));}}diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 522c8cb56..7d003d545 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -259,7 +259,7 @@ pub fn handle_merge(fn handle_merge_summary_output(reason: PreserveReason) -> anyhow::Result<()> {let message = match reason {PreserveReason::IsMainWorktree => "Worktree preserved (main worktree)",- PreserveReason::AlreadyOnTarget => "Worktree preserved (already on target)",+ PreserveReason::AlreadyOnTarget => "Worktree preserved (already on target branch)",PreserveReason::NoRemoveFlag => "Worktree preserved (--no-remove)",};crate::output::info(message)?;diff --git a/src/commands/repository_ext.rs b/src/commands/repository_ext.rsindex 7aeed11db..6e7424694 100644--- a/src/commands/repository_ext.rs+++ b/src/commands/repository_ext.rs@@ -368,7 +368,7 @@ impl TargetWorktreeStash {.run_command(&["stash", "pop", "--quiet", &self.stash_ref]){crate::output::warning(cformat!(- "Failed to restore stash <bold>{stash_ref}</> - run 'git stash pop {stash_ref}' in <bold>{path}</>",+ "Failed to restore stash <bold>{stash_ref}</> - run <bold>git stash pop {stash_ref}</> in <bold>{path}</>",stash_ref = self.stash_ref,path = format_path_for_display(&self.path),))?;diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 3bb723cc7..888189b12 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -114,7 +114,7 @@ use std::path::PathBuf;use worktrunk::HookType;use worktrunk::config::{CommandPhase, WorktrunkConfig};use worktrunk::git::{GitError, Repository, ResolvedWorktree, is_command_not_approved};-use worktrunk::styling::format_with_gutter;+use worktrunk::styling::{HINT_EMOJI, format_with_gutter};use super::command_executor::CommandContext;use super::hooks::{HookFailureStrategy, HookPipeline};@@ -327,8 +327,8 @@ pub fn handle_switch(crate::output::warning(cformat!("Branch <bold>{resolved_branch}</> exists on remote ({remote_ref}); creating new branch from base instead"))?;- crate::output::hint(format!(- "Use 'wt switch {resolved_branch}' (without --create) to switch to the remote branch"+ crate::output::print(cformat!(+ "{HINT_EMOJI} <dim>Use </>wt switch <bold>{resolved_branch}</><dim> (without </>--create<dim>) to switch to the remote branch</>"))?;}}diff --git a/src/git/error.rs b/src/git/error.rsindex 4d1377aaa..e232108b2 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -130,7 +130,7 @@ impl std::fmt::Display for GitError {};cwrite!(f,- "{ERROR_EMOJI} <red>{message}</>\n\n{HINT_EMOJI} <dim>Switch to a branch first with 'git switch <<branch>>'</>"+ "{ERROR_EMOJI} <red>{message}</>\n\n{HINT_EMOJI} <dim>Switch to a branch first with </>git switch <<branch>>")}@@ -143,28 +143,28 @@ impl std::fmt::Display for GitError {};cwrite!(f,- "{ERROR_EMOJI} <red>{message}</>\n\n{HINT_EMOJI} <dim>Commit or stash them first</>"+ "{ERROR_EMOJI} <red>{message}</>\n\n{HINT_EMOJI} <dim>Commit or stash changes first</>")}GitError::BranchAlreadyExists { branch } => {cwrite!(f,- "{ERROR_EMOJI} <red>Branch <bold>{branch}</> already exists</>\n\n{HINT_EMOJI} <dim>Remove --create flag to switch to it</>"+ "{ERROR_EMOJI} <red>Branch <bold>{branch}</> already exists</>\n\n{HINT_EMOJI} <dim>Remove </>--create<dim> flag to switch to the existing branch</>")}GitError::InvalidReference { reference } => {cwrite!(f,- "{ERROR_EMOJI} <red>Branch <bold>{reference}</> not found</>\n\n{HINT_EMOJI} <dim>Use --create to create it, or 'wt list --branches --remotes' for available branches</>"+ "{ERROR_EMOJI} <red>Branch <bold>{reference}</> not found</>\n\n{HINT_EMOJI} <dim>Use </>--create<dim> to create a new branch, or </>wt list --branches --remotes<dim> for available branches</>")}GitError::WorktreeMissing { branch } => {cwrite!(f,- "{ERROR_EMOJI} <red>Worktree directory missing for <bold>{branch}</></>\n\n{HINT_EMOJI} <dim>Run 'git worktree prune' to clean up</>"+ "{ERROR_EMOJI} <red>Worktree directory missing for <bold>{branch}</></>\n\n{HINT_EMOJI} <dim>Run </>git worktree prune<dim> to clean up</>")}@@ -181,14 +181,17 @@ impl std::fmt::Display for GitError {occupant,} => {let path_display = format_path_for_display(path);- let occupant_note = occupant- .as_ref()- .map(|b| format!(" (currently on <bold>{b}</>)"))- .unwrap_or_default();- cwrite!(- f,- "{ERROR_EMOJI} <red>Cannot create worktree for <bold>{branch}</>: target path already exists</>\n\n{HINT_EMOJI} <dim>Reuse the existing worktree at {path_display}{occupant_note} or remove it before retrying</>"- )+ if let Some(occupant_branch) = occupant {+ cwrite!(+ f,+ "{ERROR_EMOJI} <red>Cannot create worktree for <bold>{branch}</>: target path already exists</>\n\n{HINT_EMOJI} <dim>Reuse the existing worktree at {path_display} (currently on <bold>{occupant_branch}</>) or remove the directory before retrying</>"+ )+ } else {+ cwrite!(+ f,+ "{ERROR_EMOJI} <red>Cannot create worktree for <bold>{branch}</>: target path already exists</>\n\n{HINT_EMOJI} <dim>Reuse the existing worktree at {path_display} or remove the directory before retrying</>"+ )+ }}GitError::WorktreePathExists { path } => {@@ -208,7 +211,7 @@ impl std::fmt::Display for GitError {let actual = format_path_for_display(actual_path);cwrite!(f,- "{ERROR_EMOJI} <red>Ambiguous: <bold>{expected}</> has a worktree on a different branch, but branch <bold>{branch}</> exists at <bold>{actual}</></>\n\n{HINT_EMOJI} <dim>Use 'wt list' to see worktree-branch mappings</>"+ "{ERROR_EMOJI} <red>Ambiguous: <bold>{expected}</> has a worktree on a different branch, but branch <bold>{branch}</> exists at <bold>{actual}</></>\n\n{HINT_EMOJI} <dim>Use </>wt list<dim> to see worktree-branch mappings</>")}@@ -217,13 +220,15 @@ impl std::fmt::Display for GitError {base_branch,error,} => {- let base_suffix = base_branch- .as_ref()- .map(|base| format!(" from base <bold>{base}</>"))- .unwrap_or_default();- let header = cformat!(- "{ERROR_EMOJI} <red>Failed to create worktree for <bold>{branch}</>{base_suffix}</>"- );+ let header = if let Some(base) = base_branch {+ cformat!(+ "{ERROR_EMOJI} <red>Failed to create worktree for <bold>{branch}</> from base <bold>{base}</></>"+ )+ } else {+ cformat!(+ "{ERROR_EMOJI} <red>Failed to create worktree for <bold>{branch}</></>"+ )+ };write!(f, "{}", format_error_block(header, error))}@@ -278,18 +283,23 @@ impl std::fmt::Display for GitError {write!(f, "\n{}", format_with_gutter(commits_formatted, "", None))?;}// Context-appropriate hint- let hint = if *in_merge_context {- "Run 'wt merge' again to incorporate these changes".to_string()+ if *in_merge_context {+ cwrite!(+ f,+ "\n{HINT_EMOJI} <dim>Run </>wt merge<dim> again to incorporate these changes</>"+ )} else {- format!("Use 'wt step rebase' or 'wt merge' to rebase onto {target_branch}")- };- cwrite!(f, "\n{HINT_EMOJI} <dim>{hint}</>")+ cwrite!(+ f,+ "\n{HINT_EMOJI} <dim>Use </>wt step rebase<dim> or </>wt merge<dim> to rebase onto <bold>{target_branch}</></>"+ )+ }}GitError::MergeCommitsFound => {cwrite!(f,- "{ERROR_EMOJI} <red>Found merge commits in push range</>\n\n{HINT_EMOJI} <dim>Use --allow-merge-commits to push non-linear history</>"+ "{ERROR_EMOJI} <red>Found merge commits in push range</>\n\n{HINT_EMOJI} <dim>Use </>--allow-merge-commits<dim> to push non-linear history</>")}@@ -306,7 +316,7 @@ impl std::fmt::Display for GitError {} else {cwrite!(f,- "\n\n{HINT_EMOJI} <dim>Resolve conflicts and run 'git rebase --continue'</>\n{HINT_EMOJI} <dim>Or abort with 'git rebase --abort'</>"+ "\n\n{HINT_EMOJI} <dim>Resolve conflicts and run </>git rebase --continue\n{HINT_EMOJI} <dim>Or abort with </>git rebase --abort")}}@@ -319,7 +329,7 @@ impl std::fmt::Display for GitError {GitError::NotInteractive => {cwrite!(f,- "{ERROR_EMOJI} <red>Cannot prompt for approval in non-interactive environment</>\n\n{HINT_EMOJI} <dim>In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'</>"+ "{ERROR_EMOJI} <red>Cannot prompt for approval in non-interactive environment</>\n\n{HINT_EMOJI} <dim>In CI/CD, use </>--force<dim> to skip prompts. To pre-approve commands, use </>wt config approvals add")}@@ -344,7 +354,11 @@ impl std::fmt::Display for GitError {)}- GitError::ParseError { message } | GitError::Other { message } => {+ GitError::ParseError { message } => {+ cwrite!(f, "{ERROR_EMOJI} <red>{message}</>")+ }++ GitError::Other { message } => {cwrite!(f, "{ERROR_EMOJI} <red>{message}</>")}}@@ -385,12 +399,12 @@ impl std::fmt::Display for WorktrunkError {if let Some(name) = command_name {cwrite!(f,- "{ERROR_EMOJI} <red>{hook_type} command failed: <bold>{name}</>: {error}</>\n\n{HINT_EMOJI} <dim>Use --no-verify to skip {hook_type} commands</>"+ "{ERROR_EMOJI} <red>{hook_type} command failed: <bold>{name}</>: {error}</>\n\n{HINT_EMOJI} <dim>Use </>--no-verify<dim> to skip {hook_type} commands</>")} else {cwrite!(f,- "{ERROR_EMOJI} <red>{hook_type} command failed: {error}</>\n\n{HINT_EMOJI} <dim>Use --no-verify to skip {hook_type} commands</>"+ "{ERROR_EMOJI} <red>{hook_type} command failed: {error}</>\n\n{HINT_EMOJI} <dim>Use </>--no-verify<dim> to skip {hook_type} commands</>")}}diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 7d6811f38..0215e2634 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -262,7 +262,7 @@ pub fn handle_switch_output(// Shell integration not configured - show warning and setup hintlet path_display = format_path_for_display(path);super::warning(cformat!(- "<yellow>Worktree for <bold>{branch}</> at <bold>{path_display}</>; cannot cd (no shell integration)</>"+ "Worktree for <bold>{branch}</> at <bold>{path_display}</>; cannot cd (no shell integration)"))?;super::shell_integration_hint(shell_integration_hint())?;}diff --git a/tests/git_error_display.rs b/tests/git_error_display.rsindex c94ef4371..790c31738 100644--- a/tests/git_error_display.rs+++ b/tests/git_error_display.rs@@ -2,6 +2,10 @@ use insta::assert_snapshot;use std::path::PathBuf;use worktrunk::git::GitError;+// ============================================================================+// Worktree errors+// ============================================================================+#[test]fn display_worktree_removal_failed() {let err = GitError::WorktreeRemovalFailed {@@ -13,6 +17,113 @@ fn display_worktree_removal_failed() {assert_snapshot!("worktree_removal_failed", err.to_string());}+#[test]+fn display_worktree_creation_failed() {+ let err = GitError::WorktreeCreationFailed {+ branch: "feature-y".into(),+ base_branch: Some("main".into()),+ error: "fatal: '/tmp/repo.feature-y' already exists".into(),+ };++ assert_snapshot!("worktree_creation_failed", err.to_string());+}++#[test]+fn display_worktree_missing() {+ let err = GitError::WorktreeMissing {+ branch: "stale-branch".into(),+ };++ assert_snapshot!("worktree_missing", err.to_string());+}++#[test]+fn display_no_worktree_found() {+ let err = GitError::NoWorktreeFound {+ branch: "nonexistent".into(),+ };++ assert_snapshot!("no_worktree_found", err.to_string());+}++#[test]+fn display_worktree_path_occupied() {+ let err = GitError::WorktreePathOccupied {+ branch: "feature-z".into(),+ path: PathBuf::from("/tmp/repo.feature-z"),+ occupant: Some("other-branch".into()),+ };++ assert_snapshot!("worktree_path_occupied", err.to_string());+}++#[test]+fn display_worktree_path_exists() {+ let err = GitError::WorktreePathExists {+ path: PathBuf::from("/tmp/repo.feature"),+ };++ assert_snapshot!("worktree_path_exists", err.to_string());+}++#[test]+fn display_cannot_remove_main_worktree() {+ let err = GitError::CannotRemoveMainWorktree;++ assert_snapshot!("cannot_remove_main_worktree", err.to_string());+}++// ============================================================================+// Git state errors+// ============================================================================++#[test]+fn display_detached_head() {+ let err = GitError::DetachedHead {+ action: Some("merge".into()),+ };++ assert_snapshot!("detached_head", err.to_string());+}++#[test]+fn display_detached_head_no_action() {+ let err = GitError::DetachedHead { action: None };++ assert_snapshot!("detached_head_no_action", err.to_string());+}++#[test]+fn display_uncommitted_changes() {+ let err = GitError::UncommittedChanges {+ action: Some("remove worktree".into()),+ };++ assert_snapshot!("uncommitted_changes", err.to_string());+}++#[test]+fn display_branch_already_exists() {+ let err = GitError::BranchAlreadyExists {+ branch: "feature".into(),+ };++ assert_snapshot!("branch_already_exists", err.to_string());+}++#[test]+fn display_invalid_reference() {+ let err = GitError::InvalidReference {+ reference: "nonexistent-branch".into(),+ };++ assert_snapshot!("invalid_reference", err.to_string());+}++// ============================================================================+// Merge/push errors+// ============================================================================+#[test]fn display_push_failed() {let err = GitError::PushFailed {@@ -21,3 +132,111 @@ fn display_push_failed() {assert_snapshot!("push_failed", err.to_string());}++#[test]+fn display_conflicting_changes() {+ let err = GitError::ConflictingChanges {+ files: vec!["src/main.rs".into(), "src/lib.rs".into()],+ worktree_path: PathBuf::from("/tmp/repo.main"),+ };++ assert_snapshot!("conflicting_changes", err.to_string());+}++#[test]+fn display_not_fast_forward() {+ let err = GitError::NotFastForward {+ target_branch: "main".into(),+ commits_formatted: "abc1234 Fix bug\ndef5678 Add feature".into(),+ in_merge_context: false,+ };++ assert_snapshot!("not_fast_forward", err.to_string());+}++#[test]+fn display_not_fast_forward_merge_context() {+ let err = GitError::NotFastForward {+ target_branch: "main".into(),+ commits_formatted: "abc1234 New commit on main".into(),+ in_merge_context: true,+ };++ assert_snapshot!("not_fast_forward_merge_context", err.to_string());+}++#[test]+fn display_merge_commits_found() {+ let err = GitError::MergeCommitsFound;++ assert_snapshot!("merge_commits_found", err.to_string());+}++#[test]+fn display_rebase_conflict() {+ let err = GitError::RebaseConflict {+ target_branch: "main".into(),+ git_output: "CONFLICT (content): Merge conflict in src/main.rs".into(),+ };++ assert_snapshot!("rebase_conflict", err.to_string());+}++// ============================================================================+// Validation/other errors+// ============================================================================++#[test]+fn display_not_interactive() {+ let err = GitError::NotInteractive;++ assert_snapshot!("not_interactive", err.to_string());+}++#[test]+fn display_llm_command_failed() {+ let err = GitError::LlmCommandFailed {+ command: "llm --model claude".into(),+ error: "Error: API key not found".into(),+ };++ assert_snapshot!("llm_command_failed", err.to_string());+}++#[test]+fn display_project_config_not_found() {+ let err = GitError::ProjectConfigNotFound {+ config_path: PathBuf::from("/tmp/repo/.config/wt.toml"),+ };++ assert_snapshot!("project_config_not_found", err.to_string());+}++#[test]+fn display_worktree_path_mismatch() {+ let err = GitError::WorktreePathMismatch {+ branch: "feature".into(),+ expected_path: PathBuf::from("/tmp/repo.feature"),+ actual_path: PathBuf::from("/tmp/repo.other"),+ };++ assert_snapshot!("worktree_path_mismatch", err.to_string());+}++#[test]+fn display_parse_error() {+ let err = GitError::ParseError {+ message: "Invalid branch name format".into(),+ };++ assert_snapshot!("parse_error", err.to_string());+}++#[test]+fn display_other() {+ let err = GitError::Other {+ message: "Unexpected git error".into(),+ };++ assert_snapshot!("other", err.to_string());+}diff --git a/tests/integration_tests/config_cache.rs b/tests/integration_tests/config_cache.rsnew file mode 100644index 000000000..f29524d0f--- /dev/null+++ b/tests/integration_tests/config_cache.rs@@ -0,0 +1,136 @@+use crate::common::{TestRepo, wt_command};+use insta::assert_snapshot;+use std::process::Command;++fn wt_config_cache_cmd(repo: &TestRepo, args: &[&str]) -> Command {+ let mut cmd = wt_command();+ repo.clean_cli_env(&mut cmd);+ cmd.args(["config", "cache"]);+ cmd.args(args);+ cmd.current_dir(repo.root_path());+ cmd+}++// ============================================================================+// cache show+// ============================================================================++#[test]+fn test_config_cache_show_empty() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let output = wt_config_cache_cmd(&repo, &["show"]).output().unwrap();+ assert!(output.status.success());+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @r"+ βͺ Default branch cache:++ βͺ CI status cache:+ ");+}++#[test]+fn test_config_cache_show_with_default_branch() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ // Set default branch cache manually+ repo.git_command(&["config", "worktrunk.defaultBranch", "main"])+ .status()+ .unwrap();++ let output = wt_config_cache_cmd(&repo, &["show"]).output().unwrap();+ assert!(output.status.success());+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @r"+ βͺ Default branch cache:++ βͺ CI status cache:+ ");+}++// ============================================================================+// cache clear+// ============================================================================++#[test]+fn test_config_cache_clear_all_empty() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let output = wt_config_cache_cmd(&repo, &["clear"]).output().unwrap();+ assert!(output.status.success());+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No caches to clear");+}++#[test]+fn test_config_cache_clear_all_with_data() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ // Set default branch cache+ repo.git_command(&["config", "worktrunk.defaultBranch", "main"])+ .status()+ .unwrap();++ let output = wt_config_cache_cmd(&repo, &["clear"]).output().unwrap();+ assert!(output.status.success());+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared all caches[39m");+}++#[test]+fn test_config_cache_clear_default_branch() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ // Set default branch cache+ repo.git_command(&["config", "worktrunk.defaultBranch", "main"])+ .status()+ .unwrap();++ let output = wt_config_cache_cmd(&repo, &["clear", "default-branch"])+ .output()+ .unwrap();+ assert!(output.status.success());+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared default branch cache[39m");+}++#[test]+fn test_config_cache_clear_default_branch_empty() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let output = wt_config_cache_cmd(&repo, &["clear", "default-branch"])+ .output()+ .unwrap();+ assert!(output.status.success());+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No default branch cache to clear");+}++#[test]+fn test_config_cache_clear_ci_empty() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let output = wt_config_cache_cmd(&repo, &["clear", "ci"])+ .output()+ .unwrap();+ assert!(output.status.success());+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No CI cache entries to clear");+}++#[test]+fn test_config_cache_clear_unknown_type() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let output = wt_config_cache_cmd(&repo, &["clear", "unknown"])+ .output()+ .unwrap();+ assert!(!output.status.success());+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @r"+ [1m[31merror:[0m invalid value '[1m[33munknown[0m' for '[1m[36m[CACHE_TYPE][0m'+ [possible values: [1m[32mci[0m, [1m[32mdefault-branch[0m]++ For more information, try '[1m[36m--help[0m'.+ ");+}diff --git a/tests/integration_tests/config_init.rs b/tests/integration_tests/config_init.rsindex 8d088e1e0..227f845cc 100644--- a/tests/integration_tests/config_init.rs+++ b/tests/integration_tests/config_init.rs@@ -32,8 +32,8 @@ fn test_config_init_already_exists() {----- stderr -----βͺ User config already exists: [1m~/.config/worktrunk/config.toml[22m- π‘ [2mUse 'wt config show' to view existing configuration[22m- π‘ [2mUse 'wt config create --help' for config format reference[22m+ π‘ [2mUse [22mwt config show[2m to view existing configuration[22m+ π‘ [2mUse [22mwt config create --help[2m for config format reference[22m");});}diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rsindex 9aaec17fb..3a593c2be 100644--- a/tests/integration_tests/configure_shell.rs+++ b/tests/integration_tests/configure_shell.rs@@ -31,9 +31,8 @@ fn test_configure_shell_with_yes() {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.- Add this to ~/.zshrc before the wt line:- autoload -Uz compinit && compinit[39m+ π‘ [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m+ [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0mβ [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39mπ‘ [2mSkipped [1mbash[22m; ~/.bashrc not found[22mπ‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m@@ -77,9 +76,8 @@ fn test_configure_shell_specific_shell() {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.- Add this to ~/.zshrc before the wt line:- autoload -Uz compinit && compinit[39m+ π‘ [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m+ [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0mβ [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39mβ [32mConfigured 1 shell[39m@@ -301,9 +299,8 @@ fn test_configure_shell_multiple_configs() {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.- Add this to ~/.zshrc before the wt line:- autoload -Uz compinit && compinit[39m+ π‘ [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m+ [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0mβ [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39mβ [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39mπ‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m@@ -363,9 +360,8 @@ fn test_configure_shell_mixed_states() {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.- Add this to ~/.zshrc before the wt line:- autoload -Uz compinit && compinit[39m+ π‘ [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m+ [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0mβͺ Already configured shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22mβ [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39mπ‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22mdiff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex 37050255b..0d69d260f 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -31,7 +31,7 @@ fn test_switch_internal_directive() {----- stderr -----β [31mBranch [1mmy-feature[22m not found[39m- π‘ [2mUse --create to create it, or 'wt list --branches --remotes' for available branches[22m+ π‘ [2mUse [22m--create[2m to create a new branch, or [22mwt list --branches --remotes[2m for available branches[22m");});}@@ -60,7 +60,7 @@ fn test_switch_without_internal() {----- stderr -----β [31mBranch [1mmy-feature[22m not found[39m- π‘ [2mUse --create to create it, or 'wt list --branches --remotes' for available branches[22m+ π‘ [2mUse [22m--create[2m to create a new branch, or [22mwt list --branches --remotes[2m for available branches[22m");});}diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 327692187..de4925314 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -2506,7 +2506,7 @@ fn test_merge_no_commit_with_dirty_tree() {----- stderr -----β [31mCannot merge with --no-commit: working tree has uncommitted changes[39m- π‘ [2mCommit or stash them first[22m+ π‘ [2mCommit or stash changes first[22m");});}diff --git a/tests/integration_tests/mod.rs b/tests/integration_tests/mod.rsindex f9eaa17d1..09a4b6bec 100644--- a/tests/integration_tests/mod.rs+++ b/tests/integration_tests/mod.rs@@ -11,6 +11,7 @@ pub mod bare_repository;pub mod column_alignment_verification;pub mod completion;pub mod completion_validation;+pub mod config_cache;pub mod config_init;pub mod config_show;pub mod config_status;diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snapindex 8d9c512d1..c38201daf 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap@@ -4,4 +4,4 @@ expression: output.normalized()---β [31mBranch [1mexisting[22m already exists[39m-π‘ [2mRemove --create flag to switch to it[22m+π‘ [2mRemove [22m--create[2m flag to switch to the existing branch[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snapindex db9509e1f..c95cace4e 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap@@ -10,4 +10,4 @@ expression: output.normalized()β Test suite failed: 3 tests failingβ [31mpre-merge command failed: [1mtest[22m: exit status: 1[39m-π‘ [2mUse --no-verify to skip pre-merge commands[22m+π‘ [2mUse [22m--no-verify[2m to skip pre-merge commands[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snapindex db9509e1f..c95cace4e 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap@@ -10,4 +10,4 @@ expression: output.normalized()β Test suite failed: 3 tests failingβ [31mpre-merge command failed: [1mtest[22m: exit status: 1[39m-π‘ [2mUse --no-verify to skip pre-merge commands[22m+π‘ [2mUse [22m--no-verify[2m to skip pre-merge commands[22mdiff --git a/tests/snapshots/git_error_display__branch_already_exists.snap b/tests/snapshots/git_error_display__branch_already_exists.snapnew file mode 100644index 000000000..c1f6738d7--- /dev/null+++ b/tests/snapshots/git_error_display__branch_already_exists.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mBranch [1mfeature[22m already exists[39m++π‘ [2mRemove [22m--create[2m flag to switch to the existing branch[22mdiff --git a/tests/snapshots/git_error_display__cannot_remove_main_worktree.snap b/tests/snapshots/git_error_display__cannot_remove_main_worktree.snapnew file mode 100644index 000000000..00bac7b26--- /dev/null+++ b/tests/snapshots/git_error_display__cannot_remove_main_worktree.snap@@ -0,0 +1,5 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mThe main worktree cannot be removed[39mdiff --git a/tests/snapshots/git_error_display__conflicting_changes.snap b/tests/snapshots/git_error_display__conflicting_changes.snapnew file mode 100644index 000000000..2ff166bf4--- /dev/null+++ b/tests/snapshots/git_error_display__conflicting_changes.snap@@ -0,0 +1,10 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mCannot push: conflicting uncommitted changes in:[39m++[107m [0m src/main.rs+[107m [0m src/lib.rs++π‘ [2mCommit or stash these changes in /tmp/repo.main first[22mdiff --git a/tests/snapshots/git_error_display__detached_head.snap b/tests/snapshots/git_error_display__detached_head.snapnew file mode 100644index 000000000..695466caf--- /dev/null+++ b/tests/snapshots/git_error_display__detached_head.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mCannot merge: not on a branch (detached HEAD)[39m++π‘ [2mSwitch to a branch first with [22mgit switch <branch>diff --git a/tests/snapshots/git_error_display__detached_head_no_action.snap b/tests/snapshots/git_error_display__detached_head_no_action.snapnew file mode 100644index 000000000..8d870d1f0--- /dev/null+++ b/tests/snapshots/git_error_display__detached_head_no_action.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mNot on a branch (detached HEAD)[39m++π‘ [2mSwitch to a branch first with [22mgit switch <branch>diff --git a/tests/snapshots/git_error_display__invalid_reference.snap b/tests/snapshots/git_error_display__invalid_reference.snapnew file mode 100644index 000000000..240776e49--- /dev/null+++ b/tests/snapshots/git_error_display__invalid_reference.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mBranch [1mnonexistent-branch[22m not found[39m++π‘ [2mUse [22m--create[2m to create a new branch, or [22mwt list --branches --remotes[2m for available branches[22mdiff --git a/tests/snapshots/git_error_display__llm_command_failed.snap b/tests/snapshots/git_error_display__llm_command_failed.snapnew file mode 100644index 000000000..8871aeb25--- /dev/null+++ b/tests/snapshots/git_error_display__llm_command_failed.snap@@ -0,0 +1,9 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mCommit generation command failed[39m+[107m [0m Error: API key not found++βͺ Ran command:+[107m [0m llm --model claudediff --git a/tests/snapshots/git_error_display__merge_commits_found.snap b/tests/snapshots/git_error_display__merge_commits_found.snapnew file mode 100644index 000000000..169d537d4--- /dev/null+++ b/tests/snapshots/git_error_display__merge_commits_found.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mFound merge commits in push range[39m++π‘ [2mUse [22m--allow-merge-commits[2m to push non-linear history[22mdiff --git a/tests/snapshots/git_error_display__no_worktree_found.snap b/tests/snapshots/git_error_display__no_worktree_found.snapnew file mode 100644index 000000000..5645c71d6--- /dev/null+++ b/tests/snapshots/git_error_display__no_worktree_found.snap@@ -0,0 +1,5 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mNo worktree found for branch [1mnonexistent[39m[22mdiff --git a/tests/snapshots/git_error_display__not_fast_forward.snap b/tests/snapshots/git_error_display__not_fast_forward.snapnew file mode 100644index 000000000..7af0de2f1--- /dev/null+++ b/tests/snapshots/git_error_display__not_fast_forward.snap@@ -0,0 +1,9 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mCan't push to local [1mmain[22m branch: it has newer commits[39m+[107m [0m abc1234 Fix bug+[107m [0m def5678 Add feature++π‘ [2mUse [22mwt step rebase[2m or [22mwt merge[2m to rebase onto [1mmain[22m[22mdiff --git a/tests/snapshots/git_error_display__not_fast_forward_merge_context.snap b/tests/snapshots/git_error_display__not_fast_forward_merge_context.snapnew file mode 100644index 000000000..696d90a22--- /dev/null+++ b/tests/snapshots/git_error_display__not_fast_forward_merge_context.snap@@ -0,0 +1,8 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mCan't push to local [1mmain[22m branch: it has newer commits[39m+[107m [0m abc1234 New commit on main++π‘ [2mRun [22mwt merge[2m again to incorporate these changes[22mdiff --git a/tests/snapshots/git_error_display__not_interactive.snap b/tests/snapshots/git_error_display__not_interactive.snapnew file mode 100644index 000000000..7eb1eb4cf--- /dev/null+++ b/tests/snapshots/git_error_display__not_interactive.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mCannot prompt for approval in non-interactive environment[39m++π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/git_error_display__other.snap b/tests/snapshots/git_error_display__other.snapnew file mode 100644index 000000000..1f683892d--- /dev/null+++ b/tests/snapshots/git_error_display__other.snap@@ -0,0 +1,5 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mUnexpected git error[39mdiff --git a/tests/snapshots/git_error_display__parse_error.snap b/tests/snapshots/git_error_display__parse_error.snapnew file mode 100644index 000000000..a11ba3d1e--- /dev/null+++ b/tests/snapshots/git_error_display__parse_error.snap@@ -0,0 +1,5 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mInvalid branch name format[39mdiff --git a/tests/snapshots/git_error_display__project_config_not_found.snap b/tests/snapshots/git_error_display__project_config_not_found.snapnew file mode 100644index 000000000..7fa039e82--- /dev/null+++ b/tests/snapshots/git_error_display__project_config_not_found.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mNo project configuration found[39m++π‘ [2mCreate a config file at: [1m/tmp/repo/.config/wt.toml[22m[22mdiff --git a/tests/snapshots/git_error_display__rebase_conflict.snap b/tests/snapshots/git_error_display__rebase_conflict.snapnew file mode 100644index 000000000..55ecbdbc7--- /dev/null+++ b/tests/snapshots/git_error_display__rebase_conflict.snap@@ -0,0 +1,6 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mRebase onto [1mmain[22m incomplete[39m+[107m [0m CONFLICT (content): Merge conflict in src/main.rsdiff --git a/tests/snapshots/git_error_display__uncommitted_changes.snap b/tests/snapshots/git_error_display__uncommitted_changes.snapnew file mode 100644index 000000000..f0bf3d5c3--- /dev/null+++ b/tests/snapshots/git_error_display__uncommitted_changes.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mCannot remove worktree: working tree has uncommitted changes[39m++π‘ [2mCommit or stash changes first[22mdiff --git a/tests/snapshots/git_error_display__worktree_creation_failed.snap b/tests/snapshots/git_error_display__worktree_creation_failed.snapnew file mode 100644index 000000000..795c44a4e--- /dev/null+++ b/tests/snapshots/git_error_display__worktree_creation_failed.snap@@ -0,0 +1,6 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mFailed to create worktree for [1mfeature-y[22m from base [1mmain[39m[22m+[107m [0m fatal: '/tmp/repo.feature-y' already existsdiff --git a/tests/snapshots/git_error_display__worktree_missing.snap b/tests/snapshots/git_error_display__worktree_missing.snapnew file mode 100644index 000000000..4306f99f0--- /dev/null+++ b/tests/snapshots/git_error_display__worktree_missing.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mWorktree directory missing for [1mstale-branch[39m[22m++π‘ [2mRun [22mgit worktree prune[2m to clean up[22mdiff --git a/tests/snapshots/git_error_display__worktree_path_exists.snap b/tests/snapshots/git_error_display__worktree_path_exists.snapnew file mode 100644index 000000000..9c13a9f12--- /dev/null+++ b/tests/snapshots/git_error_display__worktree_path_exists.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mDirectory already exists: [1m/tmp/repo.feature[39m[22m++π‘ [2mRemove the directory or use a different branch name[22mdiff --git a/tests/snapshots/git_error_display__worktree_path_mismatch.snap b/tests/snapshots/git_error_display__worktree_path_mismatch.snapnew file mode 100644index 000000000..f939b7a35--- /dev/null+++ b/tests/snapshots/git_error_display__worktree_path_mismatch.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mAmbiguous: [1m/tmp/repo.feature[22m has a worktree on a different branch, but branch [1mfeature[22m exists at [1m/tmp/repo.other[39m[22m++π‘ [2mUse [22mwt list[2m to see worktree-branch mappings[22mdiff --git a/tests/snapshots/git_error_display__worktree_path_occupied.snap b/tests/snapshots/git_error_display__worktree_path_occupied.snapnew file mode 100644index 000000000..ba9fcac23--- /dev/null+++ b/tests/snapshots/git_error_display__worktree_path_occupied.snap@@ -0,0 +1,7 @@+---+source: tests/git_error_display.rs+expression: err.to_string()+---+β [31mCannot create worktree for [1mfeature-z[22m: target path already exists[39m++π‘ [2mReuse the existing worktree at /tmp/repo.feature-z (currently on [1mother-branch[22m) or remove the directory before retrying[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snapindex c7006f071..096740378 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap@@ -31,4 +31,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snapindex 45e8eb234..4d2675cf0 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap@@ -16,4 +16,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snapindex 8f43e4db1..567bdc147 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap@@ -22,4 +22,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snapindex a059492d5..dfa568884 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap@@ -19,4 +19,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snapindex 572efce17..a53b3f227 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap@@ -13,4 +13,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snapindex 45e8eb234..4d2675cf0 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap@@ -16,4 +16,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snapindex ac8ee6e22..67ba5a90f 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap@@ -13,4 +13,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snapindex 8a21cb82b..d017f4027 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap@@ -13,4 +13,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snapindex 71921e6bd..9105113fb 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap@@ -13,4 +13,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snapindex 9f915aeed..43c5bb815 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap@@ -32,4 +32,4 @@ exit_code: 1β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22m+π‘ [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals adddiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snapindex 54c5cb9fc..79981d865 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap@@ -36,4 +36,4 @@ exit_code: 0βͺ Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc[2mβͺ Skipped fish; ~/.config/fish/conf.d not found[22m-π‘ [2mRun 'wt config shell install' to enable shell integration[22m+π‘ [2mRun [22mwt config shell install[2m to enable shell integration[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex 4c3039f75..68b8f911c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap@@ -26,7 +26,7 @@ exit_code: 0π [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39mπ‘ [2mBackup created @ b18c23e[22mπ [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex ba42b3f2e..99113f527 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap@@ -26,7 +26,7 @@ exit_code: 0π‘ [33mAuto-staging 1 untracked file:[39m[107m [0m dirty.txtπ [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mChanges to dirty.txt[22mβ [32mCommitted changes @ [2mc1126ec[22m[39mπ [36mMerging 1 commit to [1mmain[22m @ [2mc1126ec[22m (no rebase needed)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snapindex 6e0512a70..a6a747626 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap@@ -25,4 +25,4 @@ exit_code: 1----- stderr -----β [31mCannot merge: not on a branch (detached HEAD)[39m-π‘ [2mSwitch to a branch first with 'git switch <branch>'[22m+π‘ [2mSwitch to a branch first with [22mgit switch <branch>diff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snapindex a1f32bc6a..1f2ec5eec 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap@@ -27,4 +27,4 @@ exit_code: 1----- stderr -----β [31mCannot merge with --no-commit: working tree has uncommitted changes[39m-π‘ [2mCommit or stash them first[22m+π‘ [2mCommit or stash changes first[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snapindex b513193f8..8053a186c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap@@ -28,4 +28,4 @@ exit_code: 1β [31mCan't push to local [1mmain[22m branch: it has newer commits[39m[107m [0m * [33mfb975b3[m Add main file-π‘ [2mRun 'wt merge' again to incorporate these changes[22m+π‘ [2mRun [22mwt merge[2m again to incorporate these changes[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snapindex e8170d105..cdf5d5b04 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap@@ -26,7 +26,7 @@ exit_code: 0π‘ [33mAuto-staging 1 untracked file:[39m[107m [0m newfile.txtπ [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mChanges to newfile.txt[22mβ [32mCommitted changes @ [2m96ddfbc[22m[39mπ [36mMerging 1 commit to [1mmain[22m @ [2m96ddfbc[22m (no rebase needed)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snapindex 36df61904..6be676cf0 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap@@ -35,4 +35,4 @@ exit_code: 1[0mπ‘ [33mCommand failed: exit status: 1[39mβ [31mpost-merge command failed: exit status: 1[39m-π‘ [2mUse --no-verify to skip post-merge commands[22m+π‘ [2mUse [22m--no-verify[2m to skip post-merge commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snapindex 30871e4dd..863bdd253 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap@@ -30,4 +30,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mβ [31mpre-commit command failed: exit status: 1[39m-π‘ [2mUse --no-verify to skip pre-commit commands[22m+π‘ [2mUse [22m--no-verify[2m to skip pre-commit commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex 19169878c..79a68dc5d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap@@ -30,7 +30,7 @@ exit_code: 0[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0m[0mPre-commit check passedπ [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mChanges to feature.txt[22mβ [32mCommitted changes @ [2mcdc8f90[22m[39mπ [36mMerging 1 commit to [1mmain[22m @ [2mcdc8f90[22m (no rebase needed)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snapindex 2596dce5a..25511fd72 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap@@ -28,4 +28,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mβ [31mpre-merge command failed: exit status: 1[39m-π‘ [2mUse --no-verify to skip pre-merge commands[22m+π‘ [2mUse [22m--no-verify[2m to skip pre-merge commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snapindex b07d90c80..d804b799e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap@@ -28,4 +28,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mβ [31mpre-commit command failed: exit status: 1[39m-π‘ [2mUse --no-verify to skip pre-commit commands[22m+π‘ [2mUse [22m--no-verify[2m to skip pre-commit commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 0042d5bea..bcc32cb65 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----π [36mSquashing 3 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39mπ [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex e957e21bb..7573809ef 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----π [36mSquashing 3 commits into a single commit...[39mπ [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex d5ae66631..894ca7597 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----π [36mSquashing 2 commits into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39mπ [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex 0c16d912c..9628cc8b7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap@@ -28,7 +28,7 @@ exit_code: 0π [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39mπ‘ [2mBackup created @ 330ccd6[22mπ [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex a464b1648..e979c9228 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap@@ -31,7 +31,7 @@ exit_code: 0π [36mSquashing 1 commit & working tree changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39mπ‘ [2mBackup created @ 4967998[22mπ [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snapindex c18ad8592..404da1196 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap@@ -29,6 +29,6 @@ exit_code: 0----- stderr -----π‘ [2mSkipping pre-commit hook (--no-verify)[22mπ [36mCommitting tracked changes with default message... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mChanges to tracked.txt[22mβ [32mCommitted changes @ [2ma5890cb[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snapindex a11b37697..914ba3325 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap@@ -31,6 +31,6 @@ exit_code: 0[107m [0m .config/[107m [0m file1.txtπ [36mCommitting changes with default message... [90m(2 files, [32m+2[39m[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mChanges to wt.toml & file1.txt[22mβ [32mCommitted changes @ [2m3dbcd5d[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snapindex 6060c7093..9d735c813 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap@@ -27,7 +27,7 @@ exit_code: 1----- stderr -----π [36mCommitting changes with default message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mWIP: Changes[22mβ [31mFailed to commit[39m[107m [0m On branch maindiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snapindex 1b2900489..265840790 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap@@ -27,6 +27,6 @@ exit_code: 0----- stderr -----π [36mCommitting tracked changes with default message... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mChanges to tracked.txt[22mβ [32mCommitted changes @ [2m7d441f0[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snapindex 38e2b7ddf..3b80e8b60 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap@@ -31,7 +31,7 @@ exit_code: 0π [36mSquashing 2 commits & tracked changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39mπ‘ [2mBackup created @ 31e06e8[22mπ [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snapindex 72fb74baf..c8594c914 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap@@ -29,7 +29,7 @@ exit_code: 0π‘ [2mSkipping pre-commit hook (--no-verify)[22mπ [36mSquashing 2 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39mπ [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snapindex 188004c97..4f11d0e42 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap@@ -29,7 +29,7 @@ exit_code: 0π [36mSquashing 2 commits & tracked changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39mπ‘ [2mBackup created @ ba1424b[22mπ [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snapindex a79504d7b..e9597515d 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap@@ -24,5 +24,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m[33mWorktree for [1mfeature[22m at [1m[REPO].feature[22m; cannot cd (no shell integration)[39m[39m+π‘ [33mWorktree for [1mfeature[22m at [1m[REPO].feature[22m; cannot cd (no shell integration)[39mπ‘ [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snapindex ed74ae3aa..250728a99 100644--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap@@ -27,4 +27,4 @@ exit_code: 1β [31mCan't push to local [1mmain[22m branch: it has newer commits[39m[107m [0m * [33m5ca21c8[m Main commit-π‘ [2mUse 'wt step rebase' or 'wt merge' to rebase onto main[22m+π‘ [2mUse [22mwt step rebase[2m or [22mwt merge[2m to rebase onto [1mmain[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap b/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snapindex 26a121b46..ce0366e36 100644--- a/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap+++ b/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap@@ -26,4 +26,4 @@ exit_code: 1----- stderr -----β [31mFound merge commits in push range[39m-π‘ [2mUse --allow-merge-commits to push non-linear history[22m+π‘ [2mUse [22m--allow-merge-commits[2m to push non-linear history[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snapindex 5e08e4ebd..e290dd3a3 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap@@ -25,4 +25,4 @@ exit_code: 1----- stderr -----β [31mCannot remove worktree: working tree has uncommitted changes[39m-π‘ [2mCommit or stash them first[22m+π‘ [2mCommit or stash changes first[22mdiff --git a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snapindex f87a5a67c..d5e1fbadf 100644--- a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap@@ -27,4 +27,4 @@ exit_code: 1----- stderr -----β [31mBranch [1m__WORKTRUNK_CD__/tmp[22m already exists[39m-π‘ [2mRemove --create flag to switch to it[22m+π‘ [2mRemove [22m--create[2m flag to switch to the existing branch[22mdiff --git a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snapindex e1b86b31b..df7a64312 100644--- a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap@@ -26,4 +26,4 @@ exit_code: 1----- stderr -----β [31mBranch [1m__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6[22m not found[39m-π‘ [2mUse --create to create it, or 'wt list --branches --remotes' for available branches[22m+π‘ [2mUse [22m--create[2m to create a new branch, or [22mwt list --branches --remotes[2m for available branches[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snapindex 5aa6d00e3..2a6bc5ada 100644--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap@@ -24,5 +24,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m[33mWorktree for [1mmain[22m at [1m[REPO][22m; cannot cd (no shell integration)[39m[39m+π‘ [33mWorktree for [1mmain[22m at [1m[REPO][22m; cannot cd (no shell integration)[39mπ‘ [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snapindex db4423d8c..def7f848c 100644--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap@@ -24,5 +24,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m[33mWorktree for [1mfeature-a[22m at [1m[REPO].feature-a[22m; cannot cd (no shell integration)[39m[39m+π‘ [33mWorktree for [1mfeature-a[22m at [1m[REPO].feature-a[22m; cannot cd (no shell integration)[39mπ‘ [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snapindex 93086bf2d..d00f2412d 100644--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap@@ -24,5 +24,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m[33mWorktree for [1mmain[22m at [1m[REPO][22m; cannot cd (no shell integration)[39m[39m+π‘ [33mWorktree for [1mmain[22m at [1m[REPO][22m; cannot cd (no shell integration)[39mπ‘ [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snapindex db4423d8c..def7f848c 100644--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap@@ -24,5 +24,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m[33mWorktree for [1mfeature-a[22m at [1m[REPO].feature-a[22m; cannot cd (no shell integration)[39m[39m+π‘ [33mWorktree for [1mfeature-a[22m at [1m[REPO].feature-a[22m; cannot cd (no shell integration)[39mπ‘ [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snapindex 9a7d0e60e..a4f54035c 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap@@ -27,4 +27,4 @@ exit_code: 1----- stderr -----β [31mBranch [1mfeature-y[22m already exists[39m-π‘ [2mRemove --create flag to switch to it[22m+π‘ [2mRemove [22m--create[2m flag to switch to the existing branch[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snapindex 2ad517606..b34031647 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap@@ -26,6 +26,6 @@ exit_code: 0----- stderr -----π‘ [33mBranch [1mremote-feature[22m exists on remote (origin/remote-feature); creating new branch from base instead[39m-π‘ [2mUse 'wt switch remote-feature' (without --create) to switch to the remote branch[22m+π‘ [2mUse [22mwt switch [1mremote-feature[22m[2m (without [22m--create[2m) to switch to the remote branch[22mβ [32m[32mCreated new worktree for [1mremote-feature[22m from [1mmain[22m at [1m[REPO].remote-feature[39m[22m[39mπ‘ [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snapindex c1ca95efa..ccd29b6f7 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap@@ -26,4 +26,4 @@ exit_code: 1----- stderr -----β [31mWorktree directory missing for [1mmissing-wt[39m[22m-π‘ [2mRun 'git worktree prune' to clean up[22m+π‘ [2mRun [22mgit worktree prune[2m to clean up[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snapindex f71ea1de7..fd24f01f2 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap@@ -24,5 +24,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m[33mWorktree for [1mfeature-z[22m at [1m[REPO].feature-z[22m; cannot cd (no shell integration)[39m[39m+π‘ [33mWorktree for [1mfeature-z[22m at [1m[REPO].feature-z[22m; cannot cd (no shell integration)[39mπ‘ [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snapindex 09c3eeb02..c72dfbf4f 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap@@ -24,5 +24,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m[33mWorktree for [1mbranch-a[22m at [1m[REPO].branch-a[22m; cannot cd (no shell integration)[39m[39m+π‘ [33mWorktree for [1mbranch-a[22m at [1m[REPO].branch-a[22m; cannot cd (no shell integration)[39mπ‘ [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snapindex 27454c781..2a57df695 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap@@ -24,5 +24,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m[33mWorktree for [1mexisting-branch[22m at [1m[REPO].existing-branch[22m; cannot cd (no shell integration)[39m[39m+π‘ [33mWorktree for [1mexisting-branch[22m at [1m[REPO].existing-branch[22m; cannot cd (no shell integration)[39mπ‘ [2mRun `wt config shell install` to enable automatic cd[22m