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

Patch deltas on existing rows now swap just the affected element via
replaceWith() instead of tearing down and rebuilding the entire
transcript. Stops the visible flash and preserves text selection.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

web/src/spawnForm.ts

@@ -680,13 +680,16 @@ 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-path">${escapeHtml(parent)}</span>
+      <span class="project-meta">${escapeHtml(meta)}</span>`;
     box.addEventListener("click", () => selectProject(group));
     return box;
   }

web/src/structured.ts

@@ -551,6 +551,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/styles.css

@@ -3749,7 +3749,7 @@ input.leaf-rename:focus {
 
 .picker.projects {
   display: grid;
-  grid-template-columns: repeat(2, 1fr);
+  grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
   align-content: start;
   gap: var(--sp-2);
   max-height: 300px;
@@ -3805,6 +3805,19 @@ 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;