naps62/maestro
Archived
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

e2e: project discovery, worktree spawn on new and existing branches, guarded cleanup #66

New Issue
Closed
opened 2026-08-23 19:29:23 +01:00 by naps62-yolo · 1 comment
naps62-yolo commented 2026-08-23 19:29:23 +01:00
Collaborator
Copy Link
Copy Source

Cover the new spawn path end to end in crates/maestro-e2e, against real git and tmux with a temp $HOME and TMUX_TMPDIR, as the existing tests there do.

  • A temp root holding two git repositories, configured as [spawn].project_roots, is discovered by GET /api/projects, with last_activity reflecting HEAD mtime and spawn history.
  • GET /api/branches lists the repository's branches and flags one already held by a worktree.
  • Spawning with a new branch creates the worktree at <repo>/worktrees/<branch> and the session runs in it.
  • Spawning with an existing branch checks that branch out rather than creating one.
  • A second spawn onto the same branch is rejected rather than producing a broken worktree.
  • Killing the session removes a clean worktree.
  • Killing a session whose worktree has uncommitted changes leaves it on disk and reports it, rather than force-removing.

That last case is the guard the whole "cleanup is unconditional" decision rests on, so it is the one that must not be skipped.

Depends on: #56, #61

Cover the new spawn path end to end in `crates/maestro-e2e`, against real `git` and `tmux` with a temp `$HOME` and `TMUX_TMPDIR`, as the existing tests there do. - A temp root holding two git repositories, configured as `[spawn].project_roots`, is discovered by `GET /api/projects`, with `last_activity` reflecting HEAD mtime and spawn history. - `GET /api/branches` lists the repository's branches and flags one already held by a worktree. - Spawning with a **new** branch creates the worktree at `<repo>/worktrees/<branch>` and the session runs in it. - Spawning with an **existing** branch checks that branch out rather than creating one. - A second spawn onto the same branch is rejected rather than producing a broken worktree. - Killing the session removes a clean worktree. - Killing a session whose worktree has uncommitted changes leaves it on disk and reports it, rather than force-removing. That last case is the guard the whole "cleanup is unconditional" decision rests on, so it is the one that must not be skipped. Depends on: #56, #61
naps62-yolo added this to the Spawn v2 milestone 2026-08-23 19:29:23 +01:00
naps62-yolo added the area/daemondifficulty/mediumtype/test labels 2026-08-23 19:29:23 +01:00
naps62-yolo commented 2026-08-23 23:01:22 +01:00
Author
Collaborator
Copy Link
Copy Source

Integrated into blitz/spawn-v2. All seven cases landed, plus spawn_from_linked_worktree_places_in_main_checkout, which covers the nested-worktree data loss a review caught.

The e2e binary runs 17 tests in 46s, all passing against real tmux and git. The guarded-cleanup case logs what it refused, which is the behaviour the unconditional-cleanup decision rests on:

WARN left worktree on disk path=/tmp/.tmpHOKG2s/worktrees/feature-unsaved
     error=has uncommitted changes
Integrated into `blitz/spawn-v2`. All seven cases landed, plus `spawn_from_linked_worktree_places_in_main_checkout`, which covers the nested-worktree data loss a review caught. The e2e binary runs 17 tests in 46s, all passing against real tmux and git. The guarded-cleanup case logs what it refused, which is the behaviour the unconditional-cleanup decision rests on: ``` WARN left worktree on disk path=/tmp/.tmpHOKG2s/worktrees/feature-unsaved error=has uncommitted changes ```
This repo is archived. You cannot comment on issues.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
area/android
area/cli
area/config
area/daemon
area/protocol
area/tui
area/web
code-review
difficulty/easy
difficulty/hard
difficulty/medium
epic
Tracks a multi-issue epic / parent work item
 tui
type/docs
type/feat
type/fix
type/refactor
type/test
No labels area/daemon difficulty/medium type/test
Milestone
No items
No Milestone Spawn v2
Projects
Clear projects
No projects
Assignees
Clear assignees
hermes (Hermes (agent)) naps62-yolo (naps62-yolo (agent)) resende (Resende) naps62 (Miguel Palhas)
No Assignees
1 Participants
Due Date
No due date set.
Depends on
#56 worktrees land at <repo>/worktrees/<branch>, support existing branches, clean up unconditionally but guarded
naps62/maestro
#61 web: worktree on by default in a repo, with new-or-existing branch
naps62/maestro
Reference: naps62/maestro#66