Merge remote-tracking branch 'origin/blitz/spawn-v2' into spawn-v2/96-tui-picker

Mirrors the web project-picker redesign (#95) in the TUI (#96): step one
lists one box per repository (name, full path); picking one reveals step
two — "+ new" then that repository's worktrees newest-first, defaulting
to "+ new" except on a box that is itself a linked worktree. "+ new"
creates (cwd is the repo, create-worktree on); an existing worktree runs
in it (cwd is that worktree, create-worktree off). Neither step probes
/api/gitroot — only the free-text "Other directory…" hatch does.

Replaces the flat indented project+worktree list from #91/#64 with
projects::group_projects-backed DraftGroup boxes; the filter still
matches a repository via its own name/path or any of its worktrees.

crates/maestro-tui/src/app.rs

@@ -1349,7 +1349,9 @@ mod tests {
         for c in "crimson-otter".chars() {
             app.handle_draft_input(&InputKey::char(c));
         }
-        app.handle_draft_input(&InputKey::Tab); // → advanced disclosure (collapsed, #93)
+        app.handle_draft_input(&InputKey::Tab); // → worktree toggle
+        app.handle_draft_input(&InputKey::Tab); // → branch mode
+        app.handle_draft_input(&InputKey::Tab); // → new-branch name
         app.handle_draft_input(&InputKey::Tab); // → submit
 
         match app.handle_draft_input(&InputKey::Enter).as_slice() {
@@ -1551,8 +1553,8 @@ mod tests {
             panic!("expected a draft pane");
         };
         assert_eq!(draft.command(), "aider");
-        assert_eq!(draft.rows.len(), 1);
-        assert_eq!(draft.rows[0].project.name, "maestro");
+        assert_eq!(draft.groups.len(), 1);
+        assert_eq!(draft.groups[0].main.name, "maestro");
         assert_eq!(draft.home_dir, "/home/u");
         assert_eq!(draft.name.value(), "crimson-otter");
     }

web/src/spawnForm.ts

@@ -152,38 +152,33 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
       </div>
     </div>
     <fieldset class="worktree">
-      <button type="button" class="tree-folder-header wt-toggle" aria-expanded="false">
-        <span class="chevron">▾</span>
-        <span class="folder-name">Advanced options</span>
-        <span class="wt-summary"></span>
-      </button>
-      <div class="wt-collapsible" hidden>
+      <legend>
         <label class="row-inline">
           <input type="checkbox" name="worktree_enabled" />
           Create git worktree
         </label>
-        <p class="wt-hint" hidden></p>
-        <div class="wt-body" hidden>
-          <p class="wt-repo"></p>
-          <div class="wt-mode" role="radiogroup" aria-label="Branch source">
-            <label class="row-inline">
-              <input type="radio" name="worktree_branch_mode" value="new" />
-              New branch
-            </label>
-            <label class="row-inline">
-              <input type="radio" name="worktree_branch_mode" value="existing" />
-              Existing branch
-            </label>
-          </div>
-          <label class="wt-new-wrap">
-            Branch
-            <input name="worktree_branch" type="text" placeholder="feat/foo" autocomplete="off" />
+      </legend>
+      <p class="wt-hint" hidden></p>
+      <div class="wt-body" hidden>
+        <p class="wt-repo"></p>
+        <div class="wt-mode" role="radiogroup" aria-label="Branch source">
+          <label class="row-inline">
+            <input type="radio" name="worktree_branch_mode" value="new" />
+            New branch
           </label>
-          <label class="wt-exist-wrap" hidden>
-            Branch
-            <select class="branch-select"></select>
+          <label class="row-inline">
+            <input type="radio" name="worktree_branch_mode" value="existing" />
+            Existing branch
           </label>
         </div>
+        <label class="wt-new-wrap">
+          Branch
+          <input name="worktree_branch" type="text" placeholder="feat/foo" autocomplete="off" />
+        </label>
+        <label class="wt-exist-wrap" hidden>
+          Branch
+          <select class="branch-select"></select>
+        </label>
       </div>
     </fieldset>
     <p class="form-error" role="alert" aria-live="polite"></p>
@@ -205,9 +200,6 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
   const cwdRawWrap = form.querySelector(".cwd-raw-wrap") as HTMLElement;
   const cwdRaw = form.querySelector(".cwd-raw") as HTMLInputElement;
   const wtEnabled = form.querySelector("input[name=worktree_enabled]") as HTMLInputElement;
-  const wtToggle = form.querySelector(".wt-toggle") as HTMLButtonElement;
-  const wtCollapsible = form.querySelector(".wt-collapsible") as HTMLElement;
-  const wtSummary = form.querySelector(".wt-summary") as HTMLElement;
   const wtHint = form.querySelector(".wt-hint") as HTMLElement;
   const wtBody = form.querySelector(".wt-body") as HTMLElement;
   const wtRepo = form.querySelector(".wt-repo") as HTMLElement;
@@ -534,11 +526,9 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
     markActiveChoice();
     if (choice === "new") {
       wtEnabled.checked = true;
-      updateWtSummary();
       applyProjectRepo(group.main.base_repo ?? group.main.path);
     } else {
       wtEnabled.checked = false;
-      updateWtSummary();
       inferredBaseRepo = null;
       wtBody.hidden = true;
       wtHint.hidden = true;
@@ -671,18 +661,6 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
     return p;
   }
 
-  // ---- worktree: disclosure (#93), reuses the sidebar's folder-header ---
-  let advancedCollapsed = true;
-  function setAdvancedCollapsed(collapsed: boolean): void {
-    advancedCollapsed = collapsed;
-    wtToggle.setAttribute("aria-expanded", String(!collapsed));
-    wtCollapsible.hidden = collapsed;
-  }
-  function updateWtSummary(): void {
-    wtSummary.textContent = wtEnabled.checked ? "creates a worktree" : "no worktree";
-  }
-  wtToggle.addEventListener("click", () => setAdvancedCollapsed(!advancedCollapsed));
-
   // ---- worktree (branch-only; base_repo inferred via scan or /gitroot) --
   // The project scan already reports repo membership, so a picked project
   // resolves its base repo locally (#61); only the free-text escape hatch
@@ -763,7 +741,6 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
       // Publish the untick too, or the next render seeds the box checked with
       // no inferred repo and submitting fails.
       wtEnabled.checked = false;
-      updateWtSummary();
       emit();
       wtBody.hidden = true;
       wtHint.hidden = false;
@@ -837,7 +814,6 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
   branchSelect.addEventListener("change", () => emit());
 
   wtEnabled.addEventListener("change", () => {
-    updateWtSummary();
     emit();
     if (wtEnabled.checked) {
       resolveBaseRepo();
@@ -851,7 +827,6 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
   // The toggle defaults ON (#61): the operator almost always wants a
   // worktree, and every non-repo target unticks it via the gitroot probe.
   wtEnabled.checked = prefill.worktreeEnabled ?? true;
-  updateWtSummary();
   if (prefill.worktreeBranch) branchInput.value = prefill.worktreeBranch;
   setBranchMode(branchMode);
 

web/src/spawnFormWorktree.test.ts

@@ -180,59 +180,6 @@ describe("spawnForm worktree defaults and branch picker (#61)", () => {
     expect(modes.at(-1)).toBe("existing");
   });
 
-  it("collapses the advanced (worktree) section by default (#93)", async () => {
-    const form = await mount();
-    const toggle = form.querySelector<HTMLButtonElement>(".wt-toggle")!;
-    expect(toggle.getAttribute("aria-expanded")).toBe("false");
-    expect(form.querySelector<HTMLElement>(".wt-collapsible")!.hidden).toBe(true);
-  });
-
-  it("states in the collapsed header that a worktree will be created by default (#93)", async () => {
-    const form = await mount();
-    expect(form.querySelector<HTMLElement>(".wt-summary")!.textContent).toMatch(/creates? a worktree/i);
-  });
-
-  it("states in the collapsed header that no worktree will be created for a worktree row (#91, #93)", async () => {
-    urls = stubFetch({
-      projects: [
-        {
-          path: "/home/user/wt-91",
-          name: "wt-91",
-          is_worktree: true,
-          base_repo: "/home/user/maestro",
-          last_activity: "2026-08-20T10:00:00Z",
-        },
-      ],
-    });
-    handle = createSpawnForm({ onSuccess() {} });
-    document.body.appendChild(handle.el);
-    for (let i = 0; i < 40; i++) await Promise.resolve();
-
-    handle.el
-      .querySelectorAll<HTMLButtonElement>(".project-box")
-      .forEach((box) => box.dataset.cwd === "/home/user/wt-91" && box.click());
-    await drain();
-
-    expect(handle.el.querySelector<HTMLElement>(".wt-summary")!.textContent).toMatch(/no worktree/i);
-    // Still collapsed — picking a project must not force it open.
-    expect(handle.el.querySelector<HTMLButtonElement>(".wt-toggle")!.getAttribute("aria-expanded")).toBe(
-      "false",
-    );
-  });
-
-  it("expanding the advanced section does not reorder the fields above it (#93)", async () => {
-    const form = await mount();
-    const before = [...form.querySelectorAll(".field")];
-
-    form.querySelector<HTMLButtonElement>(".wt-toggle")!.click();
-
-    expect(form.querySelector<HTMLButtonElement>(".wt-toggle")!.getAttribute("aria-expanded")).toBe(
-      "true",
-    );
-    expect(form.querySelector<HTMLElement>(".wt-collapsible")!.hidden).toBe(false);
-    expect([...form.querySelectorAll(".field")]).toStrictEqual(before);
-  });
-
   it("does not repopulate a destroyed form when the branch list lands late", async () => {
     const gate: { release?: () => void } = {};
     urls = stubFetch({ gateBranches: (r) => (gate.release = r) });

web/src/styles.css

@@ -1284,33 +1284,18 @@ textarea {
 .worktree {
   border: 1px solid var(--border);
   border-radius: var(--r-2);
-  padding: 0 var(--sp-3);
+  padding: var(--sp-3);
   margin: 0;
   display: flex;
   flex-direction: column;
+  gap: var(--sp-3);
   background: color-mix(in oklab, var(--surface-2) 50%, transparent);
 }
 
-.worktree .wt-toggle {
-  margin: 0 calc(var(--sp-3) * -1);
-  padding-left: var(--sp-3);
-  width: calc(100% + var(--sp-3) * 2);
-}
-
-.wt-summary {
-  color: var(--muted);
-  font-size: var(--fs-12);
-}
-
-.wt-collapsible {
-  display: flex;
-  flex-direction: column;
-  gap: var(--sp-3);
-  padding-bottom: var(--sp-3);
-}
-
-.wt-collapsible[hidden] {
-  display: none;
+.worktree legend {
+  padding: 0 6px;
+  color: var(--ink);
+  font-size: var(--fs-13);
 }
 
 .form-error {