Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Migrate from markdown-link-check to lychee (#8)
Maximilian Roos8790726c1aea
diff --git a/.config/lychee.toml b/.config/lychee.tomlnew file mode 100644index 000000000..41e4b5db6--- /dev/null+++ b/.config/lychee.toml@@ -0,0 +1,34 @@+# Lychee link checker configuration+# Based on PRQL's proven patterns: https://github.com/PRQL/prql++# Network resilience - handles transient failures+max_retries = 5+timeout = 20+max_redirects = 5++# Accepted HTTP status codes+accept = [200, 206, 429]++# Caching to reduce rate limiting and improve performance+cache = true+max_cache_age = "1d"++# Exclude sites that block GitHub Actions or have reliability issues+exclude = [+ # Social media (blocks GitHub Actions)+ "~twitter\\.com",+ "~x\\.com",++ # Sites with reliability issues in CI+ "~stackoverflow\\.com",+ "~npmjs\\.com",++ # Package registries (frequently return 429 or block CI)+ "~crates\\.io",+ "~docs\\.rs",+ "~img\\.shields\\.io",++ # Sites already excluded in markdown-link-check+ "~opensource\\.org",+ "~llm\\.datasette\\.io",+]diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.ymlindex 54874070e..13bda3ea5 100644--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@ -102,3 +102,48 @@ jobs:with:command: docargs: --no-deps++ check-links:+ name: Check links+ runs-on: ubuntu-latest+ steps:+ - name: π Checkout code+ uses: actions/checkout@v5++ - name: Install lychee+ uses: baptiste0928/cargo-install@v3+ with:+ crate: lychee++ - name: Setup Python+ uses: actions/setup-python@v5+ with:+ python-version: "3.12"++ - name: Install pre-commit+ run: pip install pre-commit++ - name: Cache lychee results+ uses: actions/cache@v4+ with:+ path: .lycheecache+ key: lychee-${{ github.sha }}+ restore-keys: lychee-++ - name: Get modified markdown files+ if: github.event_name == 'pull_request'+ id: changed-files+ uses: tj-actions/changed-files@v47+ with:+ files: |+ **/*.md++ - name: Link checker (modified files - PRs)+ if: github.event_name == 'pull_request' && steps.changed-files.outputs.any_modified == 'true'+ run: pre-commit run lychee --files ${{ steps.changed-files.outputs.all_changed_files }}+ continue-on-error: true++ - name: Link checker (all files - main branch)+ if: github.event_name == 'push' && github.ref == 'refs/heads/main'+ run: pre-commit run lychee --all-files+ continue-on-error: truediff --git a/.gitignore b/.gitignoreindex ea8c4bf7f..dab7be284 100644--- a/.gitignore+++ b/.gitignore@@ -1 +1,4 @@/target++# Lychee link checker cache+.lycheecachediff --git a/.markdown-link-check.json b/.markdown-link-check.jsondeleted file mode 100644index 4fe59384f..000000000--- a/.markdown-link-check.json+++ /dev/null@@ -1,22 +0,0 @@-{- "ignorePatterns": [- {- "pattern": "^https://crates\\.io/crates/worktrunk$"- },- {- "pattern": "^https://github\\.com/crate-ci/cargo-release$"- },- {- "pattern": "^https://opensource\\.org/"- },- {- "pattern": "^https://llm\\.datasette\\.io/"- },- {- "pattern": "^https://docs\\.rs/"- },- {- "pattern": "^https://img\\.shields\\.io/"- }- ]-}diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yamlindex 8ea6cacb0..3b5dd44a9 100644--- a/.pre-commit-config.yaml+++ b/.pre-commit-config.yaml@@ -24,13 +24,25 @@ repos:hooks:- id: clippyargs: ["--all-targets", "--", "-D", "warnings"]- - repo: https://github.com/tcort/markdown-link-check- rev: v3.14.1+ - repo: https://github.com/lycheeverse/lychee+ rev: lychee-v0.21.0hooks:- - id: markdown-link-check- name: markdown-link-check+ # Fast PR mode - only check worktrunk domains and local files+ - id: lychee+ name: lychee (PR mode)types: [markdown]- args: ["--config", ".markdown-link-check.json"]+ args:+ - --include=^(https://(github\.com/worktrunk|worktrunk\.dev)|file://)+ - --no-progress+ # Comprehensive mode - check all links with full config+ # Run manually: pre-commit run --hook-stage manual lychee-all --all-files+ - id: lychee+ name: lychee-all (comprehensive)+ types: [markdown]+ stages: [manual]+ args:+ - --config=.config/lychee.toml+ - --no-progress- repo: localhooks:- id: no-dbg@@ -49,5 +61,5 @@ repos:ci:# Currently network access isn't supported in the CI product.- skip: [fmt, markdown-link-check]+ skip: [fmt, lychee (PR mode)]autoupdate_commit_msg: "chore: pre-commit autoupdate"diff --git a/CLAUDE.md b/CLAUDE.mdindex dad103621..f77a7a8e5 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -17,63 +17,66 @@ When making decisions, prioritize:2. **Clean design** over maintaining old patterns3. **Modern conventions** over legacy approaches-Examples of acceptable breaking changes:-- Changing config file locations (e.g., moving from `~/Library/Application Support` to `~/.config`)-- Renaming commands or flags for clarity-- Changing output formats-- Replacing dependencies with better alternatives-- Restructuring the codebase+Acceptable breaking changes: config locations, command/flag names, output formats, dependencies, codebase structure.When the project reaches v1.0 or gains users, we'll adopt stability commitments. Until then, we're free to iterate rapidly.+## Code Quality++Claude commonly makes the mistake of adding `#[allow(dead_code)]` when writing code that isn't immediately used. Don't suppress the warningβeither delete the code or add a TODO comment explaining when it will be used.++Example of escalating instead of suppressing:++```rust+// TODO(feature-name): Used by upcoming config validation+fn parse_config() { ... }+```++### CLI Flag Descriptions++Keep flag and argument descriptions briefβaim for 3-5 words maximum. Use parenthetical defaults sparingly, only when the default isn't obvious from context.++**Good examples:**+- `/// Skip approval prompts`+- `/// Show CI, conflicts, and full diffs`+- `/// Target branch (default: default branch)`+- `/// Branch, path, '@' (HEAD), or '-' (previous)`++**Bad examples (too verbose):**+- `/// Auto-approve project commands without saving approvals.`+- `/// Run as if worktrunk was started in <path> instead of the current working directory`+- `/// Show CI status, conflict detection, and complete diff statistics`++The help text should be scannable. Users reading `wt switch --help` need to quickly understand what each flag does without parsing long sentences.+## CLI Output Formatting Standards### User Message Principles-Output messages should acknowledge user-supplied arguments (flags, options, values) by reflecting those choices in the message text. This confirms the program understood their intent and used their input correctly.--**Examples:**+Output messages should acknowledge user-supplied arguments (flags, options, values) by reflecting those choices in the message text.```rust// User runs: wt switch --create feature --base=main// β GOOD - acknowledges the base branch"Created new worktree for feature from main at /path/to/worktree"-// β BAD - ignores the base argument"Created new worktree for feature at /path/to/worktree"--// User runs: wt merge --squash-// β GOOD - acknowledges squash mode-"Squashing 3 commits into 1..."--// β BAD - doesn't mention squashing-"Merging commits..."```-This confirms the program understood user intent and used their input correctly.--**Avoid redundant parenthesized content:**--Parenthesized text should add new information, not restate what's already said. If the parentheses just rephrase the main message in different words, remove them.+**Avoid redundant parenthesized content:** Parenthesized text should add new information, not restate what's already said.```rust// β BAD - parentheses restate "no changes""No changes after squashing 3 commits (commits resulted in no net changes)"-// β GOOD - clear and concise"No changes after squashing 3 commits"--// β GOOD - parentheses add supplementary info (stats)+// β GOOD - parentheses add supplementary info"Committing with default message... (3 files, +45, -12)"--// β GOOD - parentheses explain why-"Worktree preserved (--no-remove)"```### The anstyle EcosystemAll styling uses the **anstyle ecosystem** for composable, auto-detecting terminal output:-- **`anstream`**: Auto-detecting I/O streams (println!, eprintln! macros)- **`anstyle`**: Core styling with inline pattern `{style}text{style:#}`- **Color detection**: Respects NO_COLOR, CLICOLOR_FORCE, TTY detection@@ -88,34 +91,18 @@ Six canonical message patterns with their emojis:4. **Warnings**: π‘ + yellow text (non-blocking issues)5. **Hints**: π‘ + dimmed text (actionable suggestions, tips for user)6. **Info**: βͺ + text (neutral status, system feedback, metadata)- - **NOT dimmed**: Primary status messages that answer the user's question- - **Dimmed**: Supplementary metadata and contextual information+ - **NOT dimmed**: Primary status messages+ - **Dimmed**: Supplementary metadata-Every user-facing message requires either an emoji or a gutter for consistent visual separation.--```rust-// β GOOD - standalone message with emoji-println!("{SUCCESS_EMOJI} {GREEN}Created worktree{GREEN:#}");--// β GOOD - quoted content with gutter-print!("{}", format_with_gutter(&command));--// β GOOD - section header with emoji, followed by gutter content-println!("{INFO_EMOJI} Global Config: {bold}{}{bold:#}", path.display());--// β BAD - standalone message without emoji or gutter-println!("{dim}Operation declined{dim:#}");-```+**Every user-facing message requires either an emoji or a gutter** for consistent visual separation.### stdout vs stderr: Separation by Mode-Output separation differs between interactive and directive modes.--Interactive mode:+**Interactive mode:**- stdout: All worktrunk output (messages, errors, warnings, progress)- stderr: Child process output (git, npm, user commands) + interactive prompts-Directive mode (--internal flag for shell integration):+**Directive mode** (--internal flag for shell integration):- stdout: Only directives (`__WORKTRUNK_CD__`, `__WORKTRUNK_EXEC__`) - NUL-terminated- stderr: All user-facing messages + child process output - streams in real-time@@ -124,31 +111,21 @@ Use the output system (`output::success()`, `output::progress()`, etc.) to handl```rust// β GOOD - use output system (handles both modes)output::success("Branch created")?;-output::change_directory(&path)?;// β BAD - direct writes bypass output systemprintln!("Branch created");-writeln!(io::stderr(), "Progress...")?;```-Interactive prompts flush stderr before blocking on stdin to prevent interleaving:+Interactive prompts must flush stderr before blocking on stdin:```rusteprint!("π‘ Allow and remember? [y/N] ");-stderr().flush()?; // Ensures prompt is visible before blocking+stderr().flush()?;io::stdin().read_line(&mut response)?;```-Child processes redirect stdout to stderr for deterministic ordering:-```rust-let wrapped = format!("{{ {}; }} 1>&2", command);-Command::new("sh").arg("-c").arg(&wrapped).status()?;-```-### Temporal Locality: Output Should Be Close to Operations-Output should appear immediately adjacent to the operations it describes. Output that appears far from its triggering operation breaks the user's mental model.--Progress messages apply only to slow operations (>400ms): git operations, network requests, builds. Fast operations like file checks or config reads should not show progress.+Output should appear immediately adjacent to the operations it describes. Progress messages apply only to slow operations (>400ms): git operations, network requests, builds.Sequential operations should show immediate feedback:```rust@@ -159,7 +136,7 @@ for item in items {}```-Output decoupled from operations creates confusion:+Bad example (output decoupled from operations):```π Removing worktree for feature...π Removing worktree for bugfix...@@ -168,7 +145,7 @@ Removed worktree for feature β All output at the endRemoved worktree for bugfix```-Signs of poor temporal locality: collecting messages in a buffer, single success message for batch operations, no progress before slow operations, progress without matching success.+Signs of poor temporal locality: collecting messages in a buffer, single success message for batch operations, no progress before slow operations.### Information Display: Show Once, Not Twice@@ -179,17 +156,11 @@ Progress messages should include all relevant details (what's being done, countsoutput::progress("π Squashing 3 commits with working tree changes into 1 (5 files, +120, -45)...")?;perform_squash()?;output::success("β Squashed @ a1b2c3d")?;--// β BAD - repeating detail in success message-output::progress("π Squashing 3 commits into 1...")?;-perform_squash()?;-output::success("β Squashed 3 commits into 1 @ a1b2c3d")?; // Redundant```### Semantic Style ConstantsStyle constants defined in `src/styling.rs`:-- `ERROR`: Red (errors, conflicts)- `WARNING`: Yellow (warnings)- `HINT`: Dimmed (hints, secondary information)@@ -197,103 +168,48 @@ Style constants defined in `src/styling.rs`:- `ADDITION`: Green (diffs, additions)- `DELETION`: Red (diffs, deletions)-Emoji constants:--- `ERROR_EMOJI`: β (use with ERROR style)-- `WARNING_EMOJI`: π‘ (use with WARNING style)-- `HINT_EMOJI`: π‘ (use with HINT style)-- `INFO_EMOJI`: βͺ (use with dimmed style)+Emoji constants: `ERROR_EMOJI` (β), `WARNING_EMOJI` (π‘), `HINT_EMOJI` (π‘), `INFO_EMOJI` (βͺ)### Inline Formatting PatternUse anstyle's inline pattern `{style}text{style:#}` where `#` means reset:```rust-use worktrunk::styling::{println, ERROR, ERROR_EMOJI, WARNING, WARNING_EMOJI, HINT, HINT_EMOJI, AnstyleStyle};+use worktrunk::styling::{println, ERROR, ERROR_EMOJI, WARNING_EMOJI, HINT_EMOJI, AnstyleStyle};use anstyle::{AnsiColor, Color};-// Progresslet cyan = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));println!("π {cyan}Rebasing onto main...{cyan:#}");-// Success-let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));-println!("β {green}Merged to main{green:#}");--// Error - ALL our output goes to stdoutprintln!("{ERROR_EMOJI} {ERROR}Working tree has uncommitted changes{ERROR:#}");--// Warning - ALL our output goes to stdout-println!("{WARNING_EMOJI} {WARNING}Uncommitted changes detected{WARNING:#}");--// Hintprintln!("{HINT_EMOJI} {HINT}Use 'wt list' to see all worktrees{HINT:#}");```### Composing Styles-Compose styles using anstyle methods (`.bold()`, `.fg_color()`, etc.). Branch names in messages (not tables) should be bolded:--```rust-use worktrunk::styling::{println, AnstyleStyle, ERROR};--// Error message with bold branch name-let error_bold = ERROR.bold();-println!("β Branch '{error_bold}{branch}{error_bold:#}' already exists");+Compose styles using anstyle methods (`.bold()`, `.fg_color()`, etc.). Branch names in messages (not tables) should be bolded. Tables (`wt list`) use conditional styling for branch names to indicate worktree state (current/primary/other).-// Success message with bold branch name-let bold = AnstyleStyle::new().bold();-println!("Switched to worktree: {bold}{branch}{bold:#}");-```--Tables (`wt list`) use conditional styling for branch names to indicate worktree state (current/primary/other), not bold.--Nested style resets leak color. Compose all attributes into a single style object instead:+Nested style resets leak color. Compose all attributes into a single style object:```rust// β BAD - nested reset leaks color"{WARNING}Text with {bold}nested{bold:#} styles{WARNING:#}"-// β GOOD - compose styles togetherlet warning_bold = WARNING.bold();"{WARNING}Text with {warning_bold}composed{warning_bold:#} styles{WARNING:#}"```-Resetting all styles requires `anstyle::Reset`, not `{:#}` on empty `Style`:--```rust-// β BAD - produces empty string-output.push_str(&format!("{:#}", Style::new()));--// β GOOD - produces \x1b[0m reset code-output.push_str(&format!("{}", anstyle::Reset));-```--### Information Hierarchy & Styling--Bold elements that answer the user's question; dim elements that provide context.--Styled elements must maintain their surrounding color. Compose the color with the style using `.bold()` or `.dimmed()` to avoid leaking color.+Styled elements must maintain their surrounding color. Compose the color with the style to avoid leaking:```rust// β WRONG - styled element loses surrounding colorlet bold = AnstyleStyle::new().bold();println!("β {GREEN}Message {bold}{path}{bold:#}{GREEN:#}"); // Path will be black/white!-// β RIGHT - compose color with stylelet green_bold = GREEN.bold();-println!("β {GREEN}Created worktree, changed directory to {green_bold}{}{green_bold:#}");--// Re-establish outer color after styled elements mid-message-let green_bold = GREEN.bold();-println!("β {GREEN}Already on {green_bold}{branch}{green_bold:#}{GREEN}, nothing to merge{GREEN:#}");-// ^^^^^^^ Re-establish GREEN+println!("β {GREEN}Created worktree at {green_bold}{path}{green_bold:#}{GREEN:#}");```-### Indentation Policy--No manual indentation - styling provides hierarchy. For quoted content, use `format_with_gutter()`.-### Color DetectionColors automatically adjust based on environment (NO_COLOR, CLICOLOR_FORCE, TTY detection) via `anstream` macros.@@ -303,7 +219,6 @@ Styled print macros must be imported from `worktrunk::styling`, not stdlib:```rust// β BAD - uses standard library macro, bypasses anstreameprintln!("{}", styled_text);-// β GOOD - import and use anstream-wrapped versionuse worktrunk::styling::eprintln;eprintln!("{}", styled_text);@@ -311,12 +226,11 @@ eprintln!("{}", styled_text);### Design Principles-- **Use the ecosystem, not manual escape codes** - Use `anstyle` for colors, `osc8` for hyperlinks, `strip-ansi-escapes` for stripping. Never manually write ANSI codes (`\x1b[...`) in production code+- **Use the ecosystem, not manual escape codes** - Use `anstyle` for colors, `osc8` for hyperlinks, `strip-ansi-escapes` for stripping. Never manually write ANSI codes (`\x1b[...`)- **Inline over wrappers** - Use `{style}text{style:#}` pattern, not wrapper functions- **Composition over special cases** - Use `.bold()`, `.fg_color()`, not `format_X_with_Y()`- **Semantic constants** - Use `ERROR`, `WARNING`, not raw colors- **YAGNI for presentation** - Most output needs no styling-- **Minimal output** - Only use formatting where it adds clarity- **Unicode-aware** - Width calculations respect emoji and CJK characters (via `StyledLine`)- **Graceful degradation** - Must work without color support@@ -329,13 +243,9 @@ use worktrunk::styling::StyledLine;use anstyle::{AnsiColor, Color, Style};let mut line = StyledLine::new();-let dim = Style::new().dimmed();-let cyan = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));--line.push_styled("Branch", dim);+line.push_styled("Branch", Style::new().dimmed());line.push_raw(" ");-line.push_styled("main", cyan);-+line.push_styled("main", Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan))));println!("{}", line.render());```@@ -346,44 +256,28 @@ See `src/commands/list/render.rs` for advanced usage.Use `format_with_gutter()` for quoted content. Gutter content must be raw external output without our styling additions (emojis, colors).```rust-use worktrunk::styling::format_with_gutter;-use worktrunk::git::GitError;-// β GOOD - raw git output in gutterlet raw_error = match &error {- GitError::CommandFailed(msg) => msg.as_str(), // Extract raw string+ GitError::CommandFailed(msg) => msg.as_str(),_ => &error.to_string(),};super::gutter(format_with_gutter(raw_error, "", None))?;-// β BAD - includes our formatting in gutter-super::gutter(format_with_gutter(&error.to_string(), "", None))?; // Adds β emoji--// β GOOD - command output-print!("{}", format_with_gutter(&command));+// β BAD - includes our formatting (β emoji)+super::gutter(format_with_gutter(&error.to_string(), "", None))?;```-**Linebreaks with gutter content:** Gutter content requires a single newline before it, never double newlines. The gutter's visual structure (background color, indentation) provides sufficient separation.--Output functions (`progress()`, `success()`, etc.) use `println!()` internally, adding a trailing newline. Messages passed to these functions should not include `\n`, as this creates a blank line.+**Linebreaks:** Gutter content requires a single newline before it, never double newlines. Output functions (`progress()`, `success()`, etc.) use `println!()` internally, adding a trailing newline. Messages passed to these functions should not include `\n`:```rust-// β GOOD - output function adds newline automatically-output::progress(format!("{CYAN}Merging commits...{CYAN:#}"))?;-output::gutter(format_with_gutter(&log_output, "", None))?;--// β BAD - trailing \n creates double newline (blank line)-output::progress(format!("{CYAN}Merging commits...{CYAN:#}\n"))?;-output::gutter(format_with_gutter(&log_output, "", None))?;--// β GOOD - single newline in direct format!()-format!("{header}\n{}", format_with_gutter(error, "", None))+// β GOOD - no trailing \n+output::progress(format!("{CYAN}Merging...{CYAN:#}"))?;+output::gutter(format_with_gutter(&log, "", None))?;-// β BAD - double newline creates blank line-format!("{header}\n\n{}", format_with_gutter(error, "", None))+// β BAD - trailing \n creates blank line+output::progress(format!("{CYAN}Merging...{CYAN:#}\n"))?;```-### Snapshot Testing RequirementEvery command output must have a snapshot test (`tests/integration_tests/`). Use this pattern:@@ -407,12 +301,6 @@ fn test_command_success() {repo.commit("Initial commit");snapshot_command("command_success", &repo, &[]);}--#[test]-fn test_command_no_data() {- let repo = TestRepo::new();- snapshot_command("command_no_data", &repo, &[]);-}```Cover success/error states, with/without data, and flag variations.@@ -422,7 +310,6 @@ Cover success/error states, with/without data, and flag variations.### Two Output ModesWorktrunk supports two output modes, selected once at program startup:-1. **Interactive Mode** - Human-friendly output with colors, emojis, and hints2. **Directive Mode** - Machine-readable NUL-terminated directives for shell integration@@ -432,77 +319,45 @@ The mode is determined at initialization in `main()` and never changes during exCommand code must never check which output mode is active. The output system uses enum dispatch - commands call output functions without knowing the mode.-**Bad - mode conditionals scattered through commands:**```rust// β NEVER DO THIS-use crate::output::OutputMode;--fn some_command(mode: OutputMode) {- if mode == OutputMode::Interactive {- println!("β Success!");- } else {- println!("Success!\0");- }+if mode == OutputMode::Interactive {+ println!("β Success!");}-```-**Good - use the output system:**-```rust// β ALWAYS DO THIS-use crate::output;--fn some_command() {- output::success("Success!")?;- // The output system handles formatting for both modes-}+output::success("Success!")?;```-### How It Works--Decide once at the edge (`main()`), initialize globally, trust internally.+Decide once at the edge (`main()`), initialize globally, trust internally:```rust// In main.rs - the only place that knows about modes-let mode = if internal {- OutputMode::Directive-} else {- OutputMode::Interactive-};-output::initialize(mode);+output::initialize(if internal { OutputMode::Directive } else { OutputMode::Interactive });// Everywhere else - just use the output functionsoutput::success("Created worktree")?;output::change_directory(&path)?;-output::execute("git pull")?;```### Available Output Functions-The output module (`src/output/global.rs`) provides these functions:+The output module (`src/output/global.rs`) provides:-- `success(message)` - Emit success messages (β , both modes)-- `progress(message)` - Emit progress updates (π, both modes)-- `info(message)` - Emit info messages (βͺ, both modes)-- `warning(message)` - Emit warning messages (π‘, both modes)-- `hint(message)` - Emit hint messages (π‘, interactive only, suppressed in directive)+- `success(message)` - Successful completion (β , both modes)+- `progress(message)` - Operations in progress (π, both modes)+- `info(message)` - Neutral status/metadata (βͺ, both modes)+- `warning(message)` - Non-blocking issues (π‘, both modes)+- `hint(message)` - Actionable suggestions (π‘, interactive only, suppressed in directive)- `change_directory(path)` - Request directory change (directive) or store for execution (interactive)- `execute(command)` - Execute command (interactive) or emit directive (directive mode)- `flush()` - Flush output buffers-Function usage:-- `success()` - Successful completion (e.g., "β Committed changes")-- `progress()` - Operations in progress (e.g., "π Squashing commits...")-- `info()` - Neutral status/metadata (e.g., "βͺ No changes detected")-- `warning()` - Non-blocking issues (e.g., "π‘ Uncommitted changes detected")-- `hint()` - Actionable suggestions for users (e.g., "π‘ Run 'wt config --help'")-For the complete API, see `src/output/global.rs`.### Adding New Output Functions-Add the function to both handlers, add dispatch in `global.rs`, never add mode parameters.--This maintains one canonical path: commands have ONE code path that works for both modes. Never check the mode in commands.+Add the function to both handlers, add dispatch in `global.rs`, never add mode parameters. This maintains one canonical path: commands have ONE code path that works for both modes.### Architectural Constraint: --internal Commands Must Use Output System@@ -520,7 +375,6 @@ for line in reader.lines() {println!("{}", line);stdout().flush();}-// β BAD - bufferinglet lines: Vec<_> = reader.lines().collect();```@@ -550,9 +404,7 @@ Use `wt list --format=json` for structured data access. The output is an array o### Common Fields (all objects)- `type`: "worktree" | "branch"-- `head_sha`: commit SHA-- `timestamp`: commit timestamp (Unix epoch)-- `commit_message`: commit message text+- `head_sha`, `timestamp`, `commit_message`: commit info- `ahead`, `behind`: commits ahead/behind main branch- `branch_diff`: `{added, deleted}` - line diff vs main- `has_conflicts`: boolean - merge conflicts with main@@ -567,9 +419,7 @@ Use `wt list --format=json` for structured data access. The output is an array o- `bare`, `detached`: boolean flags- `locked`, `prunable`: reason strings (null if not applicable)- `working_tree_diff`: `{added, deleted}` - uncommitted changes-- `working_tree_diff_with_main`: `{added, deleted}` or null- - `null`: not computed (optimization when trees clearly differ)- - `{added: 0, deleted: 0}`: working tree matches main exactly+- `working_tree_diff_with_main`: `{added, deleted}` or null (null = not computed, `{0,0}` = matches main exactly)- `worktree_state`: "rebase" | "merge" | null - git operation in progress- `is_primary`: boolean - is main/primary worktree- `status_symbols`: structured status object (see below)@@ -582,53 +432,25 @@ Use `wt list --format=json` for structured data access. The output is an array oThe `status_symbols` object provides structured access to status indicators:-- `has_conflicts`: boolean - merge conflicts detected-- `branch_state`: "" | "β‘" | "β "- - "β‘": working tree matches main- - "β ": no commits and clean-- `git_operation`: "" | "β»" | "β"- - "β»": rebase in progress- - "β": merge in progress-- `worktree_attrs`: string - combination of:- - "β": bare worktree- - "β ": locked- - "β ": prunable-- `main_divergence`: "" | "β" | "β" | "β"- - "β": ahead of main- - "β": behind main- - "β": diverged (both ahead and behind)-- `upstream_divergence`: "" | "β‘" | "β£" | "β "- - "β‘": ahead of remote- - "β£": behind remote- - "β ": diverged from remote-- `working_tree`: string - combination of:- - "?": untracked files- - "!": modified files- - "+": staged changes- - "Β»": renamed files- - "β": deleted files+- `has_conflicts`: boolean+- `branch_state`: "" | "β‘" (matches main) | "β " (no commits and clean)+- `git_operation`: "" | "β»" (rebase) | "β" (merge)+- `worktree_attrs`: combination of "β" (bare), "β " (locked), "β " (prunable)+- `main_divergence`: "" | "β" (ahead) | "β" (behind) | "β" (diverged)+- `upstream_divergence`: "" | "β‘" (ahead) | "β£" (behind) | "β " (diverged)+- `working_tree`: combination of "?" (untracked), "!" (modified), "+" (staged), "Β»" (renamed), "β" (deleted)### Display Fields (json-pretty format only)-These fields contain ANSI-formatted strings for human-readable output:--- `commits_display` (branches only)-- `branch_diff_display` (branches only)-- `upstream_display` (optional)-- `ci_status_display` (optional)-- `status_display`:- - Worktrees: rendered status symbols + user status- - Branches: user status or "Β·"+ANSI-formatted strings for human-readable output:+- `commits_display`, `branch_diff_display` (branches only)+- `upstream_display`, `ci_status_display` (optional)+- `status_display`: rendered status symbols + user status- `working_diff_display` (worktrees only, optional)-Note: Display fields are omitted when empty/null.-### Query Examples```bash-# Get main worktree info-jq '.[] | select(.branch == "main") | {path, ahead, behind}'-# Find worktrees with uncommitted changesjq '.[] | select(.type == "worktree" and .working_tree_diff.added > 0)'diff --git a/src/cli.rs b/src/cli.rsindex 015d8ced4..006340c9d 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -35,11 +35,11 @@ pub enum OutputFormat {#[command(version = version_str())]#[command(disable_help_subcommand = true)]pub struct Cli {- /// Run as if worktrunk was started in `<path>` instead of the current working directory+ /// Change working directory#[arg(short = 'C', global = true, value_name = "path")]pub directory: Option<std::path::PathBuf>,- /// Enable verbose output (show git commands and debug info)+ /// Show git commands and debug info#[arg(long, short = 'v', global = true)]pub verbose: bool,@@ -99,7 +99,7 @@ Xonsh (~/.xonshrc):Oil Shell (~/.config/oil/oshrc):eval "$(wt init oil)""#)]Shell {- /// Specific shell to configure (default: all shells with existing config files)+ /// Shell to configure#[arg(long, value_enum)]shell: Option<Shell>,@@ -107,7 +107,7 @@ Oil Shell (~/.config/oil/oshrc):#[arg(short, long)]force: bool,- /// Command name to use (defaults to 'wt')+ /// Command name (default: 'wt')#[arg(long, default_value = DEFAULT_COMMAND_NAME)]command_name: String,},@@ -120,33 +120,33 @@ pub enum StandaloneCommand {/// Hook type to runhook_type: HookType,- /// Auto-approve project commands without saving approvals.+ /// Skip approval prompts#[arg(short, long)]force: bool,},/// Commit changes with LLM-generated messageCommit {- /// Auto-approve project commands without saving approvals.+ /// Skip approval prompts#[arg(short, long)]force: bool,- /// Skip pre-commit project hooks.+ /// Skip pre-commit hooks#[arg(long)]no_verify: bool,},/// Squash commits with LLM-generated messageSquash {- /// Target branch to squash against (defaults to default branch)+ /// Target branch (default: default branch)#[arg(add = crate::completion::branch_value_completer())]target: Option<String>,- /// Auto-approve project commands without saving approvals.+ /// Skip approval prompts#[arg(short, long)]force: bool,- /// Skip pre-commit project hooks+ /// Skip pre-commit hooks#[arg(long)]no_verify: bool,},@@ -156,36 +156,36 @@ pub enum StandaloneCommand {/// Automatically stashes non-conflicting edits in the target worktree before/// the push and restores them afterward so other agents' changes stay intact.Push {- /// Target branch (defaults to default branch)+ /// Target branch (default: default branch)#[arg(add = crate::completion::branch_value_completer())]target: Option<String>,- /// Allow pushing merge commits (non-linear history)+ /// Allow merge commits#[arg(long)]allow_merge_commits: bool,},/// Rebase current branch onto target branchRebase {- /// Target branch to rebase onto (defaults to default branch)+ /// Target branch (default: default branch)#[arg(add = crate::completion::branch_value_completer())]target: Option<String>,},/// Approve commands in the project config (shows unapproved by default)AskApprovals {- /// Auto-approve project commands without saving approvals.+ /// Skip approval prompts#[arg(short, long)]force: bool,- /// Show all commands including already-approved ones+ /// Show all commands#[arg(long)]all: bool,},/// Clear approved commands from configClearApprovals {- /// Clear approvals from global config (all projects)+ /// Clear global approvals#[arg(short, long)]global: bool,},@@ -209,7 +209,7 @@ pub enum Commands {/// Shell to generate code forshell: Shell,- /// Command name to use (defaults to 'wt')+ /// Command name (default: 'wt')#[arg(long, default_value = DEFAULT_COMMAND_NAME)]command_name: String,},@@ -315,7 +315,7 @@ Rows are dimmed when no unique work (β‘ matches main OR β no commits)."#)]#[arg(long)]branches: bool,- /// Show CI status, conflict detection, and complete diff statistics+ /// Show CI, conflicts, and full diffs////// Adds columns: CI (pipeline status), mainβ¦Β± (line diffs)./// Enables conflict detection (shows "=" symbol in Status column).@@ -381,7 +381,7 @@ Use '@' to refer to your current HEAD (following git's convention):wt switch --create new-feature --base=@ # Branch from current HEADwt remove @ # Remove current worktree"#)]Switch {- /// Branch name, worktree path, '@' for current HEAD, or '-' for previous branch+ /// Branch, path, '@' (HEAD), or '-' (previous)#[arg(add = crate::completion::worktree_branch_completer())]branch: String,@@ -389,7 +389,7 @@ Use '@' to refer to your current HEAD (following git's convention):#[arg(short = 'c', long)]create: bool,- /// Base branch to create from (only with --create). Use '@' for current HEAD+ /// Base branch (with --create)#[arg(short = 'b', long, add = crate::completion::branch_value_completer())]base: Option<String>,@@ -397,11 +397,11 @@ Use '@' to refer to your current HEAD (following git's convention):#[arg(short = 'x', long)]execute: Option<String>,- /// Auto-approve project commands without saving approvals.+ /// Skip approval prompts#[arg(short = 'f', long)]force: bool,- /// Skip all project hooks: post-create and post-start.+ /// Skip project hooks#[arg(long)]no_verify: bool,},@@ -454,11 +454,11 @@ Remove multiple worktrees:Switch to default in primary:wt remove # (when already in primary worktree)"#)]Remove {- /// Worktree names or branches to remove (use '@' for current, defaults to current if none specified)+ /// Worktree or branch (@ for current)#[arg(add = crate::completion::worktree_branch_completer())]worktrees: Vec<String>,- /// Don't delete the branch after removing the worktree (by default, branches are deleted)+ /// Keep branch after removal#[arg(long = "no-delete-branch")]no_delete_branch: bool,},@@ -515,31 +515,31 @@ Keep worktree after merging:Skip pre-merge commands:wt merge --no-verify"#)]Merge {- /// Target branch to merge into (defaults to default branch)+ /// Target branch (default: default branch)#[arg(add = crate::completion::branch_value_completer())]target: Option<String>,- /// Disable squashing commits (by default, commits are squashed into one before merging)+ /// Don't squash commits#[arg(long = "no-squash", action = ArgAction::SetFalse, default_value_t = true)]squash_enabled: bool,- /// Push commits as-is without transformations (requires clean tree; implies --no-squash, --no-remove, and skips rebase)+ /// Push without transformations#[arg(long)]no_commit: bool,- /// Keep the worktree after merging.+ /// Keep worktree after merge#[arg(long = "no-remove")]no_remove: bool,- /// Skip pre-merge project hooks.+ /// Skip pre-merge hooks#[arg(long)]no_verify: bool,- /// Auto-approve project commands without saving approvals.+ /// Skip approval prompts#[arg(short, long)]force: bool,- /// Only stage tracked files (git add -u) instead of all files (git add -A)+ /// Stage tracked files only#[arg(long)]tracked_only: bool,},diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rsindex 2eeeab128..c7bb82e27 100644--- a/src/commands/command_approval.rs+++ b/src/commands/command_approval.rs@@ -75,8 +75,8 @@ pub fn approve_command_batch(Ok(true)}-fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> std::io::Result<bool> {- use std::io::{self, Write};+fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> Result<bool, GitError> {+ use std::io::{self, IsTerminal, Write};let project_name = project_id.split('/').next_back().unwrap_or(project_id);let bold = AnstyleStyle::new().bold();@@ -106,6 +106,13 @@ fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> std::ioeprintln!();}+ // Check if stdin is a TTY before attempting to prompt+ // This happens AFTER showing the commands so they appear in CI/CD logs+ // even when the prompt cannot be displayed (fail-fast principle)+ if !io::stdin().is_terminal() {+ return Err(GitError::NotInteractive);+ }+// Flush stderr before showing prompt to ensure all output is visiblestderr().flush()?;diff --git a/src/git/error.rs b/src/git/error.rsindex 06fdbd76a..8813e1cbc 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -44,6 +44,8 @@ pub enum GitError {MergeCommitsFound,/// Command was not approved by userCommandNotApproved,+ /// Cannot prompt for approval in non-interactive environment+ NotInteractive,/// Child process exited with non-zero code (preserves exit code for signals)ChildProcessExited { code: i32, message: String },/// Push operation failed@@ -231,6 +233,14 @@ impl std::fmt::Display for GitError {Ok(()) // on_skip callback handles the printing}+ // Not interactive (cannot prompt)+ GitError::NotInteractive => {+ write!(+ f,+ "{ERROR_EMOJI} {ERROR}Cannot prompt for approval in non-interactive environment{ERROR:#}\n\n{HINT_EMOJI} {HINT}In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'{HINT:#}"+ )+ }+// Child process exited with non-zero code// Display with error emoji - main.rs will use the exit codeGitError::ChildProcessExited { code: _, message } => {diff --git a/tests/common/mod.rs b/tests/common/mod.rsindex c1198cbcd..d0e1afc20 100644--- a/tests/common/mod.rs+++ b/tests/common/mod.rs@@ -171,6 +171,34 @@ impl TestRepo {cmd.env("SOURCE_DATE_EPOCH", "1761609600");}+ /// Get standard test environment variables as a vector+ ///+ /// This is useful for PTY tests and other cases where you need environment variables+ /// as a vector rather than setting them on a Command.+ pub fn test_env_vars(&self) -> Vec<(String, String)> {+ vec![+ ("CLICOLOR_FORCE".to_string(), "1".to_string()),+ ("COLUMNS".to_string(), "150".to_string()),+ ("GIT_CONFIG_GLOBAL".to_string(), "/dev/null".to_string()),+ ("GIT_CONFIG_SYSTEM".to_string(), "/dev/null".to_string()),+ (+ "GIT_AUTHOR_DATE".to_string(),+ "2025-01-01T00:00:00Z".to_string(),+ ),+ (+ "GIT_COMMITTER_DATE".to_string(),+ "2025-01-01T00:00:00Z".to_string(),+ ),+ ("LC_ALL".to_string(), "C".to_string()),+ ("LANG".to_string(), "C".to_string()),+ ("SOURCE_DATE_EPOCH".to_string(), "1761609600".to_string()),+ (+ "WORKTRUNK_CONFIG_PATH".to_string(),+ self.test_config_path().display().to_string(),+ ),+ ]+ }+/// Create a configured git command with args and current_dir set////// This is a convenience wrapper around configure_git_cmd that reduces boilerplate.diff --git a/tests/integration_tests/approval_pty.rs b/tests/integration_tests/approval_pty.rsnew file mode 100644index 000000000..ef3bc9e33--- /dev/null+++ b/tests/integration_tests/approval_pty.rs@@ -0,0 +1,390 @@+//! PTY-based tests for interactive approval prompts+//!+//! These tests verify the approval workflow in a real PTY environment where stdin is a TTY.+//! This allows testing the actual interactive prompt behavior that users experience.+//!+//! Note: These tests are separate from `approval_ui.rs` because they require PTY setup+//! to simulate interactive terminals. The non-PTY tests in `approval_ui.rs` verify the+//! error case (non-TTY environments).++use crate::common::TestRepo;+use insta::assert_snapshot;+use insta_cmd::get_cargo_bin;+use portable_pty::{CommandBuilder, PtySize, native_pty_system};+use std::io::{Read, Write};+use std::path::Path;++/// Execute a command in a PTY with interactive input+///+/// Returns (combined_output, exit_code)+fn exec_in_pty_with_input(+ command: &str,+ args: &[&str],+ working_dir: &Path,+ env_vars: &[(String, String)],+ input: &str,+) -> (String, i32) {+ let pty_system = native_pty_system();+ let pair = pty_system+ .openpty(PtySize {+ rows: 48,+ cols: 200,+ pixel_width: 0,+ pixel_height: 0,+ })+ .expect("Failed to open PTY");++ // Spawn the command inside the PTY+ let mut cmd = CommandBuilder::new(command);+ for arg in args {+ cmd.arg(arg);+ }+ cmd.cwd(working_dir);++ // Set minimal environment+ cmd.env_clear();+ cmd.env(+ "HOME",+ std::env::var("HOME").unwrap_or_else(|_| "/tmp".to_string()),+ );+ cmd.env(+ "PATH",+ std::env::var("PATH").unwrap_or_else(|_| "/usr/bin:/bin".to_string()),+ );++ // Add test-specific environment variables+ for (key, value) in env_vars {+ cmd.env(key, value);+ }++ let mut child = pair+ .slave+ .spawn_command(cmd)+ .expect("Failed to spawn command in PTY");+ drop(pair.slave); // Close slave in parent++ // Get reader and writer for the PTY master+ let mut reader = pair+ .master+ .try_clone_reader()+ .expect("Failed to clone PTY reader");+ let mut writer = pair.master.take_writer().expect("Failed to get PTY writer");++ // Write input to the PTY (simulating user typing)+ writer+ .write_all(input.as_bytes())+ .expect("Failed to write input to PTY");+ writer.flush().expect("Failed to flush PTY writer");+ drop(writer); // Close writer so command sees EOF++ // Read all output+ let mut buf = String::new();+ reader+ .read_to_string(&mut buf)+ .expect("Failed to read PTY output");++ // Wait for child to exit+ let exit_status = child.wait().expect("Failed to wait for child");+ let exit_code = exit_status.exit_code() as i32;++ (buf, exit_code)+}++/// Normalize output for snapshot testing+fn normalize_output(output: &str) -> String {+ // Remove repository paths+ let output = regex::Regex::new(r"/[^\s]+\.tmp[^\s/]+")+ .unwrap()+ .replace_all(output, "[REPO]");++ // Remove config paths+ let output = regex::Regex::new(r"/var/folders/[^\s]+/test-config\.toml")+ .unwrap()+ .replace_all(&output, "[CONFIG]");++ output.to_string()+}++#[test]+fn test_approval_prompt_accept() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.write_project_config(r#"post-create-command = "echo 'test command'""#);+ repo.commit("Add config");++ let env_vars = repo.test_env_vars();+ let (output, exit_code) = exec_in_pty_with_input(+ get_cargo_bin("wt").to_str().unwrap(),+ &["switch", "--create", "test-approve"],+ repo.root_path(),+ &env_vars,+ "y\n",+ );++ let normalized = normalize_output(&output);+ assert_eq!(exit_code, 0, "Command should succeed when approved");+ assert_snapshot!("approval_prompt_accept", normalized);+}++#[test]+fn test_approval_prompt_decline() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.write_project_config(r#"post-create-command = "echo 'test command'""#);+ repo.commit("Add config");++ let env_vars = repo.test_env_vars();+ let (output, exit_code) = exec_in_pty_with_input(+ get_cargo_bin("wt").to_str().unwrap(),+ &["switch", "--create", "test-decline"],+ repo.root_path(),+ &env_vars,+ "n\n",+ );++ let normalized = normalize_output(&output);+ assert_eq!(exit_code, 0, "Command should succeed even when declined");+ assert_snapshot!("approval_prompt_decline", normalized);+}++#[test]+fn test_approval_prompt_multiple_commands() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.write_project_config(+ r#"post-create-command = [+ "echo 'First command'",+ "echo 'Second command'",+ "echo 'Third command'"+]"#,+ );+ repo.commit("Add config");++ let env_vars = repo.test_env_vars();+ let (output, exit_code) = exec_in_pty_with_input(+ get_cargo_bin("wt").to_str().unwrap(),+ &["switch", "--create", "test-multi"],+ repo.root_path(),+ &env_vars,+ "y\n",+ );++ let normalized = normalize_output(&output);+ assert_eq!(exit_code, 0);+ assert_snapshot!("approval_prompt_multiple_commands", normalized);+}++#[test]+fn test_approval_prompt_permission_error() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.write_project_config(r#"post-create-command = "echo 'test command'""#);+ repo.commit("Add config");++ // Create config file and make it read-only to trigger permission error when saving approval+ let config_path = repo.test_config_path();+ #[cfg(unix)]+ {+ use std::fs;+ use std::os::unix::fs::PermissionsExt;++ // Create the config file first+ fs::write(config_path, "# read-only config\n").unwrap();++ // Make it read-only+ let mut perms = fs::metadata(config_path).unwrap().permissions();+ perms.set_mode(0o444); // Read-only+ fs::set_permissions(config_path, perms).unwrap();+ }++ let env_vars = repo.test_env_vars();+ let (output, exit_code) = exec_in_pty_with_input(+ get_cargo_bin("wt").to_str().unwrap(),+ &["switch", "--create", "test-permission"],+ repo.root_path(),+ &env_vars,+ "y\n",+ );++ let normalized = normalize_output(&output);+ assert_eq!(+ exit_code, 0,+ "Command should succeed even when saving approval fails"+ );+ assert!(+ normalized.contains("Failed to save command approval"),+ "Should show permission error warning"+ );+ assert!(+ normalized.contains("You will be prompted again next time"),+ "Should show hint about being prompted again"+ );+ assert!(+ normalized.contains("test command"),+ "Command should still execute despite save failure"+ );+ assert_snapshot!("approval_prompt_permission_error", normalized);+}++#[test]+fn test_approval_prompt_named_commands() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.write_project_config(+ r#"[post-create-command]+install = "echo 'Installing dependencies...'"+build = "echo 'Building project...'"+test = "echo 'Running tests...'"+"#,+ );+ repo.commit("Add config");++ let env_vars = repo.test_env_vars();+ let (output, exit_code) = exec_in_pty_with_input(+ get_cargo_bin("wt").to_str().unwrap(),+ &["switch", "--create", "test-named"],+ repo.root_path(),+ &env_vars,+ "y\n",+ );++ let normalized = normalize_output(&output);+ assert_eq!(exit_code, 0, "Command should succeed when approved");+ assert!(+ normalized.contains("install") && normalized.contains("Installing dependencies"),+ "Should show command name 'install' and execute it"+ );+ assert!(+ normalized.contains("build") && normalized.contains("Building project"),+ "Should show command name 'build' and execute it"+ );+ assert!(+ normalized.contains("test") && normalized.contains("Running tests"),+ "Should show command name 'test' and execute it"+ );+ assert_snapshot!("approval_prompt_named_commands", normalized);+}++#[test]+fn test_approval_prompt_mixed_approved_unapproved_accept() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.write_project_config(+ r#"post-create-command = [+ "echo 'First command'",+ "echo 'Second command'",+ "echo 'Third command'"+]"#,+ );+ repo.commit("Add config");++ // Pre-approve the second command+ let project_id = repo.root_path().file_name().unwrap().to_str().unwrap();+ repo.write_test_config(&format!(+ r#"[projects."{}"]+approved-commands = ["echo 'Second command'"]+"#,+ project_id+ ));++ let env_vars = repo.test_env_vars();+ let (output, exit_code) = exec_in_pty_with_input(+ get_cargo_bin("wt").to_str().unwrap(),+ &["switch", "--create", "test-mixed-accept"],+ repo.root_path(),+ &env_vars,+ "y\n",+ );++ let normalized = normalize_output(&output);+ assert_eq!(exit_code, 0, "Command should succeed when approved");++ // Check that only 2 commands are shown in the prompt (ANSI codes may be in between)+ assert!(+ normalized.contains("execute")+ && normalized.contains("2")+ && normalized.contains("command"),+ "Should show 2 unapproved commands in prompt"+ );+ assert!(+ normalized.contains("First command"),+ "Should execute first command"+ );+ assert!(+ normalized.contains("Second command"),+ "Should execute pre-approved second command"+ );+ assert!(+ normalized.contains("Third command"),+ "Should execute third command"+ );+ assert_snapshot!(+ "approval_prompt_mixed_approved_unapproved_accept",+ normalized+ );+}++#[test]+fn test_approval_prompt_mixed_approved_unapproved_decline() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.write_project_config(+ r#"post-create-command = [+ "echo 'First command'",+ "echo 'Second command'",+ "echo 'Third command'"+]"#,+ );+ repo.commit("Add config");++ // Pre-approve the second command+ let project_id = repo.root_path().file_name().unwrap().to_str().unwrap();+ repo.write_test_config(&format!(+ r#"[projects."{}"]+approved-commands = ["echo 'Second command'"]+"#,+ project_id+ ));++ let env_vars = repo.test_env_vars();+ let (output, exit_code) = exec_in_pty_with_input(+ get_cargo_bin("wt").to_str().unwrap(),+ &["switch", "--create", "test-mixed-decline"],+ repo.root_path(),+ &env_vars,+ "n\n",+ );++ let normalized = normalize_output(&output);++ assert_eq!(+ exit_code, 0,+ "Command should succeed even when declined (worktree still created)"+ );+ // Check that only 2 commands are shown in the prompt (ANSI codes may be in between)+ assert!(+ normalized.contains("execute")+ && normalized.contains("2")+ && normalized.contains("command"),+ "Should show only 2 unapproved commands in prompt (not 3)"+ );+ // When declined, ALL commands are skipped (including pre-approved ones)+ assert!(+ normalized.contains("Commands declined"),+ "Should show 'Commands declined' message"+ );+ // Commands appear in the prompt, but should not be executed+ // Check for "Running post-create" which indicates execution+ assert!(+ !normalized.contains("Running post-create"),+ "Should NOT execute any commands when declined"+ );+ assert!(+ normalized.contains("Created new worktree"),+ "Should still create worktree even when commands declined"+ );+ assert_snapshot!(+ "approval_prompt_mixed_approved_unapproved_decline",+ normalized+ );+}diff --git a/tests/integration_tests/approval_ui.rs b/tests/integration_tests/approval_ui.rsindex 8d7e5950c..8692c35ba 100644--- a/tests/integration_tests/approval_ui.rs+++ b/tests/integration_tests/approval_ui.rs@@ -239,67 +239,6 @@ test = "echo 'Running tests...'");}-/// Test that shows the full output when config save fails due to permission error-///-/// This captures what users actually see when approve_command_batch() catches a save error-/// at src/commands/command_approval.rs:82-85.-#[test]-fn test_permission_error_user_output() {- use std::fs::Permissions;- use std::os::unix::fs::PermissionsExt;-- let repo = TestRepo::new();- repo.commit("Initial commit");-- // Set up project config with post-create command- repo.write_project_config(r#"post-create-command = "echo 'test command'""#);-- repo.commit("Add config");-- // Create an initial config file and make it read-only BEFORE running the command- // This will cause the save operation to fail with a permission error- fs::write(repo.test_config_path(), "# read-only config\n").expect("Failed to create config");- let readonly_perms = Permissions::from_mode(0o444);- fs::set_permissions(repo.test_config_path(), readonly_perms).expect("Failed to set read-only");-- let settings = setup_snapshot_settings(&repo);- settings.bind(|| {- let mut cmd = make_snapshot_cmd(&repo, "switch", &["--create", "test-permission"], None);- cmd.stdin(Stdio::piped())- .stdout(Stdio::piped())- .stderr(Stdio::piped());-- let mut child = cmd.spawn().expect("Failed to spawn command");-- // Approve the command - this will trigger the permission error when saving- {- let stdin = child.stdin.as_mut().expect("Failed to get stdin");- stdin.write_all(b"y\n").expect("Failed to write to stdin");- }-- let output = child- .wait_with_output()- .expect("Failed to wait for command");-- // Restore write permissions to the config file for cleanup- let writable_perms = Permissions::from_mode(0o644);- fs::set_permissions(repo.test_config_path(), writable_perms)- .expect("Failed to restore permissions");-- // Capture the full output showing the warning- let stdout = String::from_utf8_lossy(&output.stdout);- let stderr = String::from_utf8_lossy(&output.stderr);- let combined = format!(- "exit_code: {}\n----- stdout -----\n{}\n----- stderr -----\n{}",- output.status.code().unwrap_or(-1),- stdout,- stderr- );-- insta::assert_snapshot!("permission_error_user_output", combined);- });-}-/// Helper for run-hook snapshot tests with approval promptfn snapshot_run_hook(test_name: &str, repo: &TestRepo, hook_type: &str, approve: bool) {let settings = setup_snapshot_settings(repo);@@ -383,3 +322,48 @@ fn test_run_hook_post_merge_requires_approval() {false,);}++/// Test that approval fails in non-TTY environment with clear error message+///+/// When stdin is not a TTY (e.g., CI/CD, piped input), approval prompts cannot be shown.+/// The command should fail with a clear error telling users to use --force.+#[test]+fn test_approval_fails_in_non_tty() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ repo.write_project_config(r#"post-create-command = "echo 'test command'""#);+ repo.commit("Add config");++ // Run WITHOUT piping stdin - this simulates non-TTY environment+ // When running under cargo test, stdin is not a TTY+ let settings = setup_snapshot_settings(&repo);+ settings.bind(|| {+ let mut cmd = make_snapshot_cmd(&repo, "switch", &["--create", "test-non-tty"], None);+ assert_cmd_snapshot!("approval_fails_in_non_tty", cmd);+ });+}++/// Test that --force flag bypasses TTY requirement+///+/// Even in non-TTY environments, --force should allow commands to execute.+#[test]+fn test_force_bypasses_tty_check() {+ let repo = TestRepo::new();+ repo.commit("Initial commit");++ repo.write_project_config(r#"post-create-command = "echo 'test command'""#);+ repo.commit("Add config");++ // Run with --force to bypass approval entirely+ let settings = setup_snapshot_settings(&repo);+ settings.bind(|| {+ let mut cmd = make_snapshot_cmd(+ &repo,+ "switch",+ &["--create", "test-force-tty", "--force"],+ None,+ );+ assert_cmd_snapshot!("force_bypasses_tty_check", cmd);+ });+}diff --git a/tests/integration_tests/mod.rs b/tests/integration_tests/mod.rsindex 65578c6b2..d64560509 100644--- a/tests/integration_tests/mod.rs+++ b/tests/integration_tests/mod.rs@@ -3,6 +3,7 @@#![cfg(unix)]// column_alignment merged into spacing_edge_cases+pub mod approval_pty;pub mod approval_save;pub mod approval_ui;pub mod approvals;diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snapnew file mode 100644index 000000000..fb3a3c926--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap@@ -0,0 +1,17 @@+---+source: tests/integration_tests/approval_pty.rs+expression: normalized+---+y++^Dπ‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'test command'[0m[0m++π‘ Allow and remember? [1m[y/N][0m+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[0mtest command+β [32mCreated new worktree for [1m[32mtest-approve[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-approve[0m[0m+π‘ [2mTo enable automatic cd, run: wt config shell[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snapnew file mode 100644index 000000000..f9126dc37--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap@@ -0,0 +1,15 @@+---+source: tests/integration_tests/approval_pty.rs+expression: normalized+---+n++^Dπ‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'test command'[0m[0m++π‘ Allow and remember? [1m[y/N][0m+βͺ Commands declined, continuing worktree creation+β [32mCreated new worktree for [1m[32mtest-decline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-decline[0m[0m+π‘ [2mTo enable automatic cd, run: wt config shell[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snapnew file mode 100644index 000000000..bf594e76d--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap@@ -0,0 +1,26 @@+---+source: tests/integration_tests/approval_pty.rs+expression: normalized+---+y++^Dπ‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m2[0m[33m commands:[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'First command'[0m[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'Third command'[0m[0m++π‘ Allow and remember? [1m[y/N][0m+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[0mFirst command+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho[0m [32m'Second command'[0m[0m+[0mSecond command+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[0mThird command+β [32mCreated new worktree for [1m[32mtest-mixed-accept[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-mixed-accept[0m[0m+π‘ [2mTo enable automatic cd, run: wt config shell[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snapnew file mode 100644index 000000000..4dbc2fbb9--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap@@ -0,0 +1,18 @@+---+source: tests/integration_tests/approval_pty.rs+expression: normalized+---+n++^Dπ‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m2[0m[33m commands:[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'First command'[0m[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'Third command'[0m[0m++π‘ Allow and remember? [1m[y/N][0m+βͺ Commands declined, continuing worktree creation+β [32mCreated new worktree for [1m[32mtest-mixed-decline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-mixed-decline[0m[0m+π‘ [2mTo enable automatic cd, run: wt config shell[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snapnew file mode 100644index 000000000..2fbfcd7ea--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap@@ -0,0 +1,29 @@+---+source: tests/integration_tests/approval_pty.rs+expression: normalized+---+y++^Dπ‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m3[0m[33m commands:[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'First command'[0m[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'Second command'[0m[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'Third command'[0m[0m++π‘ Allow and remember? [1m[y/N][0m+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[0mFirst command+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho[0m [32m'Second command'[0m[0m+[0mSecond command+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[0mThird command+β [32mCreated new worktree for [1m[32mtest-multi[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-multi[0m[0m+π‘ [2mTo enable automatic cd, run: wt config shell[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snapnew file mode 100644index 000000000..8aeefec16--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap@@ -0,0 +1,29 @@+---+source: tests/integration_tests/approval_pty.rs+expression: normalized+---+y++^Dπ‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m3[0m[33m commands:[0m++π post-create [1minstall[0m:+[40m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m++π post-create [1mbuild[0m:+[40m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m++π post-create [1mtest[0m:+[40m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m++π‘ Allow and remember? [1m[y/N][0m+π [36mRunning post-create [1minstall[0m:[0m+[40m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m+[0mInstalling dependencies...+π [36mRunning post-create [1mbuild[0m:[0m+[40m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m+[0mBuilding project...+π [36mRunning post-create [1mtest[0m:[0m+[40m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m+[0mRunning tests...+β [32mCreated new worktree for [1m[32mtest-named[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-named[0m[0m+π‘ [2mTo enable automatic cd, run: wt config shell[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__permission_error_user_output.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snapsimilarity index 64%rename from tests/snapshots/integration__integration_tests__approval_ui__permission_error_user_output.snaprename to tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snapindex 3a786a53a..46d99d400 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__permission_error_user_output.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap@@ -1,21 +1,19 @@----source: tests/integration_tests/approval_ui.rs-expression: combined+source: tests/integration_tests/approval_pty.rs+expression: normalized----exit_code: 0------ stdout ------π‘ [33mFailed to save command approval: Failed to write config file: Permission denied (os error 13)[0m-π‘ [2mYou will be prompted again next time.[0m-π [36mRunning post-create:[0m-[40m [0m [1m[34mecho[0m [32m'test command'[0m[0m-β [32mCreated new worktree for [1m[32mtest-permission[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-permission[0m[0m-π‘ [2mTo enable automatic cd, run: wt config shell[0m+y------ stderr ------π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0m+^Dπ‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0mπ post-create:[40m [0m [1m[34mecho[0m [32m'test command'[0m[0mπ‘ Allow and remember? [1m[y/N][0m+π‘ [33mFailed to save command approval: Failed to write config file: Permission denied (os error 13)[0m+π‘ [2mYou will be prompted again next time.[0m+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho[0m [32m'test command'[0m[0m[0mtest command+β [32mCreated new worktree for [1m[32mtest-permission[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-permission[0m[0m+π‘ [2mTo enable automatic cd, run: wt config shell[0mdiff --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.snapnew file mode 100644index 000000000..c7ee87efa--- /dev/null+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap@@ -0,0 +1,33 @@+---+source: tests/integration_tests/approval_ui.rs+info:+ program: wt+ args:+ - switch+ - "--create"+ - test-non-tty+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSRSVBw/test-config.toml+---+success: false+exit_code: 1+----- stdout -----+β [31mCannot prompt for approval in non-interactive environment[0m++π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m++----- stderr -----+π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0m++π post-create:+[40m [0m [1m[34mecho[0m [32m'test command'[0m[0mdiff --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 bfd7aebaa..94ab0a06e 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@@ -2,11 +2,11 @@source: tests/integration_tests/approval_ui.rsexpression: combined----exit_code: 0+exit_code: 1----- stdout ------βͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1m[32mtest-mixed[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-mixed[0m[0m-π‘ [2mTo enable automatic cd, run: wt config shell[0m+β [31mCannot prompt for approval in non-interactive environment[0m++π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m2[0m[33m commands:[0m@@ -16,5 +16,3 @@ exit_code: 0π post-create:[40m [0m [1m[34mecho[0m [32m'Third command'[0m[0m--π‘ Allow and remember? [1m[y/N][0mdiff --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 4960fc85e..8d91e670e 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@@ -2,11 +2,11 @@source: tests/integration_tests/approval_ui.rsexpression: combined----exit_code: 0+exit_code: 1----- stdout ------βͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1m[32mtest/nested-branch[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-nested-branch[0m[0m-π‘ [2mTo enable automatic cd, run: wt config shell[0m+β [31mCannot prompt for approval in non-interactive environment[0m++π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m4[0m[33m commands:[0m@@ -22,5 +22,3 @@ exit_code: 0π post-create:[40m [0m [1m[34mcd[0m [REPO].test-nested-branch [36m&&[0m [1m[34mpwd[0m[0m--π‘ Allow and remember? [1m[y/N][0mdiff --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 2a65e354b..c5fec5fd1 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@@ -2,11 +2,11 @@source: tests/integration_tests/approval_ui.rsexpression: combined----exit_code: 0+exit_code: 1----- stdout ------βͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1m[32mtest-named[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-named[0m[0m-π‘ [2mTo enable automatic cd, run: wt config shell[0m+β [31mCannot prompt for approval in non-interactive environment[0m++π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m3[0m[33m commands:[0m@@ -19,5 +19,3 @@ exit_code: 0π post-create [1mtest[0m:[40m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m--π‘ Allow and remember? [1m[y/N][0mdiff --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 943692561..8e4de590f 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@@ -2,16 +2,14 @@source: tests/integration_tests/approval_ui.rsexpression: combined----exit_code: 0+exit_code: 1----- stdout ------βͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1m[32mfeature/test-approval[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-test-approval[0m[0m-π‘ [2mTo enable automatic cd, run: wt config shell[0m+β [31mCannot prompt for approval in non-interactive environment[0m++π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0mπ post-create:[40m [0m [1m[34mecho[0m [32m'Worktree path: [REPO].feature-test-approval'[0m[0m--π‘ Allow and remember? [1m[y/N][0mdiff --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 2b5ca7ed2..94ab0a06e 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@@ -2,11 +2,11 @@source: tests/integration_tests/approval_ui.rsexpression: combined----exit_code: 0+exit_code: 1----- stdout ------βͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1m[32mtest-decline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-decline[0m[0m-π‘ [2mTo enable automatic cd, run: wt config shell[0m+β [31mCannot prompt for approval in non-interactive environment[0m++π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m2[0m[33m commands:[0m@@ -16,5 +16,3 @@ exit_code: 0π post-create:[40m [0m [1m[34mecho[0m [32m'Third command'[0m[0m--π‘ Allow and remember? [1m[y/N][0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snapnew file mode 100644index 000000000..bac303c13--- /dev/null+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap@@ -0,0 +1,32 @@+---+source: tests/integration_tests/approval_ui.rs+info:+ program: wt+ args:+ - switch+ - "--create"+ - test-force-tty+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmlvzfL/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho[0m [32m'test command'[0m[0m+β [32mCreated new worktree for [1m[32mtest-force-tty[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force-tty[0m[0m+π‘ [2mTo enable automatic cd, run: wt config shell[0m++----- stderr -----+[0mtest commanddiff --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 933ddef08..2620b1822 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@@ -2,16 +2,14 @@source: tests/integration_tests/approval_ui.rsexpression: combined----exit_code: 0+exit_code: 1----- stdout ------βͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1m[32mtest-force-2[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force-2[0m[0m-π‘ [2mTo enable automatic cd, run: wt config shell[0m+β [31mCannot prompt for approval in non-interactive environment[0m++π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0mπ post-create:[40m [0m [1m[34mecho[0m [32m'test command'[0m [36m>[0m output.txt[0m--π‘ Allow and remember? [1m[y/N][0mdiff --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 d95e1699c..674623a8e 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@@ -4,12 +4,12 @@ expression: combined---exit_code: 1----- stdout -----+β [31mCannot prompt for approval in non-interactive environment[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0mπ post-merge:[40m [0m [1m[34mecho[0m [32m'Post-merge cleanup for main'[0m[0m--π‘ Allow and remember? [1m[y/N][0mdiff --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 8d82dac68..6b6e0e106 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@@ -4,12 +4,12 @@ expression: combined---exit_code: 1----- stdout -----+β [31mCannot prompt for approval in non-interactive environment[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0mπ pre-merge:[40m [0m [1m[34mecho[0m [32m'Running pre-merge checks on main'[0m[0m--π‘ Allow and remember? [1m[y/N][0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snapindex 7984d6c06..fe0e47f84 100644--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap+++ b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap@@ -17,17 +17,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfCfS8A/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuzpIU1/test-config.toml----success: true-exit_code: 0+success: false+exit_code: 1----- stdout ------βͺ Commands declined+β [31mCannot prompt for approval in non-interactive environment[0m++π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m wants to execute [1m[33m1[0m[33m command:[0mπ post-create:[40m [0m [1m[34mecho[0m [32m'test'[0m[0m--π‘ Allow and remember? [1m[y/N][0mdiff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snapindex f5605f063..52f6f5695 100644--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0zq2ID/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjMnKcX/test-config.toml---success: trueexit_code: 0@@ -183,8 +183,8 @@ function __fish_wt_using_subcommandcontains -- $cmd[1] $argvend-complete -c wt -n "__fish_wt_needs_command" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_needs_command" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_needs_command" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_needs_command" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_needs_command" -s h -l help -d 'Print help'complete -c wt -n "__fish_wt_needs_command" -s V -l version -d 'Print version'complete -c wt -n "__fish_wt_needs_command" -f -a "init" -d 'Generate shell integration code'@@ -194,36 +194,36 @@ complete -c wt -n "__fish_wt_needs_command" -f -a "list" -d 'List worktrees andcomplete -c wt -n "__fish_wt_needs_command" -f -a "switch" -d 'Switch to a worktree'complete -c wt -n "__fish_wt_needs_command" -f -a "remove" -d 'Finish current worktree, returning to primary if current'complete -c wt -n "__fish_wt_needs_command" -f -a "merge" -d 'Merge worktree into target branch'-complete -c wt -n "__fish_wt_using_subcommand init" -l command-name -d 'Command name to use (defaults to \'wt\')' -r-complete -c wt -n "__fish_wt_using_subcommand init" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand init" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand init" -l command-name -d 'Command name (default: \'wt\')' -r+complete -c wt -n "__fish_wt_using_subcommand init" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand init" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand init" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -s h -l help -d 'Print help (see more with \'--help\')'complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -f -a "init" -d 'Initialize global configuration file with examples'complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -f -a "list" -d 'List all configuration files and their locations'complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -f -a "refresh-cache" -d 'Refresh the cached default branch by querying the remote'complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -f -a "shell" -d 'Configure shell by writing to config files'-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from init" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from init" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from init" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from init" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from init" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -l shell -d 'Specific shell to configure (default: all shells with existing config files)' -r -f -a "bash\t''+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -l shell -d 'Shell to configure' -r -f -a "bash\t''fish\t''zsh\t''"-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -l command-name -d 'Command name to use (defaults to \'wt\')' -r-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -l command-name -d 'Command name (default: \'wt\')' -r+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s C -d 'Change working directory' -r -Fcomplete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s f -l force -d 'Skip confirmation prompt'-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s h -l help -d 'Print help (see more with \'--help\')'-complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -s h -l help -d 'Print help'complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -f -a "run-hook" -d 'Run a project hook for testing'complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -f -a "commit" -d 'Commit changes with LLM-generated message'@@ -233,66 +233,66 @@ complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommacomplete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -f -a "ask-approvals" -d 'Approve commands in the project config (shows unapproved by default)'complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -f -a "clear-approvals" -d 'Clear approved commands from config'complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from run-hook commit squash push rebase ask-approvals clear-approvals select" -f -a "select" -d 'Interactive worktree selector'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from run-hook" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from run-hook" -s f -l force -d 'Auto-approve project commands without saving approvals'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from run-hook" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from run-hook" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from run-hook" -s f -l force -d 'Skip approval prompts'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from run-hook" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from run-hook" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from commit" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from commit" -s f -l force -d 'Auto-approve project commands without saving approvals'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from commit" -l no-verify -d 'Skip pre-commit project hooks'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from commit" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from commit" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from commit" -s f -l force -d 'Skip approval prompts'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from commit" -l no-verify -d 'Skip pre-commit hooks'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from commit" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from commit" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from squash" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from squash" -s f -l force -d 'Auto-approve project commands without saving approvals'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from squash" -l no-verify -d 'Skip pre-commit project hooks'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from squash" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from squash" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from squash" -s f -l force -d 'Skip approval prompts'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from squash" -l no-verify -d 'Skip pre-commit hooks'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from squash" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from squash" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from push" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from push" -l allow-merge-commits -d 'Allow pushing merge commits (non-linear history)'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from push" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from push" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from push" -l allow-merge-commits -d 'Allow merge commits'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from push" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from push" -s h -l help -d 'Print help (see more with \'--help\')'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from rebase" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from rebase" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from rebase" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from rebase" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from rebase" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from ask-approvals" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from ask-approvals" -s f -l force -d 'Auto-approve project commands without saving approvals'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from ask-approvals" -l all -d 'Show all commands including already-approved ones'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from ask-approvals" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from ask-approvals" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from ask-approvals" -s f -l force -d 'Skip approval prompts'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from ask-approvals" -l all -d 'Show all commands'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from ask-approvals" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from ask-approvals" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from clear-approvals" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from clear-approvals" -s g -l global -d 'Clear approvals from global config (all projects)'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from clear-approvals" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from clear-approvals" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from clear-approvals" -s g -l global -d 'Clear global approvals'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from clear-approvals" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from clear-approvals" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -s h -l help -d 'Print help (see more with \'--help\')'complete -c wt -n "__fish_wt_using_subcommand list" -l format -d 'Output format' -r -f -a "table\t'Human-readable table format'json\t'Machine-readable JSON with display fields (includes styled unicode for rendering)'"-complete -c wt -n "__fish_wt_using_subcommand list" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand list" -s C -d 'Change working directory' -r -Fcomplete -c wt -n "__fish_wt_using_subcommand list" -l branches -d 'Include branches without worktrees'-complete -c wt -n "__fish_wt_using_subcommand list" -l full -d 'Show CI status, conflict detection, and complete diff statistics'-complete -c wt -n "__fish_wt_using_subcommand list" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand list" -l full -d 'Show CI, conflicts, and full diffs'+complete -c wt -n "__fish_wt_using_subcommand list" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand list" -s h -l help -d 'Print help (see more with \'--help\')'-complete -c wt -n "__fish_wt_using_subcommand switch" -s b -l base -f -d 'Base branch to create from (only with --create). Use \'@\' for current HEAD' -r+complete -c wt -n "__fish_wt_using_subcommand switch" -s b -l base -f -d 'Base branch (with --create)' -rcomplete -c wt -n "__fish_wt_using_subcommand switch" -s x -l execute -d 'Execute command after switching' -r-complete -c wt -n "__fish_wt_using_subcommand switch" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand switch" -s C -d 'Change working directory' -r -Fcomplete -c wt -n "__fish_wt_using_subcommand switch" -s c -l create -d 'Create a new branch'-complete -c wt -n "__fish_wt_using_subcommand switch" -s f -l force -d 'Auto-approve project commands without saving approvals'-complete -c wt -n "__fish_wt_using_subcommand switch" -l no-verify -d 'Skip all project hooks: post-create and post-start'-complete -c wt -n "__fish_wt_using_subcommand switch" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand switch" -s f -l force -d 'Skip approval prompts'+complete -c wt -n "__fish_wt_using_subcommand switch" -l no-verify -d 'Skip project hooks'+complete -c wt -n "__fish_wt_using_subcommand switch" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand switch" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand remove" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand remove" -l no-delete-branch -d 'Don\'t delete the branch after removing the worktree (by default, branches are deleted)'-complete -c wt -n "__fish_wt_using_subcommand remove" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand remove" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand remove" -l no-delete-branch -d 'Keep branch after removal'+complete -c wt -n "__fish_wt_using_subcommand remove" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand remove" -s h -l help -d 'Print help'-complete -c wt -n "__fish_wt_using_subcommand merge" -s C -d 'Run as if worktrunk was started in <path> instead of the current working directory' -r -F-complete -c wt -n "__fish_wt_using_subcommand merge" -l no-squash -d 'Disable squashing commits (by default, commits are squashed into one before merging)'-complete -c wt -n "__fish_wt_using_subcommand merge" -l no-commit -d 'Push commits as-is without transformations (requires clean tree; implies --no-squash, --no-remove, and skips rebase)'-complete -c wt -n "__fish_wt_using_subcommand merge" -l no-remove -d 'Keep the worktree after merging'-complete -c wt -n "__fish_wt_using_subcommand merge" -l no-verify -d 'Skip pre-merge project hooks'-complete -c wt -n "__fish_wt_using_subcommand merge" -s f -l force -d 'Auto-approve project commands without saving approvals'-complete -c wt -n "__fish_wt_using_subcommand merge" -l tracked-only -d 'Only stage tracked files (git add -u) instead of all files (git add -A)'-complete -c wt -n "__fish_wt_using_subcommand merge" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand merge" -s C -d 'Change working directory' -r -F+complete -c wt -n "__fish_wt_using_subcommand merge" -l no-squash -d 'Don\'t squash commits'+complete -c wt -n "__fish_wt_using_subcommand merge" -l no-commit -d 'Push without transformations'+complete -c wt -n "__fish_wt_using_subcommand merge" -l no-remove -d 'Keep worktree after merge'+complete -c wt -n "__fish_wt_using_subcommand merge" -l no-verify -d 'Skip pre-merge hooks'+complete -c wt -n "__fish_wt_using_subcommand merge" -s f -l force -d 'Skip approval prompts'+complete -c wt -n "__fish_wt_using_subcommand merge" -l tracked-only -d 'Stage tracked files only'+complete -c wt -n "__fish_wt_using_subcommand merge" -s v -l verbose -d 'Show git commands and debug info'complete -c wt -n "__fish_wt_using_subcommand merge" -s h -l help -d 'Print help (see more with \'--help\')'----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snapindex ab47bb6bc..9ae7a67fa 100644--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5Os0LO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeaTQjA/test-config.toml---success: trueexit_code: 0@@ -158,9 +158,9 @@ _wt() {local context curcontext="$curcontext" state line_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \'-V[Print version]' \@@ -176,10 +176,10 @@ _wt() {case $line[1] in(init)_arguments "${_arguments_options[@]}" : \-'--command-name=[Command name to use (defaults to '\''wt'\'')]:COMMAND_NAME:_default' \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'--command-name=[Command name (default\: '\''wt'\'')]:COMMAND_NAME:_default' \+'-C+[Change working directory]:path:_files' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \':shell -- Shell to generate code for:(bash fish zsh)' \@@ -187,9 +187,9 @@ _arguments "${_arguments_options[@]}" : \;;(config)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help (see more with '\''--help'\'')]' \'--help[Print help (see more with '\''--help'\'')]' \":: :_wt__config_commands" \@@ -204,40 +204,40 @@ _arguments "${_arguments_options[@]}" : \case $line[1] in(init)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \&& ret=0;;(list)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \&& ret=0;;(refresh-cache)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \&& ret=0;;(shell)_arguments "${_arguments_options[@]}" : \-'--shell=[Specific shell to configure (default\: all shells with existing config files)]:SHELL:(bash fish zsh)' \-'--command-name=[Command name to use (defaults to '\''wt'\'')]:COMMAND_NAME:_default' \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \+'--shell=[Shell to configure]:SHELL:(bash fish zsh)' \+'--command-name=[Command name (default\: '\''wt'\'')]:COMMAND_NAME:_default' \+'-C+[Change working directory]:path:_files' \'-f[Skip confirmation prompt]' \'--force[Skip confirmation prompt]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help (see more with '\''--help'\'')]' \'--help[Print help (see more with '\''--help'\'')]' \&& ret=0@@ -248,9 +248,9 @@ esac;;(beta)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \":: :_wt__beta_commands" \@@ -265,11 +265,11 @@ _arguments "${_arguments_options[@]}" : \case $line[1] in(run-hook)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-f[Auto-approve project commands without saving approvals]' \-'--force[Auto-approve project commands without saving approvals]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-f[Skip approval prompts]' \+'--force[Skip approval prompts]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \':hook_type -- Hook type to run:(post-create post-start pre-commit pre-merge post-merge)' \@@ -277,78 +277,78 @@ _arguments "${_arguments_options[@]}" : \;;(commit)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-f[Auto-approve project commands without saving approvals]' \-'--force[Auto-approve project commands without saving approvals]' \-'--no-verify[Skip pre-commit project hooks]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-f[Skip approval prompts]' \+'--force[Skip approval prompts]' \+'--no-verify[Skip pre-commit hooks]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \&& ret=0;;(squash)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-f[Auto-approve project commands without saving approvals]' \-'--force[Auto-approve project commands without saving approvals]' \-'--no-verify[Skip pre-commit project hooks]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-f[Skip approval prompts]' \+'--force[Skip approval prompts]' \+'--no-verify[Skip pre-commit hooks]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \-'::target -- Target branch to squash against (defaults to default branch):_default' \+'::target -- Target branch (default\: default branch):_default' \&& ret=0;;(push)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'--allow-merge-commits[Allow pushing merge commits (non-linear history)]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'--allow-merge-commits[Allow merge commits]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help (see more with '\''--help'\'')]' \'--help[Print help (see more with '\''--help'\'')]' \-'::target -- Target branch (defaults to default branch):_default' \+'::target -- Target branch (default\: default branch):_default' \&& ret=0;;(rebase)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \-'::target -- Target branch to rebase onto (defaults to default branch):_default' \+'::target -- Target branch (default\: default branch):_default' \&& ret=0;;(ask-approvals)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-f[Auto-approve project commands without saving approvals]' \-'--force[Auto-approve project commands without saving approvals]' \-'--all[Show all commands including already-approved ones]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-f[Skip approval prompts]' \+'--force[Skip approval prompts]' \+'--all[Show all commands]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \&& ret=0;;(clear-approvals)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-g[Clear approvals from global config (all projects)]' \-'--global[Clear approvals from global config (all projects)]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-g[Clear global approvals]' \+'--global[Clear global approvals]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \&& ret=0;;(select)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help (see more with '\''--help'\'')]' \'--help[Print help (see more with '\''--help'\'')]' \&& ret=0@@ -361,60 +361,60 @@ esac_arguments "${_arguments_options[@]}" : \'--format=[Output format]:FORMAT:((table\:"Human-readable table format"json\:"Machine-readable JSON with display fields (includes styled unicode for rendering)"))' \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \+'-C+[Change working directory]:path:_files' \'--branches[Include branches without worktrees]' \-'--full[Show CI status, conflict detection, and complete diff statistics]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'--full[Show CI, conflicts, and full diffs]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help (see more with '\''--help'\'')]' \'--help[Print help (see more with '\''--help'\'')]' \&& ret=0;;(switch)_arguments "${_arguments_options[@]}" : \-'-b+[Base branch to create from (only with --create). Use '\''@'\'' for current HEAD]:BASE:_default' \-'--base=[Base branch to create from (only with --create). Use '\''@'\'' for current HEAD]:BASE:_default' \+'-b+[Base branch (with --create)]:BASE:_default' \+'--base=[Base branch (with --create)]:BASE:_default' \'-x+[Execute command after switching]:EXECUTE:_default' \'--execute=[Execute command after switching]:EXECUTE:_default' \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \+'-C+[Change working directory]:path:_files' \'-c[Create a new branch]' \'--create[Create a new branch]' \-'-f[Auto-approve project commands without saving approvals]' \-'--force[Auto-approve project commands without saving approvals]' \-'--no-verify[Skip all project hooks\: post-create and post-start]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-f[Skip approval prompts]' \+'--force[Skip approval prompts]' \+'--no-verify[Skip project hooks]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \-':branch -- Branch name, worktree path, '\''@'\'' for current HEAD, or '\''-'\'' for previous branch:_default' \+':branch -- Branch, path, '\''@'\'' (HEAD), or '\''-'\'' (previous):_default' \&& ret=0;;(remove)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'--no-delete-branch[Don'\''t delete the branch after removing the worktree (by default, branches are deleted)]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'--no-delete-branch[Keep branch after removal]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help]' \'--help[Print help]' \-'*::worktrees -- Worktree names or branches to remove (use '\''@'\'' for current, defaults to current if none specified):_default' \+'*::worktrees -- Worktree or branch (@ for current):_default' \&& ret=0;;(merge)_arguments "${_arguments_options[@]}" : \-'-C+[Run as if worktrunk was started in <path> instead of the current working directory]:path:_files' \-'--no-squash[Disable squashing commits (by default, commits are squashed into one before merging)]' \-'--no-commit[Push commits as-is without transformations (requires clean tree; implies --no-squash, --no-remove, and skips rebase)]' \-'--no-remove[Keep the worktree after merging]' \-'--no-verify[Skip pre-merge project hooks]' \-'-f[Auto-approve project commands without saving approvals]' \-'--force[Auto-approve project commands without saving approvals]' \-'--tracked-only[Only stage tracked files (git add -u) instead of all files (git add -A)]' \-'-v[Enable verbose output (show git commands and debug info)]' \-'--verbose[Enable verbose output (show git commands and debug info)]' \+'-C+[Change working directory]:path:_files' \+'--no-squash[Don'\''t squash commits]' \+'--no-commit[Push without transformations]' \+'--no-remove[Keep worktree after merge]' \+'--no-verify[Skip pre-merge hooks]' \+'-f[Skip approval prompts]' \+'--force[Skip approval prompts]' \+'--tracked-only[Stage tracked files only]' \+'-v[Show git commands and debug info]' \+'--verbose[Show git commands and debug info]' \'-h[Print help (see more with '\''--help'\'')]' \'--help[Print help (see more with '\''--help'\'')]' \-'::target -- Target branch to merge into (defaults to default branch):_default' \+'::target -- Target branch (default\: default branch):_default' \&& ret=0;;esac