mirror of
https://github.com/max-sixty/worktrunk.git
synced 2026-09-14 20:00:38 +08:00
codex/remove-codex-cloud-specific-tests
80 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 Maximilian Roos
|
1b35950a9c |
test: simplify the integration suite (#3657)
This reduces duplicated and false-confidence integration coverage while preserving the suite's semantic and user-facing contracts. ## What changed - Replaces three overlapping list-layout suites with two representative CLI integrations, leaving exhaustive geometry at the direct layout layer. - Groups Git error render variants into labeled family snapshots and removes command-by-shell wrapper cross-products while retaining shell-specific conformance and regression cases. - Updates test-authoring guidance around boundary choice, minimal contrasts, and PTY use, and runs local and CI coverage through Nextest isolation. ## Results - Test catalog: 4,642 to 4,562 - Snapshots: 1,193 to 1,131 - Warm all-feature runtime: 84.70s to 78.17-80.35s - Full coverage: 97.32% of lines ## Testing - `cargo run -- hook pre-merge --yes` - `cargo llvm-cov nextest --features shell-integration-tests --summary-only` > _This was written by Claude Code on behalf of max_. |
||
|
Maximilian Roos
|
18d2bef84b |
refactor(perf): canonicalize the benchmark / wt-perf system (#3403)
Implements the design proposal from this branch's first commit
(
|
||
|
Worktrunk Bot
|
d67e6ab779 |
test(package): guard compile-time-embedded assets ship in packaged builds (#3130)
Follow-up to #3124, requested in [this thread](https://github.com/max-sixty/worktrunk/pull/3124#issuecomment-4747856158): turn the "build/package environment differs from the dev checkout" class inner-loop. #3123 (`env!("VERGEN_GIT_DESCRIBE")` failing on the crates.io archive) was one instance of a general pattern — *something read at compile time that exists in our git checkout but may be absent in a packaged build*. There are three mechanisms in the crate that do this, and a missing file in any of them is a hard compile error, exactly the #3123 failure mode: | Mechanism | Embeds | |-----------|--------| | `include_str!` / `include_bytes!` | `dev/*.example.toml`, `dev/opencode-plugin.ts`, `gemini-extension.json` | | askama `#[template(path = …)]` (reads files at compile time via proc-macro) | `templates/{bash.sh,zsh.zsh,fish.fish,fish_wrapper.fish,nushell.nu,powershell.ps1}` | The detection gap: a plain `cargo build`/`cargo test` always sees these files (they're in the working tree), so it can never catch a packaging drop. Today that's only caught by the nightly Nix build (slow) or by crates.io itself after publish (the worst loop). The realistic future regression is someone adding a new `include_str!("../../assets/foo")` or `#[template]` outside the currently-packaged dirs — it passes every PR check, then breaks Nix that night and `cargo install` at the next release. This adds a fast guard (`embedded_assets_ship_in_package`, no build, runs on every PR) that scans `src/` for every embedded path and asserts each is: 1. **present in `cargo package --list`** — so it ships in the crates.io archive (the #3123 surface), and 2. **covered by the `flake.nix` source filter** — so it survives the Nix build. Both currently pass. I verified the test isn't vacuous: pointing an `include_str!` at a tracked-but-unpackaged file (`tests/helpers/wt-perf/src/lib.rs`) fails it with both violations reported, distinct from the compiler's own "file not found" for a path that doesn't exist at all. This sits alongside the existing `version_build.rs` guards (the fast `env!`-vs-`option_env!` mechanism check on every PR, and the `#[ignore]`d full-archive build in nightly), extending the same philosophy to the file-presence half of the class. Co-authored-by: worktrunk-bot <worktrunk-bot@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> |
||
|
Worktrunk Bot
|
aa1a5cd98b |
fix(version): tolerate missing VERGEN_GIT_DESCRIBE on crates.io builds (#3124)
## Problem
`cargo install worktrunk` fails to build from crates.io:
```
error: environment variable `VERGEN_GIT_DESCRIBE` not defined at compile time
--> src/cli/mod.rs:168:27
|
168 | let git_version = env!("VERGEN_GIT_DESCRIBE");
```
`version_str()` reads the git-describe version with the `env!` macro,
which **requires** the variable to exist at compile time. The
`vergen_gitcl` build script can only set `VERGEN_GIT_DESCRIBE` when
building inside a git worktree. The crates.io package archive has no
`.git`, so the build script emits `Unable to set VERGEN_GIT_DESCRIBE`
and never defines the variable — and `env!` then fails to compile.
## Solution
Switch `env!` → `option_env!`, which yields `None` when the variable is
unset instead of failing to compile, and fall back to the cargo package
version. That fallback is exactly what the existing `IDEMPOTENT` branch
already does, so the behavior is unchanged for normal builds. The choice
is extracted into a pure `resolve_version(Option<&str>, &str)` helper
with unit tests.
## Testing
Reproduced the failure the same way crates.io builds the package —
`cargo package` produces the source archive, which I extracted to a
non-git directory and built:
- **Before:** build fails with `environment variable VERGEN_GIT_DESCRIBE
not defined at compile time`.
- **After:** build succeeds (the harmless `Unable to set
VERGEN_GIT_DESCRIBE` warning remains), and `wt --version` reports
`0.59.0` (the cargo version fallback).
New unit tests cover the three `resolve_version` cases: git-describe
available, vergen `IDEMPOTENT` placeholder, and absent (`None` — the
crates.io case).
---
Closes #3123 — automated triage
---------
Co-authored-by: worktrunk-bot <254187624+worktrunk-bot@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com>
|
||
|
Worktrunk Bot
|
08a8c26ab5 |
docs(config,shell): correct etcetera macOS path docstrings (#2881)
## Summary Fix docstrings/comments in `src/config/user/path.rs` and `src/shell/paths.rs` that misdescribe how `etcetera`'s `choose_base_strategy()` resolves paths on macOS. `etcetera::choose_base_strategy()` follows the *CLI convention* and returns the [`Xdg`](https://github.com/lunacookies/etcetera/blob/v0.11.0/src/base_strategy.rs#L57-L65) strategy on every Unix platform — including macOS. So: - `strategy.config_dir()` on macOS = `$XDG_CONFIG_HOME` (default `~/.config`), not `~/Library/Application Support`. - The Apple/`~/Library/...` paths are what `choose_native_strategy()` returns (and also, per [`apple.rs`](https://github.com/lunacookies/etcetera/blob/v0.11.0/src/base_strategy/apple.rs#L59-L65), `Apple::config_dir()` is `~/Library/Preferences/` — `~/Library/Application Support/` is `data_dir()`). Three places now told the reader the opposite of what the code does — flagged in #2878. This PR is **comments-only**: the runtime behavior of `default_config_path()`, `nushell_config_dir()`, and `nushell_config_candidates()` is unchanged. The deeper Nushell autoload-path bug discussed in #2878 (installing to `$nu.default-config-dir/vendor/autoload/`, which isn't an autoload directory) is independent and needs its own PR with an uninstall-side migration story. ## Test plan - [x] `cargo check --lib` - [ ] CI: `test (linux|macos|windows)` --------- Co-authored-by: worktrunk-bot <254187624+worktrunk-bot@users.noreply.github.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> |
||
|
Worktrunk Bot
|
ec62580c29 |
revert(hooks): keep docs on pre-start/post-start; code accepts both (#2857)
Per @max-sixty's [direction in #2838](https://github.com/max-sixty/worktrunk/issues/2838#issuecomment-4509447593): revert the docs portion of #2840 and keep the code. Docs continue to recommend `pre-start`/`post-start`; both names work in code so anyone who already followed the briefly-changed docs (e.g. @EcksDy) isn't stranded once a release ships these aliases. ## User-visible — back to `pre-start`/`post-start` - README, docs site, skill mirrors, `dev/*.example.toml`, `plugins/worktrunk/README.md`, `flake.nix`, `.config/wt.toml` - `src/cli/mod.rs` / `src/cli/config.rs` / `src/cli/step.rs` / `src/help.rs` after_long_help and example snippets — and the auto-synced `docs/content/` and `skills/worktrunk/reference/` mirrors - `wt hook --help` canonical subcommand names; completion advertises `-start` only - `HookType` Display via strum, serde `rename`, and clap `ValueEnum` name — all `pre-start`/`post-start`. The Rust variant identifiers stay `PreCreate`/`PostCreate` (internal; we already paid for that rename in #2840, and now the eventual flip is a Display-only change) - `HooksConfig` serde canonical fields ## `*-create` still works (kept code) - `wt hook pre-create` / `post-create` — CLI alias on the canonical subcommand - `pre-create` / `post-create` in config: top-level, `[hooks.*]`, and per-project, in string, `[table]`, and `[[array-of-tables]]` form. Mechanism: serde `alias = ...` on the field, plus a silent in-memory rename in `migrate_content()` so the round-trip in `unknown_tree` doesn't flag table forms as schema-unknown. - The pre-0.32.0 `post-create` fatal-load-error machinery stays removed — the name is reclaimed, and both forms load without error. ## Smaller bits - `valid_user_config_keys()` / `valid_project_config_keys()` append `pre-create` / `post-create` so the unknown-field round-trip skips them. `test_valid_*_keys_all_deserialize` skips both aliases (they can't sit alongside the canonical without a duplicate-field error). - `DEPRECATED_SECTION_KEYS` drops the `pre-start`/`post-start` entries #2840 added — `pre-start`/`post-start` are canonical again. - `find_pre_start_from_doc` / `find_post_start_from_doc` / `find_renamed_hook_key` / `is_non_empty_item` / `migrate_start_hooks_doc` and their tests are removed; the migration direction flips via a new `migrate_create_hooks_doc` (silent, mirrors the prior shape). - Test files `e2e_shell_post_create.rs` and `post_create_commands.rs` rename back to `_post_start_` (via `git mv`, so the rename shows as a rename). ## Testing `cargo run -- hook pre-merge --yes` — 3806 tests pass; the 10 failures are all `case_4` of `shell_wrapper::unix_tests::*` (nu-shell case; `nu` isn't installed in this runner; same failures occur on `main`). Also manually verified that a fresh `wt switch --create` against a project config with `[post-create]` loads cleanly with no unknown-field warning and the hook fires as `post-start`. ## Follow-up Per @max-sixty: in a couple of weeks, once a release with both-names-work is out and users have had a chance to upgrade, the docs flip is straightforward (most of it is in `src/cli/mod.rs`'s `after_long_help` and the doc-sync test propagates). Re #2838. Co-authored-by: worktrunk-bot <254187624+worktrunk-bot@users.noreply.github.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> |
||
|
Maximilian Roos
|
d7e3f88422 |
feat(hooks): rename worktree-creation hooks to pre-create/post-create (#2840)
Phase 1 of the staged hook rename tracked in #2838: the worktree-creation hooks `pre-start`/`post-start` become `pre-create`/`post-create`. The old names keep working with no deprecation warning yet (Phase 2, months out, adds the warning). ## What changes - `pre-create`/`post-create` are canonical everywhere: the `HookType` enum, the `HooksConfig` serde fields, the `wt hook` CLI, completion, and all docs. - Old names keep working: `migrate_content()` rewrites `pre-start`/`post-start` config keys to `-create` before serde, and `parse_hook_type` accepts the old CLI names as silent aliases. `wt config update` rewrites them on disk; `wt config show` shows the migration diff. `wt hook <type>` execution and `wt hook show` both accept the old names; completion and `--help` advertise only the canonical names. - `detect_deprecations()` flags the old keys so `update`/`show` act on them, but `format_deprecation_warnings()` stays silent (Phase 2 adds the warning). A new empty-warnings guard in `check_and_migrate` keeps a `-start`-only config from emitting a stray hint. - The dead pre-0.32.0 `post-create` machinery is removed: the fatal `POST_CREATE_REMOVED_MSG` load error, the vestigial `HooksConfig.post_create` merge-fold, and `find_post_create_from_doc`. `post-create` is reclaimed as the canonical background creation hook. ## Semantic flip Before v0.32.0, the key `post-create` named a *blocking* hook. It now names the *background* one. Since v0.44.0, a pre-0.32.0 `post-create` config is a fatal load error on the `check_and_migrate` paths: `ProjectConfig::load` and user/system config loading, which fire on essentially every `wt` command. A repo carrying one has been unusable ever since. The one path that skips that check is `project_config_at_ref` (the base-ref read behind `wt switch --create`), which applies only structural migration. A pre-0.32.0 `post-create` surviving solely on a base ref, never checked out into a worktree, would now load as a background hook rather than folding into the blocking `pre-start`. That edge case is accepted: once `post-create` is valid again, reclaiming the name and detecting the dead key are mutually exclusive. ## Reviewing this diff 205 files, but the substance is ~36 files under `src/`. The rest is regenerated snapshots and auto-synced doc mirrors. Start with: - `src/config/deprecation.rs` — detection (`find_renamed_hook_key`), migration (`rename_hook_key`), removal of the fatal block, the empty-warnings guard, and the `DEPRECATED_SECTION_KEYS` entries that stop unknown-field detection from flagging the migrated keys. - `src/config/hooks.rs`, `src/git/mod.rs` — the serde field and enum renames. - `src/config/project.rs` — `ProjectConfig::load` deserializes `check_and_migrate`'s migrated content, so a current-worktree config using the old keys loads into the canonical fields. - `src/cli/hook.rs`, `src/commands/hook_commands.rs`, `src/completion.rs`, `src/main.rs` — the CLI alias layer; `wt hook show` accepts the old type names as hidden value-parser aliases. - `src/cli/mod.rs` — the `wt hook` docs, including the soft-deprecation note linking #2838. The ~93 modified snapshots also pick up deterministic env-block lines (`GIT_*: ""`, `LLVM_PROFILE_FILE`) that pre-existing snapshots already carry. That is stale-snapshot drift surfaced by the regeneration, not a behavior change. ## Testing Full suite green (3799 tests). New coverage: `snapshot_migrate_start_to_create` (migration preserves value shape and position), `test_deprecated_start_hook_key_runs_silently` and `test_standalone_hook_start_alias_runs_silently` (old config and CLI names run with no warning), `test_config_show_displays_start_hook_migration` (`config show` reveals the diff without an "unknown field" warning), and `test_hook_show_accepts_deprecated_start_hooks` (a current-worktree config using the old keys loads, and `wt hook show` takes both the canonical and the deprecated type arguments). Part of #2838. 🤖 Generated with [Claude Code](https://claude.com/claude-code) |
||
|
Maximilian Roos
|
408f4f5bee |
Add wt step tether: kill a command's process group when its worktree is removed
`wt step tether -- CMD…` runs CMD in its own process group and tears the whole group down when CMD exits or its worktree is removed (a 250ms portable poll; killpg on Unix, taskkill /T /F on Windows). Replaces the leaked-dev-server / fseventsd-saturation failure mode with a fire-and-forget supervisor needing only a single post-start hook. No unsafe, no new deps. Shell handling matches `wt step for-each`. Windows taskkill has a documented self-exit-detach edge. Co-Authored-By: Claude <noreply@anthropic.com> |
||
|
Worktrunk Bot
|
ec917a4081 |
chore(tests): drop stale column_alignment breadcrumb comment (#2332)
The comment marked where the `column_alignment` module used to live
before it was merged into `spacing_edge_cases` (October 2025, commit
|
||
|
Maximilian Roos
|
016eb030e7 |
docs(extending): rename "external subcommand" to "custom subcommand" (#2270)
## Summary Renames the git-style `wt-<name>` dispatch feature to "custom subcommand" across user-facing docs and internal code. Two motivations: - **Avoid overloading "external."** The codebase already uses "external command" for the `shell_exec` concept (subprocesses like `git` and `gh`). Using the same word for the `wt-foo` dispatch feature is ambiguous. - **Cargo uses "custom command" / "external subcommand" interchangeably.** kubectl calls theirs "plugins," gh calls theirs "extensions"; git doesn't have a settled term. "Custom subcommand" reads naturally in prose and matches cargo's user-facing phrasing. ## Changes **User-facing docs** — `docs/content/extending.md` (section heading, description, comparison table) and `docs/content/faq.md` (link + anchor). Skill references auto-sync. **Internal code** — `src/commands/external.rs` → `custom.rs`, `Commands::External` → `Commands::Custom`, `handle_external_command` → `handle_custom_command`, plus matching renames in `src/completion.rs` (inject/discover/forward functions) and corresponding tests. Also renames `tests/integration_tests/external.rs` → `custom.rs`. **Kept intact** — clap's `#[command(external_subcommand)]` attribute and `.allow_external_subcommands(true)` are clap's own vocabulary, not ours. CHANGELOG is historical and left unchanged. ## Test plan - [x] `cargo build` clean - [x] `cargo clippy --all-targets --all-features` clean - [x] `cargo test --lib --bins` — all pass - [x] `cargo test --test integration` — all pass (1476) - [x] `pre-commit run --all-files` clean > _This was written by Claude Code on behalf of Maximilian_ --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
185341f7a4 |
Unblock picker first render; add preview dry-run (#2210)
## Problem On repos with many worktrees, `wt switch` shows a blank terminal for 1–2 seconds before the list appears. Skim 0.20's event loop calls `SkimItem::preview()` synchronously before `term.draw()` (`model/mod.rs:715-722`) — any latency inside `preview()` freezes the whole UI, not just the preview pane. The previous implementation held a DashMap shard write lock across a git + pager subprocess via `entry().or_insert_with(...)`, so skim's first render blocked behind whichever background task was currently computing the first item's default mode. ## Changes **Thread pool** (first commit, already reviewed upstream): dedicated rayon pool for preview/summary pre-compute, sized `2×cores` to match the global pool's mixed-I/O profile. Extracted `rayon_thread_count()` so the two sites can't drift. **Non-blocking `preview()`**: `preview_for_mode` is now a pure cache read — hit returns content, miss returns a mode-specific placeholder (`"○ Loading working-tree diff. Press 1 again to refresh."`). Background tasks compute outside any DashMap lock and use `insert` after, matching the pattern `generate_and_cache_summary` already used for LLM summaries. Skim 0.20 doesn't expose a way to re-query preview without user interaction (`on_item_change` at `previewer.rs:187` bails on unchanged items), so the placeholder's "press N again" instruction is the supported refresh path. **`PreviewOrchestrator`** (`src/commands/picker/preview_orchestrator.rs`): owns the cache, dedicated pool, and a pending-task counter. `PendingGuard` decrements on drop so a panicking task still releases the counter — otherwise `wait_for_idle` would hang forever on any panic. Exposes `spawn_preview`, `spawn_summary`, `wait_for_idle`, `dump_cache_json` so the pipeline is testable without skim. **`WORKTRUNK_PICKER_DRY_RUN`**: setting the env var runs the full pre-compute (speculative first-item spawn, collect, full spawn loop, summaries), waits for all tasks, prints cache inventory as JSON, and exits instead of launching skim. Useful for diagnosing "previews never load" bugs from scripts and as the basis for integration tests. ## Testing Unit tests in `preview_orchestrator.rs` cover end-to-end cache population (via real `TestRepo` + git subprocesses, no mocks), duplicate-spawn short-circuiting, and the JSON dump format. Verified by running `WORKTRUNK_PICKER_DRY_RUN=1 wt switch` in this repo: 14 branches × 5 modes = 70 entries, all non-empty, 5s to full cache warm. > _This was written by Claude Code on behalf of max-sixty_ --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Worktrunk Bot
|
5709eb50d4 |
Add git-style external subcommand dispatch (wt-<name>) (#2054)
## Summary - `wt foo` now runs `wt-foo` from PATH when `foo` is not a built-in, mirroring `git foo` → `git-foo`. Third-party tools like a hypothetical `wt-sync` can be installed and invoked as `wt sync` without touching this repo. - Built-ins always take precedence (clap only dispatches `External` when no built-in matched), so external binaries cannot shadow existing subcommands. - Nested subcommand hints still pre-empt the PATH lookup — `wt squash` continues to suggest `wt step squash` rather than searching for `wt-squash`. - When nothing matches, wt prints a git-style `'foo' is not a wt command` error with a Levenshtein-based typo suggestion (replacing the old clap `InvalidSubcommand` handler). - The global `-C <path>` flag is forwarded as the child's working directory, matching git's semantics. - Child exit codes (including Unix signal codes) are propagated verbatim. wt does **not** decorate child failures with its own error line — the child has already reported whatever it needed to. Requested in #2053 — the original PR added `wt sync` as a built-in, but the preferred approach is a generic extensibility mechanism so `wt sync` can call any `wt-sync` binary on PATH. ## Implementation - `Commands::External(Vec<OsString>)` captured via clap's `#[command(external_subcommand)]`. - `src/commands/external.rs` owns the dispatch: nested-suggestion check first, then `which::which("wt-<name>")`, then run with `Command::status()` inheriting stdio. - `main()` dispatches `External` directly (instead of via `dispatch_command`) so the parsed `-C <path>` can be forwarded as the child's cwd. - The nested-suggestion path moved from clap's built-in error renderer to our module; help snapshots updated to the cleaner worktrunk-style output (✗ / ↳). ## Test plan - [x] `cargo test --test integration external_subcommand` — 7 new integration tests cover happy path, not-found error, typo suggestion, nested suggestion winning over PATH lookup, exit-code propagation (exit 42), `-C` flag forwarding, and `--help` passthrough. - [x] `cargo test --bins` — 3 new unit tests for `closest_subcommand` (typo, unrelated, hidden). - [x] `cargo test --test integration` — full suite passes (1407 tests). - [x] `cargo test --lib --bins` — full unit suite passes (500 tests). - [x] `cargo fmt --check` and `cargo clippy --all-targets --all-features -- -D warnings`. - [x] Manual smoke tests: `wt wt-<name>`, `wt unknown`, `wt siwtch`, `wt squash`, `wt -C /tmp wt-<name>`, `wt wt-<name> --help`, child exit code 42 propagation. --------- Co-authored-by: worktrunk-bot <254187624+worktrunk-bot@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> |
||
|
Maximilian Roos
|
a7f224d263 |
feat: add wt step eval for template expression evaluation (#1004)
## Summary
- Add experimental `wt step eval` subcommand that evaluates a minijinja
template in the current worktree context and prints the result to stdout
- Reuses existing hook template infrastructure — all variables
(`branch`, `repo`, `worktree_path`, etc.) and filters (`hash_port`,
`sanitize`, `sanitize_db`) are available
- Output goes to stdout with no decoration or shell escaping, designed
for scripting and shell substitution
```
$ wt step eval '{{ branch | hash_port }}'
16066
$ curl http://localhost:$(wt step eval '{{ branch | hash_port }}')/health
```
This is the first step from the
[IDEAS.md](https://github.com/max-sixty/worktrunk/blob/arbitrary-data/IDEAS.md)
design doc, directly addressing the user request in #947 — "found no way
to run it on a single branch."
## Test plan
- [x] 6 integration tests: basic branch, hash_port, multiple values,
sanitize_db, conditionals, template error
- [x] Help text and completion snapshots updated
- [x] stdout guard allowlisted
- [x] Doc pages auto-synced
- [x] All lints pass
- [x] 2360 tests pass (5 pre-existing shell_wrapper failures excluded)
Ref #947
> _This was written by Claude Code on behalf of @max-sixty_
---------
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: worktrunk-bot <254187624+worktrunk-bot@users.noreply.github.com>
Co-authored-by: worktrunk-bot <w@worktrunk.dev>
|
||
|
Maximilian Roos
|
55bc9188b4 |
feat(step): add alias command for user-defined command templates (#1348)
## Summary
- Adds `wt step <alias-name>` for running user-defined command templates
configured in `[aliases]` sections of user or project config
- Aliases support the same template variables as hooks (`{{ branch }}`,
`{{ worktree }}`, etc.) plus custom `--var KEY=VALUE` variables
- Project-config aliases require the same command approval flow as
project hooks; user-config aliases are trusted. `--dry-run` skips
approval since it's a read-only preview
- Alias names matching built-in step commands are filtered from the
"available" list in error messages (shadowed by the built-in)
- Introduces `Phase` enum (`Hook(HookType)` | `Alias`) replacing the old
`hook_type` + `phase_override` pattern in the approval system
- Renames `HookCommand` to `ApprovableCommand` since it now covers both
hooks and aliases
## Test plan
- [x] Unit tests for `AliasOptions::parse` (name-only, --dry-run, --yes,
--var, empty key rejection, positional arg rejection)
- [x] Integration tests for alias execution, dry-run (without --yes),
exit code propagation
- [x] Integration tests for shadowing (filtered from available list)
- [x] Integration tests for user/project config merging
- [x] Integration tests for approval flow (project prompts, user skips,
override skips, already-approved, --yes bypass, decline)
- [x] Unit tests for `merge_alias_maps` coverage
- [x] Sync test: `BUILTIN_STEP_COMMANDS` matches actual `StepCommand`
clap variants
> _This was written by Claude Code on behalf of max-sixty_
---------
Co-authored-by: Claude <noreply@anthropic.com>
|
||
|
Maximilian Roos
|
35c2172b74 |
feat: add wt step prune to remove merged worktrees (#1191)
|
||
|
Maximilian Roos
|
bc2ee2dcb6 |
Add experimental wt step promote command (#789)
## Summary Adds `wt step promote` — an experimental command to exchange branches between the main worktree and another worktree, including swapping gitignored files (build artifacts, `.env`, `node_modules/`, etc.). This addresses #738 where users want to move a branch from a worktree into the main worktree. This is useful when the main worktree has special significance (Docker Compose configs, IDE settings, heavy build artifacts anchored to project root) and hooks aren't yet set up to run on arbitrary worktrees. **Key features:** - Exchange branches between main worktree and any other worktree - Swap gitignored files so build artifacts follow their branch - Auto-restore: `wt step promote` from main worktree (no args) restores default branch - Shows mismatch state in `wt list` with ⚑ indicator - Warns when creating mismatch, with hint to restore - `.worktreeinclude` filtering respected per worktree **Swap algorithm (stage → exchange → distribute):** 1. Discover gitignored entries before branch exchange (`.gitignore` belongs to the branch) 2. Stage files to `.git/wt-promote-staging/` before `git switch` (prevents tracked file collision) 3. Exchange branches with per-step rollback 4. Cross-distribute staged files to new worktrees 5. Best-effort restore on failure with recovery guidance **Adversarial testing (4 rounds, 9 issues found and fixed):** - Stage before switch to prevent tracked file collision - Per-step rollback in `exchange_branches()` - Bail on leftover staging (don't destroy previous run's files) - Recovery guidance on all failure paths - Dedicated `restore_staged()` for rollback semantics - `ErrorKind::CrossesDevices` for cross-device fallback - `Option<PathBuf>` instead of sentinel empty path ## Test plan - [x] 25 integration tests covering: bidirectional swap, round-trip, `.worktreeinclude` filtering, nested directories, same-filename-different-content, tracked-vs-ignored separation, stale staging detection, bare repo rejection, detached HEAD, dirty worktrees, no-arg from main/linked, branch argument, already-in-main, mismatch indicator in `wt list` - [x] All 2576 tests pass - [x] All lints clean - [x] `copy-ignored` tests still pass after `list_and_filter_ignored_entries` extraction 🤖 Generated with [Claude Code](https://claude.com/claude-code) > _This was written by Claude Code on behalf of max-sixty_ --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
87ae623c78 |
feat: add wt step diff command (#1074)
## Summary - Add `wt step diff` — shows all changes (committed, staged, unstaged, untracked) that `wt merge` would include, in a single diff against the merge base - Default shows full diff with git pager; `--stat` flag for summary only - Uses a temporary empty git index with `git add --intent-to-add` to make untracked files visible without touching the real index Closes #1043 ## Test plan - [x] 8 integration tests covering: no changes, committed only, untracked, all change types combined, stat mode, stat with untracked, explicit target, index safety - [x] All 1048 integration + 530 unit tests pass - [x] Pre-commit lints pass - [x] Help snapshots and doc sync updated 🤖 Generated with [Claude Code](https://claude.com/claude-code) > _This was written by Claude Code on behalf of @max-sixty_ --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
b70b99e06e |
feat: add wt config update command (#1083)
## Summary - Adds `wt config update` — detects deprecated config patterns, previews changes with a diff, and applies with confirmation (`--yes` to skip prompt) - Extracts `format_deprecation_warnings()` as a shared helper to avoid duplicating warning formatting between `config show` and `config update` - Uses `get_config_path()` (respects `WORKTRUNK_CONFIG_PATH` and `--config`) for user config resolution ## Test plan - [x] 4 non-interactive snapshot tests: no deprecations, template vars, commit-generation, approved-commands - [x] 2 PTY-based interactive tests: prompt accept and decline flows - [x] 1057 integration tests pass, 530 unit tests pass - [x] All lints clean (`pre-commit run --all-files`) > _This was written by Claude Code on behalf of @max-sixty_ Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
339ced434e |
fix: remove stray blank lines before hints in error output (#1072)
Remove blank line between detail lines and hint in ConflictingChanges and
NotFastForward error display. The `"\n{detail}\n"` + `"\n{hint}"` pattern
produced `\n\n` (blank line) violating "hints attach to their subject."
Also fix trailing double blanks in --help-md output (print! instead of
println! since clap output already ends with \n) and diagnostic template
(Jinja {%- whitespace control).
Add snapshot_formatting_guard tests that scan all 726 snapshots for:
- Blank line before hint marker (↳)
- Double blank lines in output sections
Co-authored-by: Claude <noreply@anthropic.com>
|
||
|
Maximilian Roos
|
7ed8cdb421 |
Revert "feat: add jj (Jujutsu) support alongside git"
This reverts commit
|
||
|
Maximilian Roos
|
cd8420235b |
feat: add jj (Jujutsu) support alongside git
Adds support for jj (Jujutsu) as a VCS backend alongside git. Introduces the `Workspace` trait to abstract over both VCS implementations, enabling `wt` commands to work with either git or jj repositories. Includes full jj implementations of core workflows: switch, merge, remove, commit/squash/push/rebase steps, and comprehensive integration tests. Commands automatically detect the repository type and route to the appropriate backend. |
||
|
Maximilian Roos
|
50d12a7e14 |
refactor: rename wt select references to wt switch interactive picker (#959)
* refactor: rename `wt select` references to `wt switch` interactive picker Update all documentation, comments, and test references from the deprecated `wt select` to `wt switch` interactive picker. Migrate TUI tests from select.rs to switch_picker.rs exercising `wt switch` directly. - Docs/comments: Replace `wt select` with `wt switch` interactive picker - Tests: Rename select.rs → switch_picker.rs, use `wt switch` CLI args - Remove redundant tests covered by existing switch.rs tests - Fix pre-existing incorrect binary/path in src/commands/CLAUDE.md - Leave alone: CHANGELOG, runtime deprecation warnings, [select] config section names, demo assets Co-Authored-By: Claude <noreply@anthropic.com> * fix: add missing switch_picker snapshot files for CI The switch_picker tests (migrated from select tests) generate snapshots via PTY execution, which need to be committed for CI to pass. Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
722e70373d |
fix(shell): add | Out-String to PowerShell config_line (#888)
* fix(shell): add `| Out-String` to PowerShell config_line (#885) PowerShell command output is an array of strings by default, but `Invoke-Expression` expects a single string. Without `| Out-String`, users get "Cannot convert 'System.Object[]' to the type 'System.String'". Also adds PSModulePath hint to `wt config show` diagnostics on Windows. Co-Authored-By: Claude <noreply@anthropic.com> * fix: add wt to PATH in PowerShell test, remove PSModulePath hint - Add bin_dir to PATH so `Get-Command wt` works in CI - Remove PSModulePath diagnostic to fix Windows snapshot failures Co-Authored-By: Claude <noreply@anthropic.com> * fix: move PowerShell test to integration tests CARGO_BIN_EXE_wt is only available in integration tests, not lib tests. Move the test to tests/integration_tests/shell_powershell.rs. Co-Authored-By: Claude <noreply@anthropic.com> * feat: require | Out-String in PowerShell detection PowerShell configs without `| Out-String` are now treated as "not installed" so that `wt config shell install` will update them with the fix. Key changes: - PowerShell detection now uses case-insensitive matching - Check for Invoke-Expression/iex BEFORE POSIX patterns to avoid false match on `if ` which appears in old PowerShell configs - Add test for exact old canonical PowerShell line Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
c4b50bb6a8 |
Add wt step relocate command (#790)
* Add step relocate command Adds `wt step relocate` to move worktrees to their expected paths based on the `worktree-path` template. Supports dry-run preview, filtering by branch name, and auto-committing dirty worktrees. Handles special case of main worktree by switching to default branch and creating a new worktree. * Add `--clobber` flag and cycle resolution to `step relocate` Implement full swap/cycle handling and non-worktree blocker management for relocate command. Adds `--clobber` flag to automatically backup blocking paths, dependency graph processing to handle worktree cycles via temporary locations, and comprehensive spec documentation. Key changes: - Add `--clobber` flag to back up non-worktree paths at target locations - Implement cycle detection and resolution using temp directory - Build dependency graph to coordinate multi-worktree moves - Handle main worktree relocation by creating new worktree + switching - Add test cases for swap, clobber, and cycle scenarios - Canonicalize temp home paths on macOS for snapshot consistency * fix: address Codex review issues in step relocate - Refuse to clobber existing worktrees (would corrupt git metadata) - Prefer non-main worktree when breaking cycles (git can't move main) - Sanitize branch names for temp paths (feature/foo -> feature-foo) - Track original path for shell cd in temp-relocated worktrees - Show template errors as warnings instead of silently dropping Co-Authored-By: Claude <noreply@anthropic.com> * test: add coverage for clobber refusing to overwrite worktrees Co-Authored-By: Claude <noreply@anthropic.com> * test: add relocate --commit coverage test Tests the commit_worktree_changes function by configuring a mock LLM and verifying that dirty worktrees are auto-committed before relocating. Co-Authored-By: Claude <noreply@anthropic.com> * refactor: simplify step relocate and improve coverage - Change unreachable defensive code to expect() with explanation - Simplify multi-line cformat! calls to single-line (improves LLVM coverage) - Add test_relocate_mixed_success_and_skip to cover "relocated X, skipped Y" path - Add test_relocate_dirty_with_commit to cover commit_worktree_changes function Co-Authored-By: Claude <noreply@anthropic.com> * refactor: remove shell cd for temp-to-final moves, simplify summary - Remove shell directory update for temp-to-final worktree moves (rare case where user is inside a worktree during cycle resolution) - Simplify summary pluralization with inline closure - Remove unused original_path tracking from temp_relocated Co-Authored-By: Claude <noreply@anthropic.com> * refactor: simplify remaining cformat! calls in step_relocate Extract multi-line cformat! macro calls to single-line variables to improve LLVM coverage instrumentation. Co-Authored-By: Claude <noreply@anthropic.com> * refactor: remove defensive early return in commit_worktree_changes The early return when no staged changes was unreachable - if is_dirty() returned true, git add -A must stage something. Removing improves coverage and follows fail-fast principles. Co-Authored-By: Claude <noreply@anthropic.com> * refactor: simplify step_relocate for better coverage - Remove redundant exists() check before create_dir_all - Extract cformat! to single-line variable in commit_worktree_changes Co-Authored-By: Claude <noreply@anthropic.com> * refactor: revert configure_shell cosmetic changes to reduce diff Reverts format_path_for_display changes that were unrelated to step relocate and were reducing coverage percentage since they're in error paths. Co-Authored-By: Claude <noreply@anthropic.com> * fix: harden step relocate against edge cases Fixes identified by adversarial testing: 1. Empty default branch validation - fails early with actionable error instead of confusing "git checkout ''" errors 2. Same-target conflict handling - `is_target_empty` now returns `Option<bool>` to gracefully skip when target is unexpectedly blocked (TOCTOU race or same-target conflict) 3. Main worktree rollback - if `git worktree add` fails after checkout, restore the original branch Adds test for same-target scenario that previously panicked. Co-Authored-By: Claude <noreply@anthropic.com> * Move step relocate plan to Rust module spec Moved the comprehensive plan from .claude/plans/step-relocate-spec.md to a Rust doc comment on the step_relocate function. This makes the specification more discoverable and keeps it synchronized with the implementation. The doc comment now includes: - Complete flag descriptions - Detailed algorithm explanation - Multiple scenario examples (swap, chain, mixed, clobber, main worktree) - Implementation notes - Test case list Co-authored-by: Maximilian Roos <max-sixty@users.noreply.github.com> * test: add coverage for step relocate edge cases Add tests for: - Template expansion error handling (invalid variable) - Empty default branch validation (non-existent configured branch) These cover lines 844-847 and 890-895 in step_commands.rs that were flagged by codecov/patch. Co-Authored-By: Claude <noreply@anthropic.com> * Improve step relocate output messages - Use gutter formatting for template error details (per output guidelines) - Fix misleading summary when template errors occurred - Show source path in temp-relocated worktree success messages - Use bright-black styling for flags in hints (--commit, --clobber) - Use concrete example in default branch error message Co-Authored-By: Claude <noreply@anthropic.com> * Use gutter for dry-run preview in step relocate Per output guidelines: every user-facing message needs symbol or gutter. The dry-run preview now uses gutter formatting instead of plain indentation. Co-Authored-By: Claude <noreply@anthropic.com> * Fix: use wt command for setting default branch The error message now suggests 'wt config state default-branch set main' instead of the raw git config command. Co-Authored-By: Claude <noreply@anthropic.com> * Refactor commit pipeline to accept WorkingTree parameter Extract commit staging and execution into CommitGenerator to eliminate duplicate commit logic in step_relocate. Add show_progress parameter to control progress message display for bulk operations. Add repo() accessor to WorkingTree for repository access. * refactor: extract step_relocate into modular pipeline with explicit types Split the 500-line monolithic step_relocate function into a clean pipeline: - gather_candidates() finds worktrees not at expected paths - validate_candidates() checks locked/dirty, handles --commit - RelocationExecutor encapsulates the dependency graph algorithm New types document each stage: RelocationCandidate, ValidatedCandidate, GatherResult, ValidationResult. The complex swap/cycle resolution logic is now isolated in RelocationExecutor with clear methods for each phase. Co-authored-by: Claude <noreply@anthropic.com> * fix: update test to use correct commit.generation config format The test was using the old `args` field which no longer exists. The command should be a complete shell string that receives the prompt via stdin. Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Maximilian Roos <max-sixty@users.noreply.github.com> |
||
|
Maximilian Roos
|
3bc243d76f |
refactor: simplify Repository caching to use Arc-based sharing (#521)
Replace global HashMap cache with direct Arc<RepoCache> ownership on Repository. Previously, Repository instances looked up their cache in a static HashMap keyed by git_common_dir. This required computing git_common_dir to access any cached value and had complexity around lock ordering. Now: - Repository holds Arc<RepoCache> directly - Cloning a Repository shares the cache via Arc - Parallel tasks (wt list, statusline) clone the Repository - Tests naturally get isolation since each creates its own Repository Benefits: - Simpler mental model: clone = share cache - No global state coordination - Clearer ownership semantics - Removes with_cache() indirection Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
acce1423d4 |
feat(trace): add trace log analysis module (#503)
* feat(trace): add trace log analysis module Add a new `trace` module for analyzing `wt-trace` performance logs. This helps understand where time is spent during command execution. Components: - `parse.rs`: Parse [wt-trace] log lines into structured TraceEntry - `analyze.rs`: Compute stats, histograms, timeout impact analysis - `display.rs`: Render analysis as formatted text - `analyze-trace` binary: CLI tool for analyzing log files Usage: RUST_LOG=debug wt list 2>&1 | grep wt-trace | analyze-trace analyze-trace /path/to/trace.log The module is intentionally minimal - we're open to adding more metrics as needs emerge. Wall-time and concurrency analysis would require adding timestamps to the trace format. Co-Authored-By: Claude <noreply@anthropic.com> * test(trace): add tests for edge cases to improve coverage - Add test_empty_entries for empty input handling - Add test_parse_unknown_keys_ignored for forward compatibility Co-Authored-By: Claude <noreply@anthropic.com> * style: fix formatting in trace module tests Fix line length issues flagged by cargo fmt. Co-Authored-By: Claude <noreply@anthropic.com> * test: add coverage for edge cases in trace module - Add test for percentile with empty slice (analyze.rs:112) - Add test for trailing whitespace parsing (parse.rs:75) Co-Authored-By: Claude <noreply@anthropic.com> * test: add integration tests for analyze-trace binary Cover the binary code path for codecov/patch: - Test reading from stdin with sample trace input - Test error handling for non-existent files - Test empty input handling - Test reading from the sample log file Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
bd2a7c16e9 |
feat(step): add copy-ignored command for syncing .worktreeinclude files (#469)
* feat(step): add copy-ignored command for syncing .worktreeinclude files Add `wt step copy-ignored` to copy files listed in `.worktreeinclude` that are also gitignored between worktrees. Useful in post-create hooks to sync local config files (.env, IDE settings, build caches) to new worktrees. Key features: - Uses git ls-files --ignored for accurate gitignore handling (nested .gitignore, global excludes, .git/info/exclude) - Uses ignore crate for .worktreeinclude pattern matching - COW (reflink) copying for efficient large directory handling - --directory flag stops at directory boundaries (avoids listing thousands of files in target/ or node_modules/) - Skips existing files for idempotent hook usage - Skips symlinks and .git entries 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * docs: update hook examples to use wt step copy-ignored Replace manual CoW bash scripts with the new `wt step copy-ignored` command in hook documentation. Update Rust and Node.js sections to show `.worktreeinclude` patterns instead of complex shell commands. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Add worktree-only branch completion filter Add a new `worktree_only_completer()` function to filter branch completions to only worktree branches, and update the `CopyIgnored` command to use it instead of `local_branches_completer()` for the `--from` and `--to` arguments. * Refactor hook documentation on copying files and CoW strategies Replace the `.worktreeinclude` and `wt step copy-ignored` approach with direct copy-on-write examples using native OS commands (`cp -c`, `cp --reflink=auto`). Add comparison table of symlink vs copy vs CoW strategies with their tradeoffs. Update language-specific sections (Rust, Node.js) to show CoW patterns instead of `.worktreeinclude` configuration. Improve clarity on disk efficiency and cross-platform fallback patterns. * chore: use wt step copy-ignored for this repo Add .worktreeinclude with target/ and replace the manual bash CoW script with `wt step copy-ignored` in post-create hook. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * docs: update all manual CoW examples to use wt step copy-ignored Update cli.rs (source for hook docs) and tips-patterns.md to use the new copy-ignored command instead of manual bash CoW scripts. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: use gutter format for dry-run output, sync skill files - Refactor copy-ignored --dry-run to show files in a gutter list instead of printing each item separately - Sync skill documentation files with docs (hook.md, step.md, tips-patterns.md) after rebase on main 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: simplify error handling in copy-ignored - Use expect() for strip_prefix since paths always come from git ls-files - Remove verbose .with_context() wrappers for simple errors - let them bubble up - Reduces untestable code paths 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * test: add idempotent and nested file tests for copy-ignored - test_copy_ignored_idempotent: verifies running twice succeeds (AlreadyExists branch) - test_copy_ignored_nested_file: copies single file in subdirectory Improves coverage by exercising more code paths. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * test: fix copy-ignored tests to hit correct code paths - test_copy_ignored_no_worktreeinclude: now creates worktree first so it hits the .worktreeinclude check instead of "same worktree" - test_copy_ignored_empty_intersection: same fix - Add test_copy_ignored_idempotent and test_copy_ignored_nested_file 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * test: add --to flag test for copy-ignored coverage Adds test for the --to flag which specifies an explicit destination worktree. This covers lines 437-439 which were previously uncovered. Note: The .worktreeinclude parse error path (line 465) and copy error path (line 524) remain untested because: - The ignore crate is very lenient and doesn't return parse errors - Filesystem copy errors are hard to test reliably cross-platform 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * test: add .git skip coverage for copy_dir_recursive Adds a .git file inside the target directory to test that copy_dir_recursive correctly skips .git entries (line 598). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * ci: trigger CI run * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> |
||
|
Maximilian Roos
|
ba012899d9 |
Add [select] pager config with backward-compatible auto-detection (#449)
* feat: add [select] pager config with backward-compatible auto-detection Adds a `[select] pager` config option to override git's pager specifically for `wt select` diff previews. When not configured, maintains existing behavior by auto-detecting delta/bat/batcat and appending --paging=never to prevent hangs in non-TTY contexts. Users can now set explicit pager commands: ```toml [select] pager = "delta --paging=never" ``` The config option takes precedence over auto-detection, giving users full control while preserving backward compatibility for existing setups. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> * test: add coverage for has_explicit_pager_config 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> * test: add config deserialization tests for [select] pager Tests verify that the SelectConfig struct deserializes correctly from TOML, including edge cases (empty string, optional section). Note: The actual config-loading code path in get_diff_pager() (lines 38-43) remains uncovered because it only executes during wt select's TUI preview generation, which requires complex PTY test setup. Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com> |
||
|
Maximilian Roos
|
1181f05255 |
feat: add diagnostic report generation for GitHub issues (#439)
* Add diagnostic report generation for issue reporting Create diagnostic reports when warnings occur during `wt list`. These markdown files help users file better GitHub issues by including: - wt and git versions, OS/arch info - Shell integration status - `git worktree list --porcelain` output - Verbose logs (when run with --verbose) Reports are only written when --verbose is used (since they need debug logs to be useful). Without verbose, a hint tells users to re-run with --verbose. Files are saved to `.git/wt-logs/diagnostic.md` with an accompanying verbose log at `.git/wt-logs/verbose.log`. When the GitHub CLI is installed, the hint includes a command to create an issue with the diagnostic attached. Changes: - Add `diagnostic.rs` module for report generation and formatting - Add `verbose_log.rs` module to capture debug logs to file - Refactor logging setup in main.rs to write logs to both stderr and file - Update `list/collect.rs` to show diagnostic hints on timeouts and errors - Add comprehensive integration tests with snapshot verification * fix: address code review feedback for diagnostic module - Change timeout message from RUST_LOG=debug to --verbose - Add shell escaping for paths in gh issue create command - Use chained .join() for cross-platform path compatibility in tests - Add TODO documenting -C flag limitation in verbose_log 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: use minijinja template for diagnostic report - Replace manual string building with a clear minijinja template - Template structure is immediately visible in REPORT_TEMPLATE constant - Fix cross-platform CI snapshot by normalizing line wrapping in git errors - Remove unnecessary trailing spaces from report output 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: improve snapshot normalization for CI compatibility - Fix version regex to match CI commit hash versions (e.g., "be89089") - Add Windows path normalization for repo paths 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: simplify Windows path regex for snapshot normalization Match Windows paths starting with drive letter (C:...) without requiring specific path separator patterns. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: consolidate timestamp formatting into utils module - Move chrono_now() from diagnostic.rs to utils.rs as format_timestamp_iso8601() - Add now_iso8601() convenience function that combines get_now() with formatting - Update diagnostic.rs to use worktrunk::utils::now_iso8601() This consolidates all timestamp formatting logic in one place, making it reusable across the codebase and removing duplicate chrono formatting code. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
ed94a47085 |
fix: preserve .exe suffix in shell function names on Windows (#438)
* fix: preserve .exe suffix in shell function names on Windows When invoked as `git-wt.exe`, the shell function is now named `git-wt.exe()` instead of `git-wt()`. This ensures aliases like `alias gwt="git-wt.exe"` correctly invoke the shell wrapper. The fix changes `binary_name()` from `file_stem()` to `file_name()`, and simplifies the `--source` flag to always use `cargo run --bin wt` since `wt` and `git-wt` are identical code. Fixes #348 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: remove unused TestRepo parameter from Windows tests The shell init command doesn't need a git repo context - it just generates shell initialization code. Remove the TestRepo parameter to fix compilation on Windows CI. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: strip .exe from config lines, keep only in function name On Windows, binary_name() returns "wt.exe" but the config line written to .bashrc/.zshrc should use "wt" (without .exe) because: - MSYS2/Git Bash automatically resolves wt → wt.exe - Simpler detection (no dual-pattern matching needed) - Config files look cleaner The .exe suffix is preserved in the shell function name (in templates) to match alias expansion - that's the fix for issue #348. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: simplify Windows shell integration by stripping .exe Instead of preserving .exe in shell function names and stripping it in 6 different places for detection, we now simply strip .exe at the source in binary_name(). This relies on MSYS2/Git Bash automatically resolving `wt` to `wt.exe`. Users should use `alias wt="wt"` instead of `alias wt="wt.exe"`. The shell function will be `wt()` and MSYS2 handles the PATH resolution. This significantly simplifies the codebase by removing .exe handling from: - is_shell_integration_line() - scan_file() - config_line() - config_paths() for Fish - completion_path() - scan_for_detection_details() Issue #348 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: remove git-wt test that requires optional feature The git-wt binary requires the git-wt feature which isn't enabled in CI. The wt test is sufficient since both binaries use the same binary_name() logic. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
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> |
||
|
Maximilian Roos
|
7b5bea8ce4 |
Add tests for documentation template examples (#374)
Ensures template examples in docs work as described. Tests cover basic variables, filters (sanitize, hash_port), operator precedence with concatenation, and full command examples from docs. Catches issues like PR #373 where operator precedence was documented incorrectly. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude <noreply@anthropic.com> |
||
|
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> |
||
|
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> |
||
|
Maximilian Roos
|
0888aee061 |
Simplify code and improve coverage (#226)
* 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> * Simplify repository code and add coverage tests - Remove unused path() method from Repository - Simplify parse error handling: replace verbose GitError::ParseError blocks with .context() in count_commits, commit_timestamp, ahead_behind - Move nix/signal-hook from regular dependencies to dev-only (only used in tests, not main crate) - Add 20 new tests for repository methods: - worktree_state() for MERGING, REBASING, CHERRY-PICKING, etc. - available_branches() and all_branches() - project_identifier() URL parsing (https, http, ssh://, git@) - get_config/set_config Coverage: repository/mod.rs improved from 82.1% to 89.9% 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
4ad3d4e00f |
Unify var and cache into state subcommand (#178)
Replace `wt config var` and `wt config cache` with a unified `wt config state` subcommand that provides consistent get/set/clear semantics for all runtime state. New CLI structure uses key-first subcommands: - `wt config state default-branch get [--refresh]` - `wt config state default-branch set <branch>` - `wt config state default-branch clear` - `wt config state ci-status get [--refresh] [--branch=X]` - `wt config state ci-status clear [--branch=X | --all]` - `wt config state marker get [--branch=X]` - `wt config state marker set <value> [--branch=X]` - `wt config state marker clear [--branch=X | --all]` - `wt config state logs get` - `wt config state logs clear` - `wt config state show` Key changes: - Added ability to manually set/clear default branch - Each key is a subcommand with only its valid flags (type-safe at parse time) - Removed runtime validation since clap handles invalid combinations - Reuse format_relative_time_short for age formatting in logs 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
e3e1319f5f |
Test: enable all modules on Windows (#170)
* Re-add Windows skips for platform-specific tests Two switch tests have fundamental platform differences: - test_switch_execute_failure: On Unix, --execute uses exec() which replaces the process, so no error message is shown. On Windows, spawn-and-wait reports the exit status. - test_switch_missing_argument_shows_hints: Hints display differently. The directives test (test_remove_internal_powershell_directive) passes on all platforms and remains enabled. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Align Windows and Unix behavior for --execute and hints Two fixes to align cross-platform behavior: 1. Fix hints display on Windows: The check for "wt switch" in error messages now also checks for "wt.exe switch" (Windows executable). 2. Fix --execute error handling on Windows: When --execute command fails, Windows now exits with the command's exit code without showing an error message, matching Unix behavior where exec() replaces the process. Enables two previously Windows-skipped tests: - test_switch_execute_failure - test_switch_missing_argument_shows_hints 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Test: enable all modules on Windows Enable all remaining test modules on Windows by removing mod.rs guards. Individual tests that truly require Unix are marked with #[cfg(unix)] or #[cfg_attr(windows, ignore)] at the test level: - internal_flag (2 tests) - spacing_edge_cases (7 tests) - push (9 tests) - list (49 tests) - list_column_alignment (2 tests) - list_config (5 tests) - directives (9 tests) - statusline (7 tests, 2 skipped on Windows due to timing) - user_hooks (19 tests, 1 skipped on Windows due to /tmp path, 1 Unix-only) - merge (66 tests, 3 skipped on Windows due to chmod) - security (9 tests, 1 Unix-only) Total: ~185 additional Windows tests. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
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> |
||
|
Maximilian Roos
|
9df3fbbf70 |
Add wt step for-each command for multi-worktree operations (#138)
Add experimental command to run commands across all worktrees sequentially.
Canonical use case: `wt step for-each -- git pull --autostash`
Features:
- Template variables: {{ branch }}, {{ worktree }}, {{ commit }}, etc.
- JSON context piped to stdin for scripts
- Continues on failure, reports summary at end
- Proper exit code (1) when any worktree fails
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-authored-by: Claude <noreply@anthropic.com>
|
||
|
Maximilian Roos
|
4ee9334d0f |
Add PowerShell directive tests and fix test file cfg placement (#125)
* Add PowerShell directive tests and fix test file cfg placement - Add snapshot tests for PowerShell directives (switch, merge, remove) - Fix misplaced #![cfg(unix)] attributes in test files - Refactor shell config defaults for consistency 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Gate Unix-specific permission tests with #[cfg(unix)] These tests use std::os::unix::fs::PermissionsExt which doesn't exist on Windows. Gate them to only compile and run on Unix platforms. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Retrigger CI 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Normalize PowerShell remove test output for cross-platform compatibility The removal message varies between platforms due to worktree/branch state detection differences. Add filter to normalize the message in snapshots. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Normalize doubled ANSI codes in PowerShell remove test Unix outputs [36m[36m (doubled), Windows outputs [36m (single). Add filter to normalize this platform difference. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Skip PowerShell remove test on Windows due to ANSI escape code differences Unix and Windows handle ANSI escape code output differently: - Unix: ESC[36mESC[36m (doubled) - Windows: ESC[36m (single) This is a snapshot compatibility issue only - the actual Set-Location directive works correctly on both platforms. Skip the test on Windows to unblock CI while keeping test coverage on Unix. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Escape Windows paths in regex filters for snapshot tests Windows paths contain backslashes which are interpreted as regex escape sequences. Use regex::escape() to properly escape paths before using them as filter patterns in insta snapshot settings. Fixed in: - tests/common/mod.rs: setup_snapshot_settings_with_home, setup_home_snapshot_settings - tests/integration_tests/hook_show.rs: test_hook_show_with_both_configs - tests/integration_tests/statusline.rs: claude_code_snapshot_settings 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Set USERPROFILE for Windows home directory detection in tests The `home` crate uses USERPROFILE (not HOME) to detect the home directory on Windows. Add USERPROFILE to set_temp_home_env() so that format_path_for_display() correctly replaces paths with ~ on Windows. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Filter out Windows-specific PowerShell lines in snapshot tests On Windows, PowerShell is detected as a shell to configure, adding extra lines to config show output. Filter these out so snapshots remain compatible across platforms. Also removed duplicate Broken pipe filter. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Canonicalize worktree path for is_current comparison on Windows On Windows, paths from `git worktree list --porcelain` may have different formats than paths from `git rev-parse --show-toplevel` (which are canonicalized). Canonicalize both paths before comparison to ensure the current worktree is correctly identified. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Add forward-slash path filters for Windows JSON output On Windows, paths in JSON output may have forward slashes (after the backslash conversion filter). Add filters for both backslash and forward-slash versions of repo and worktree paths to ensure proper replacement regardless of filter application order. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Add wt.exe→wt filter for Windows help output On Windows, clap shows 'wt.exe' instead of 'wt' in help output. Add filter to normalize this for cross-platform snapshot consistency. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Add USERPROFILE env var to switch and post_start tests On Windows, the `home` crate uses USERPROFILE instead of HOME. Test helper functions that set HOME also need to set USERPROFILE for path normalization (format_path_for_display) to work correctly. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Add USERPROFILE redaction for env metadata in snapshots On Windows, tests that set USERPROFILE will have it captured in snapshot metadata. Add redaction to normalize it to [TEST_HOME]. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Normalize trailing ANSI resets in help output for Windows Windows terminal strips trailing \x1b[0m reset codes that Unix includes. Add filters to remove these trailing resets for cross-platform consistency. Update all help snapshots to not include trailing resets. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Add trailing ANSI reset filter to setup_snapshot_settings Windows terminal strips trailing \x1b[0m reset codes that Unix includes. Add the same filter used in help.rs to the central setup_snapshot_settings function so all snapshot tests normalize trailing resets consistently. Update 150+ snapshots to remove trailing ANSI reset codes. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix ANSI-to-HTML conversion for snapshots with stripped trailing resets The trailing ANSI reset filter (for Windows compatibility) strips [0m codes from line endings, causing the ansi-to-html library to produce malformed HTML with tags spanning across lines. Fix by adding reset codes back at line boundaries in readme_sync before HTML conversion. This ensures each line gets proper HTML tag closure. Also update inline snapshots in config_show.rs to match the new filter behavior. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Use dunce for cross-platform path canonicalization in tests On Windows, std::fs::canonicalize() returns verbatim paths (\\?\C:\...) which git cannot handle, causing 120 test failures with errors like: fatal: could not create leading directories of '//?/C:/...' The dunce crate provides a drop-in replacement that strips the verbatim prefix when safe, while on Unix it's a no-op wrapper. This fixes Windows CI while preserving macOS symlink resolution (/var -> /private/var). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix formatting * Use dunce for path canonicalization in source code The dunce crate strips Windows verbatim path prefixes (\\?\) which external tools like git cannot handle. This complements the test utilities fix by also updating the main source code: - src/git/repository/mod.rs: git_common_dir, git_dir, worktree_root - src/commands/worktree.rs: switch_to_existing helper - src/commands/list/collect.rs: current worktree and path mismatch detection On Unix, dunce::canonicalize is a no-op wrapper around std::fs::canonicalize, so there's no behavioral change on macOS/Linux. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Add tilde-prefixed path filters and APPDATA env for Windows On Windows, temp directories are under the user's home directory (C:\Users\<user>\AppData\Local\Temp), so format_path_for_display() converts them to tilde-prefixed paths (~/AppData/Local/Temp/...). The existing snapshot filters work on absolute paths but miss these tilde-prefixed paths. Add filters for: - Tilde-prefixed repo paths - Tilde-prefixed worktree paths Also set APPDATA env var in set_temp_home_env() to redirect etcetera's config_dir() (which uses %APPDATA% on Windows) to the temp home, ensuring fish completions go to the expected ~/.config/ location. Note: Canonicalize home_dir() as well, since on Windows home::home_dir() may return a short path (C:\Users\RUNNER~1) while dunce::canonicalize returns the long path (C:\Users\runneradmin), causing strip_prefix to fail. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix ANSI styling filter to be Windows-only The previous filter converted ESC[2m (dim) to ESC[1m (bold) on all platforms, breaking Unix tests that expected dim styling. Changed to Windows-only filter that converts ESC[1m (bold) to ESC[2m (dim), matching how clap renders backticked text differently per platform: - Windows: bold (ESC[1m) - Unix: dim (ESC[2m) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Remove ANSI bold-to-dim filter that broke application styling The filter was converting ALL bold (ESC[1m) to dim (ESC[2m), which broke the application's intentional bold styling in warning messages and other output - not just clap help text. Reverting to see the actual Windows-only failures without this filter. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Filter out select command from Windows help tests The select command is Unix-only (#[cfg(unix)]) because it uses TUI. On Windows, help output doesn't include the select command, so filter it out for cross-platform snapshot consistency. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix Windows help test styling and skip bare repo merge test - Add filter to convert Windows backtick-quoted text to ANSI bold (clap uses backticks instead of ANSI codes on Windows) - Skip test_bare_repo_merge_workflow on Windows due to file locking issues that prevent worktree removal during background cleanup 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Skip platform-specific tests and fix hardcoded paths on Windows - help.rs: Skip entire module on Windows (clap markdown formatting differs) - init.rs: Skip on Windows (shell scripts for bash/zsh/fish, CRLF issues) - readme_sync.rs: Skip on Windows (depends on help output formatting) - list.rs: Use std::env::temp_dir() instead of hardcoded /tmp - remove.rs: Skip 3 tests on Windows (file locking prevents removal) - user_hooks.rs: Skip pre-remove test on Windows (uses /tmp, file locking) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Skip additional platform-specific tests on Windows - merge.rs: Skip 4 README example tests (use Unix shell commands) - post_start_commands.rs: Skip JSON stdin test (uses `cat` command) - statusline.rs: Skip 3 Claude Code tests (JSON path escaping) - switch.rs: Skip execute failure and hints tests (shell behavior) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Allow dead_code for Windows-only unused test utilities The test_env_vars method and ExponentialBackoff.timeout field are only used by Unix PTY tests (approval_pty.rs, select.rs, progressive_output.rs). On Windows, these items appear unused because the PTY tests are cfg-gated. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Update snapshots after merge from main Syncs snapshot formatting with main branch ANSI code changes. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Extract canonicalize() to shared path module - Move duplicated canonicalize() wrapper to src/path.rs - Update imports in git/repository/mod.rs, commands/worktree.rs, commands/list/collect.rs - Clarify comment in shell_exec.rs for bash path detection The canonicalize() function wraps dunce::canonicalize() to handle Windows verbatim paths (\\?\) that external tools like git cannot handle. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Reorder imports in worktree.rs 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * Use dunce::canonicalize directly instead of wrapper Remove the thin wrapper function and import dunce::canonicalize directly at call sites. The wrapper provided no additional logic. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> |
||
|
Maximilian Roos
|
1460d55352 |
Move test modules into integration_tests directory
Reorganize git_error_display and output_system_guard test modules into the integration_tests directory and update mod.rs to include them. Move corresponding snapshot files to the new location. |
||
|
Maximilian Roos
|
b2048db58a |
feat: Add user-level hooks that run for all repositories, add wt hook show (#118)
* feat: Add user-level hooks that run for all repositories
Implement a new user hooks system that allows developers to define
personal hooks in `~/.config/worktrunk/config.toml` that execute for
all repositories. User hooks complement project hooks with these key
differences:
- **Scope**: Run for all repositories (vs. single repository)
- **Location**: User config file (vs. `.config/wt.toml`)
- **Approval**: Not required (user implicitly approves via config)
- **Execution order**: Run before project hooks
- **Skip behavior**: Skipped together with project hooks via `--no-verify`
### Implementation Details
**Configuration syntax** (same as project hooks):
```toml
[post-create]
setup = "echo 'Setting up worktree...'"
[pre-merge]
notify = "notify-send 'Merging {{ branch }}'"
```
**Hook types supported**: post-create, post-start, pre-commit, pre-merge,
post-merge, pre-remove
**Template variables**: Support all project hook variables plus `remote_url`
for repository-specific conditional logic
**New data structures**:
- `HookSource` enum: Distinguishes user vs. project hooks
- `prepare_user_commands()`: Expands user hook templates without approval
**Updated hook pipeline**:
- `HookPipeline::run_sequential()`: Accepts `HookSource` instead of
`phase` and `label_prefix`
- `HookPipeline::spawn_background()`: Renamed from `spawn_detached()` for
consistency
### Documentation Updates
- Updated help text and documentation to clarify `--no-verify` skips all
hooks (both user and project)
- Added "User hooks" section to config documentation with examples
- Added comparison table showing key differences from project hooks
- Added use cases and filtering examples
### Tests
Added comprehensive integration test suite (`tests/integration_tests/user_hooks.rs`)
covering:
- Basic execution of all hook types
- Execution order (user before project)
- No approval required for user hooks
- `--no-verify` skips all hooks
- Failure handling and behavior
- Template variable expansion
- Background hook execution
- Combined user and project hook scenarios
* Refine hooks: document remote_url, consolidate check
- Document remote_url template variable in cli.rs (syncs to docs)
- Move check_any_hook_configured into run_hook_with_filter
- Simplify standalone hook match arms
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
* Update snapshots for symmetric project hook labeling
Project hooks now show "project" prefix (e.g., "Running project pre-merge")
for consistency with user hook labeling.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
* Update docs to reflect user hooks in all hook references
- wt hook intro: Mention both user and project hooks
- --no-verify: Change "skip project hooks" to "skip all hooks"
- User config comment: Clarify verify skips all hooks
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
* Add `wt hook show` command to display configured hooks with approval status
Adds a new `show` subcommand to `wt hook` that displays all configured hooks
from both user and project config files with their approval status. Project
hooks show a ❓ indicator when they require approval.
Features:
- Lists hooks organized by type (post-create, post-start, pre-commit, etc.)
- Shows both user-level hooks (run for all repos) and project-specific hooks
- Displays approval status for project hooks (❓ = needs approval)
- Optional `--expanded` flag to show template variables substituted with current context
- Optional hook type filter to show only specific hook types
- Output is displayed through a pager (like git help) when available
Also reorders hook subcommands to put `show` first, making hook inspection
the primary entry point before hook execution commands.
* feat: Add user-level hooks that run for all repositories
Personal hooks in ~/.config/worktrunk/config.toml now run automatically
before project hooks for all worktree operations. User hooks don't require
approval and use the same syntax and template variables as project hooks.
Changes:
- Add user hook support for all hook types (post-create, post-start,
pre-commit, pre-merge, post-merge, pre-remove)
- User hooks run before project hooks in execution order
- Skip all hooks with --no-verify (applies to both user and project)
- Add remote_url template variable for repository-aware filtering
- Update documentation and help text to reflect user hooks
- Refine hook labeling to distinguish "user" vs "project" hooks in output
- Add comprehensive integration tests for user hook functionality
* feat: Add user-level hooks and improve hook infrastructure
User hooks enable personal, repository-agnostic automations while maintaining
team standards via project hooks. Key improvements:
- User hooks defined in ~/.config/worktrunk/config.toml run before project hooks
- User hooks don't require approval (user implicitly approves by defining them)
- Post-start logs now include source prefix to avoid collisions (user/project)
- remote_url template variable added for conditional hook logic
- Hook output labels distinguish user vs project hooks for clarity
- All hooks skipped together via --no-verify flag
- --no-verify help text simplified from "Skip project hooks" to "Skip hooks"
Implementation:
- HookSource enum tracks whether hooks are user or project
- prepare_user_commands() handles user hooks (no approval needed)
- Hook pipeline shows source in output: "Running user pre-merge" vs "Running project pre-merge"
- Background operation names include source to prevent log file collisions
* feat: support SSH URLs and improve branch name escaping
Add support for ssh:// URL format in git remote parsing to handle
SSH URLs alongside existing git@ and https:// formats.
Improve branch name escaping for git config keys by using hex encoding
(-XX format) instead of percent-encoding, ensuring all non-alphanumeric
characters (except . and -) are properly escaped. This handles UTF-8
multi-byte sequences and enables reliable round-trip encoding/decoding
of branch names containing /, _, and other special characters.
* feat: Add user-level hooks and improve hook infrastructure
User hooks enable personal, repository-agnostic automations while maintaining
team standards via project hooks. Key improvements:
- User hooks defined in ~/.config/worktrunk/config.toml run before project hooks
- User hooks don't require approval (user implicitly approves by defining them)
- Post-start logs now include source prefix to avoid collisions (user/project)
- remote_url template variable added for conditional hook logic
- Hook output labels distinguish user vs project hooks for clarity
- All hooks skipped together via --no-verify flag
- --no-verify help text simplified from "Skip project hooks" to "Skip hooks"
Implementation:
- HookSource enum tracks whether hooks are user or project
- prepare_user_commands() handles user hooks (no approval needed)
- Hook pipeline shows source in output: "Running user pre-merge" vs "Running project pre-merge"
- Background operation names include source to prevent log file collisions
* Fix pre-remove hook approval with "Approve at the Gate" pattern
The pre-remove hook execution was incorrectly using auto_trust=true,
bypassing approval prompts. This commit introduces a design pattern
where approval happens exactly once at command entry points:
- Add collect_and_approve_hooks() helper for upfront approval
- wt remove now approves pre-remove hooks before any execution
- Add --force flag to skip approval prompts
- Thread auto_trust parameter through handle_remove_output
The pattern ensures approval happens at the "gate" (command entry),
eliminating error-prone threading of auto_trust through execution layers.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
* Remove pending snapshot file from statusline tests
The .statusline.rs.pending-snap file is no longer needed and should not be committed to version control.
* Implement "Approve at the Gate" pattern for all project hooks
Moves approval prompts to command entry points instead of hook execution.
Commands are now approved once in a batch before any hooks run, with template
expansion so users see actual values (branch names, paths) instead of
placeholders. This eliminates redundant prompts and simplifies the execution
layer by removing the `auto_trust` parameter threading.
Key changes:
- Rename `collect_and_approve_hooks()` to `collect_and_approve_hooks_with_context()`
and add `expand_commands_for_approval()` for showing expanded templates in prompts
- Remove `auto_trust` parameter from hook execution functions
- Simplify `HookSource::Project` enum variant (no longer carries approval state)
- Add gate approval at `wt switch --create`, `wt remove`, `wt step commit/squash`
- Update merge command collection to expand templates before approval batch
- Remove binary `rust_out` artifact and test snapshot file
* Clarify hook command runs on demand for testing and CI
Update documentation and help text to better explain that `wt hook`
runs hooks independently of normal worktree operations. Changes emphasize
the use cases (testing, CI, re-running after failure) rather than
describing it as "manually" running hooks.
Also simplify phrasing around user hooks and remove unnecessary markdown
formatting for consistency.
* Rename approval and hook functions to simpler names
Update function names to be more concise and consistent:
- `collect_and_approve_hooks_with_context()` → `approve_hooks()`
- `handle_standalone_run_hook()` → `run_hook()`
- `handle_standalone_commit()` → `step_commit()`
- `handle_standalone_add_approvals()` → `add_approvals()`
- `handle_standalone_clear_approvals()` → `clear_approvals()`
Also update documentation examples to reference the new names.
* Handle declined command approvals by skipping hooks while continuing operations
When users decline command approval, hooks are now skipped but the operation
proceeds. This applies consistently across all approval gates: merge, commit,
squash, remove, and hook execution.
Previously, declined approvals would still attempt hook execution. Now, the
verify flag is shadowed based on approval result - if declined, verify becomes
false to gate all subsequent hook execution. For explicit hook runs via
`wt hook`, a declined approval returns early since the entire purpose is hook
execution.
This ensures users have clear control: approving runs hooks, declining skips
them but continues the workflow.
* Fix wt hook approval: filter by name and use consistent target branch
Two fixes for `wt hook` command:
1. Pass name_filter to approval so `wt hook pre-merge --name foo` only
prompts for approval of the "foo" hook, not all hooks of that type.
Added `approve_hooks_filtered()` function that accepts optional name
filter parameter.
2. Use current branch as target for pre-merge/post-merge approval prompts
to match execution. Previously approval used default_branch while
execution used current branch, showing misleading command expansions.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
* Fix wt hook show --expanded to expand {{ target }} for merge/commit hooks
The expand_command_template function now passes hook-specific extra vars:
- PreCommit: target = default branch (for comparison context)
- PreMerge/PostMerge: target = current branch (matches run_hook behavior)
Previously, --expanded would show raw {{ target }} placeholders for these
hook types because extra_vars was always empty.
Also added TODO for pre-remove approval context issue: when removing
another worktree, the approval preview uses current worktree context
instead of the target worktree context.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
---------
Co-authored-by: Claude <noreply@anthropic.com>
|
||
|
Maximilian Roos
|
6a23808e7c |
Refactor output API to use message formatting functions
Update output documentation and implementation to clarify that message formatting functions (success_message, progress_message, etc.) are called first, then passed to output::print(). This separates concerns: formatting functions add emoji and semantic color, while print() handles both interactive and directive modes. Add `wt config shell show-theme` command to preview all message types, gutter formatting, and prompt styling in the terminal. Includes integration test with snapshot verification. |
||
|
Maximilian Roos
|
2462c6961e |
Remove flaky PTY-based list test with timing-dependent output
The test verifies status column rendering that is already covered by non-PTY tests with more stable assertions. Progressive rendering in PTY environments produces timing-dependent output that varies between runs. |
||
|
Maximilian Roos
|
2da8c3304c |
feat(config): Introduce wt config var command
Renames `wt config status` to `wt config var`, allowing the management of various runtime variables stored in git config. This change: - Renames `worktrunk.status.<branch>` to `worktrunk.marker.<branch>` for consistency. - Extends the command to support `get` operations for `default-branch`, `marker`, and `ci-status`. - Updates all references in documentation, plugin hooks, and internal code. |
||
|
Maximilian Roos
|
1be558a785 |
feat: Add GitHub Pages deployment workflows (#65)
* Refactor: Standardize user messages for improved clarity
This commit introduces a set of refinements to user-facing messages across the application. The goal is to ensure consistency in tone, terminology, and presentation, making interactions more intuitive and understandable for users.
* feat: Add a documentation site for Worktrunk
This commit adds the initial scaffolding for the Worktrunk documentation site, built with Zola and a customized Juice theme.
The site includes:
- Basic configuration (`config.toml`)
- Custom SASS styling (`custom.scss`)
- Custom SVG logos and favicons
- Overridden Zola templates (`base.html`, `index.html`, `page.html`)
- Markdown content for:
- Quick Start
- Concepts
- Configuration
- Commands Reference
- Advanced Features
- FAQ
The content is an initial auto-generated draft and requires review for accuracy and completeness before being considered production-ready. A `CLAUDE.md` file is included to highlight this and list necessary verification steps.
* feat: Add GitHub Pages deployment workflows
Build Zola docs site and deploy to worktrunk.dev on push to main.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
---------
Co-authored-by: Claude <noreply@anthropic.com>
|
||
|
Maximilian Roos
|
5414addc2c |
Refactor ClaudeCodeContext parsing and add tests
Refactors the `ClaudeCodeContext` parsing logic into a dedicated `parse` method. Adds comprehensive unit tests for `ClaudeCodeContext::parse` to cover various JSON scenarios, including missing fields. Adds integration tests for `wt beta statusline` covering basic functionality, changes, commits ahead, and Claude Code mode with different JSON contexts. Corrects the documentation for `statusline` command's output behavior in interactive vs. directive modes. |
||
|
Maximilian Roos
|
b55ec5fa7d |
feat(select): Add TUI snapshot tests for wt beta select
|
||
|
Maximilian Roos
|
73138958f6 |
feat: Rename config list to config show and enhance shell integration
Renamed the `wt config list` command to `wt config show` for better clarity. This command now includes enhanced shell integration checks: - Displays shell status for better visibility. - Verifies `compinit` order for Zsh to ensure proper completion loading. |
||
|
Maximilian Roos
|
71aa0ab6cd |
docs: Use Rust test for README snapshot sync
Removes the Python `dev/update-readme.py` script. The README examples are now verified and updated by a new Rust integration test. Adds `bash` syntax highlighting to code blocks and refactors the approval prompt snapshot. |