Merge remote-tracking branch 'origin/main' into tuba

web/src/spawnForm.ts

@@ -11,7 +11,7 @@ import { attachDirAutocomplete } from "./dirAutocomplete.js";
 import { parentDir } from "./paths.js";
 import { filterProjects, groupProjects, isStale, sortProjects } from "./projectList.js";
 import type { ProjectGroup } from "./projectList.js";
-import { splitCommand } from "./toolIcon.js";
+import { splitCommand, toolIconSvg, TOOL_LABELS } from "./toolIcon.js";
 import { abbreviateCwd } from "./types.js";
 import type { BranchInfo, CreateSessionRequest, Project, Session, SpawnPreset } from "./types.js";
 
@@ -140,6 +140,12 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
   const form = document.createElement("form");
   form.className = "spawn-form";
   form.innerHTML = `
+    <div class="field">
+      <span class="field-label">Harness</span>
+      <div class="harness-grid cmd-tiles"></div>
+      <input class="raw-input cmd-raw" name="command_raw" type="text" hidden
+             placeholder="bash -l" autocomplete="off" />
+    </div>
     <div class="field">
       <span class="field-label">Project</span>
       <input class="raw-input project-filter" type="text" placeholder="Filter projects…"
@@ -151,12 +157,6 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
                placeholder="/home/user/project" inputmode="text" autocomplete="off" />
       </div>
     </div>
-    <div class="field">
-      <span class="field-label">Command</span>
-      <div class="tile-row cmd-tiles"></div>
-      <input class="raw-input cmd-raw" name="command_raw" type="text" hidden
-             placeholder="bash -l" autocomplete="off" />
-    </div>
     <div class="advanced">
       <button type="button" class="tree-folder-header wt-toggle" aria-expanded="false">
         <span class="chevron">▾</span>
@@ -348,37 +348,69 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
       command = preset!.command;
     }
     updateStructuredAvailability();
-    for (const tile of cmdTiles.querySelectorAll(".tile")) {
-      tile.classList.toggle("is-active", (tile as HTMLElement).dataset.id === id);
+    for (const card of cmdTiles.querySelectorAll(".harness-card")) {
+      card.classList.toggle("is-active", (card as HTMLElement).dataset.id === id);
     }
     emit();
   }
 
-  /** Re-highlight the operator's already-picked tile after `renderCommandTiles`
-   * rebuilds the row from scratch (new tiles carry no `is-active` class) —
+  /** Re-highlight the operator's already-picked card after `renderCommandTiles`
+   * rebuilds the grid from scratch (new cards carry no `is-active` class) —
    * without touching `command`, since that was already settled. */
   function reapplyActiveTile(): void {
-    for (const tile of cmdTiles.querySelectorAll(".tile")) {
-      tile.classList.toggle("is-active", (tile as HTMLElement).dataset.id === selectedPresetId);
+    for (const card of cmdTiles.querySelectorAll(".harness-card")) {
+      card.classList.toggle("is-active", (card as HTMLElement).dataset.id === selectedPresetId);
     }
   }
 
+  /** Resolve a preset id to a tool icon id. The preset's command is the
+   * source of truth — `splitCommand` extracts the tool the same way the
+   * sidebar does. For the "Custom…" preset (empty command) there is no
+   * tool to show, and a terminal prompt stands in. */
+  function presetToolId(p: SpawnPreset): string | null {
+    if (!p.command) return null;
+    return splitCommand(p.command).tool;
+  }
+
   function renderCommandTiles(): void {
     cmdTiles.replaceChildren();
     for (const p of presets) {
-      const tile = document.createElement("button");
-      tile.type = "button";
-      tile.className = "tile";
-      tile.dataset.id = p.id;
-      tile.innerHTML = `<span class="tile-label">${escapeHtml(p.label)}</span>`;
-      tile.addEventListener("click", () => {
+      const isCustom = p.command === "";
+      const card = document.createElement("button");
+      card.type = "button";
+      card.className = isCustom ? "harness-card harness-custom" : "harness-card";
+      card.dataset.id = p.id;
+      const toolId = presetToolId(p);
+      const iconHtml = isCustom ? customIcon() : toolId ? harnessIcon(toolId) : harnessIcon("shell");
+      const label = TOOL_LABELS[toolId ?? ""] ?? p.label;
+      card.innerHTML =
+        `<span class="harness-icon">${iconHtml}</span>` +
+        `<span class="harness-label">${escapeHtml(isCustom ? "Custom\u2026" : label)}</span>`;
+      card.addEventListener("click", () => {
         commandTouched = true;
         selectPreset(p.id);
       });
-      cmdTiles.appendChild(tile);
+      cmdTiles.appendChild(card);
     }
   }
 
+  /** Render a harness card icon at card size (24x24). Re-uses the SVG bodies
+   * from toolIcon.ts but at a larger viewport so the marks breathe. */
+  function harnessIcon(toolId: string): string {
+    // toolIconSvg renders at 13x13 with viewBox 0 0 16 16 — we want the
+    // same shape at 24x24 for the card context.
+    const small = toolIconSvg(toolId);
+    if (!small) return "";
+    return small
+      .replace(/width="13"/g, 'width="24"')
+      .replace(/height="13"/g, 'height="24"');
+  }
+
+  /** An ellipsis mark for the "Custom…" escape hatch. */
+  function customIcon(): string {
+    return `<svg class="tool-icon" viewBox="0 0 16 16" width="24" height="24" role="img" aria-label="Custom command"><title>Custom command</title><g fill="currentColor"><circle cx="4" cy="8" r="1.3"/><circle cx="8" cy="8" r="1.3"/><circle cx="12" cy="8" r="1.3"/></g></svg>`;
+  }
+
   // Set once the operator picks a tile or types a custom command — guards
   // `applyInitialCommand()` the same way `nameTouched` guards a late name
   // batch: a late `/api/info` resolution must never overwrite a field the
@@ -648,16 +680,13 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
     box.type = "button";
     box.className = `project-box${isStale(project, new Date()) ? " is-stale" : ""}`;
     box.dataset.cwd = project.path;
-    const trees = worktreesOf(group).length;
     // The parent directory only — the last segment is the name line above it.
     // Unabbreviated beyond `~`, since the stem is what tells two projects
     // sharing a basename apart (#95).
     const parent = abbreviateCwd(parentDir(project.path), homeDir);
-    const meta = trees > 0 ? `${trees} worktree${trees === 1 ? "" : "s"}` : "";
     box.innerHTML = `
       <span class="project-name">${escapeHtml(project.name)}</span>
-      <span class="project-path">${escapeHtml(parent)}</span>
-      <span class="project-meta">${escapeHtml(meta)}</span>`;
+      <span class="project-path">${escapeHtml(parent)}</span>`;
     box.addEventListener("click", () => selectProject(group));
     return box;
   }

web/src/spawnFormEnter.test.ts

@@ -139,7 +139,7 @@ describe("spawnForm Enter-to-submit (#97)", () => {
       const form = await mount([MAESTRO]);
       box(form, MAESTRO.path).click();
       await drain();
-      form.querySelector<HTMLButtonElement>('.cmd-tiles .tile[data-id="custom"]')!.click();
+      form.querySelector<HTMLButtonElement>('.cmd-tiles .harness-card[data-id="custom"]')!.click();
       const raw = form.querySelector<HTMLInputElement>(".cmd-raw")!;
       raw.value = "bash -l";
       raw.dispatchEvent(new Event("input"));

web/src/spawnFormPreset.test.ts

@@ -63,7 +63,7 @@ describe("spawnForm preset selection vs. late /api/info (#76)", () => {
     await drain();
 
     // Fallback presets are up; the operator picks "zsh" before /api/info lands.
-    const zshTile = [...form.querySelectorAll<HTMLButtonElement>(".tile")].find(
+    const zshTile = [...form.querySelectorAll<HTMLButtonElement>(".harness-card")].find(
       (t) => t.dataset.id === "zsh",
     )!;
     zshTile.click();
@@ -88,7 +88,7 @@ describe("spawnForm preset selection vs. late /api/info (#76)", () => {
     document.body.appendChild(form);
     await drain();
 
-    const customTile = [...form.querySelectorAll<HTMLButtonElement>(".tile")].find(
+    const customTile = [...form.querySelectorAll<HTMLButtonElement>(".harness-card")].find(
       (t) => t.dataset.id === "custom",
     )!;
     customTile.click();
@@ -116,7 +116,7 @@ describe("spawnForm preset selection vs. late /api/info (#76)", () => {
 
     // Untouched: the refined preset list is still free to settle the command.
     expect(values?.command).toBe("claude");
-    const fishTile = [...form.querySelectorAll<HTMLButtonElement>(".tile")].find(
+    const fishTile = [...form.querySelectorAll<HTMLButtonElement>(".harness-card")].find(
       (t) => t.dataset.id === "fish",
     );
     expect(fishTile).toBeDefined();

web/src/spawnModal.test.ts

@@ -52,14 +52,14 @@ describe("spawn modal", () => {
     expect(host.querySelector(".form-actions .cancel")).toBeTruthy();
   });
 
-  it("opens with the project filter focused, ahead of the command tiles", async () => {
+  it("opens with the project filter focused, harness before project", async () => {
     openSpawnModal({ onSuccess: () => {} });
     await flush();
 
     const form = modal()!.querySelector("form.spawn-form")!;
     expect(document.activeElement).toBe(form.querySelector(".project-filter"));
     const fields = [...form.querySelectorAll(".field .field-label")].map((el) => el.textContent);
-    expect(fields.slice(0, 2)).toEqual(["Project", "Command"]);
+    expect(fields.slice(0, 2)).toEqual(["Harness", "Project"]);
   });
 
   it("titles a seeded open as a clone", async () => {

web/src/structured.test.ts

@@ -933,7 +933,7 @@ describe("structured connection: approvals", () => {
     conn.dispose();
   });
 
-  it("removes the buttons once the approval resolves, even with no accompanying transcript delta", () => {
+  it("hides a standalone resolved approval entirely when no tool group absorbs it", () => {
     const ws = new FakeSocket();
     const conn = mount({ sockets: [ws] });
     ws.open();
@@ -949,7 +949,68 @@ describe("structured connection: approvals", () => {
     // Resolved on another client: state clears with no transcript delta at all.
     ws.emit({ type: "reduced_state", state: idleState });
     expect(conn.el.querySelector(".st-approval-acts")).toBeNull();
-    expect(conn.el.querySelector(".st-approval-resolved")).not.toBeNull();
+    // Standalone resolved approval is hidden — no card, no compact line.
+    expect(conn.el.querySelector(".st-row-approval")).toBeNull();
+    conn.dispose();
+  });
+
+  it("absorbs a resolved approval into the tool group as a compact line", () => {
+    const ws = new FakeSocket();
+    const conn = mount({ sockets: [ws] });
+    ws.open();
+    ws.emit({
+      type: "transcript_snapshot",
+      snapshot: {
+        cursor: 0,
+        rows: [
+          row("user:1", "user", { content: { text: "go" } }),
+          toolRow("tool:1", "first"),
+          row("approval:1", "approval", { toolCall: { title: "Write file.ts" }, options: allApprovalOptions }),
+          toolRow("tool:2", "second"),
+        ],
+      },
+    });
+    ws.emit({ type: "reduced_state", state: idleState });
+    // 2+ tools in the turn → tool group exists; resolved approval is inside it.
+    const group = conn.el.querySelector(".st-tool-group");
+    expect(group).not.toBeNull();
+    const compact = group!.querySelector(".st-approval-compact");
+    expect(compact).not.toBeNull();
+    expect(compact!.textContent).toContain("Write file.ts");
+    expect(compact!.textContent).toContain("approved");
+    // No full-card approval anywhere on the transcript.
+    expect(conn.el.querySelector(".st-approval")).toBeNull();
+    conn.dispose();
+  });
+
+  it("keeps a pending approval standalone even when a tool group exists in the same turn", () => {
+    const ws = new FakeSocket();
+    const conn = mount({ sockets: [ws] });
+    ws.open();
+    ws.emit({
+      type: "transcript_snapshot",
+      snapshot: {
+        cursor: 0,
+        rows: [
+          row("user:1", "user", { content: { text: "go" } }),
+          toolRow("tool:1", "first"),
+          row("approval:1", "approval", { toolCall: { title: "Write file.ts" }, options: allApprovalOptions }),
+          toolRow("tool:2", "second"),
+        ],
+      },
+    });
+    ws.emit({
+      type: "reduced_state",
+      state: { ...idleState, pending_approval: { nonce: "n1", request: { sessionId: "s1", toolCall: {}, options: allApprovalOptions } } },
+    });
+    // Pending approval stays outside the tool group as a full card.
+    const approvalCard = conn.el.querySelector(".st-approval");
+    expect(approvalCard).not.toBeNull();
+    expect(conn.el.querySelectorAll(".st-approval-acts button").length).toBeGreaterThan(0);
+    // It should not be inside the tool group.
+    const group = conn.el.querySelector(".st-tool-group");
+    expect(group).not.toBeNull();
+    expect(group!.querySelector(".st-approval")).toBeNull();
     conn.dispose();
   });
 

web/src/structured.ts

@@ -402,13 +402,15 @@ export function createStructuredConnection(
     return el;
   }
 
-  /** Group tool rows (and intermediate agent text between them) by turn.
-   *  An agent_text/agent_thought row is "intermediate" when a tool row follows
-   *  it in the same turn — it gets absorbed into the group so the collapsed
-   *  block preserves chronological order.  The *last* agent text with no
-   *  subsequent tool stays standalone (the prominent final answer).
-   *  Returns groups keyed by `turn:<userId>`, each with `toolCount` (for the
-   *  header label) and `rows` (tools + intermediate text, in order). */
+  /** Group tool rows (and intermediate agent text / resolved approvals between
+   *  them) by turn.  An agent_text/agent_thought row is "intermediate" when a
+   *  tool row follows it in the same turn — it gets absorbed into the group so
+   *  the collapsed block preserves chronological order.  Resolved approval rows
+   *  (not the currently pending one) are absorbed the same way.  The *last*
+   *  agent text with no subsequent tool stays standalone (the prominent final
+   *  answer).  Returns groups keyed by `turn:<userId>`, each with `toolCount`
+   *  (for the header label) and `rows` (tools + intermediate text/approvals,
+   *  in order). */
   function activityGroupsByTurn(): Map<string, { toolCount: number; rows: TranscriptRow[] }> {
     // First: count tools per turn to know which turns qualify for grouping.
     const toolCounts = new Map<string, number>();
@@ -422,33 +424,35 @@ export function createStructuredConnection(
     // Second: build groups with interleaved text for turns with 2+ tools.
     const groups = new Map<string, { toolCount: number; rows: TranscriptRow[] }>();
     turnId = "before-first-message";
-    // Pending text rows that might be intermediate (not yet confirmed by a
+    // Pending rows that might be intermediate (not yet confirmed by a
     // following tool). If no tool follows, they stay standalone.
-    let pendingText: TranscriptRow[] = [];
+    let pending: TranscriptRow[] = [];
     let currentGid = `turn:${turnId}`;
     for (const row of rows) {
       if (row.kind === "user") {
         turnId = row.id;
         currentGid = `turn:${turnId}`;
-        pendingText = [];
+        pending = [];
         continue;
       }
       const count = toolCounts.get(currentGid) ?? 0;
       if (count < 2) continue;
-      if (row.kind === "agent_text" || row.kind === "agent_thought") {
-        pendingText.push(row);
+      const isIntermediateText = row.kind === "agent_text" || row.kind === "agent_thought";
+      const isResolvedApproval = row.kind === "approval" && row.id !== pendingApprovalRowId;
+      if (isIntermediateText || isResolvedApproval) {
+        pending.push(row);
         continue;
       }
       if (row.kind === "tool_call" || row.kind === "tool_diff") {
         const group = groups.get(currentGid) ?? { toolCount: count, rows: [] };
-        // Flush any pending text — a tool follows, so it's intermediate.
-        group.rows.push(...pendingText);
-        pendingText = [];
+        // Flush any pending rows — a tool follows, so they're intermediate.
+        group.rows.push(...pending);
+        pending = [];
         group.rows.push(row);
         groups.set(currentGid, group);
       }
     }
-    // pendingText at end of a turn = final text, stays outside (not flushed).
+    // pending at end of a turn = final text/approvals, stays outside (not flushed).
     return groups;
   }
 
@@ -500,6 +504,10 @@ export function createStructuredConnection(
         children.push(groupEl);
         continue;
       }
+      // Resolved approvals not absorbed into a tool group are hidden — the
+      // tool row itself already identifies the action, so a standalone
+      // "answered" card adds nothing.  Pending approvals always render.
+      if (row.kind === "approval" && row.id !== pendingApprovalRowId) continue;
       const rowEl = buildRowElement(row);
       if (!rowEl) continue;
       rowEls.set(row.id, rowEl);
@@ -551,6 +559,19 @@ export function createStructuredConnection(
           rows.push(delta.row);
         } else {
           rows[i] = delta.row;
+          // Surgical DOM swap: replace just this row's element instead of
+          // tearing down and rebuilding the entire transcript, which causes
+          // visible flashing and breaks text selection.
+          const oldEl = rowEls.get(delta.row.id);
+          if (oldEl) {
+            const newEl = buildRowElement(delta.row);
+            if (newEl) {
+              oldEl.replaceWith(newEl);
+              rowEls.set(delta.row.id, newEl);
+            }
+            syncAvailableCommands();
+            return;
+          }
         }
       } else {
         const i = rowIndex.get(delta.id);

web/src/structuredRender.test.ts

@@ -368,13 +368,14 @@ describe("buildTranscriptRow: approval", () => {
     expect(el.querySelector(".st-approval-path")!.textContent).toBe("/etc/x");
   });
 
-  it("hides the buttons and shows an answered note once resolved", () => {
+  it("renders a compact one-liner once resolved", () => {
     const el = buildTranscriptRow(approvalRow(allThreeOptions), {
       pending: false,
       onDecide: () => Promise.resolve(),
     });
     expect(el.querySelector(".st-approval-acts")).toBeNull();
-    expect(el.querySelector(".st-approval-resolved")!.textContent).toBe("answered");
+    expect(el.classList.contains("st-approval-compact")).toBe(true);
+    expect(el.textContent).toContain("approved");
   });
 
   it("invokes onDecide with the clicked decision and disables the buttons", () => {

web/src/structuredRender.ts

@@ -704,6 +704,16 @@ function offeredDecisions(options: AcpPermissionOption[]): StructuredApprovalDec
 function buildApprovalRow(row: TranscriptRow, approval: ApprovalRowState): HTMLElement {
   const request = (row.data ?? {}) as { toolCall?: AcpToolCallLike; options?: AcpPermissionOption[] };
   const toolCall = request.toolCall ?? {};
+
+  // Resolved approvals render as a compact one-liner inside a tool group
+  // (or are hidden entirely when standalone — see rebuildTranscript).
+  if (!approval.pending) {
+    const wrap = el("div", "st-row st-row-approval st-approval-compact");
+    const label = toolCall.title ?? toolKindLabel(toolCall.kind);
+    wrap.textContent = `${label} — approved`;
+    return wrap;
+  }
+
   const wrap = el("div", "st-row st-row-approval");
   const card = el("div", "st-approval");
   wrap.appendChild(card);
@@ -723,45 +733,39 @@ function buildApprovalRow(row: TranscriptRow, approval: ApprovalRowState): HTMLE
     card.appendChild(pathEl);
   }
 
-  if (approval.pending) {
-    const acts = el("div", "st-approval-acts");
-    const mk = (label: string, decision: StructuredApprovalDecision, cls: string) => {
-      const btn = document.createElement("button");
-      btn.type = "button";
-      btn.className = cls ? `act ${cls}` : "act";
-      btn.textContent = label;
-      btn.addEventListener("click", () => {
-        const buttons = [...acts.querySelectorAll<HTMLButtonElement>("button")];
-        buttons.forEach((b) => (b.disabled = true));
-        approval.onDecide(decision).catch(() => {
-          // Rejects only when this approval is still pending (see
-          // ApprovalRowState) — restore the controls so the operator can
-          // retry; the error itself is surfaced by the connection.
-          buttons.forEach((b) => (b.disabled = false));
-        });
+  const acts = el("div", "st-approval-acts");
+  const mk = (label: string, decision: StructuredApprovalDecision, cls: string) => {
+    const btn = document.createElement("button");
+    btn.type = "button";
+    btn.className = cls ? `act ${cls}` : "act";
+    btn.textContent = label;
+    btn.addEventListener("click", () => {
+      const buttons = [...acts.querySelectorAll<HTMLButtonElement>("button")];
+      buttons.forEach((b) => (b.disabled = true));
+      approval.onDecide(decision).catch(() => {
+        // Rejects only when this approval is still pending (see
+        // ApprovalRowState) — restore the controls so the operator can
+        // retry; the error itself is surfaced by the connection.
+        buttons.forEach((b) => (b.disabled = false));
       });
-      return btn;
-    };
-    const offered = offeredDecisions(request.options ?? []);
-    const specs: [StructuredApprovalDecision, string, string][] = [
-      ["allow_once", "Allow once", "primary"],
-      ["allow_for_session", "Allow for session", ""],
-      ["deny", "Deny", "deny"],
-    ];
-    for (const [decision, label, cls] of specs) {
-      if (offered.includes(decision)) acts.appendChild(mk(label, decision, cls));
-    }
-    if (acts.children.length > 0) {
-      card.appendChild(acts);
-    } else {
-      const none = el("div", "st-approval-resolved");
-      none.textContent = "no decision offered";
-      card.appendChild(none);
-    }
+    });
+    return btn;
+  };
+  const offered = offeredDecisions(request.options ?? []);
+  const specs: [StructuredApprovalDecision, string, string][] = [
+    ["allow_once", "Allow once", "primary"],
+    ["allow_for_session", "Allow for session", ""],
+    ["deny", "Deny", "deny"],
+  ];
+  for (const [decision, label, cls] of specs) {
+    if (offered.includes(decision)) acts.appendChild(mk(label, decision, cls));
+  }
+  if (acts.children.length > 0) {
+    card.appendChild(acts);
   } else {
-    const resolved = el("div", "st-approval-resolved");
-    resolved.textContent = "answered";
-    card.appendChild(resolved);
+    const none = el("div", "st-approval-resolved");
+    none.textContent = "no decision offered";
+    card.appendChild(none);
   }
 
   return wrap;

web/src/styles.css

@@ -3040,6 +3040,16 @@ input.leaf-rename:focus {
   color: var(--faint);
 }
 
+/* compact resolved approval inside a tool group — same muted treatment
+   as intermediate agent text so the audit trail is preserved without
+   drawing attention to itself. */
+.st-approval-compact {
+  color: var(--muted);
+  font-size: var(--fs-12);
+  padding: var(--sp-1) var(--sp-2);
+  font-style: italic;
+}
+
 .act {
   appearance: none;
   font: inherit;
@@ -3651,61 +3661,78 @@ input.leaf-rename:focus {
   color: var(--ink);
 }
 
-/* One-click tiles: host row + command row. */
-.tile-row {
-  display: flex;
-  flex-wrap: wrap;
+/* Harness cards: the first decision in the spawn form — which tool runs. */
+.harness-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
   gap: var(--sp-2);
 }
 
-.tile {
-  flex: 1 1 auto;
-  min-width: 96px;
+.harness-card {
   display: flex;
   flex-direction: column;
-  gap: 2px;
-  align-items: flex-start;
-  padding: var(--sp-2) var(--sp-3);
+  align-items: center;
+  gap: var(--sp-2);
+  padding: var(--sp-3) var(--sp-2);
   background: var(--surface-2);
   border: 1px solid var(--border);
   border-radius: var(--r-2);
   color: var(--ink);
   font-family: inherit;
   cursor: pointer;
-  text-align: left;
+  text-align: center;
   transition:
     border-color var(--dur-fast) var(--ease-out),
     background var(--dur-fast) var(--ease-out);
 }
 
-.tile:hover {
+.harness-card:hover {
   border-color: var(--border-strong);
+  background: var(--surface-3);
 }
 
-.tile.is-active {
+.harness-card.is-active {
   border-color: var(--accent);
   background: var(--accent-tint);
 }
 
-.tile-label {
-  font-size: var(--fs-14);
-  font-weight: 600;
-}
-
-.tile-sub {
-  font-size: var(--fs-12);
-  color: var(--muted);
-  font-family: var(--font-mono);
-}
-
-.tile-more {
-  flex: 0 0 auto;
-  min-width: 0;
-  justify-content: center;
+.harness-icon {
+  display: flex;
   align-items: center;
+  justify-content: center;
+  width: 32px;
+  height: 32px;
   color: var(--muted);
 }
 
+.harness-card.is-active .harness-icon {
+  color: var(--ink);
+}
+
+.harness-icon .tool-icon {
+  display: block;
+}
+
+.harness-label {
+  font-size: var(--fs-13);
+  font-weight: 600;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 100%;
+}
+
+/* The "Custom…" card is an escape hatch, not a peer tool — dashed border
+   and subdued color separate it from the named harnesses. */
+.harness-custom {
+  border-style: dashed;
+  color: var(--muted);
+}
+
+.harness-custom .harness-label {
+  font-weight: 500;
+}
+
 /* Working-directory picker (#95). Two steps: a grid of project boxes, then the
    picked project's worktree choices. Stale beyond 7 days dims but stays
    selectable. */
@@ -3732,7 +3759,7 @@ input.leaf-rename:focus {
 
 .picker.projects {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
+  grid-template-columns: repeat(2, 1fr);
   align-content: start;
   gap: var(--sp-2);
   max-height: 300px;
@@ -3788,19 +3815,6 @@ input.leaf-rename:focus {
   overflow-wrap: anywhere;
 }
 
-.project-meta {
-  font-family: var(--font-mono);
-  font-size: var(--fs-12);
-  color: var(--faint);
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.project-meta:empty {
-  display: none;
-}
-
 .project-other {
   align-self: flex-start;
   padding: 4px 0;