@ogpoyraz/wtx 0.6.0 → 0.6.1

package/README.md

@@ -280,7 +280,7 @@ Lookups degrade gracefully: if `gh` is missing or unauthenticated you get a warn
 | `c` | Edit configuration |
 | `?` / `q` | Help / quit |
 
-Actions show inline progress — `creating worktree` next to the repo header, `deleting` / `rebasing` / `syncing` next to the branch — while the dashboard is busy. Input is locked until the operation (and its refresh) finishes; on failure a log modal opens with the captured output. Destructive ones confirm first.
+Actions run in the background — navigation never locks. Progress shows inline: `fetching` next to the repo header, `deleting` / `rebasing` / `syncing` next to the branch (dimmed while busy), and a new worktree appears immediately as a `(creating)` row. One operation runs per repo at a time; conflicting actions are rejected with a toast until it finishes. On failure a log modal opens with the captured output; press any key to dismiss. Destructive ones confirm first.
 
 ---
 

package/dist/cli.mjs

@@ -24910,7 +24910,7 @@ var init_deps = __esm(() => {
 });
 
 // src/tui/data.ts
-async function fetchWorktreeData(opts) {
+async function fetchWorktreeData(opts, scope) {
   const warnings = [];
   let config2;
   try {
@@ -24924,6 +24924,10 @@ async function fetchWorktreeData(opts) {
   } catch (err) {
     throw new Error(`Failed to resolve repos: ${err.message}`);
   }
+  if (scope) {
+    const scopeSet = new Set(scope);
+    repos = repos.filter((r) => scopeSet.has(r.name));
+  }
   const semaphore = new Semaphore(4);
   const allRows = [];
   const processRepo = async (repo) => {
@@ -24941,7 +24945,7 @@ async function fetchWorktreeData(opts) {
             prCache.set(`${repo.name}/${br}`, pr);
           }
         } catch (err) {
-          warnings.push(`PR lookup failed for ${repo.name}: ${err.message}`);
+          warnings.push({ repoName: repo.name, message: `PR lookup failed for ${repo.name}: ${err.message}` });
           for (const br of branches) {
             const cached2 = prCache.get(`${repo.name}/${br}`);
             if (cached2) {
@@ -25043,7 +25047,7 @@ async function fetchWorktreeData(opts) {
         allRows.push(row);
       }
     } catch (err) {
-      warnings.push(`Failed to process repo ${repo.name}: ${err.message}`);
+      warnings.push({ repoName: repo.name, message: `Failed to process repo ${repo.name}: ${err.message}` });
     } finally {
       semaphore.release();
     }
@@ -25066,20 +25070,131 @@ var init_data = __esm(() => {
   prCache = new Map;
 });
 
+// src/tui/utils.ts
+function matchesFilter(entry, term) {
+  if (!term)
+    return true;
+  const lower = term.toLowerCase();
+  if (entry.branch.toLowerCase().includes(lower))
+    return true;
+  if (entry.repoName.toLowerCase().includes(lower))
+    return true;
+  if (entry.prNumber?.toString().includes(lower))
+    return true;
+  if (entry.owner?.toLowerCase().includes(lower))
+    return true;
+  if (entry.prState?.toLowerCase().includes(lower))
+    return true;
+  if (entry.prUrl?.toLowerCase().includes(lower))
+    return true;
+  return false;
+}
+function toggleSelection(current, path33) {
+  const next = new Set(current);
+  if (next.has(path33)) {
+    next.delete(path33);
+  } else {
+    next.add(path33);
+  }
+  return next;
+}
+function computeScrollWindow(selectedIndex, currentStart, visibleRows, totalRows) {
+  if (totalRows === 0)
+    return { start: 0, end: 0 };
+  let start = currentStart;
+  const maxStart = Math.max(0, totalRows - visibleRows);
+  if (start > maxStart) {
+    start = maxStart;
+  }
+  if (selectedIndex < start) {
+    start = selectedIndex;
+  } else if (selectedIndex >= start + visibleRows) {
+    start = selectedIndex - visibleRows + 1;
+  }
+  const end = Math.min(start + visibleRows, totalRows);
+  return { start, end };
+}
+function rowSort(a2, b) {
+  if (a2.isMainCheckout && !b.isMainCheckout)
+    return -1;
+  if (!a2.isMainCheckout && b.isMainCheckout)
+    return 1;
+  return a2.branch.localeCompare(b.branch);
+}
+function mergeBlocks(prev, next, scope) {
+  if (!scope)
+    return next;
+  const kept = prev.filter((b) => !scope.has(b.repoName));
+  return [...kept, ...next].sort((a2, b) => a2.repoName.localeCompare(b.repoName));
+}
+function mergeWarnings(prev, next, scope) {
+  if (!scope)
+    return next;
+  const kept = prev.filter((w) => !scope.has(w.repoName));
+  return [...kept, ...next];
+}
+function makePlaceholderRow(repoName, branch) {
+  return {
+    repoName,
+    branch,
+    path: `pending-create:${repoName}:${branch}`,
+    commitShort: "",
+    isMainCheckout: false,
+    isLocked: false,
+    isPrunable: false,
+    isBare: false,
+    dirtyFiles: [],
+    ahead: null,
+    behind: null,
+    prNumber: null,
+    prState: null,
+    prChecks: null,
+    prUrl: null,
+    owner: null,
+    rebaseStatus: null,
+    depsStrategy: "none",
+    isPendingCreate: true
+  };
+}
+function withCreatePlaceholders(blocks, creating) {
+  if (creating.length === 0)
+    return blocks;
+  const byRepo = new Map;
+  for (const c4 of creating) {
+    const arr = byRepo.get(c4.repoName);
+    if (arr) {
+      arr.push(c4.branch);
+    } else {
+      byRepo.set(c4.repoName, [c4.branch]);
+    }
+  }
+  return blocks.map((block) => {
+    const branches = byRepo.get(block.repoName);
+    if (!branches)
+      return block;
+    const placeholders = branches.map((br) => makePlaceholderRow(block.repoName, br));
+    return { ...block, rows: [...block.rows, ...placeholders].sort(rowSort) };
+  });
+}
+
 // src/tui/hooks/useWorktrees.ts
-import { useState, useEffect, useCallback } from "react";
+import { useState, useEffect, useCallback, useRef } from "react";
 function useWorktrees(opts) {
   const [blocks, setBlocks] = useState([]);
   const [loading, setLoading] = useState(true);
+  const [refreshing, setRefreshing] = useState(false);
   const [error52, setError] = useState(null);
   const [warnings, setWarnings] = useState([]);
   const [lastRefreshed, setLastRefreshed] = useState("");
-  const refresh = useCallback(async () => {
-    setLoading(true);
+  const seqRef = useRef(0);
+  const refresh = useCallback(async (scope) => {
+    const seq = ++seqRef.current;
+    setRefreshing(true);
     setError(null);
-    setWarnings([]);
     try {
-      const data = await fetchWorktreeData(opts);
+      const data = await fetchWorktreeData(opts, scope);
+      if (seq !== seqRef.current)
+        return;
       const byRepo = new Map;
       for (const row of data.rows) {
         let arr = byRepo.get(row.repoName);
@@ -25091,29 +25206,27 @@ function useWorktrees(opts) {
       }
       const newBlocks = [];
       for (const [repoName, rows] of byRepo.entries()) {
-        rows.sort((a2, b) => {
-          if (a2.isMainCheckout && !b.isMainCheckout)
-            return -1;
-          if (!a2.isMainCheckout && b.isMainCheckout)
-            return 1;
-          return a2.branch.localeCompare(b.branch);
-        });
+        rows.sort(rowSort);
         newBlocks.push({ repoName, rows });
       }
-      newBlocks.sort((a2, b) => a2.repoName.localeCompare(b.repoName));
-      setBlocks(newBlocks);
-      setWarnings(data.warnings);
+      const scopeSet = scope ? new Set(scope) : undefined;
+      setBlocks((prev) => mergeBlocks(prev, newBlocks, scopeSet));
+      setWarnings((prev) => mergeWarnings(prev, data.warnings, scopeSet));
       setLastRefreshed(new Date().toLocaleTimeString());
     } catch (err) {
-      setError(err.message);
+      if (seq === seqRef.current)
+        setError(err.message);
     } finally {
-      setLoading(false);
+      if (seq === seqRef.current) {
+        setLoading(false);
+        setRefreshing(false);
+      }
     }
   }, [opts]);
   useEffect(() => {
     refresh();
   }, [refresh]);
-  return { blocks, loading, error: error52, warnings, lastRefreshed, refresh };
+  return { blocks, loading, refreshing, error: error52, warnings, lastRefreshed, refresh };
 }
 var init_useWorktrees = __esm(() => {
   init_data();
@@ -25151,7 +25264,7 @@ var init_theme = __esm(() => {
 });
 
 // src/tui/components/WorktreeTable.tsx
-import { useEffect as useEffect2, useRef } from "react";
+import { useEffect as useEffect2, useRef as useRef2 } from "react";
 import { jsx, jsxs } from "@opentui/react/jsx-runtime";
 function statusBadge(row) {
   if (row.isMainCheckout)
@@ -25166,9 +25279,10 @@ function statusBadge(row) {
     return { text: `dirty (${row.dirtyFiles.length})`, fg: tokens.warning };
   return { text: "clean", fg: tokens.dim };
 }
-function WorktreeItem({ row, isSelected, isMultiSelected, busy, id }) {
-  const badge = busy ? { text: `${busy.frame} ${busy.verb}…`, fg: tokens.accent } : statusBadge(row);
-  const primary = isSelected ? tokens.bright : tokens.fg;
+function WorktreeItem({ row, isSelected, isMultiSelected, indicator, frame, id }) {
+  const badge = indicator ? indicator.running ? { text: `${frame} ${indicator.verb}…`, fg: tokens.accent } : { text: `◌ ${indicator.verb}`, fg: tokens.dim } : row.isPendingCreate ? { text: `${frame} creating…`, fg: tokens.accent } : statusBadge(row);
+  const disabled = indicator !== undefined || row.isPendingCreate === true;
+  const primary = isSelected ? tokens.bright : disabled ? tokens.dim : tokens.fg;
   const divergence = row.ahead !== null && row.behind !== null && (row.ahead > 0 || row.behind > 0) ? ` · ↑${row.ahead} ↓${row.behind}` : "";
   const prSegment = row.prNumber ? [
     `· #${row.prNumber}`,
@@ -25224,8 +25338,8 @@ function WorktreeItem({ row, isSelected, isMultiSelected, busy, id }) {
     ]
   });
 }
-function WorktreeTable({ blocks, selectedIndex, selection = new Set, busy }) {
-  const scrollRef = useRef(null);
+function WorktreeTable({ blocks, selectedIndex, selection = new Set, frame, repoVerbs, rowVerbs }) {
+  const scrollRef = useRef2(null);
   useEffect2(() => {
     if (scrollRef.current?.scrollChildIntoView) {
       scrollRef.current.scrollChildIntoView("selected-row");
@@ -25245,42 +25359,48 @@ function WorktreeTable({ blocks, selectedIndex, selection = new Set, busy }) {
     children: blocks.length === 0 ? /* @__PURE__ */ jsx("text", {
       fg: tokens.dim,
       children: "No repositories configured."
-    }) : blocks.map((block) => /* @__PURE__ */ jsxs("box", {
-      flexDirection: "column",
-      style: { marginBottom: 1 },
-      children: [
-        /* @__PURE__ */ jsx("box", {
-          style: { marginTop: flatIndex === 0 ? 0 : 1 },
-          children: /* @__PURE__ */ jsxs("text", {
-            children: [
-              /* @__PURE__ */ jsx("span", {
-                fg: tokens.bright,
-                children: block.repoName
-              }),
-              /* @__PURE__ */ jsx("span", {
-                fg: tokens.dim,
-                children: ` · ${block.rows.length}`
-              }),
-              busy && busy.repoNames.includes(block.repoName) && !busy.rowPath && /* @__PURE__ */ jsx("span", {
-                fg: tokens.accent,
-                children: `  ${busy.frame} ${busy.verb}…`
-              })
-            ]
+    }) : blocks.map((block) => {
+      const repoIndicator = repoVerbs.get(block.repoName);
+      return /* @__PURE__ */ jsxs("box", {
+        flexDirection: "column",
+        style: { marginBottom: 1 },
+        children: [
+          /* @__PURE__ */ jsx("box", {
+            style: { marginTop: flatIndex === 0 ? 0 : 1 },
+            children: /* @__PURE__ */ jsxs("text", {
+              children: [
+                /* @__PURE__ */ jsx("span", {
+                  fg: tokens.bright,
+                  children: block.repoName
+                }),
+                /* @__PURE__ */ jsx("span", {
+                  fg: tokens.dim,
+                  children: ` · ${block.rows.filter((r) => !r.isPendingCreate).length}`
+                }),
+                repoIndicator && /* @__PURE__ */ jsx("span", {
+                  fg: repoIndicator.running ? tokens.accent : tokens.dim,
+                  children: repoIndicator.running ? `  ${frame} ${repoIndicator.verb}…` : `  ◌ ${repoIndicator.verb}`
+                })
+              ]
+            })
+          }),
+          block.rows.map((row) => {
+            const navigable = !row.isPendingCreate;
+            const isSelected = navigable && flatIndex === selectedIndex;
+            if (navigable)
+              flatIndex++;
+            return /* @__PURE__ */ jsx(WorktreeItem, {
+              row,
+              isSelected,
+              isMultiSelected: selection.has(row.path),
+              indicator: rowVerbs.get(row.path),
+              frame,
+              id: isSelected ? "selected-row" : undefined
+            }, row.path);
           })
-        }),
-        block.rows.map((row) => {
-          const isSelected = flatIndex === selectedIndex;
-          flatIndex++;
-          return /* @__PURE__ */ jsx(WorktreeItem, {
-            row,
-            isSelected,
-            isMultiSelected: selection.has(row.path),
-            busy: busy?.rowPath === row.path ? busy : undefined,
-            id: isSelected ? "selected-row" : undefined
-          }, row.path);
-        })
-      ]
-    }, block.repoName))
+        ]
+      }, block.repoName);
+    })
   });
 }
 var SECONDARY_INDENT = "      ";
@@ -25949,7 +26069,7 @@ async function runWtxAction(args, onLine) {
 
 // src/tui/components/ActionLogModal.tsx
 import { jsx as jsx7, jsxs as jsxs6 } from "@opentui/react/jsx-runtime";
-function ActionLogModal({ title, lines, done, exitCode }) {
+function ActionLogModal({ title, lines, done, exitCode, remaining }) {
   return /* @__PURE__ */ jsxs6(Overlay, {
     title,
     borderColor: tokens.border,
@@ -25989,6 +26109,10 @@ function ActionLogModal({ title, lines, done, exitCode }) {
                   exitCode
                 ]
               }),
+              remaining !== undefined && remaining > 0 && /* @__PURE__ */ jsx7("span", {
+                fg: tokens.warning,
+                children: ` · ${remaining} more failure${remaining > 1 ? "s" : ""}`
+              }),
               /* @__PURE__ */ jsx7("span", {
                 fg: tokens.dim,
                 children: " - press any key to close"
@@ -26200,51 +26324,6 @@ var init_InputModal = __esm(() => {
   init_theme();
 });
 
-// src/tui/utils.ts
-function matchesFilter(entry, term) {
-  if (!term)
-    return true;
-  const lower = term.toLowerCase();
-  if (entry.branch.toLowerCase().includes(lower))
-    return true;
-  if (entry.repoName.toLowerCase().includes(lower))
-    return true;
-  if (entry.prNumber?.toString().includes(lower))
-    return true;
-  if (entry.owner?.toLowerCase().includes(lower))
-    return true;
-  if (entry.prState?.toLowerCase().includes(lower))
-    return true;
-  if (entry.prUrl?.toLowerCase().includes(lower))
-    return true;
-  return false;
-}
-function toggleSelection(current, path34) {
-  const next = new Set(current);
-  if (next.has(path34)) {
-    next.delete(path34);
-  } else {
-    next.add(path34);
-  }
-  return next;
-}
-function computeScrollWindow(selectedIndex, currentStart, visibleRows, totalRows) {
-  if (totalRows === 0)
-    return { start: 0, end: 0 };
-  let start = currentStart;
-  const maxStart = Math.max(0, totalRows - visibleRows);
-  if (start > maxStart) {
-    start = maxStart;
-  }
-  if (selectedIndex < start) {
-    start = selectedIndex;
-  } else if (selectedIndex >= start + visibleRows) {
-    start = selectedIndex - visibleRows + 1;
-  }
-  const end = Math.min(start + visibleRows, totalRows);
-  return { start, end };
-}
-
 // src/tui/components/ConfigOverlay.tsx
 import { useState as useState4, useEffect as useEffect4 } from "react";
 import { useKeyboard } from "@opentui/react";
@@ -26634,16 +26713,19 @@ var init_useSpinnerFrame = __esm(() => {
 });
 
 // src/tui/components/App.tsx
-import { useState as useState6, useEffect as useEffect6 } from "react";
+import { useState as useState6, useEffect as useEffect6, useMemo, useRef as useRef3, useCallback as useCallback2 } from "react";
 import { useKeyboard as useKeyboard2, useRenderer } from "@opentui/react";
 import { jsx as jsx11, jsxs as jsxs10 } from "@opentui/react/jsx-runtime";
 function App({ opts }) {
   const renderer = useRenderer();
-  const { blocks, loading, error: error52, warnings, lastRefreshed, refresh } = useWorktrees(opts);
+  const { blocks, loading, refreshing, error: error52, warnings, lastRefreshed, refresh } = useWorktrees(opts);
   const [selectedIndex, setSelectedIndex] = useState6(0);
   const [modal, setModal] = useState6({ type: "none" });
   const [actionMessage, setActionMessage] = useState6();
-  const [actionRun, setActionRun] = useState6(null);
+  const messageTimer = useRef3(null);
+  const [ops, setOps] = useState6([]);
+  const [failedLogs, setFailedLogs] = useState6([]);
+  const nextOpId = useRef3(1);
   const [createModal, setCreateModal] = useState6(false);
   const [createError, setCreateError] = useState6();
   const [configOpen, setConfigOpen] = useState6(false);
@@ -26655,11 +26737,19 @@ function App({ opts }) {
       setModal({ type: "error", message: error52 });
     }
   }, [error52]);
-  const filteredBlocks = blocks.map((b) => ({
-    ...b,
-    rows: b.rows.filter((r) => matchesFilter(r, filterText))
-  })).filter((b) => b.rows.length > 0);
-  const flatRows = filteredBlocks.flatMap((b) => b.rows);
+  const flash = useCallback2((message, ms = 3000) => {
+    if (messageTimer.current)
+      clearTimeout(messageTimer.current);
+    setActionMessage(message);
+    messageTimer.current = setTimeout(() => setActionMessage(undefined), ms);
+  }, []);
+  const busyRepos = useMemo(() => new Set(ops.flatMap((o2) => o2.repoNames)), [ops]);
+  const busyRowPaths = useMemo(() => new Set(ops.map((o2) => o2.rowPath).filter((p) => p !== undefined)), [ops]);
+  const anyRunning = ops.some((o2) => o2.status === "running");
+  const spinnerFrame = useSpinnerFrame(anyRunning || loading || refreshing);
+  const baseFiltered = useMemo(() => blocks.map((b) => ({ ...b, rows: b.rows.filter((r) => matchesFilter(r, filterText)) })).filter((b) => b.rows.length > 0), [blocks, filterText]);
+  const displayBlocks = useMemo(() => withCreatePlaceholders(baseFiltered, ops.filter((o2) => o2.branch !== undefined).map((o2) => ({ repoName: o2.repoNames[0], branch: o2.branch }))), [baseFiltered, ops]);
+  const flatRows = useMemo(() => displayBlocks.flatMap((b) => b.rows.filter((r) => !r.isPendingCreate)), [displayBlocks]);
   const totalRows = blocks.flatMap((b) => b.rows).length;
   const maxIndex = Math.max(0, flatRows.length - 1);
   useEffect6(() => {
@@ -26668,50 +26758,118 @@ function App({ opts }) {
     }
   }, [maxIndex, selectedIndex]);
   const selectedRow = flatRows[selectedIndex] ?? null;
-  const busy = actionRun !== null && !actionRun.done ? { kind: actionRun.kind, repoNames: actionRun.repoNames, rowPath: actionRun.rowPath } : null;
-  const spinnerFrame = useSpinnerFrame(busy !== null || loading);
+  const { repoVerbs, rowVerbs } = useMemo(() => {
+    const rv = new Map;
+    const nv = new Map;
+    for (const o2 of ops) {
+      const indicator = { verb: VERBS[o2.kind], running: o2.status === "running" };
+      if (o2.rowPath) {
+        nv.set(o2.rowPath, indicator);
+      } else {
+        for (const rn of o2.repoNames)
+          rv.set(rn, indicator);
+      }
+    }
+    return { repoVerbs: rv, rowVerbs: nv };
+  }, [ops]);
+  const runningOps = ops.filter((o2) => o2.status === "running");
+  const latestOp = runningOps[runningOps.length - 1];
   const getSelectedRows = () => {
     if (selection.size > 0) {
       return blocks.flatMap((b) => b.rows).filter((r) => selection.has(r.path));
     }
     return selectedRow ? [selectedRow] : [];
   };
-  const runSequentialActions = async (kind, targets, actionArgs) => {
-    for (const row of targets) {
-      await startAction(kind, `${capitalize(VERBS[kind])} ${row.branch}`, row.branch, [row.repoName], row.path, actionArgs(row));
+  const findConflict = (targets) => {
+    for (const t of targets) {
+      if (busyRowPaths.has(t.path))
+        return `${t.branch} is busy`;
+    }
+    for (const t of targets) {
+      if (busyRepos.has(t.repoName))
+        return `${t.repoName} is busy`;
     }
-    setSelection(new Set);
+    return null;
   };
-  const startAction = async (kind, title, label, repoNames, rowPath, args) => {
-    return new Promise((resolve2) => {
-      setActionRun({ kind, repoNames, rowPath, title, label, lines: [], done: false, exitCode: null });
-      runWtxAction(args, (text, type) => {
-        setActionRun((prev) => {
-          if (!prev)
-            return prev;
-          return {
-            ...prev,
-            lines: [...prev.lines, { text, type }]
-          };
-        });
-      }).then((result) => {
-        if (result.exitCode === 0) {
-          setActionRun(null);
-        } else {
-          setActionRun((prev) => {
-            if (!prev)
-              return prev;
-            return {
-              ...prev,
-              done: true,
-              exitCode: result.exitCode
-            };
-          });
-        }
-        refresh();
-        resolve2();
+  const executeOp = async (op, args, refreshScope) => {
+    setOps((prev) => prev.map((o2) => o2.id === op.id ? { ...o2, status: "running" } : o2));
+    const collected = [];
+    let exitCode;
+    try {
+      const result = await runWtxAction(args, (text, type) => {
+        collected.push({ text, type });
+        setOps((prev) => prev.map((o2) => o2.id === op.id ? { ...o2, lines: [...o2.lines, { text, type }] } : o2));
       });
+      exitCode = result.exitCode;
+    } catch (err) {
+      exitCode = 1;
+      const msg = err instanceof Error ? err.message : String(err);
+      collected.push({ text: `Failed to run wtx ${args.join(" ")}: ${msg}`, type: "err" });
+    }
+    if (exitCode === 0) {
+      if (refreshScope)
+        await refresh(refreshScope);
+      setOps((prev) => prev.filter((o2) => o2.id !== op.id));
+    } else {
+      setOps((prev) => prev.filter((o2) => o2.id !== op.id));
+      setFailedLogs((prev) => [...prev, { title: op.title, lines: collected, exitCode }]);
+    }
+  };
+  const startBatchActions = (kind, targets, argsFor) => {
+    const created = targets.map((row) => {
+      const op = {
+        id: nextOpId.current++,
+        kind,
+        repoNames: [row.repoName],
+        rowPath: row.path,
+        label: row.branch,
+        title: `${capitalize(VERBS[kind])} ${row.branch}`,
+        status: "queued",
+        lines: []
+      };
+      return { op, row };
     });
+    setOps((prev) => [...prev, ...created.map((c4) => c4.op)]);
+    (async () => {
+      for (const { op, row } of created) {
+        await executeOp(op, argsFor(row), [row.repoName]);
+      }
+      setSelection(new Set);
+    })();
+  };
+  const startFetch = (targets) => {
+    const repoNames = [...new Set(targets.map((t) => t.repoName))];
+    const conflict = repoNames.find((rn) => busyRepos.has(rn));
+    if (conflict) {
+      flash(`${conflict} is busy`);
+      return;
+    }
+    const label = repoNames.length === 1 ? repoNames[0] : `${repoNames.length} repos`;
+    const op = {
+      id: nextOpId.current++,
+      kind: "fetch",
+      repoNames,
+      label,
+      title: `Fetch ${label}`,
+      status: "queued",
+      lines: []
+    };
+    setOps((prev) => [...prev, op]);
+    executeOp(op, ["fetch", "--repo", repoNames.join(",")], repoNames).then(() => setSelection(new Set));
+  };
+  const startCreate = (branch, repoName) => {
+    const op = {
+      id: nextOpId.current++,
+      kind: "create",
+      repoNames: [repoName],
+      branch,
+      label: `${branch} in ${repoName}`,
+      title: `Create ${branch}`,
+      status: "queued",
+      lines: []
+    };
+    setOps((prev) => [...prev, op]);
+    executeOp(op, ["create", branch, "--repo", repoName], [repoName]);
   };
   useKeyboard2((key) => {
     if (isFiltering) {
@@ -26724,11 +26882,8 @@ function App({ opts }) {
       }
       return;
     }
-    if (loading || busy) {
-      return;
-    }
-    if (actionRun) {
-      setActionRun(null);
+    if (failedLogs.length > 0) {
+      setFailedLogs((prev) => prev.slice(1));
       return;
     }
     if (configOpen)
@@ -26755,16 +26910,16 @@ function App({ opts }) {
           const action = modal.type;
           setModal({ type: "none" });
           if (action === "confirm_remove") {
-            runSequentialActions("remove", rows, (r) => {
+            startBatchActions("remove", rows, (r) => {
               const args = ["remove", r.branch, "--repo", r.repoName, "--yes"];
               if (r.dirtyFiles.length > 0)
                 args.push("--force");
               return args;
             });
           } else if (action === "confirm_rebase") {
-            runSequentialActions("rebase", rows, (r) => ["rebase", r.branch, "--repo", r.repoName]);
+            startBatchActions("rebase", rows, (r) => ["rebase", r.branch, "--repo", r.repoName]);
           } else {
-            runSequentialActions("sync", rows, (r) => ["sync", r.branch, "--repo", r.repoName]);
+            startBatchActions("sync", rows, (r) => ["sync", r.branch, "--repo", r.repoName]);
           }
           return;
         }
@@ -26792,113 +26947,160 @@ function App({ opts }) {
       }
       return;
     }
-    if (key.name === "a") {
-      (async () => {
-        const targets = getSelectedRows();
-        if (targets.length === 0)
-          return;
-        const target = targets[0];
-        if (!target)
-          return;
-        const startedAt = Date.now();
-        try {
-          const config2 = await loadConfig();
-          const cmdTemplate = resolveAgentCommand("claude", config2.agents) ?? "claude";
-          const result = await spawnAgentInWorktree(cmdTemplate, target.path, { repoName: target.repoName, branch: target.branch });
-          appendHistory({
-            ts: new Date().toISOString(),
-            source: "terminal",
-            command: "agent",
-            args: ["agent", target.branch, "--repo", target.repoName],
-            durationMs: Date.now() - startedAt,
-            exit: 0
-          });
-          setActionMessage(`Agent spawned (${result.mode}${result.session ? ` session ${result.session}` : ""})`);
-          setTimeout(() => setActionMessage(undefined), 5000);
-        } catch (e) {
-          appendHistory({
-            ts: new Date().toISOString(),
-            source: "terminal",
-            command: "agent",
-            args: ["agent", target.branch, "--repo", target.repoName],
-            durationMs: Date.now() - startedAt,
-            exit: 1
-          });
-          setActionMessage(`Agent failed: ${e.message}`);
-        }
-      })();
+    if (key.name === "down" || key.name === "j") {
+      setSelectedIndex((prev) => Math.min(prev + 1, maxIndex));
       return;
     }
-    if (key.name === "f") {
-      const targets = getSelectedRows();
-      if (targets.length === 0)
-        return;
-      const repoNames = [...new Set(targets.map((t) => t.repoName))];
-      const label = repoNames.length === 1 ? repoNames[0] : `${repoNames.length} repos`;
-      startAction("fetch", `Fetch ${label}`, label, repoNames, undefined, ["fetch", "--repo", repoNames.join(",")]).then(() => setSelection(new Set));
-      return;
-    } else if (key.name === "down" || key.name === "j") {
-      setSelectedIndex((prev) => Math.min(prev + 1, maxIndex));
-    } else if (key.name === "up" || key.name === "k") {
+    if (key.name === "up" || key.name === "k") {
       setSelectedIndex((prev) => Math.max(prev - 1, 0));
-    } else if (key.name === "r") {
+      return;
+    }
+    if (key.name === "r" && !key.shift) {
       refresh();
-    } else if (key.name === "c") {
+      return;
+    }
+    if (key.name === "c" && !key.ctrl) {
       setConfigOpen(true);
-    } else if (key.name === "?" || key.name === "H" || key.name === "h" && key.shift) {
+      return;
+    }
+    if (key.name === "?" || key.name === "H" || key.name === "h" && key.shift) {
       if (key.name === "?") {
         setModal({ type: "help" });
       } else {
         setModal({ type: "history" });
       }
-    } else if (key.name === "n") {
+      return;
+    }
+    if (key.name === "n") {
       if (!selectedRow)
         return;
       setCreateModal(true);
       setCreateError(undefined);
-    } else if (key.name === "o") {
+      return;
+    }
+    if (key.name === "f") {
+      const targets = getSelectedRows();
+      if (targets.length > 0)
+        startFetch(targets);
+      return;
+    }
+    if (key.name === "o") {
       const targets = getSelectedRows();
       if (targets.length === 0)
         return;
       if (targets.length > 1) {
-        setActionMessage("Cannot open multiple worktrees");
-        setTimeout(() => setActionMessage(undefined), 3000);
+        flash("Cannot open multiple worktrees");
         return;
       }
       const target = targets[0];
       if (!target)
         return;
-      startAction("open", `Open ${target.branch}`, target.branch, [target.repoName], target.path, ["open", target.branch, "--repo", target.repoName]);
-    } else if (key.name === "d" || key.name === "D" && key.shift) {
+      const conflict = findConflict(targets);
+      if (conflict) {
+        flash(conflict);
+        return;
+      }
+      const op = {
+        id: nextOpId.current++,
+        kind: "open",
+        repoNames: [target.repoName],
+        rowPath: target.path,
+        label: target.branch,
+        title: `Open ${target.branch}`,
+        status: "queued",
+        lines: []
+      };
+      setOps((prev) => [...prev, op]);
+      executeOp(op, ["open", target.branch, "--repo", target.repoName], null);
+      return;
+    }
+    if (key.name === "d" || key.name === "D" && key.shift) {
       const targets = getSelectedRows();
       if (targets.length === 0)
         return;
       if (targets.some((r) => r.isMainCheckout)) {
-        setActionMessage("Cannot remove main checkout");
-        setTimeout(() => setActionMessage(undefined), 3000);
+        flash("Cannot remove main checkout");
+        return;
+      }
+      const conflict = findConflict(targets);
+      if (conflict) {
+        flash(conflict);
         return;
       }
       setModal({ type: "confirm_remove", rows: targets });
-    } else if (key.name === "b" || key.name === "R" || key.name === "r" && key.shift) {
+      return;
+    }
+    if (key.name === "b" || key.name === "R" || key.name === "r" && key.shift) {
       const targets = getSelectedRows();
       if (targets.length === 0)
         return;
       if (targets.some((r) => r.isMainCheckout)) {
-        setActionMessage("Cannot rebase main checkout");
-        setTimeout(() => setActionMessage(undefined), 3000);
+        flash("Cannot rebase main checkout");
+        return;
+      }
+      const conflict = findConflict(targets);
+      if (conflict) {
+        flash(conflict);
         return;
       }
       setModal({ type: "confirm_rebase", rows: targets });
-    } else if (key.name === "s") {
+      return;
+    }
+    if (key.name === "s") {
       const targets = getSelectedRows();
       if (targets.length === 0)
         return;
       if (targets.some((r) => r.isMainCheckout)) {
-        setActionMessage("Cannot sync main checkout");
-        setTimeout(() => setActionMessage(undefined), 3000);
+        flash("Cannot sync main checkout");
+        return;
+      }
+      const conflict = findConflict(targets);
+      if (conflict) {
+        flash(conflict);
         return;
       }
       setModal({ type: "confirm_sync", rows: targets });
+      return;
+    }
+    if (key.name === "a") {
+      const targets = getSelectedRows();
+      if (targets.length === 0)
+        return;
+      const target = targets[0];
+      if (!target)
+        return;
+      const conflict = findConflict([target]);
+      if (conflict) {
+        flash(conflict);
+        return;
+      }
+      (async () => {
+        const startedAt = Date.now();
+        try {
+          const config2 = await loadConfig();
+          const cmdTemplate = resolveAgentCommand("claude", config2.agents) ?? "claude";
+          const result = await spawnAgentInWorktree(cmdTemplate, target.path, { repoName: target.repoName, branch: target.branch });
+          appendHistory({
+            ts: new Date().toISOString(),
+            source: "terminal",
+            command: "agent",
+            args: ["agent", target.branch, "--repo", target.repoName],
+            durationMs: Date.now() - startedAt,
+            exit: 0
+          });
+          flash(`Agent spawned (${result.mode}${result.session ? ` session ${result.session}` : ""})`, 5000);
+        } catch (e) {
+          appendHistory({
+            ts: new Date().toISOString(),
+            source: "terminal",
+            command: "agent",
+            args: ["agent", target.branch, "--repo", target.repoName],
+            durationMs: Date.now() - startedAt,
+            exit: 1
+          });
+          flash(`Agent failed: ${e.message}`, 5000);
+        }
+      })();
     }
   });
   return /* @__PURE__ */ jsxs10("box", {
@@ -26912,10 +27114,12 @@ function App({ opts }) {
         flexGrow: 1,
         children: [
           /* @__PURE__ */ jsx11(WorktreeTable, {
-            blocks: filteredBlocks,
+            blocks: displayBlocks,
             selectedIndex,
             selection,
-            busy: busy ? { repoNames: busy.repoNames, rowPath: busy.rowPath, verb: VERBS[busy.kind], frame: spinnerFrame } : undefined
+            frame: spinnerFrame,
+            repoVerbs,
+            rowVerbs
           }),
           /* @__PURE__ */ jsx11(DetailPane, {
             selectedRow
@@ -26939,11 +27143,11 @@ function App({ opts }) {
         ]
       }),
       /* @__PURE__ */ jsx11(Footer, {
-        loading,
+        loading: loading || refreshing,
         lastRefreshed,
         errorCount: warnings.length,
         message: actionMessage,
-        busyText: actionRun && !actionRun.done ? `${capitalize(VERBS[actionRun.kind])} ${actionRun.label}…` : undefined,
+        busyText: latestOp ? `${capitalize(VERBS[latestOp.kind])} ${latestOp.label}…${runningOps.length > 1 ? ` (+${runningOps.length - 1})` : ""}` : undefined,
         spinnerFrame,
         filter: filterText ? { term: filterText, matches: flatRows.length, total: totalRows } : undefined
       }),
@@ -26979,7 +27183,7 @@ function App({ opts }) {
         message: `Are you sure you want to sync ${modal.rows.length === 1 ? modal.rows[0]?.branch : modal.rows.length + " worktrees"}?`
       }),
       createModal && /* @__PURE__ */ jsx11(InputModal, {
-        title: "New worktree branch",
+        title: `New worktree branch in ${selectedRow?.repoName ?? ""}`,
         placeholder: "Branch name (empty to cancel)",
         errorMessage: createError,
         onSubmit: (value) => {
@@ -26992,10 +27196,16 @@ function App({ opts }) {
             setCreateError("Invalid branch name");
             return;
           }
-          setCreateModal(false);
-          if (selectedRow) {
-            startAction("create", `Create ${branch}`, `${branch} in ${selectedRow.repoName}`, [selectedRow.repoName], undefined, ["create", branch, "--repo", selectedRow.repoName]);
+          const repoName = selectedRow?.repoName;
+          if (!repoName)
+            return;
+          if (busyRepos.has(repoName)) {
+            setCreateError(`${repoName} is busy`);
+            return;
           }
+          setCreateModal(false);
+          setCreateError(undefined);
+          startCreate(branch, repoName);
         }
       }),
       configOpen && /* @__PURE__ */ jsx11(ConfigOverlay, {
@@ -27003,11 +27213,12 @@ function App({ opts }) {
         onSaved: () => refresh(),
         onError: (msg) => setModal({ type: "error", message: msg })
       }),
-      actionRun?.done && /* @__PURE__ */ jsx11(ActionLogModal, {
-        title: actionRun.title,
-        lines: actionRun.lines,
-        done: actionRun.done,
-        exitCode: actionRun.exitCode
+      failedLogs.length > 0 && /* @__PURE__ */ jsx11(ActionLogModal, {
+        title: failedLogs[0].title,
+        lines: failedLogs[0].lines,
+        done: true,
+        exitCode: failedLogs[0].exitCode,
+        remaining: failedLogs.length - 1
       })
     ]
   });
@@ -31194,7 +31405,7 @@ function registerTerminalCommand(program2) {
 `);
       process.stderr.write(`  To use the dashboard, run it via Bun:
 `);
-      process.stderr.write(`    bunx wtx terminal
+      process.stderr.write(`    bunx --bun wtx terminal
 
 `);
       process.stderr.write("  Note: `wtx ls` provides a fast list view and works everywhere.\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogpoyraz/wtx",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Multi-repo git worktree manager",
   "type": "module",
   "bin": {