dries/ocman

Fork 1

feat(worktree): delete worktrees from the Worktrees view #174

Merged

dries merged 2 commits from feat/worktree-delete into main

2026-06-28 23:02:09 +02:00

dries commented

2026-06-28 16:09:25 +02:00

Owner

Summary

Adds a Delete action to each row in the Worktrees view — closes the gap where ocman created worktrees but never cleaned them up.
worktree.Remove shells out to git worktree remove [--force]; git enforces the guards (refuses the main checkout and a dirty tree), classified into ErrMainWorktree / ErrWorktreeDirty.
Wired through the hostsvc.Host seam (local + remote gRPC), so it works for remote hosts too. New RemoveWorktree RPC.
POST /api/worktree/remove (localhost-only): 404 non-repo, 409 main/dirty, 502 otherwise.
UI: per-row Delete with a two-step confirm, disabled on the main worktree, plus a Force delete retry when the tree is dirty (409).

Out of scope (deliberate)

Auto-reaper on session end — data-loss risk, needs the state.db ownership tracking v1 avoided. Add when manual delete proves insufficient.

Testing

make lint + make test green (1322 frontend tests, full Go suite).
New: worktree pkg (happy / main-refused / dirty+force / classify), local Host, 4 handler tests, 2 frontend api tests.

## Summary - Adds a **Delete** action to each row in the Worktrees view — closes the gap where ocman created worktrees but never cleaned them up. - `worktree.Remove` shells out to `git worktree remove [--force]`; git enforces the guards (refuses the main checkout and a dirty tree), classified into `ErrMainWorktree` / `ErrWorktreeDirty`. - Wired through the `hostsvc.Host` seam (local + remote gRPC), so it works for remote hosts too. New `RemoveWorktree` RPC. - `POST /api/worktree/remove` (localhost-only): 404 non-repo, 409 main/dirty, 502 otherwise. - UI: per-row Delete with a two-step confirm, disabled on the main worktree, plus a **Force delete** retry when the tree is dirty (409). ## Out of scope (deliberate) - Auto-reaper on session end — data-loss risk, needs the state.db ownership tracking v1 avoided. Add when manual delete proves insufficient. ## Testing - `make lint` + `make test` green (1322 frontend tests, full Go suite). - New: worktree pkg (happy / main-refused / dirty+force / classify), local Host, 4 handler tests, 2 frontend api tests.

dries added 1 commit

2026-06-28 16:09:25 +02:00

feat(worktree): delete worktrees from the Worktrees view

CI / Frontend (pull_request) Successful in 3m25s

Details

CI / Backend (pull_request) Successful in 3m37s

Details

CI / Build Desktop (macOS arm64) (pull_request) Successful in 50s

Details

CI / Playwright E2E (pull_request) Successful in 7m18s

Details

CI / Build (pull_request) Successful in 4m20s

Details

CI / Semantic Tag (pull_request) Has been skipped

Details

CI / Coverage Ratchet (pull_request) Failing after 5m19s

Details

5f862e9178

Adds a Delete action to each worktree row, wired through the hostsvc.Host
seam so it works for remote hosts too.

- worktree.Remove shells out to `git worktree remove [--force]`; git
  enforces the guards (refuses the main checkout and a dirty tree),
  classified into ErrMainWorktree / ErrWorktreeDirty.
- Host.RemoveWorktree on the local + remote (gRPC) hosts; new
  RemoveWorktree RPC.
- POST /api/worktree/remove (localhost-only): 404 non-repo, 409
  main/dirty, 502 otherwise.
- UI: per-row Delete with two-step confirm and a Force delete retry on a
  dirty worktree.

forgejo-actions commented

2026-06-28 16:18:19 +02:00

Coverage ratchet: ✅ pass

Suite	Baseline	This PR	Δ
go	69.40%	69.40%	+0.00	✅
frontend	56.96%	57.39%	+0.43	✅

Tolerance: -0.1%. Baseline stored on gh-pages.

### Coverage ratchet: ✅ pass | Suite | Baseline | This PR | Δ | | |---|---|---|---|---| | go | 69.40% | 69.40% | +0.00 | ✅ | | frontend | 56.96% | 57.39% | +0.43 | ✅ | _Tolerance: -0.1%. Baseline stored on `gh-pages`._

dries added 1 commit

2026-06-28 16:59:07 +02:00

test(worktree): cover WorktreesView delete flow

CI / Backend (pull_request) Successful in 2m54s

Details

CI / Frontend (pull_request) Successful in 3m18s

Details

CI / Build Desktop (macOS arm64) (pull_request) Successful in 1m4s

Details

CI / Playwright E2E (pull_request) Successful in 7m27s

Details

CI / Build (pull_request) Successful in 4m39s

Details

CI / Coverage Ratchet (pull_request) Successful in 7m20s

Details

CI / Semantic Tag (pull_request) Has been skipped

Details

db7cd7b18f

Exercises the new per-row delete: two-step confirm, success+reload, dirty
409 -> Force delete retry, and non-dirty error surfacing. Raises
WorktreesView.tsx line coverage from 0% (no prior test) to ~77%.