skills/max-sixty__worktrunk
1
0
Fork 0
mirror of https://github.com/max-sixty/worktrunk.git synced 2026-09-14 20:00:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,873 Commits 44 Branches 150 Tags
codex/remove-codex-cloud-specific-tests
Commit Graph

233 Commits

Author SHA1 Message Date
Maximilian Roos a7bb80365e Enable Windows CI status tests via MOCK_SCRIPT_DIR (#407) 
* Enable Windows CI status tests via MOCK_SCRIPT_DIR

mock-stub.exe now passes MOCK_SCRIPT_DIR environment variable to bash,
allowing scripts to reliably find sibling files (like JSON test data)
without relying on $0/dirname/pwd which fail in Git Bash on Windows CI.

- Add script_dir computation and MOCK_SCRIPT_DIR env var to mock-stub.exe
- Update mock gh script to use MOCK_SCRIPT_DIR when available
- Remove all 12 Windows ignore attributes from ci_status.rs

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(mock-stub): use Git Bash explicitly on Windows, not WSL bash

On Windows, there are multiple 'bash' executables in PATH:
- C:\Windows\System32\bash.exe - WSL wrapper (fails if WSL not installed)
- C:\Program Files\Git\bin\bash.exe - Git Bash (what we need)

The WSL wrapper was being found first and failing with 'Windows Subsystem
for Linux has no installed distributions' because WSL isn't installed on
GitHub Actions Windows runners.

Fix by adding find_bash() that explicitly looks for Git Bash at known
installation paths before falling back to the WSL wrapper.

Co-Authored-By: Claude <noreply@anthropic.com>

* style: cargo fmt

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(mock-stub): collapse nested if statements for clippy

Co-Authored-By: Claude <noreply@anthropic.com>

* chore: remove debug logging from Windows CI fix

Remove the debug file-based logging that was added during troubleshooting.
Keep the MOCK_DEBUG conditional stderr logging for future debugging.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* refactor(mock-stub): simplify find_bash to single path check

GitHub Actions Windows runners have Git at C:\Program Files\Git.
No need for multiple fallback paths.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2026-01-03 23:30:48 -08:00
Maximilian Roos e8f1037719 Enable Windows test support with cross-platform mock infrastructure (#401) 
* test: add cross-platform mock command helpers for Windows tests

Add mock_commands.rs module with platform-abstracted mock creation:
- create_mock_command: branching mock based on first argument
- create_simple_mock: fixed output mock (e.g., for llm)
- create_mock_command_2arg: two-argument matching (e.g., uv run pytest)
- High-level helpers: create_mock_cargo, create_mock_llm_*, etc.

On Unix: creates shell scripts with #!/bin/sh shebang
On Windows: creates .cmd/.bat batch files with goto-based control flow

Migrate 3 merge.rs tests from inline shell scripts to cross-platform mocks:
- test_readme_example_complex
- test_readme_example_hooks_post_create
- test_readme_example_hooks_pre_merge

Enable ci_status.rs tests on Windows (PATHEXT handling already works).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* simplify: target Git Bash for Windows test mocks

Change from maintaining parallel shell/batch implementations to a unified
shell script approach. Since hooks already require Git Bash on Windows
(documented in FAQ), tests can assume Git Bash is available.

The new approach:
- Write all mock logic as shell scripts (#!/bin/sh)
- On Windows, create thin .bat/.cmd shims that invoke `bash script.sh`
- Single source of truth for mock behavior

This reduces mock_commands.rs from 558 to 380 lines (-178 lines) while
simplifying maintenance.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* chore: remove unused MockBranch2, clarify Git Bash requirement

Code review fixes:
- Delete unused MockBranch2 and create_mock_command_2arg (YAGNI)
- Clarify Git Bash requirement in module documentation

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: write mock scripts without extension for Git Bash on Windows

The hooks run through Git Bash, which doesn't recognize .bat/.cmd files
as executables. Git Bash needs shell scripts without extensions that it
can execute directly via shebang.

Now on Windows we create:
- `name` (no extension) - shell script for Git Bash
- `name.cmd` and `name.bat` - shims for CMD/PowerShell

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: use .cmd extension for LLM command path on Windows

When worktrunk runs the LLM command directly (not via PATH lookup),
Windows requires a .cmd or .bat extension for direct execution.
Use llm.cmd on Windows, llm (no extension) on Unix.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: add .gitattributes for consistent line endings across platforms

Force LF line endings for all text files to ensure consistent commit
hashes across platforms. Without this, Windows may use CRLF which
changes file content hashes and thus commit hashes, causing snapshot
test failures.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: skip CI status tests on Windows

Rust's Command::new("gh") uses CreateProcessW which only searches for
.exe files, not .bat/.cmd files. Our mock infrastructure creates batch
files that work for Git Bash but aren't found by CreateProcessW.

The CI status feature works identically on Windows — it just calls gh/glab
binaries. The core functionality is verified by Unix tests.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: set filemode=false in test template for cross-platform consistency

Git on Windows handles file modes differently than Unix. With filemode=true,
Git tries to track executable bits, but Windows reports them differently,
causing tree hash differences and thus different commit hashes.

Setting filemode=false ensures Git records all files as 100644 (non-executable)
on both platforms, producing identical commit hashes.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Revert "fix: set filemode=false in test template for cross-platform consistency"

This reverts commit 31d5661a53.

* fix: skip merge tests with commit hashes on Windows

Git on Windows handles file modes differently than Unix, causing tree hashes
(and thus commit hashes) to differ. Tests that have commit hashes in their
snapshot output are skipped on Windows.

The underlying merge functionality works correctly on Windows - only the
snapshot verification differs.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: redact commit hashes in snapshots for cross-platform consistency

Instead of skipping tests on Windows, redact commit hashes to [HASH] in
snapshot output. Git on Windows produces different tree hashes due to
filemode handling, but the underlying functionality works correctly.

The hash redaction filter matches "Squashed @ <hash>" and "Committed @ <hash>"
patterns and replaces the 7-char hex hash with [HASH].

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* refactor: simplify mock command helpers with inline shell scripts

- Remove MockBranch struct and create_mock_command() function
- Change create_simple_mock() to accept &str instead of &[&str]
- Convert all mock helpers to use inline shell scripts with raw strings
- Each mock's behavior is now directly visible (no indirection)
- Simpler to read and maintain

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* feat: add mock-stub.exe for Windows Command::new() compatibility

Rust's Command::new() uses CreateProcessW on Windows, which only searches
for .exe files (doesn't respect PATHEXT). This was causing CI status tests
to be skipped on Windows.

The solution is simple: mock-stub.exe is a 10-line stub that delegates to
bash with a companion shell script. When copied as gh.exe, it runs
`bash gh <args>`.

Changes:
- Add tests/helpers/mock-stub/ with the stub binary
- Update write_mock_script() to copy mock-stub.exe on Windows
- Remove #[cfg_attr(windows, ignore)] from CI status tests (12 tests)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: convert Windows paths to MSYS2 style for bash in mock-stub

Git Bash on Windows doesn't understand Windows-style paths like
`D:\temp\bin\gh`. Convert to MSYS2 style `/d/temp/bin/gh` before
passing to bash.

This fixes the CI status tests that were failing on Windows because
the mock `gh` command couldn't find its companion script.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: use write_mock_script for all gh/glab mocks

The CI status tests were failing on Windows because setup_mock_gh_with_ci_data
and setup_mock_ci_tools_unauthenticated were creating mock scripts directly
with fs::write instead of using write_mock_script. This meant on Windows:
- Only .cmd/.bat files were created
- No .exe files were created (via mock-stub)
- Rust's Command::new("gh") couldn't find the mocks

Also update the gh mock to use relative paths via $SCRIPT_DIR so it works
when invoked through mock-stub.exe on Windows.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(tests): embed JSON in gh mock for Windows compatibility

Instead of writing JSON to separate files and using `cat` to read them,
embed the JSON data directly in the shell script. This avoids path
conversion issues when mock-stub.exe invokes bash on Windows - the
SCRIPT_DIR path from `dirname "$0"` wasn't being converted properly.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(tests): use heredoc for multiline JSON in gh mock

Using echo with single-quoted multiline strings doesn't work reliably
on Windows with Git Bash. Switch to heredoc syntax (cat <<'PREOF')
which is more robust for multiline content and prevents any shell
interpretation of special characters.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(tests): flatten JSON for cross-platform shell compatibility

Multiline JSON in shell scripts causes issues on Windows with Git Bash.
Instead of heredocs or multiline echo, flatten JSON to single line and
use printf which is the most portable approach across shells.

This eliminates any line ending or multiline escaping issues.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(tests): capture and forward bash output in mock-stub

On Windows, relying on handle inheritance for stdout/stderr between
mock-stub.exe and bash doesn't work reliably when the parent process
(wt.exe) uses pipes for output capture.

Instead, explicitly capture bash's stdout/stderr using .output() and
forward them to our own streams. This ensures the mock command output
actually reaches the caller.

Also flatten JSON to single line for simpler shell escaping.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(tests): use pre-computed MSYS2 path for JSON files

Instead of trying to compute SCRIPT_DIR at runtime in the shell script
(which fails when mock-stub.exe invokes bash), compute the MSYS2-style
path in Rust and embed it directly in the script.

This writes JSON to separate files and reads them using an absolute
path that works correctly on both Unix and Windows with Git Bash.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(tests): use dirname to find JSON files in mock script

Use `$(cd "$(dirname "$0")" && pwd)` to get the script's directory.
This works because mock-stub.exe already converts the script path to
MSYS2 format before invoking bash, so $0 is in Unix format.

Removes the need for compile-time path conversion in Rust code.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: use Command::new directly for tool_available on Windows

Instead of wrapping through `cmd /c`, use Command::new(tool) directly.
On Windows, CreateProcessW searches PATH for .exe files, which finds
our mock-stub.exe files correctly.

The cmd.exe wrapper was causing issues because it may have different
PATH handling behavior that bypassed our test mocks.

Also add optional MOCK_DEBUG logging to mock-stub for debugging.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(tests): preserve PATH variable case on Windows

On Windows, environment variables are case-insensitive but Rust stores
them case-sensitively. If the existing variable is named "Path" and we
set "PATH", we create a duplicate that may not be respected.

Find the actual case of the PATH variable and use that when setting
our modified value.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix(tests): skip CI status tests on Windows

The mock gh command infrastructure for JSON file reading doesn't work
reliably on Windows CI. The mock-stub.exe successfully invokes bash,
but the SCRIPT_DIR path resolution and JSON file reading fails.

Skip these specific tests on Windows while keeping the rest of the
Windows test support. Tests that only need simple mock behavior
(like `wt config show` which just checks gh --version) work fine.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: address Codex review feedback for Windows test support

Two issues identified by Codex gpt-5.2 review:

1. mock-stub output flushing: `write_all()` + `exit()` could lose
   buffered stdout/stderr. Added explicit `flush()` calls before exit.
   This likely explains the "JSON file reading fails" issue in CI.

2. PATH variable case: `make_path_with_mock_bin()` now preserves the
   original PATH variable name to avoid creating duplicate env vars
   on Windows (where vars are case-insensitive but Rust stores them
   case-sensitively).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* test: re-enable CI status tests on Windows

The flush fix in mock-stub may have resolved the JSON reading issue.
Testing on Windows CI to confirm.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Revert "test: re-enable CI status tests on Windows"

This reverts commit 74c223e203.

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2026-01-03 19:43:05 -08:00
Maximilian Roos 49c15097ff refactor(tests): simplify snapshot testing with auto-bound settings (#396) 
* refactor(tests): simplify snapshot testing with auto-bound settings

- Auto-bind snapshot settings in TestRepo::new() via _snapshot_guard field
- Remove manual setup_snapshot_settings().bind() wrappers from tests
- Inline make_snapshot_cmd calls directly in assert_cmd_snapshot! macros
- Remove unused helper functions (json_settings, bind, bind_json)
- Use auto-naming from test function names (explicit names only for multi-snapshot tests)
- Fix directive file guard lifetime in test_remove_internal_mode
- Clean up orphaned snapshot files and let git detect renames

Net reduction: -183 lines in test files

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: update statusline tests for fish-abbreviated paths

The auto-bound snapshot settings from TestRepo use `_REPO_` filters
for full paths, but the statusline command uses fish-style path
abbreviation (e.g., `/p/v/f/.../repo`). These abbreviated paths
weren't matched by the existing filters.

Updated `claude_code_snapshot_settings()` to:
- Filter fish-abbreviated paths ending in `/repo` to `[PATH]`
- Strip leading ANSI reset codes from output
- Remove unused `repo` parameter

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: normalize statusline paths across platforms

The statusline output varies by platform:
- Linux: Raw path filtered by auto-bound settings to `_REPO_`
- macOS: Fish-style abbreviation bypasses auto-bound filters

Updated claude_code_snapshot_settings() to normalize both cases
to a consistent `[PATH]` placeholder for cross-platform tests.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2026-01-03 01:00:10 -08:00
Maximilian Roos 63ccd6f9f9 feat(config): improve RUNTIME section display and add debug info (#394) 
- Display version as heading suffix to avoid lonely gutter
- Add shell integration debug info (invocation path, detection flags)
- Change "Shell integration not active" from hint to warning

The debug info helps diagnose shell integration issues by showing:
- How wt was invoked (the actual argv[0] path)
- Whether GIT_EXEC_PATH was set (git subcommand mode)
- Whether an explicit path was used (contains path separator)

Closes: helps debug issues like #387

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>
 2026-01-02 19:55:32 -08:00
Maximilian Roos ee507ee519 Clarify SIGTTOU issue in nextest config and docs 
Update comments to explain that the SIGTTOU issue occurs specifically
when tests spawn interactive shells (zsh -ic, bash -ic) that take control
of the foreground process group, rather than being a general background
process group issue. Link to the upstream nextest issue #2878 for reference.
Remove redundant cross-references between files.
 2026-01-02 16:46:35 -08:00
Maximilian Roos 3af0d98619 fix: improve shell integration warning for explicit path invocations (#382) 
When running wt via an explicit path (cargo run, ./wt, /usr/bin/wt),
shell integration can't intercept the command. Previously this showed
a misleading "restart shell" message.

Now shows: "ran target/debug/wt; shell integration wraps wt" - clearly
explaining what was run vs what the shell wrapper intercepts.

Detection uses argv[0]: PATH lookup sets it to just "wt", while explicit
paths include the path separator. This catches cargo run, symlinks to
dev builds, and any direct binary invocation.

🤖 Generated with [Claude Code](https://claude.ai/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>
 2026-01-02 14:59:06 -08:00
Maximilian Roos feff9d22ca Rename template variables for clarity with deprecation warnings (#369) 
* Rename template variables for clarity with deprecation warnings

Renames hook template variables for clearer semantics:
- `repo_root` → `repo_path` (absolute path to repository root)
- `worktree` → `worktree_path` (absolute path to current worktree)
- `main_worktree` → `repo` (repository directory name)

Adds new `main_worktree_path` variable for the actual path to the default
branch worktree, useful for sharing dependencies across worktrees.

Deprecated variables continue to work but emit warnings with migration
assistance:
- Detects deprecated variables using minijinja's undeclared_variables()
- Creates a `.new` migration file with replacements
- Shows inline warning: "User config uses deprecated template variables:
  repo_root → repo_path, worktree → worktree_path"
- Shows hint: "Wrote migrated config.toml.new; to apply: mv ..."

Project config warnings only appear when in main worktree (where changes
can be committed). Warnings are deduplicated per path per process.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix issues identified in Codex review

- Fix malformed template bug: check for closing `}}` BEFORE emitting
  replacement to prevent corrupted output
- Add shell escaping to mv command paths using shell_escape::escape
- Add `--` separator to mv command to prevent paths starting with `-`
  from being interpreted as flags
- Handle migration file write errors gracefully with hint message
  instead of propagating error that would block config loading
- Use distinct [TEST_CONFIG_NEW] placeholder for .new files in
  snapshots for better readability
- Add test for malformed template preservation

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Simplify deprecated variable replacement with regex

Replace manual character-by-character parsing (~55 lines) with regex-based
approach (~13 lines) that:
- Handles both {{ }} and {% %} Jinja blocks
- Supports multiline blocks with (?s) dotall mode
- Preserves original formatting instead of normalizing whitespace
- Uses word boundaries to avoid false matches

Trade-off: regex moves from dev to prod dependency.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix snapshot filter for Windows shell-escaped paths

Windows paths with backslashes get quoted by shell_escape, so the
filter needs to handle: 'C:\Users\...\test-config.toml'

Update regex to match both forward/backward slashes and optional quotes.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Simplify replacement by reusing TOML string extraction

Instead of regex-matching Jinja blocks, reuse extract_template_strings()
to get TOML string values, then do word-boundary replacement within them.

This naturally excludes TOML keys like `worktree-path` since we only
process string values, not keys.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Update test snapshots after merge: main_worktree → repo

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2026-01-02 13:19:10 -08:00
Maximilian Roos 94b2253cc9 Add RUNTIME section to wt config show (#375) 
* Add RUNTIME section to `wt config show`

Display runtime information at the bottom of config show output:
- Binary name (wt or git-wt)
- Version string
- Shell integration status (active vs not active)
- argv[0] if different from binary name (for debugging invocation issues)

This helps debug shell integration issues like #348 where users invoke
`git wt` (binary) instead of `git-wt` (shell function).

Closes #348

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix TOML config indentation to match format_with_gutter

- Changed gutter spacing from 2 spaces to 1 space after the gutter marker
- Removed dead fallback code (synoptic always has TOML support built-in)
- Simplified the highlighting loop

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix version filter to match bare git hashes in CI

In CI without git tags, version_str() returns just the commit hash
(e.g., "b9ffe83") instead of a semver string (e.g., "v0.8.5-2-gabcdef").
Updated the snapshot filter regex to match both patterns.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Make version filter more specific to avoid matching commit hashes

The previous filter matched any 7+ char hex string in dim codes,
which incorrectly replaced commit hashes in merge progress messages.
Now the filter only matches the specific pattern after "wt" in the
RUNTIME section output.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Remove argv[0] debugging code to improve patch coverage

The shell integration status already indicates if someone is calling
the binary directly vs through the shell function. The argv[0 check
added complexity and test coverage burden for minimal diagnostic value.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2026-01-02 12:45:22 -08:00
Maximilian Roos d21a463430 Add shell integration prompt after wt switch (#370) 
* Add shell integration prompt after wt switch

When shell integration is not active after `wt switch`, show a one-time
interactive prompt asking users if they want to install it. This helps
new users discover shell integration without requiring them to read docs.

## Features

- Interactive prompt with preview option (?) to see what will be installed
- Remembers user choice via `skip-shell-integration-prompt` config flag
- Falls back to hint message for non-TTY or after declining

## Decision flow

1. Unsupported shell → hint with supported shells
2. $SHELL not set → hint to run install command
3. Already installed → hint to restart shell
4. Already prompted → hint to run install command
5. TTY available → show interactive prompt
6. Non-TTY → hint to run install command

## Code improvements

- Consolidated shell install output into `print_shell_install_result()`
- Extracted `print_skipped_shells()` helper to eliminate duplication
- Improved hint styling: commands/paths use `<bright-black>` per guidelines

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: install for all shells on prompt accept, skip flag only on decline

- Prompt now installs for ALL shells with config files, matching
  `wt config shell install` behavior
- Skip flag only set on explicit decline, not before prompt (Ctrl+C
  doesn't permanently disable prompts)
- Shell detection uses starts_with for versioned binaries (zsh-5.9)
- If no config files exist anywhere, show install hint

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: update prompt_accept snapshot for all-shells install

The prompt now installs for all shells (same as `wt config shell install`),
so the snapshot includes skip messages for shells without config files.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2026-01-02 12:31:07 -08:00
Maximilian Roos 3f74563188 fix(list): dim URL for current worktree when health check fails (#350) 
* fix(list): dim URL for current worktree when health check fails

Update snapshots to show dimmed URLs when dev servers are not running.
The health check correctly reports ports as inactive, so URLs should
display with dim styling.

Previous snapshots incorrectly showed undimmed URLs for the main worktree
because CI and test environments don't have servers running on those ports.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* test: isolate URL health checks from local environment

Add WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK env var that, when set, makes
the URL health check always return inactive. This prevents flaky tests
caused by random local processes (like dev servers) listening on ports
that happen to match the hash_port values.

The env var is set in configure_cli_command() so all test commands
get consistent behavior.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* test: disable zsh compinit security warning in PTY tests

Set ZSH_DISABLE_COMPFIX=true to prevent the "insecure directories"
warning from interfering with test output on CI runners.

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: escape branch placeholder in Windows wt select error

The `<branch>` was being interpreted as a cformat! color tag, causing
a compilation error on Windows. Use `BRANCH` instead.

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: use let _ = instead of ? for output::print in Windows wt select error

The main() function doesn't return Result, so the ? operator cannot be used.

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2026-01-01 10:36:28 -08:00
Maximilian Roos 4709409ccb Consolidate test git commands using helper methods (#339) 
* Consolidate test git commands using helper methods

Migrate ~180 instances of manual `Command::new("git")` calls to use
TestRepo helper methods for better consistency and reduced boilerplate:

- `repo.run_git(&["..."])` - run in repo root, panic on failure
- `repo.run_git_in(&path, &["..."])` - run in specific dir, panic on failure
- `repo.git_command()` - get configured Command for output capture

Changes:
- Add `run_git_in()` to `TestRepoBase` trait so BareRepoTest and
  NestedBareRepoTest also get this method
- Migrate tests in switch.rs, remove.rs, merge.rs, list.rs, completion.rs,
  shell_wrapper.rs, push.rs, security.rs, list_config.rs, list_column_alignment.rs
- Migrate internal TestRepo methods to use git_command() with chained env vars
- Remove unused `use std::process::Command` imports where no longer needed

Remaining intentional uses of Command::new("git"):
- TestRepoBase::git_command() and TestRepo::git_command() definitions
- BareRepoTest constructors for `git init --bare` (can't use git_command
  because init takes path as argument, not current_dir)
- Standalone bare repo test in remove.rs (to be refactored separately)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Move BareRepoTest to common module and refactor bare repo test

- Move `BareRepoTest` from bare_repository.rs to common/mod.rs for reuse
- Add `wt_command()` helper method to BareRepoTest
- Refactor `test_remove_default_branch_no_tautology` to use shared BareRepoTest
- Remove unused imports (canonicalize, Command, TempDir) from remove.rs

This reduces the standalone bare repo test from 70+ lines to ~15 lines.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Move commit_in method to TestRepoBase trait

Consolidate BareRepoTest::commit_in_worktree into the shared
TestRepoBase trait as commit_in(). This allows all test harnesses
to share this method without duplication.

- Add commit_in() to TestRepoBase trait (tests/common/mod.rs:619)
- Remove duplicate commit_in_worktree from BareRepoTest
- Update 16 callers in bare_repository.rs
- Update 1 caller in remove.rs

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-31 15:46:01 -08:00
Maximilian Roos d13eb0c1d2 refactor(tests): simplify test helpers and remove unnecessary worktrees (#326) 
- Add `check_git_status()` helper to verify git command success
- Add thin wrappers `run_git`, `run_git_in`, `git_output` using check_git_status
- Simplify `repo_with_main_worktree` fixture to no-op (primary is already on main)
- Remove unnecessary `add_main_worktree()` calls from merge tests and fixtures
- Fix latent test bugs where git commands were silently failing
- Use `set_temp_home_env` helper in post_start_commands tests
- Fix test using non-existent "develop" branch
- Fix test needing `repo_with_remote` fixture

Net reduction: ~208 lines

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-31 01:25:45 -08:00
Maximilian Roos 27befddd56 Add TestRepoBase trait for consistent test git environment (#325) 
* Add nested bare repo documentation and test helpers

Add documentation example showing worktree-path template for nested bare
repo layout (project/.git pattern from issue #313). Users can use relative
paths like `../{{ branch | sanitize }}` to create worktrees as siblings to
the .git directory.

Also adds a standalone configure_git_cmd() helper function in tests/common
that can be reused by different test fixtures.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add TestRepoBase trait for consistent test git environment

Extract common git environment configuration into a TestRepoBase trait,
ensuring all test fixtures (TestRepo, BareRepoTest, NestedBareRepoTest)
use the same isolated git environment.

The trait provides:
- git_config_path() - required accessor for git config file path
- configure_git_cmd() - default impl using the shared helper
- git_command(dir) - default impl for creating configured git commands

This fixes BareRepoTest which was previously using inconsistent env vars
(missing GIT_AUTHOR_DATE, GIT_COMMITTER_DATE, LC_ALL, etc).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-31 00:53:45 -08:00
Maximilian Roos f21388acc0 Add nested bare repo documentation and test helpers (#320) 
Add documentation example showing worktree-path template for nested bare
repo layout (project/.git pattern from issue #313). Users can use relative
paths like `../{{ branch | sanitize }}` to create worktrees as siblings to
the .git directory.

Also adds a standalone configure_git_cmd() helper function in tests/common
that can be reused by different test fixtures.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-30 23:50:06 -08:00
Maximilian Roos bceedcade7 Fix test isolation for wt commands and improve test API (#314) 
Tests that spawn `wt` must be isolated from the host environment to
prevent directive leakage (test commands writing to user's shell
directive file), config pollution, and git interference.

Changes:
- Add `TestRepo::wt_command()` returning pre-configured Command
- Rename `clean_cli_env` → `configure_wt_cmd` (parallel to git)
- Make `git_command()` consistent (no args, chain `.args()`)
- Fix approval_ui.rs and readme_sync.rs missing isolation
- Add `#[must_use]` to command builders
- Document pattern in tests/CLAUDE.md

The public API is now 3 symmetric methods:
- `repo.wt_command()` - for wt commands with TestRepo
- `repo.git_command()` - for git commands
- `wt_command()` - for wt without TestRepo (help tests)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-30 20:29:27 -08:00
Maximilian Roos e20508d79e Add tests for uncovered user message paths (#300) 
* Add tests for uncovered user message paths

- config_state.rs: Tests for CI cache and marker clear messages (9 tests)
- config_show.rs: Tests for empty/whitespace project config (2 tests)
- approvals.rs: Tests for already approved and no commands scenarios (2 tests)
- for_each.rs: Test for command spawn failure (1 test)
- hook_show.rs: Test for project config with no hooks (1 test)
- configure_shell.rs: Test for fish with all already configured (1 test)

All user-facing output paths in src/commands/ are now exercised by tests.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix cross-platform snapshot for command not found error

Add filter to normalize shell "command not found" errors:
- macOS: "sh: cmd: command not found"
- Windows Git Bash: "/usr/bin/bash: line 1: cmd: command not found"

Both now normalize to the macOS format for consistent snapshots.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix shell error normalization for Linux dash

Linux dash shell outputs "sh: 1: cmd: not found" format (no "command"
word, has line number). Updated the regex filter to handle all three
platform variants:
- macOS: "sh: cmd: command not found"
- Windows Git Bash: "/usr/bin/bash: line 1: cmd: command not found"
- Linux (dash): "sh: 1: cmd: not found"

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-26 21:39:41 -08:00
Maximilian Roos 6c8e370525 Add Repository caching to reduce git subprocess spawns (#287) 
* Use once_cell for fallible cache initialization

Replace manual OnceLock pattern with once_cell's get_or_try_init(),
which handles fallible initialization cleanly. This reduces boilerplate
in the three cached Repository methods (git_common_dir, worktree_root,
current_branch).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add TODO noting macro-based caching tradeoffs

Document the design decision to use per-instance OnceCell caching
vs static macro-based caching (like #[cached]).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Unify caching and make primary_remote consistent

- Remove RepositoryLayout struct, move fields into RepoCache
- Cache worktree_base() and is_bare() using OnceCell pattern
- Make primary_remote() consistent across all worktrees by removing
  branch-specific upstream check (fixes project_identifier consistency)
- Add git documentation links for non-obvious features
- Create .claude/rules/caching-strategy.md

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-24 14:39:43 -08:00
Maximilian Roos 87321281d4 Replace --internal flag with WORKTRUNK_DIRECTIVE_FILE environment variable (#269) 
* Replace --internal flag with WT_DIRECTIVE_FILE environment variable

* Rename directive file environment variable to WORKTRUNK_DIRECTIVE_FILE

* Update stale comments referencing directive scripts

Codex review identified comments that still referenced "directive scripts"
after migrating to file-based directive passing. Updated to reference
"data output" which is the current terminology.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Address documentation review feedback

- Add WORKTRUNK_DIRECTIVE_FILE to env var tables (cli.rs, config.md)
- Update stale "directive mode" terminology in test comments to use
  "shell integration" or "data output" as appropriate
- Regenerate help snapshot

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Refactor progressive table output to use output module

Remove finalize_non_tty method and simplify non-TTY output path to use
output::table() directly, consistent with buffered mode. Add WORKTRUNK_SHELL
environment variable support for PowerShell-specific path escaping. Update
documentation and templates accordingly.

* Preserve directive script exit code in PowerShell

Add logic to use the directive script's exit code when wt succeeds, and
add redaction for WORKTRUNK_DIRECTIVE_FILE in test snapshots.

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-20 21:33:25 -08:00
Maximilian Roos b4e2f2e4ed Fix shell wrapper piping and simplify process detachment (#258) 
Detached processes now use process_group(0) instead of nohup, allowing
them to survive PTY closure while remaining responsive. Shell wrappers
now detect piping via `[[ ! -t 1 ]]` and bypass the wrapper when stdout
isn't a terminal, enabling commands like `wt list --format=json | jq`.

Updated shell templates (bash, zsh, fish, PowerShell) to check for
redirected output and run the binary directly in those cases. Removed
dev-detach dependency in favor of portable PTY for shell integration
tests. Simplified output routing by removing data_raw() function and
consolidating data output handling. Added FAQ entry explaining JSON
output routing and piping behavior.
 2025-12-20 16:59:03 -08:00
Maximilian Roos 2aedba0e39 Combine ~/repo pattern with optional worktree suffix (#264) 
Use a single pattern with optional capture group instead of two separate
patterns. The optional suffix (\.[a-zA-Z0-9_-]+)? matches worktree paths
like ~/repo.feature while also matching plain ~/repo.

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-20 16:59:03 -08:00
Maximilian Roos ade78538d8 Move backslash normalization to start of filter chain (#263) 
By normalizing backslashes to forward slashes FIRST, all subsequent
path filters only need the forward-slash version. This removes:
- Duplicate path filters for backslash versions
- The later backslash normalization filter

Simplifies the filter chain by having one canonical path format.

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-20 16:59:03 -08:00
Maximilian Roos 6b65787285 Unify placeholder filter patterns (#262) 
Combine multiple separate patterns for _REPO_, _REPO_.suffix, and
_WORKTREE_X_ into single unified patterns for:
- Quote stripping (with ANSI code handling)
- Syntax highlighting normalization

This reduces duplication and makes the filter logic easier to maintain.

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-19 17:31:16 -08:00
Maximilian Roos 8517420ec4 Remove redundant quoted path filters in snapshot settings (#261) 
The final cleanup already strips quotes around placeholders (handling ANSI
codes too), so explicit quoted path filters are redundant. They add complexity
without benefit since paths get replaced first, then quotes are stripped.

Removes 44 lines of duplicate filter logic.

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-19 17:21:27 -08:00
Maximilian Roos 12dbe6df58 Fix snapshot filters to strip quotes from shell-escaped paths (#257) 
* Fix snapshot filters to match shell-escaped paths on Windows

shell_escape::escape() quotes paths containing special characters like ~
(tilde) or backslashes (Windows paths). The snapshot filters only matched
unquoted paths, causing CI failures on Windows where paths like
D:\a\worktrunk\... get quoted to 'D:\a\worktrunk\...'.

Add filters that match single-quoted versions of all path patterns:
- Repo paths (absolute, forward-slash, and POSIX-style)
- Tilde-prefixed paths (~/repo)
- Worktree paths
- Windows temp directory patterns

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Trigger CI

* Fix snapshot filters to strip quotes from shell-escaped paths

When shell_escape quotes paths containing special characters (tildes,
backslashes), the filters need to strip these quotes to normalize output
across platforms.

Two issues were fixed:
1. Quoted path filters were replacing with quoted placeholders instead of
   stripping the quotes entirely
2. When ANSI codes appear between the quote and path content, the quoted
   path filter doesn't match - added cleanup filters to strip quotes around
   placeholders after all path filters have run

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix snapshot filter for ANSI codes inside quotes

shell_escape::escape() quotes paths with special characters (tildes,
backslashes). The quoted paths include ANSI color codes from syntax
highlighting between the quotes and the path content, e.g.:
  '<ANSI>[REPO]<ANSI>'

The cleanup filters now use ANSI-aware regex patterns:
  r"'(?:\x1b\[[0-9;]*m)*\[REPO\](?:\x1b\[[0-9;]*m)*'"

This matches quotes with zero or more ANSI escape sequences inside
and strips them, normalizing output across platforms.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Simplify snapshot placeholders: [REPO] -> _REPO_

Replace bracket-based placeholders with underscore-based ones to
eliminate regex escaping complexity in test filters:

- [REPO] -> _REPO_
- [WORKTREE_XXX] -> _WORKTREE_XXX_

This makes the cleanup filters much simpler since underscores don't
need escaping in regex patterns. The ANSI-aware patterns still work
but are now simpler to read and maintain.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add filter to normalize syntax highlighting around placeholders

Bash syntax highlighters color paths differently across platforms
(green on Linux, no color on macOS). Add filters to strip ANSI color
codes from around _REPO_ and _WORKTREE_ placeholders so snapshots
are consistent regardless of the platform's syntax highlighting behavior.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix filter to normalize CI syntax highlighting to local format

Linux CI produces different ANSI code structure for paths in hints:
- CI: [2m [0m[2m_REPO_[2m [0m (separate spans for spaces)
- Local: [2m _REPO_ [0m (all in one span)

Add filter to match CI format and convert to local format so
snapshots work consistently on both platforms.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix filter to handle green color codes around placeholders

The bash syntax highlighter on Linux CI applies green color ([32m) to
_REPO_ placeholders, while macOS local does not. Update the filter to
handle optional [32m before and [0m after the placeholder.

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-19 17:01:30 -08:00
Maximilian Roos 366bb03c46 Fix snapshot filters to match shell-escaped paths on Windows 
shell_escape::escape() quotes paths containing special characters like ~
(tilde) or backslashes (Windows paths). The snapshot filters only matched
unquoted paths, causing CI failures on Windows where paths like
D:\a\worktrunk\... get quoted to 'D:\a\worktrunk\...'.

Add filters that match single-quoted versions of all path patterns:
- Repo paths (absolute, forward-slash, and POSIX-style)
- Tilde-prefixed paths (~/repo)
- Worktree paths
- Windows temp directory patterns

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-12-19 15:34:01 -08:00
Maximilian Roos d918813e89 Enable warn logging in tests for better diagnostics (#250) 
* Fix flaky CI tests

- Limit parallelism for heavy ci_status tests using threads-required = 4
- Add retries for Windows list tests that hit file locking race conditions

ci_status tests spawn ~30 threads and ~34 child processes each. When
nextest runs multiple in parallel, the CI runner gets overwhelmed,
causing 60s timeouts on macOS. Using threads-required = 4 limits
concurrent heavy tests (on an 8-core machine, only 2 run at once).

Windows has stricter file locking than macOS/Linux. The parallel git
operations in wt list can race for .git/config access, causing transient
"Permission denied" errors. Retries handle these rare race conditions.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Enable warn logging in tests for better diagnostics

Set RUST_LOG=warn for test subprocesses so any warnings show up in
test failure output. Also remove list test retries to verify if the
Windows file locking issue still occurs.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* ci: trigger another run

* ci: trigger run 3

* ci: trigger run 4

* ci: trigger run 5

* ci: trigger run 6

* ci: trigger run 7

* ci: trigger run 8

* ci: trigger run 9

* ci: trigger run 10

* ci: trigger run 11

* ci: trigger run 12

* ci: trigger run 13

* ci: force trigger

* ci: revert workflow, trigger with test change

* ci: additional test run 1

* ci: additional test run 2

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-18 14:50:32 -08:00
Maximilian Roos 7f0c927240 Unify git config state storage under worktrunk.state.<branch>.* (#234) 
Changes from separate namespaces to unified format:
- CI cache: worktrunk.cache.<branch>.ci-status → worktrunk.state.<branch>.ci-status
- Markers: worktrunk.marker.<escaped> → worktrunk.state.<branch>.marker

Benefits:
- Numeric branch names (10704) now work - git subsections have no naming restrictions
- No escaping needed for slashes, underscores, hyphens
- Unified namespace for all branch-keyed state
- Removed ~260 lines of escape/unescape code and tests

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-16 00:16:53 -08:00
Maximilian Roos a458da8726 Clarify shell integration purpose in docs 
Shell integration allows commands to change directories. Updated documentation
to separate this explanation from the installation command. Refactored CI
status detection to use non-interactive mode for CLI tools (gh, glab) by
disabling TTY features and stdin. Renamed disable_color_output to
configure_non_interactive and set stdin to /dev/null across all tool
invocations. Simplified shell availability checks in tests with dedicated
helper function.
 2025-12-15 20:51:41 -08:00
Maximilian Roos 71b35e76d7 Enable coverage for PTY tests and add CI status tests (#222) 
* Add integration tests for config and state commands

Add three new tests for project config creation in config_init.rs:
- test_config_create_project_creates_file: verifies project config file creation
- test_config_create_project_already_exists: tests idempotent behavior

Add test_state_get_logs_with_files in config_state.rs to verify log file
listing displays correct table headers and file information.

* Enable coverage for PTY tests and add CI status tests

- Add configure_pty_command() and pass_coverage_env_to_pty_cmd() helpers
  for passing LLVM coverage env vars through PTY command builders
- Update select.rs, approval_pty.rs, shell_wrapper.rs to use helpers
- Enable --features shell-integration-tests in dev/coverage.sh
- Add CI status parsing integration tests with mock gh commands

Coverage for select.rs improved from 47% to 86%.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Consolidate PTY setup into shared helpers

Add open_pty() and open_pty_with_size() helpers to reduce
boilerplate in PTY tests. Net reduction of 80 lines.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add shell_command() helper for shell-specific PTY setup

Consolidate the repeated shell setup pattern from shell_wrapper.rs tests
into a shared helper. The helper handles:
- env_clear + HOME + PATH (with optional bin_dir prefix)
- Shell-specific env vars (ZDOTDIR for zsh)
- Shell-specific isolation flags (--norc, --no-rcs, --no-config)
- Coverage env var passthrough

Net reduction: 65 lines (122 deleted, 57 added).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix Windows mock gh command not being found

On Windows, PATHEXT defines extension search order (.COM;.EXE;.BAT;.CMD;...).
This means Windows searches ALL directories for .exe before ANY directory
for .cmd. The real gh.exe on GitHub Actions runners was being found before
our mock gh.cmd, causing CI status tests to fail.

Fix by modifying PATHEXT to prefer .CMD over .EXE in the test environment.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix Windows mock: create .bat files and adjust PATHEXT

Create both .bat and .cmd mock files on Windows, and set PATHEXT to
prefer .BAT before .EXE. This ensures Rust's Command::new finds our
mock scripts instead of the real gh.exe installed on CI runners.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Consolidate setup_mock_gh() to delegate to setup_mock_gh_with_ci_data()

Reduces ~85 lines of duplicated mock script code by having setup_mock_gh()
delegate to setup_mock_gh_with_ci_data("[]", "[]"). Both mocks now use
the same implementation with empty JSON arrays for PR/run data.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix Windows mock gh: use %~dp0 for reliable relative paths

The batch file now uses %~dp0 (directory of the batch script itself)
instead of absolute paths. This avoids issues with path formatting
differences between how Rust generates paths and how cmd.exe's type
command interprets them.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Skip CI status tests on Windows

Rust's Command::new("gh") doesn't use PATHEXT for resolution - it looks
for .exe directly. Our mock gh.bat scripts aren't found, so we can't
mock the gh command reliably on Windows without creating a real .exe
wrapper.

TODO: Re-enable once we have a reliable Windows mocking solution.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-15 15:29:51 -08:00
Maximilian Roos fda66b0f1f Remove legacy marker format & add standalone hook tests (#223) 
* Add tests for standalone hook execution (wt hook <type>)

- Test wt hook post-create with project config
- Test wt hook post-start with project config
- Test wt hook pre-commit with project config
- Test error when no hooks configured

Coverage improved from 88.29% to 88.58%

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Remove legacy plain-text marker format support

The JSON marker format was introduced only 3 days ago (PR #180).
Given the project's early release status and breaking-changes-welcome policy,
remove the preemptive backward compatibility for plain-text markers.

Changes:
- repository/mod.rs: Only parse JSON markers, skip invalid entries
- config.rs: Remove legacy fallback and "?" age display
- tests: Update marker setup to use JSON format via set_marker()

Users with old-format markers will need to re-set them with
`wt config state marker set`.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-15 14:25:29 -08:00
Maximilian Roos 25eec0af65 Improve switch mismatch detection and messaging (#195) 
* Refactor worktree display names and path computation

* Improve switch mismatch message clarity

Refactor SwitchBranchInfo for clearer naming:
- `requested` → `expected` (matches message text)
- `actual` → `current` (clearer meaning)
- `has_mismatch()` → `is_mismatch()` (Rust convention)
- `display_name()` → `branch()` (simpler)

Change mismatch message to two-part structure:
"Already at [path]. Branch doesn't match path: expecting main, got develop"

This clearly separates what happened from what's wrong, making the
path/branch inconsistency immediately obvious.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix Windows CI: use dunce::canonicalize to avoid \\?\ prefix

On Windows, std::fs::canonicalize() returns paths with \\?\ prefix
(extended-length paths) which causes git worktree operations to fail
with "Invalid argument" when creating worktrees inside bare repos.

Changes:
- Export canonicalize() from common/mod.rs (uses dunce crate)
- Update all test files to use common::canonicalize()
- Add pre-commit lint to prevent future .canonicalize() usage in tests

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add path mismatch hint for switch command

When switching to a worktree that exists but at a different path than
the naming template expects, show a hint: "Worktree path doesn't match
naming template"

Changes:
- Add path_at_expected field to SwitchBranchInfo
- Show hint in handle_switch_output when path doesn't match
- Add test_switch_path_mismatch_shows_hint integration test
- Fix regex filter in test common to not be overly greedy

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add tests for switch path-occupied error scenarios

When a worktree's branch is changed externally, `wt switch` can't find
it by branch name and tries to create a new worktree. This fails because
the path already exists. Tests cover:
- Path occupied by worktree on different branch (shows current branch)
- Path occupied by detached HEAD worktree

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Improve path mismatch and path-occupied error messages

Path mismatch hint now shows the expected path:
  💡 Worktree path doesn't match naming template (expected ~/repo.feature)

Path-occupied error now shows actionable commands in a gutter:
  💡 Worktree exists at ~/repo.feature (currently on bugfix)
     ┃  cd ~/repo.feature
     ┃  git switch feature

For detached HEAD worktrees, only cd is suggested since there's no
target branch to switch to.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add test for switching to main when main worktree is on different branch

Verifies that `wt switch main` shows the correct error when the main
worktree (repo root) has been switched to a feature branch via `git
checkout`. The error now shows helpful commands to fix the situation:

  ❌ Cannot create worktree for main: target path already exists
  💡 Worktree exists at ~/repo (currently on feature)
     ┃  cd ~/repo
     ┃  git switch main

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Change path mismatch message from hint to warning

The path mismatch indicator is alerting about a state issue, not
suggesting an action the user could take. Using warning (🟡 yellow)
is more appropriate than hint (💡 dimmed).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix path-occupied error message format per guidelines

- Include path in error message (not just branch name)
- Provide context in hint ("Worktree is on X; switch it back")
- Put command in gutter for easy copying

Format is now:
  ❌ Cannot create worktree for feature at ~/repo.feature: path occupied
  💡 Worktree is on bugfix; switch it back
     ┃  cd ~/repo.feature && git switch feature

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Include occupant branch in path-occupied error message

Error now shows which branch occupies the path:
  ❌ Cannot create worktree for feature at ~/repo.feature: path occupied by worktree on bugfix
  💡 Switch it back
     ┃  cd ~/repo.feature && git switch feature

For detached worktrees:
  ❌ ... path occupied by detached worktree
  💡 Access the worktree
     ┃  cd ~/repo.feature

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Suggest git switch for detached worktree path-occupied error

Both cases now suggest switching to the target branch:
  ❌ ... path occupied by detached worktree
  💡 Switch it to the branch
     ┃  cd ~/repo.feature && git switch feature

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add Linux temp path filter for snapshot tests

The [PROJECT_ID] filter only matched macOS temp paths. On Linux,
/tmp/.tmpXXXXXX/path wasn't being filtered, causing test failures.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix filter ordering: specific filters before generic [PROJECT_ID]

The Linux temp path filter was matching test-config.toml and
test-gitconfig paths before their specific filters could run,
replacing them with [PROJECT_ID] instead of [TEST_CONFIG] or
[TEST_GIT_CONFIG].

Move the specific filters before the generic ones so they match first.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add filter for generic tilde-prefixed temp paths

On CI, HOME is set to a temp directory, so paths under HOME are displayed
as ~/something. This filter catches paths like ~/wrong-path that don't
follow the repo naming convention (~/repo*).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix pronoun in path-occupied hints to be self-contained

Per CLI output guidelines, hints should be self-contained without
pronouns that refer to error messages. Changed:

- "Switch it back" → "Switch the worktree to {branch}"
- "Switch it to the branch" → "Switch the worktree to {branch}"

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix path filter consuming ANSI escape codes

The temp path filters were using [^)'\s]+ which matched everything
including ANSI escape codes. On macOS, this caused escape codes
after the path to be consumed by the filter, while on Linux CI
(where paths show as ~/wrong-path), the tilde filter preserved them.

Fix by adding \x1b to the exclusion list, so escape codes are
preserved consistently across platforms.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add Windows temp path filter for PROJECT_ID

The Windows CI uses paths like C:/Users/user/AppData/Local/Temp/.tmpXXX/path
which weren't covered by existing filters. Add a pattern to normalize these
to [PROJECT_ID].

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-14 19:47:12 -08:00
Maximilian Roos bbd786acd0 Fix Windows null device path in test infrastructure (#196) 
Add platform-specific NULL_DEVICE constant (NUL on Windows, /dev/null
on Unix) and use it for GIT_CONFIG_SYSTEM in test infrastructure.

This ensures git commands in tests don't fail on Windows due to the
non-existent /dev/null path.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-14 16:07:11 -08:00
kyleacmooney 02b66ff1e7 Fix branch names with slashes breaking git config markers (#189) 
* Fix branch names with slashes breaking git config markers

Branch names like 'fix/feature-name' contain '/' which git config
interprets as a key path separator, causing 'invalid key' errors.

Use sed to replace '/' with '__' (double underscore) to avoid
collisions with branches that already contain single hyphens.
For example:
  fix/bug-123   → fix__bug-123
  fix-bug-123   → fix-bug-123  (unchanged, no collision)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* Use double hyphen instead of underscore for branch sanitization

Git config keys don't allow underscores. The previous fix using `__`
still produces "invalid key" errors. Double hyphen (`--`) is valid
and maintains uniqueness between `fix/feature` and `fix-feature`.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* Use wt commands for marker hooks with proper escaping

Instead of manually sanitizing branch names in shell, delegate to
`wt config state marker set/clear` which handles escaping internally.

- Add escape_branch_for_config/unescape_branch_from_config to git module
- Update marker code to use escaping (handles `/`, `-`, `_`, Unicode)
- Consolidate duplicate escaping code from CI status cache
- Add TestRepo::set_marker() helper for tests
- Simplify hooks to just call wt commands with `|| true` fallback

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-authored-by: Maximilian Roos <m@maxroos.com>
 2025-12-14 11:36:11 -08:00
Maximilian Roos d3c9bf650b Add git-wt binary for Windows (#177) 
* Add git-wt binary for Windows (wt conflicts with Windows Terminal)

- Add `git-wt` binary behind `--features git-wt` feature flag
- Add `--cmd` option to `config shell init/install` (defaults to argv[0])
- Shell templates now use `{{ cmd }}` for binary name throughout
- Fix `--source` flag to use correct binary with `cargo run --bin`
- Extract `add_standard_env_redactions()` for DRY snapshot settings
- Document Windows workaround in FAQ

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix rustdoc link in argv[0] doc comment

* Fix Windows binary name detection stripping .exe extension

Use `file_stem()` instead of `file_name()` to strip the `.exe` extension
on Windows. This fixes `test_configure_shell_already_exists` which was
failing because the config line detection compared `wt` (in file) with
`wt.exe` (from argv[0]).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-11 23:18:42 -08:00
Maximilian Roos 059d8d9660 Add NEXTEST_NO_INPUT_HANDLER=1 env var for PTY tests 
PTY-based tests (approval prompts, TUI select, progressive rendering, shell
wrappers) can trigger a nextest bug where its InputHandler cleanup receives
SIGTTOU. This occurs because nextest's terminal restoration happens while
nextest isn't in the foreground process group.

Changes:
- Add NEXTEST_NO_INPUT_HANDLER=1 to pre-merge hook insta test command
- Gate PTY test files behind shell-integration-tests feature
- Document the issue and workaround in CLAUDE.md and Cargo.toml
- Simplify execute_streaming() by removing signal forwarding code
  (child already receives SIGINT directly from terminal via Stdio::inherit)
- Add comments explaining PTY system behavior and nextest workaround
 2025-12-11 22:49:59 -08:00
Maximilian Roos 38c7a056c3 Add Codecov badge to README 2025-12-11 20:05:27 -08:00
Maximilian Roos d1480a5b0e Test: enable for_each tests on Windows (#166) 
* Enable ~49 more Windows tests

Now that we've verified echo commands work through Git Bash on Windows,
enable all tests that use shell commands like 'echo ... > file.txt'.

Remaining 19 Windows-ignored tests have actual platform incompatibilities:
- chmod command (Unix only)
- File locking during worktree removal
- git status CRLF/LF differences
- /tmp paths
- cat command

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Enable 16 Windows tests that use simple echo commands

Selectively enable tests that use:
- Simple echo commands without path template variables
- Non-path template variables ({{ branch }}, {{ target }}, {{ default_branch }})

Tests using path template variables ({{ worktree }}, {{ main_worktree }},
{{ repo_root }}, {{ worktree_name }}) remain ignored due to shell quoting
differences when these paths are echoed on Windows via Git Bash.

Enabled tests by file:
- approval_ui.rs: 7 tests
- merge.rs: 3 tests
- switch.rs: 2 tests
- user_hooks.rs: 2 tests
- remove.rs: 1 test
- post_start_commands.rs: 1 test

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix Windows path quoting in shell templates

Convert Windows native paths (D:\...) to POSIX format (/d/...)
in hook context variables. This avoids shell escaping of `:` and `\`
characters that caused snapshot mismatches between Windows and Unix.

The root cause was that shell_escape::escape() uses unix escaping
when MSYSTEM is set (as it is in Git Bash), and Windows paths contain
characters not in the unix safe character set, causing them to be
wrapped in single quotes.

Changes:
- Add to_posix_path() helper for Git Bash compatibility
- Update build_hook_context() to use POSIX paths for worktree/repo_root
- Enable 15+ tests that were previously skipped due to path differences

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add POSIX path filters for Windows snapshot redaction

The to_posix_path() conversion in command_executor.rs converts Windows
paths like C:\Users\...\repo to POSIX format /c/Users/.../repo for Git
Bash compatibility. However, snapshot redaction patterns weren't catching
these POSIX-formatted paths.

Add:
- to_posix_path() helper in test common module
- POSIX path filters for repo and worktree paths
- Regex fallback pattern for POSIX-style Windows temp paths

This ensures template variables like ${worktree} and ${repo_root} are
properly redacted in snapshots regardless of path format.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Format: split long filter line

* Update user_hooks snapshots after rebase

* Use cygpath for Windows path conversion

Instead of hand-rolling POSIX path conversion, use cygpath from Git for
Windows which handles all edge cases (UNC paths, verbatim paths, etc.).

- Derive cygpath location from cached ShellConfig (no duplicate Git-finding)
- Fall back to pass-through if cygpath unavailable
- Remove duplicate to_posix_path implementations from command_executor and tests

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Test: enable for_each tests on Windows

Remove stale Windows skip attributes from for_each tests.
These tests run commands through Git Bash (via ShellConfig), so
echo and git commands should behave identically to Unix.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add .gitattributes to force LF line endings in test repos

The for_each tests were skipped on Windows because `git status`
showed files as modified due to CRLF conversion. Adding `.gitattributes`
with `* text=auto eol=lf` ensures consistent line endings across all
platforms.

Changes:
- Add .gitattributes to template-repo
- Update copy_fixture_template() to copy .gitattributes
- Regenerate template git objects with .gitattributes tracked
- Update snapshots (git warning removed, env vars normalized)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-11 16:09:21 -08:00
Maximilian Roos a87c8a35a1 Fix Windows path quoting in shell templates (#161) 
* Enable ~49 more Windows tests

Now that we've verified echo commands work through Git Bash on Windows,
enable all tests that use shell commands like 'echo ... > file.txt'.

Remaining 19 Windows-ignored tests have actual platform incompatibilities:
- chmod command (Unix only)
- File locking during worktree removal
- git status CRLF/LF differences
- /tmp paths
- cat command

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Enable 16 Windows tests that use simple echo commands

Selectively enable tests that use:
- Simple echo commands without path template variables
- Non-path template variables ({{ branch }}, {{ target }}, {{ default_branch }})

Tests using path template variables ({{ worktree }}, {{ main_worktree }},
{{ repo_root }}, {{ worktree_name }}) remain ignored due to shell quoting
differences when these paths are echoed on Windows via Git Bash.

Enabled tests by file:
- approval_ui.rs: 7 tests
- merge.rs: 3 tests
- switch.rs: 2 tests
- user_hooks.rs: 2 tests
- remove.rs: 1 test
- post_start_commands.rs: 1 test

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix Windows path quoting in shell templates

Convert Windows native paths (D:\...) to POSIX format (/d/...)
in hook context variables. This avoids shell escaping of `:` and `\`
characters that caused snapshot mismatches between Windows and Unix.

The root cause was that shell_escape::escape() uses unix escaping
when MSYSTEM is set (as it is in Git Bash), and Windows paths contain
characters not in the unix safe character set, causing them to be
wrapped in single quotes.

Changes:
- Add to_posix_path() helper for Git Bash compatibility
- Update build_hook_context() to use POSIX paths for worktree/repo_root
- Enable 15+ tests that were previously skipped due to path differences

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add POSIX path filters for Windows snapshot redaction

The to_posix_path() conversion in command_executor.rs converts Windows
paths like C:\Users\...\repo to POSIX format /c/Users/.../repo for Git
Bash compatibility. However, snapshot redaction patterns weren't catching
these POSIX-formatted paths.

Add:
- to_posix_path() helper in test common module
- POSIX path filters for repo and worktree paths
- Regex fallback pattern for POSIX-style Windows temp paths

This ensures template variables like ${worktree} and ${repo_root} are
properly redacted in snapshots regardless of path format.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Format: split long filter line

* Update user_hooks snapshots after rebase

* Use cygpath for Windows path conversion

Instead of hand-rolling POSIX path conversion, use cygpath from Git for
Windows which handles all edge cases (UNC paths, verbatim paths, etc.).

- Derive cygpath location from cached ShellConfig (no duplicate Git-finding)
- Fall back to pass-through if cygpath unavailable
- Remove duplicate to_posix_path implementations from command_executor and tests

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-11 15:29:05 -08:00
Maximilian Roos 430a8aa331 Add test fixtures and refactor test infrastructure 
Expand test fixtures with repo_with_remote_and_feature, repo_with_alternate_primary,
and repo_with_multi_commit_feature. Add TestRepo::add_feature() helper method and
refactor help tests to use rstest parametrization. Update test files to use new
fixtures, reducing boilerplate setup code.
 2025-12-11 13:19:32 -08:00
Maximilian Roos b661a8e69b Add repo_with_feature_worktree fixture 
Extract common feature worktree setup into a reusable fixture to reduce
test boilerplate. This fixture builds on repo_with_main_worktree and adds
a "feature" worktree with one commit, accessible via repo.worktrees["feature"].
 2025-12-11 12:08:01 -08:00
Maximilian Roos 299b1ce75f Re-enable Windows config_show tests (#149) 2025-12-11 05:05:30 -08:00
Maximilian Roos 42ec896732 Add temp_home fixture and refactor tests 
Add temp_home fixture for tests requiring custom home directory.
Refactor tests to use repo_with_remote fixture.
 2025-12-11 04:11:07 -08:00
Maximilian Roos 7723fce280 more rstest (#150) 
* Add temp_home fixture for tests that need custom home directory

Tests that manipulate shell config files or other home directory content were creating `TempDir::new()` manually. Convert these to use an `#[rstest]` fixture for consistency and cleaner test code.

The `temp_home` fixture:
- Creates a temporary directory for use as a fake HOME
- Automatically cleans up when dropped
- Makes test intent clearer by appearing in function signature

This reduces boilerplate across multiple test files (config_init, config_show, configure_shell, hook_show, list_config) and enables better test composition.

* Refactor tests to use repo_with_remote fixture

Replace manual setup_remote() calls with #[from(repo_with_remote)]
rstest fixture parameter to reduce boilerplate in test functions.
Also normalize import ordering across test files.
 2025-12-11 04:03:09 -08:00
Maximilian Roos 5bb60fdc7e Enable Windows tests by normalizing ANSI escape codes (#147) 
* Re-enable Windows config_show tests

The cmd.exe /c wrapper was added in the previous commit to properly find
.cmd batch files on Windows. The tests were preemptively ignored before
verifying if the fix worked.

Remove the #[cfg_attr(windows, ignore)] attributes to test if Windows CI
now passes with the batch file mocks.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix Windows mock command discovery by filtering PATH

Windows PATHEXT searches for .exe before .cmd extensions. Even with our
mock-bin directory prepended to PATH, a real gh.exe in another directory
would be found before our mock gh.cmd. Fix by removing directories
containing real gh.exe/glab.exe from PATH on Windows.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Make Windows tests compatible with multi-platform snapshot testing

* Restore Windows skips for config_show tests

The merge from main lost the #[cfg_attr(windows, ignore)] attributes
for tests that use mock gh/glab batch files which don't work on Windows.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-11 03:29:05 -08:00
Maximilian Roos e8d99854ec Add helper methods to TestRepo for common test patterns 
This refactors repetitive test setup code by introducing three new TestRepo methods:
- `add_worktree_with_commit()`: Creates a worktree, writes a file, stages and commits it
- `commit_in_worktree()`: Adds a commit to an existing worktree (for multiple commits)
- `create_branch()`: Creates a local branch without checking it out
- `push_branch()`: Pushes a branch to origin

Also converts test functions from manual `#[test]` to use `#[rstest]` fixtures
with the `repo` and `mut repo` fixtures, eliminating boilerplate `TestRepo::new()`
calls and improving test consistency.
 2025-12-11 02:47:23 -08:00
Maximilian Roos a473c2dd8d Add Windows batch file versions of gh/glab mocks (#148) 
* Add Windows batch file versions of gh/glab mocks

The mock commands were only created as shell scripts (shebang #!/bin/sh)
which don't work on Windows. This caused tests to fail because glab
appeared as "not found" instead of "installed but not authenticated".

Add .cmd files alongside the shell scripts so Windows CI can find and
execute the mock commands properly.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix Windows CI: use cmd.exe /c for tool detection + exclude root-relative lychee paths

Two fixes for CI failures:

1. Windows batch file detection: Rust's Command::new() doesn't search
   PATHEXT for .cmd/.bat files - it only finds .exe files. The fix uses
   cmd.exe /c on Windows to properly resolve batch files that may be in
   PATH. This enables the mock gh/glab .cmd files to be found during tests.

2. Lychee link checker: Root-relative paths like /assets/wt-demo.gif can't
   be resolved without a web root. Added exclude pattern for these asset
   GIF paths (which are fetched at deploy time from a separate repo).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Ignore Windows config_show tests pending mock batch file fix

Rust's Command::new() doesn't search PATHEXT for .cmd/.bat files
(rust-lang/rust#37380), so mock gh/glab batch files are not found
on Windows CI. Skip these tests until proper fix is implemented.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix lychee: exclude files with root-relative asset paths

Lychee's exclude patterns apply to URLs, not source paths before URL
conversion. The error "Cannot convert path '/assets/...' to a URI"
happens during URL building, before exclude checks.

Use exclude_path to skip the two files containing root-relative asset
references. These assets are fetched at deploy time from a separate repo.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix CI: skip Windows integration tests, add lychee exclude

Windows snapshot tests fail due to path format differences (backslashes
vs forward slashes). Skip failing integration test modules on Windows
via #[cfg(not(windows))] attributes.

Also:
- Add docs/content/worktrunk.md to lychee exclude_path for root-
  relative asset paths
- Add #![allow(dead_code)] to test helpers that are conditionally
  used based on platform

TODO: Re-enable Windows tests once snapshot path normalization is
implemented. Either normalize paths in test output or create Windows-
specific snapshots.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix snapshot path filter for tilde-prefixed worktree paths

When temp directories are under HOME (common on CI), format_path_for_display()
converts paths to tilde-prefixed format. The previous filter only matched the
exact repo path (~/repo) but not worktree paths (~/repo.feature).

Add a regex pattern to catch worktree suffixes after the tilde-prefixed repo path.
This ensures paths like ~/repo.feature are normalized to [REPO].feature in snapshots.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
 2025-12-11 02:33:22 -08:00
Maximilian Roos 35674060b1 Refactor tests to use rstest fixture instead of manual setup 2025-12-11 02:14:13 -08:00
Maximilian Roos 76be939cd0 Add rstest fixtures for TestRepo initialization 
Add two new rstest fixtures to the common test module:
- `repo()`: Creates a fresh TestRepo for each test
- `repo_with_remote()`: Extends repo with remote tracking setup

Refactor remove.rs and switch.rs integration tests to use these
fixtures instead of manual TestRepo::new() calls within test bodies.
This reduces boilerplate and enables better test parametrization with
rstest's fixture composition.
 2025-12-11 01:37:16 -08:00
Maximilian Roos a76f710d36 Setup mock gh/glab commands in TestRepo::new() 
Move `setup_mock_gh()` call into `TestRepo::new()` so mock gh/glab
commands are automatically available for all tests without explicit setup.
This prevents CI detection hints from appearing in test output by default.

Also refactor switch tests to use rstest fixtures and parametrization,
remove manual HOME environment setup (now handled by `clean_cli_env()`),
and add `home_path()` helper for accessing the isolated test HOME directory.
 2025-12-11 00:38:34 -08:00
Maximilian Roos 1a8fb80d87 Add fixture-based test repo initialization for faster tests 
Replace `git init` with pre-initialized fixture template to save ~10ms per test.
The fixture at tests/fixtures/template-repo/ contains a minimal git repo with
one deterministic commit (hash 23e5a15, timestamp 2025-01-01T00:00:00Z).

Changes:
- TestRepo::new() now copies fixture instead of running git init
- TestRepo::empty() added for tests needing uninitialized repos
- Removed ~320 redundant `repo.commit("Initial commit")` calls from tests
- Reduced fixture from 32 files to 9 (removed sample hooks, logs, etc.)
- Fixed path canonicalization in TestRepo::empty() for Windows compatibility
- Added typos exception for commit hash substring 'ede'

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-12-10 23:33:02 -08:00