feat: support removing multiple worktrees at once by Jercik · Pull Request #19 · Jercik/worktree-remove

Jercik · 2026-02-26T19:34:11Z

Summary

CLI argument changes from [target] to variadic [target...], allowing worktree-remove feat/a feat/b feat/c
Interactive mode (-i) now uses a multi-select checkbox instead of single-select
Unified orchestration: all targets (single or multiple) route through removeBatch, eliminating the duplicated resolution/preflight logic that previously existed in removeWorktree
Batch path resolves all targets upfront, checks all for uncommitted changes with a single prompt, confirms once, then removes in parallel (p-limit, concurrency 4)
Single-target invocations get compact confirmation prompts and skip the batch summary
performWorktreeRemoval returns a discriminated union (status: "ok" | "failed" | "cancelled") so batch accounting accurately tracks failures and user cancellations exit cleanly

Test plan

pnpm exec vitest run — all 53 tests pass
pnpm exec tsc -b --noEmit — type-check passes
pnpm exec eslint src/ — no lint errors
pnpm run fta — all files under complexity threshold
Manual: node --experimental-strip-types src/cli.ts -i — shows checkbox multi-select
Manual: node --experimental-strip-types src/cli.ts branch1 branch2 — removes both
Manual: node --experimental-strip-types src/cli.ts --dry-run -i — shows what would be removed for multiple selections

Add multi-select to both interactive and non-interactive modes: - CLI argument changes from [target] to variadic [target...] - Interactive mode uses checkbox (multi-select) instead of single select - Batch path resolves all targets upfront, checks uncommitted changes once, confirms in a single prompt, then removes in parallel (p-limit) - Single target still uses the existing removeWorktree flow

…ccounting performWorktreeRemoval has failure paths that return without throwing, causing Promise.allSettled to count them as fulfilled. The batch summary would over-report success (e.g. "Removed 2 of 2" when one failed). Return { ok: boolean } so removeBatch can accurately track outcomes.

Route all targets through removeBatch, eliminating the duplicated resolution/preflight logic in removeWorktree. The batch path now handles n=1 with appropriate singular grammar and compact confirmation prompts. Delete remove-worktree.ts entirely. Extract cwd-switch detection and handling into handle-cwd-switch.ts to keep remove-batch.ts within complexity thresholds.

- Return ok:false from performWorktreeRemoval when git unregister fails - Force-skip internal prompts in multi-target batch (prevents concurrent readline races since user already confirmed in Phase 2) - Use "Would remove" instead of "Removed" in dry-run summary - Log explicit failure line for fulfilled-but-not-ok results - Deduplicate targets by normalized path before processing

- prepareCwdSwitch now finds the actual target containing cwd instead of always using the first target's name - performWorktreeRemoval returns ok:false when git unregister fails - Multi-target batch passes force:true to skip internal prompts - Dry-run summary uses "Would remove" wording - Batch summary logs explicit failure for fulfilled-but-not-ok results

Add `skipTrashFailurePrompt` to `performWorktreeRemoval` so batch mode can prevent concurrent readline races without also enabling destructive fallback when trash fails. Multi-target batches now report trash failures as errors instead of silently proceeding with `git worktree remove --force`. Also error when all batch targets resolve to empty instead of silently returning success (regression from the single-target path).

Single-target failures now exit with code 1, matching multi-target behavior. Previously, single-target mode skipped Phase 4 entirely, causing performWorktreeRemoval failures to silently exit 0.

Use a discriminated union (status: "ok" | "failed" | "cancelled") for PerformWorktreeRemovalResult instead of a boolean. Single-target user cancellation (declining the trash-failure prompt) now exits cleanly with code 0 instead of being misreported as a failure with code 1.

Add comment explaining why resolution exits immediately on invalid targets — it runs before confirmation or removal, so no worktrees are modified yet.

Wrap the OutputWriter with target-name prefixes (e.g., [foo] Moving directory to trash...) for multi-target batches so interleaved parallel output is attributable. Single-target mode is unchanged. Extract prefixOutput into output-writer.ts and batch result reporting into report-batch-results.ts to keep remove-batch.ts under the FTA complexity threshold.

github-actions · 2026-02-27T08:51:43Z

🎉 This PR is included in version 1.4.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

This comment was marked as resolved.

Sign in to view

This comment has been minimized.

Sign in to view

This comment was marked as resolved.

Sign in to view

fix: exit with code 1 for single-target removal failures

2a08d95

Single-target failures now exit with code 1, matching multi-target behavior. Previously, single-target mode skipped Phase 4 entirely, causing performWorktreeRemoval failures to silently exit 0.

This comment was marked as resolved.

Sign in to view

docs: clarify fail-fast resolution in batch target loop

a14e431

Add comment explaining why resolution exits immediately on invalid targets — it runs before confirmation or removal, so no worktrees are modified yet.

This comment was marked as resolved.

Sign in to view

Jercik merged commit c75efbf into main Feb 27, 2026
5 checks passed

Jercik deleted the multiple-choice branch February 27, 2026 08:51

github-actions Bot added the released label Feb 27, 2026

Conversation

Jercik commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

Uh oh!

github-actions Bot commented Feb 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Jercik commented Feb 26, 2026 •

edited

Loading