sync-worktrees 4.0.0 → 4.2.0

package/dist/index.js

@@ -4,7 +4,7 @@
 import { realpathSync as realpathSync2 } from "fs";
 import * as path17 from "path";
 import { fileURLToPath } from "url";
-import pLimit3 from "p-limit";
+import pLimit4 from "p-limit";
 
 // src/constants.ts
 var GIT_CONSTANTS = {
@@ -141,6 +141,8 @@ var SyncWorktreesError = class extends Error {
 Caused by: ${cause.stack}`;
     }
   }
+  code;
+  cause;
 };
 var GitError = class extends SyncWorktreesError {
   constructor(message, code, cause) {
@@ -163,6 +165,8 @@ var WorktreeNotCleanError = class extends WorktreeError {
     this.path = path18;
     this.reasons = reasons;
   }
+  path;
+  reasons;
 };
 var ConfigError = class extends SyncWorktreesError {
   constructor(message, code, cause) {
@@ -175,18 +179,22 @@ var ConfigValidationError = class extends ConfigError {
     this.field = field;
     this.reason = reason;
   }
+  field;
+  reason;
 };
 var ConfigFileNotFoundError = class extends ConfigError {
   constructor(configPath) {
     super(`Config file not found: ${configPath}`, "FILE_NOT_FOUND");
     this.configPath = configPath;
   }
+  configPath;
 };
 var ConfigFileExistsError = class extends ConfigError {
   constructor(configPath) {
     super(`Config file already exists: ${configPath}`, "FILE_EXISTS");
     this.configPath = configPath;
   }
+  configPath;
 };
 
 // src/services/config-loader.service.ts
@@ -814,19 +822,28 @@ import React8 from "react";
 import * as path14 from "path";
 import { render } from "ink";
 import * as cron2 from "node-cron";
-import pLimit2 from "p-limit";
+import pLimit3 from "p-limit";
 import { spawn as spawn2, spawnSync } from "child_process";
 import { existsSync as existsSync2 } from "fs";
 
 // src/components/App.tsx
 import React7, { useState as useState6, useEffect as useEffect6, useCallback as useCallback4, useRef as useRef5 } from "react";
-import { Box as Box7, useInput as useInput6, useStdout } from "ink";
+import { Box as Box7, useInput as useInput6, useWindowSize } from "ink";
 
 // src/components/StatusBar.tsx
 import React, { useState, useEffect } from "react";
 import { Box, Text } from "ink";
 import { CronExpressionParser } from "cron-parser";
-var StatusBar = ({ status, repositoryCount, lastSyncTime, cronSchedule, diskSpaceUsed }) => {
+var StatusBar = ({
+  status,
+  syncProgressEntries = [],
+  activeOps = [],
+  maxProgressLines = 2,
+  repositoryCount,
+  lastSyncTime,
+  cronSchedule,
+  diskSpaceUsed
+}) => {
   const [nextSyncTime, setNextSyncTime] = useState(null);
   useEffect(() => {
     if (!cronSchedule) {
@@ -856,7 +873,14 @@ var StatusBar = ({ status, repositoryCount, lastSyncTime, cronSchedule, diskSpac
   const getStatusIcon = () => {
     return status === "syncing" ? "\u27F3" : "\u2713";
   };
-  return /* @__PURE__ */ React.createElement(Box, { borderStyle: "single", paddingX: 1 }, /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, { bold: true }, getStatusIcon(), " Status:", " ", /* @__PURE__ */ React.createElement(Text, { color: getStatusColor() }, status === "syncing" ? "Syncing..." : "Running")), /* @__PURE__ */ React.createElement(Text, null, "Repositories: ", /* @__PURE__ */ React.createElement(Text, { bold: true, color: "cyan" }, repositoryCount))), /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, null, "Last Sync: ", /* @__PURE__ */ React.createElement(Text, { color: "gray" }, formatTime(lastSyncTime))), cronSchedule && /* @__PURE__ */ React.createElement(Text, null, "Next Sync: ", /* @__PURE__ */ React.createElement(Text, { color: "gray" }, formatTime(nextSyncTime)))), /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, null, "Disk Space: ", /* @__PURE__ */ React.createElement(Text, { color: "magenta" }, diskSpaceUsed || "Calculating...")), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "s"), "ync", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "c"), "reate", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "o"), "pen", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "w"), "tree", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "r"), "eload", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "?"), "help", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "q"), "uit"))));
+  const formatProgress = (syncProgress) => `[${syncProgress.repo}] ${syncProgress.message}`;
+  const progressLineCount = Math.max(1, maxProgressLines);
+  const visibleProgress = syncProgressEntries.slice(-progressLineCount);
+  return /* @__PURE__ */ React.createElement(Box, { borderStyle: "single", paddingX: 1 }, /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, { bold: true }, getStatusIcon(), " Status:", " ", /* @__PURE__ */ React.createElement(Text, { color: getStatusColor() }, status === "syncing" ? "Syncing..." : "Running")), /* @__PURE__ */ React.createElement(Text, null, "Repositories: ", /* @__PURE__ */ React.createElement(Text, { bold: true, color: "cyan" }, repositoryCount))), /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, null, "Last Sync: ", /* @__PURE__ */ React.createElement(Text, { color: "gray" }, formatTime(lastSyncTime))), cronSchedule && /* @__PURE__ */ React.createElement(Text, null, "Next Sync: ", /* @__PURE__ */ React.createElement(Text, { color: "gray" }, formatTime(nextSyncTime)))), status === "syncing" && Array.from({ length: progressLineCount }).map((_, index) => {
+    const entry = visibleProgress[index];
+    const message = entry ? formatProgress(entry) : index === 0 ? "waiting for progress events" : "";
+    return /* @__PURE__ */ React.createElement(Box, { key: index }, /* @__PURE__ */ React.createElement(Text, { wrap: "truncate" }, message ? "Progress: " : " ", message && /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, message)));
+  }), activeOps.map((label, index) => /* @__PURE__ */ React.createElement(Box, { key: `op-${index}` }, /* @__PURE__ */ React.createElement(Text, { wrap: "truncate" }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "\u23F3 "), /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, label)))), /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, null, "Disk Space: ", /* @__PURE__ */ React.createElement(Text, { color: "magenta" }, diskSpaceUsed || "Calculating...")), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "s"), "ync", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "c"), "reate", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "o"), "pen", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "w"), "tree", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "r"), "eload", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "?"), "help", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "q"), "uit"))));
 };
 var StatusBar_default = StatusBar;
 
@@ -875,7 +899,7 @@ var HelpModal_default = HelpModal;
 
 // src/components/BranchCreationWizard.tsx
 import React3, { useState as useState2, useEffect as useEffect2, useCallback, useMemo, useRef } from "react";
-import { Box as Box3, Text as Text3, useInput as useInput2 } from "ink";
+import { Box as Box3, Text as Text3, useInput as useInput2, usePaste } from "ink";
 
 // src/utils/git-validation.ts
 function isValidGitBranchName(name) {
@@ -1141,6 +1165,17 @@ var BranchCreationWizard = ({
       onComplete(result?.success ?? false);
     }
   });
+  usePaste((text) => {
+    if (step === "SELECT_PROJECT") {
+      setProjectFilter((prev) => prev + text);
+      setSelectedProjectIndex(0);
+    } else if (step === "SELECT_BRANCH") {
+      setBranchFilter((prev) => prev + text);
+      setSelectedBranchIndex(0);
+    } else if (step === "ENTER_NAME") {
+      setBranchName((prev) => prev + text.replace(/[^a-zA-Z0-9/._-]/g, ""));
+    }
+  });
   const getStepNumber = () => {
     if (repositories.length === 1) {
       if (step === "SELECT_BRANCH") return 1;
@@ -1234,7 +1269,7 @@ var BranchCreationWizard_default = BranchCreationWizard;
 
 // src/components/OpenEditorWizard.tsx
 import React4, { useState as useState3, useEffect as useEffect3, useMemo as useMemo2, useCallback as useCallback2, useRef as useRef2 } from "react";
-import { Box as Box4, Text as Text4, useInput as useInput3 } from "ink";
+import { Box as Box4, Text as Text4, useInput as useInput3, usePaste as usePaste2 } from "ink";
 var OpenEditorWizard = ({
   repositories,
   getWorktreesForRepo,
@@ -1352,6 +1387,15 @@ var OpenEditorWizard = ({
       onClose();
     }
   });
+  usePaste2((text) => {
+    if (step === "SELECT_PROJECT") {
+      setProjectFilter((prev) => prev + text);
+      setSelectedProjectIndex(0);
+    } else if (step === "SELECT_WORKTREE") {
+      setWorktreeFilter((prev) => prev + text);
+      setSelectedWorktreeIndex(0);
+    }
+  });
   const getStepNumber = () => {
     if (repositories.length === 1) {
       return 1;
@@ -1423,7 +1467,7 @@ var OpenEditorWizard_default = OpenEditorWizard;
 
 // src/components/WorktreeStatusView.tsx
 import React5, { useState as useState4, useEffect as useEffect4, useMemo as useMemo3, useCallback as useCallback3, useRef as useRef3 } from "react";
-import { Box as Box5, Text as Text5, useInput as useInput4 } from "ink";
+import { Box as Box5, Text as Text5, useInput as useInput4, usePaste as usePaste3 } from "ink";
 
 // src/utils/lfs-error.ts
 function getErrorMessage(error) {
@@ -1526,6 +1570,7 @@ var formatDivergedDate = (dateStr) => {
 var WorktreeStatusView = ({
   repositories,
   getWorktreeStatusForRepo,
+  getRepositoryDiskUsage,
   getDivergedDirectoriesForRepo,
   deleteDivergedDirectory,
   onClose
@@ -1540,6 +1585,8 @@ var WorktreeStatusView = ({
   const [entryFilter, setEntryFilter] = useState4("");
   const [expandedEntry, setExpandedEntry] = useState4(null);
   const [loading, setLoading] = useState4(false);
+  const [repoDiskUsage, setRepoDiskUsage] = useState4({});
+  const requestedDiskUsageRef = useRef3(/* @__PURE__ */ new Set());
   const [confirmDelete, setConfirmDelete] = useState4(null);
   const [deleting, setDeleting] = useState4(false);
   const [error, setError] = useState4(null);
@@ -1595,6 +1642,29 @@ var WorktreeStatusView = ({
     },
     [getWorktreeStatusForRepo, getDivergedDirectoriesForRepo]
   );
+  useEffect4(() => {
+    if (!getRepositoryDiskUsage) return void 0;
+    let cancelled = false;
+    const indexesToLoad = repositories.map((repo) => repo.index).filter((repoIndex) => !requestedDiskUsageRef.current.has(repoIndex));
+    if (indexesToLoad.length === 0) return void 0;
+    for (const repoIndex of indexesToLoad) {
+      requestedDiskUsageRef.current.add(repoIndex);
+      setRepoDiskUsage((prev) => ({ ...prev, [repoIndex]: { status: "loading" } }));
+      void getRepositoryDiskUsage(repoIndex).then((usage) => {
+        if (cancelled) return;
+        setRepoDiskUsage((prev) => ({ ...prev, [repoIndex]: { status: "ready", usage } }));
+      }).catch(() => {
+        if (cancelled) return;
+        setRepoDiskUsage((prev) => ({
+          ...prev,
+          [repoIndex]: { status: "error" }
+        }));
+      });
+    }
+    return () => {
+      cancelled = true;
+    };
+  }, [repositories, getRepositoryDiskUsage]);
   useEffect4(() => {
     if (step === "VIEW_STATUS" && entries.length === 0 && !loading && selectedRepoIndexRef.current >= 0) {
       loadStatus(selectedRepoIndexRef.current);
@@ -1668,11 +1738,11 @@ var WorktreeStatusView = ({
       } else if (key.downArrow) {
         setSelectedProjectIndex((prev) => Math.min(filteredProjects.length - 1, prev + 1));
       } else if (key.return && filteredProjects.length > 0) {
-        const selectedRepo = filteredProjects[selectedProjectIndex];
-        if (selectedRepo) {
-          selectedRepoIndexRef.current = selectedRepo.index;
+        const selectedRepo2 = filteredProjects[selectedProjectIndex];
+        if (selectedRepo2) {
+          selectedRepoIndexRef.current = selectedRepo2.index;
           setStep("VIEW_STATUS");
-          loadStatus(selectedRepo.index);
+          loadStatus(selectedRepo2.index);
         }
       } else if (key.backspace || key.delete) {
         setProjectFilter((prev) => prev.slice(0, -1));
@@ -1703,6 +1773,17 @@ var WorktreeStatusView = ({
       onClose();
     }
   });
+  usePaste3((text) => {
+    if (confirmDelete !== null) return;
+    if (step === "SELECT_PROJECT") {
+      setProjectFilter((prev) => prev + text);
+      setSelectedProjectIndex(0);
+    } else if (step === "VIEW_STATUS" && !loading) {
+      setEntryFilter((prev) => prev + text);
+      setSelectedEntryIndex(0);
+      setExpandedEntry(null);
+    }
+  });
   const getStepNumber = () => {
     if (repositories.length === 1) return 1;
     return step === "SELECT_PROJECT" ? 1 : 2;
@@ -1720,7 +1801,7 @@ var WorktreeStatusView = ({
     return /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "column", gap: 1 }, /* @__PURE__ */ React5.createElement(Text5, null, "Select repository:"), /* @__PURE__ */ React5.createElement(Box5, null, /* @__PURE__ */ React5.createElement(Text5, null, "Filter: "), /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, projectFilter || "_"), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " ", "(", filteredProjects.length, "/", repositories.length, " matches)")), /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "column" }, filteredProjects.length === 0 ? /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, "No matches") : /* @__PURE__ */ React5.createElement(React5.Fragment, null, startIdx > 0 && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " ..."), visibleProjects.map((repo, idx) => {
       const actualIdx = startIdx + idx;
       const isSelected = actualIdx === selectedProjectIndex;
-      return /* @__PURE__ */ React5.createElement(Box5, { key: repo.index }, /* @__PURE__ */ React5.createElement(Text5, { color: isSelected ? "cyan" : void 0 }, isSelected ? "> " : "  ", repo.name));
+      return /* @__PURE__ */ React5.createElement(Box5, { key: repo.index }, /* @__PURE__ */ React5.createElement(Text5, { color: isSelected ? "cyan" : void 0 }, isSelected ? "> " : "  "), /* @__PURE__ */ React5.createElement(Box5, { width: 38 }, /* @__PURE__ */ React5.createElement(Text5, { color: isSelected ? "cyan" : void 0 }, repo.name)), getRepositoryDiskUsage && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " "), renderRepositoryDiskUsage(repo.index));
     }), endIdx < filteredProjects.length && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " ..."))));
   };
   const renderDetailPanel = (entry) => {
@@ -1731,6 +1812,17 @@ var WorktreeStatusView = ({
   const renderDivergedDetailPanel = (entry) => {
     return /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "column", marginLeft: 4, marginTop: 0, marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "Path: ", entry.path), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " Original branch: ", entry.originalBranch), entry.divergedAt && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " Diverged: ", entry.divergedAt), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " Size: ", entry.sizeFormatted));
   };
+  const renderRepositoryDiskUsage = (repoIndex) => {
+    if (!getRepositoryDiskUsage) return null;
+    const state = repoDiskUsage[repoIndex];
+    if (!state || state.status === "loading") {
+      return /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "Size: calculating...");
+    }
+    if (state.status === "error") {
+      return /* @__PURE__ */ React5.createElement(Text5, { color: "red" }, "Size: N/A");
+    }
+    return /* @__PURE__ */ React5.createElement(Text5, null, "Size: ", /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, state.usage.sizeFormatted));
+  };
   const renderStatusList = () => {
     if (loading) {
       return /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, "Loading worktree status...");
@@ -1784,7 +1876,8 @@ var WorktreeStatusView = ({
     }
     return /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, step === "VIEW_STATUS" ? isDivergedSelected ? "\u2191/\u2193 navigate \u2022 Type to filter \u2022 Enter to expand \u2022 d to delete \u2022 ESC to close" : "\u2191/\u2193 navigate \u2022 Type to filter \u2022 Enter to expand \u2022 ESC to close" : "\u2191/\u2193 navigate \u2022 Type to filter \u2022 Enter to select \u2022 ESC to cancel");
   };
-  return /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "column", marginTop: 1, marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Box5, { borderStyle: "round", borderColor: "green", paddingX: 2, paddingY: 1, flexDirection: "column", width: 70 }, /* @__PURE__ */ React5.createElement(Box5, { marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Text5, { bold: true, color: "green" }, "\u{1F4CA} Worktree Status", " ", step !== "ERROR" && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "(Step ", getStepNumber(), "/", getTotalSteps(), ")"))), repositories.length > 1 && step === "VIEW_STATUS" && !loading && selectedRepoIndexRef.current >= 0 && /* @__PURE__ */ React5.createElement(Box5, { marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Text5, null, "Repository: ", /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, repositories.find((r) => r.index === selectedRepoIndexRef.current)?.name))), renderContent(), /* @__PURE__ */ React5.createElement(Box5, { marginTop: 1 }, renderFooter())));
+  const selectedRepo = selectedRepoIndexRef.current >= 0 ? repositories.find((repo) => repo.index === selectedRepoIndexRef.current) : void 0;
+  return /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "column", marginTop: 1, marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Box5, { borderStyle: "round", borderColor: "green", paddingX: 2, paddingY: 1, flexDirection: "column", width: 70 }, /* @__PURE__ */ React5.createElement(Box5, { marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Text5, { bold: true, color: "green" }, "\u{1F4CA} Worktree Status", " ", step !== "ERROR" && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "(Step ", getStepNumber(), "/", getTotalSteps(), ")"))), step === "VIEW_STATUS" && selectedRepo && /* @__PURE__ */ React5.createElement(Box5, { marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Text5, null, "Repository: ", /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, selectedRepo.name)), getRepositoryDiskUsage && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "  "), renderRepositoryDiskUsage(selectedRepo.index)), renderContent(), /* @__PURE__ */ React5.createElement(Box5, { marginTop: 1 }, renderFooter())));
 };
 var WorktreeStatusView_default = WorktreeStatusView;
 
@@ -1893,7 +1986,9 @@ var App = ({
   onManualSync,
   onReload,
   onQuit,
+  maxProgressLines = 2,
   getRepositoryList,
+  getRepositoryDiskUsage,
   getBranchesForRepo,
   getDefaultBranchForRepo,
   fetchForRepo,
@@ -1913,12 +2008,15 @@ var App = ({
   const [showOpenEditorWizard, setShowOpenEditorWizard] = useState6(false);
   const [showWorktreeStatus, setShowWorktreeStatus] = useState6(false);
   const [status, setStatus] = useState6("idle");
+  const [activeOps, setActiveOps] = useState6([]);
+  const opIdRef = useRef5(0);
+  const [syncProgressEntries, setSyncProgressEntries] = useState6([]);
   const [lastSyncTime, setLastSyncTime] = useState6(null);
   const [diskSpaceUsed, setDiskSpaceUsed] = useState6(null);
   const [logs, setLogs] = useState6([]);
   const [repoCount, setRepoCount] = useState6(repositoryCount);
   const [schedule2, setSchedule] = useState6(cronSchedule);
-  const { stdout } = useStdout();
+  const { rows } = useWindowSize();
   const addLog = useCallback4((message, level = "info") => {
     setLogs((prev) => {
       const newLogs = [
@@ -1952,11 +2050,11 @@ var App = ({
       onQuit().catch((err) => console.error("Quit failed:", err));
     } else if (input2 === "?" || input2 === "h") {
       setShowHelp(true);
-    } else if (input2 === "c" && status === "idle") {
+    } else if (input2 === "c") {
       setShowBranchWizard(true);
-    } else if (input2 === "o" && status === "idle") {
+    } else if (input2 === "o") {
       setShowOpenEditorWizard(true);
-    } else if (input2 === "w" && status === "idle" && getWorktreeStatusForRepo) {
+    } else if (input2 === "w" && getWorktreeStatusForRepo) {
       setShowWorktreeStatus(true);
     } else if (input2 === "s" && status !== "syncing") {
       setStatus("syncing");
@@ -1983,15 +2081,36 @@ var App = ({
   const updateLastSyncTime = useCallback4(() => {
     setLastSyncTime(/* @__PURE__ */ new Date());
     setStatus("idle");
+    setSyncProgressEntries([]);
   }, []);
   useEffect6(() => {
     const unsubscribers = [
       events.on("updateLastSyncTime", () => {
         setLastSyncTime(/* @__PURE__ */ new Date());
         setStatus("idle");
+        setSyncProgressEntries([]);
       }),
       events.on("setStatus", (newStatus) => {
         setStatus(newStatus);
+        if (newStatus === "idle") {
+          setSyncProgressEntries([]);
+        }
+      }),
+      events.on("setSyncProgress", (progress) => {
+        if (progress === null) {
+          setSyncProgressEntries([]);
+          return;
+        }
+        setSyncProgressEntries((prev) => {
+          if (progress.completed) {
+            return prev.filter((entry) => entry.repo !== progress.repo);
+          }
+          const existingIndex = prev.findIndex((entry) => entry.repo === progress.repo);
+          if (existingIndex === -1) {
+            return [...prev, progress];
+          }
+          return prev.map((entry, index) => index === existingIndex ? progress : entry);
+        });
       }),
       events.on("setDiskSpace", (diskSpace) => {
         setDiskSpaceUsed(diskSpace);
@@ -2011,8 +2130,9 @@ var App = ({
       unsubscribers.forEach((unsub) => unsub());
     };
   }, []);
-  const statusBarHeight = 5;
-  const terminalRows = stdout.rows ?? 24;
+  const progressLineCount = status === "syncing" ? Math.max(1, maxProgressLines) : 0;
+  const statusBarHeight = 5 + progressLineCount + activeOps.length;
+  const terminalRows = rows ?? 24;
   const logPanelHeight = Math.max(5, terminalRows - statusBarHeight);
   const showModal = showHelp || showBranchWizard || showOpenEditorWizard || showWorktreeStatus;
   return /* @__PURE__ */ React7.createElement(Box7, { flexDirection: "column", minHeight: terminalRows }, !showModal && /* @__PURE__ */ React7.createElement(LogPanel_default, { logs, height: logPanelHeight, isActive: !showModal }), showHelp && /* @__PURE__ */ React7.createElement(HelpModal_default, { onClose: () => setShowHelp(false) }), showBranchWizard && /* @__PURE__ */ React7.createElement(
@@ -2025,7 +2145,8 @@ var App = ({
       createAndPushBranch,
       onClose: () => setShowBranchWizard(false),
       onBranchCreated: (context) => {
-        setStatus("syncing");
+        const opId = ++opIdRef.current;
+        setActiveOps((prev) => [...prev, { id: opId, label: `Creating worktree ${context.newBranch}` }]);
         (async () => {
           try {
             await createWorktreeForBranch(context.repoIndex, context.newBranch);
@@ -2054,7 +2175,7 @@ var App = ({
               level: "error"
             });
           } finally {
-            setStatus("idle");
+            setActiveOps((prev) => prev.filter((op) => op.id !== opId));
           }
         })().catch((err) => console.error("Branch creation unhandled error:", err));
       },
@@ -2076,6 +2197,7 @@ var App = ({
     {
       repositories: getRepositoryList(),
       getWorktreeStatusForRepo,
+      getRepositoryDiskUsage,
       getDivergedDirectoriesForRepo,
       deleteDivergedDirectory,
       onClose: () => setShowWorktreeStatus(false)
@@ -2084,6 +2206,9 @@ var App = ({
     StatusBar_default,
     {
       status,
+      syncProgressEntries,
+      activeOps: activeOps.map((op) => op.label),
+      maxProgressLines,
       repositoryCount: repoCount,
       lastSyncTime,
       cronSchedule: schedule2,
@@ -2093,6 +2218,9 @@ var App = ({
 };
 var App_default = App;
 
+// src/services/worktree-sync.service.ts
+import pLimit2 from "p-limit";
+
 // src/utils/retry.ts
 var DEFAULT_OPTIONS = {
   maxAttempts: "unlimited",
@@ -2287,7 +2415,7 @@ function makeGitProgressHandler(logger, emitProgress) {
     lastBucket.set(key, bucket);
     const total = event.total > 0 ? `${event.processed}/${event.total}` : `${event.processed}`;
     const message = `${event.method} ${event.stage}: ${event.progress}% (${total})`;
-    logger.info(`  \u21B3 ${message}`);
+    logger.debug(`  \u21B3 ${message}`);
     emitProgress?.({
       phase: event.method,
       message,
@@ -2493,6 +2621,7 @@ var SyncOutcomeAccumulator = class {
   constructor(options) {
     this.options = options;
   }
+  options;
   counts = cloneCounts(EMPTY_COUNTS);
   actions = [];
   add(action) {
@@ -2569,6 +2698,9 @@ var CloneSyncService = class {
     this.progressEmitter = options.progressEmitter;
     this.onSkip = options.onSkip;
   }
+  config;
+  gitService;
+  logger;
   initialized = false;
   resolvedBranch = null;
   branchCreatedActions;
@@ -3674,6 +3806,7 @@ var WorktreeStatusService = class {
     this.config = config;
     this.logger = logger ?? Logger.createDefault();
   }
+  config;
   gitInstances = /* @__PURE__ */ new Map();
   logger;
   async checkWorktreeStatus(worktreePath) {
@@ -4022,8 +4155,9 @@ function sanitizeGitEnv(env) {
   return sanitized;
 }
 var GitService = class {
-  constructor(config, logger) {
+  constructor(config, logger, progressEmitter) {
     this.config = config;
+    this.progressEmitter = progressEmitter;
     this.logger = logger ?? Logger.createDefault(void 0, config.debug);
     this.bareRepoPath = this.config.bareRepoDir || getDefaultBareRepoDir(this.config.repoUrl);
     this.mainWorktreePath = path8.join(this.config.worktreeDir, GIT_CONSTANTS.DEFAULT_BRANCH);
@@ -4031,6 +4165,8 @@ var GitService = class {
     this.statusService = new WorktreeStatusService({ skipLfs: this.config.skipLfs }, this.logger);
     this.sparseCheckoutService = new SparseCheckoutService(this.logger);
   }
+  config;
+  progressEmitter;
   git = null;
   bareRepoPath;
   mainWorktreePath;
@@ -4064,7 +4200,9 @@ var GitService = class {
     return git;
   }
   buildSimpleGitOptions(blockMs) {
-    const options = { progress: makeGitProgressHandler(this.logger) };
+    const options = {
+      progress: makeGitProgressHandler(this.logger, (event) => this.progressEmitter?.(event))
+    };
     if (blockMs > 0) options.timeout = { block: blockMs };
     return options;
   }
@@ -4923,6 +5061,9 @@ var RepoOperationLock = class {
     this.gitService = gitService;
     this.logger = logger;
   }
+  config;
+  gitService;
+  logger;
   updateLogger(logger) {
     this.logger = logger;
   }
@@ -4984,6 +5125,9 @@ var SyncRetryPolicy = class {
     this.gitService = gitService;
     this.logger = logger;
   }
+  config;
+  gitService;
+  logger;
   updateLogger(logger) {
     this.logger = logger;
   }
@@ -5204,6 +5348,10 @@ var WorktreeModeSyncRunner = class {
     this.logger = logger;
     this.progressEmitter = progressEmitter;
   }
+  config;
+  gitService;
+  logger;
+  progressEmitter;
   pathResolution = new PathResolutionService();
   updateLogger(logger) {
     this.logger = logger;
@@ -5884,7 +6032,7 @@ var WorktreeSyncService = class {
   constructor(config) {
     this.config = config;
     this.logger = config.logger ?? Logger.createDefault(void 0, config.debug);
-    this.gitService = new GitService(config, this.logger);
+    this.gitService = new GitService(config, this.logger, (event) => this.emitProgress(event));
     this.repoOperationLock = new RepoOperationLock(config, this.gitService, this.logger);
     this.retryPolicy = new SyncRetryPolicy(config, this.gitService, this.logger);
     this.worktreeModeSyncRunner = new WorktreeModeSyncRunner(
@@ -5902,10 +6050,15 @@ var WorktreeSyncService = class {
       });
     }
   }
+  config;
   gitService;
   cloneSyncService = null;
   logger;
-  syncInProgress = false;
+  // In-process FIFO serializer for all bare-repo-mutating operations (sync, init,
+  // interactive create). One per repo. wait:true callers queue behind an in-flight op;
+  // wait:false callers fail fast. The cross-process file lock (RepoOperationLock) is
+  // acquired inside the mutex body for multi-process safety.
+  repoMutex = pLimit2(1);
   progressEmitter = new ProgressEmitter();
   repoOperationLock;
   retryPolicy;
@@ -5957,7 +6110,7 @@ var WorktreeSyncService = class {
     return this.gitService.isInitialized();
   }
   isSyncInProgress() {
-    return this.syncInProgress;
+    return this.repoMutex.activeCount + this.repoMutex.pendingCount > 0;
   }
   getGitService() {
     return this.gitService;
@@ -5973,34 +6126,31 @@ var WorktreeSyncService = class {
   onProgress(listener) {
     return this.progressEmitter.onProgress(listener);
   }
-  async runExclusiveRepoOperation(operation) {
-    if (this.syncInProgress) {
+  async runExclusiveRepoOperation(operation, options = {}) {
+    if (!options.wait && this.repoMutex.activeCount + this.repoMutex.pendingCount > 0) {
       this.logger.warn("\u26A0\uFE0F  Another repository operation is already in progress, skipping...");
       return { started: false, reason: "in_progress" };
     }
-    this.syncInProgress = true;
-    let release;
-    try {
-      release = await this.repoOperationLock.acquire();
-    } catch (error) {
-      this.syncInProgress = false;
-      throw error;
-    }
-    if (release === null) {
-      this.syncInProgress = false;
-      this.logger.warn("\u26A0\uFE0F  Another process holds the sync lock for this repo, skipping...");
-      return { started: false, reason: "locked" };
-    }
-    try {
-      return { started: true, value: await operation() };
-    } finally {
+    return this.repoMutex(async () => {
+      const release = await this.repoOperationLock.acquire();
+      if (release === null) {
+        this.logger.warn("\u26A0\uFE0F  Another process holds the sync lock for this repo, skipping...");
+        return { started: false, reason: "locked" };
+      }
       try {
-        await release();
-      } catch (releaseError) {
-        this.logger.warn(`Failed to release sync lock: ${getErrorMessage(releaseError)}`);
+        return { started: true, value: await operation() };
+      } finally {
+        try {
+          await release();
+        } catch (releaseError) {
+          this.logger.warn(`Failed to release sync lock: ${getErrorMessage(releaseError)}`);
+        }
       }
-      this.syncInProgress = false;
-    }
+    });
+  }
+  // Interactive variant: queues behind any in-flight sync/op instead of failing fast.
+  async runQueuedRepoOperation(operation) {
+    return this.runExclusiveRepoOperation(operation, { wait: true });
   }
   emitProgress(event) {
     this.progressEmitter.emit(event);
@@ -6288,11 +6438,13 @@ var InteractiveUIService = class {
   branchCreatedActions = new BranchCreatedActionsService();
   pathResolution = new PathResolutionService();
   limit;
+  maxProgressLines;
   reloadInProgress = false;
   isDestroyed = false;
   events;
   ownsEvents;
   unsubscribeCallbacks = [];
+  progressUnsubscribers = [];
   constructor(syncServices, configPath, cronSchedule, maxParallel, events) {
     this.ownsEvents = events === void 0;
     this.events = events ?? new AppEventEmitter();
@@ -6303,9 +6455,11 @@ var InteractiveUIService = class {
     this.configPath = configPath;
     this.cronSchedule = cronSchedule;
     this.repositoryCount = syncServices.length;
-    this.limit = pLimit2(maxParallel ?? DEFAULT_CONFIG.PARALLELISM.MAX_REPOSITORIES);
+    this.maxProgressLines = Math.max(1, maxParallel ?? DEFAULT_CONFIG.PARALLELISM.MAX_REPOSITORIES);
+    this.limit = pLimit3(this.maxProgressLines);
     this.startBufferFlushCheck();
     this.renderUI();
+    this.subscribeToServiceProgress();
     this.injectLoggersIntoServices();
     setTimeout(() => {
       this.addLog("\u{1F680} sync-worktrees UI initialized", "info");
@@ -6343,6 +6497,26 @@ var InteractiveUIService = class {
       );
     }
   }
+  subscribeToServiceProgress() {
+    for (const unsubscribe of this.progressUnsubscribers) {
+      unsubscribe();
+    }
+    this.progressUnsubscribers = this.syncServices.map((service, index) => {
+      const repoName = this.getRepoName(index);
+      if (!service.onProgress) return () => void 0;
+      return service.onProgress((event) => {
+        if (this.isDestroyed) return;
+        this.events.emit("setSyncProgress", {
+          repo: repoName,
+          phase: event.phase,
+          message: event.message,
+          progress: event.progress,
+          processed: event.processed,
+          total: event.total
+        });
+      });
+    });
+  }
   addLog(message, level = "info") {
     if (this.isDestroyed) return;
     if (this.uiReady) {
@@ -6395,6 +6569,7 @@ var InteractiveUIService = class {
           events: this.events,
           repositoryCount: this.repositoryCount,
           cronSchedule: this.cronSchedule,
+          maxProgressLines: this.maxProgressLines,
           onManualSync: () => this.handleManualSync(),
           onReload: () => this.handleReload(),
           onQuit: () => this.handleQuit(),
@@ -6405,6 +6580,7 @@ var InteractiveUIService = class {
           createAndPushBranch: (repoIndex, baseBranch, branchName) => this.createAndPushBranch(repoIndex, baseBranch, branchName),
           getWorktreesForRepo: (index) => this.getWorktreesForRepo(index),
           getWorktreeStatusForRepo: (index) => this.getWorktreeStatusForRepo(index),
+          getRepositoryDiskUsage: (index) => this.getRepositoryDiskUsage(index),
           getDivergedDirectoriesForRepo: (index) => this.getDivergedDirectoriesForRepo(index),
           deleteDivergedDirectory: (repoIndex, name) => this.deleteDivergedDirectory(repoIndex, name),
           openEditorInWorktree: (path18) => this.openEditorInWorktree(path18),
@@ -6413,7 +6589,11 @@ var InteractiveUIService = class {
           createWorktreeForBranch: (repoIndex, branchName) => this.createWorktreeForBranch(repoIndex, branchName),
           executeOnBranchCreatedHooks: (repoIndex, context) => this.executeOnBranchCreatedHooks(repoIndex, context)
         }
-      )
+      ),
+      {
+        alternateScreen: true,
+        incrementalRendering: true
+      }
     );
   }
   async handleManualSync() {
@@ -6470,6 +6650,7 @@ var InteractiveUIService = class {
       cronJobsCancelled = true;
       this.syncServices = newServices;
       this.repositoryCount = this.syncServices.length;
+      this.subscribeToServiceProgress();
       this.injectLoggersIntoServices();
       const uniqueSchedules = [...new Set(this.syncServices.map((s) => s.config.cronSchedule))];
       this.cronSchedule = uniqueSchedules.length === 1 ? uniqueSchedules[0] : void 0;
@@ -6546,6 +6727,9 @@ var InteractiveUIService = class {
   setStatus(status) {
     if (this.isDestroyed) return;
     this.events.emit("setStatus", status);
+    if (status === "idle") {
+      this.events.emit("setSyncProgress", null);
+    }
   }
   setDiskSpace(diskSpace) {
     if (this.isDestroyed) return;
@@ -6575,6 +6759,46 @@ var InteractiveUIService = class {
     const service = this.syncServices[index];
     return service.config.name || `repo-${index}`;
   }
+  async getRepositoryDiskUsage(repoIndex) {
+    if (repoIndex < 0 || repoIndex >= this.syncServices.length) {
+      throw new Error(`Invalid repository index: ${repoIndex}`);
+    }
+    const service = this.syncServices[repoIndex];
+    const config = service.config;
+    const repoName = this.getRepoName(repoIndex);
+    const mode = resolveMode(config);
+    const sizeTargets = [
+      ...mode === "worktree" ? [{ kind: "bare", path: config.bareRepoDir || getDefaultBareRepoDir(config.repoUrl) }] : [],
+      { kind: "worktree", path: config.worktreeDir }
+    ];
+    let bareSizeBytes = 0;
+    let worktreeSizeBytes = 0;
+    const errors = [];
+    for (const target of sizeTargets) {
+      try {
+        const size = await calculateDirectorySize(target.path);
+        if (target.kind === "bare") {
+          bareSizeBytes = size;
+        } else {
+          worktreeSizeBytes = size;
+        }
+      } catch (error) {
+        errors.push(`${target.path}: ${error instanceof Error ? error.message : String(error)}`);
+      }
+    }
+    const sizeBytes = bareSizeBytes + worktreeSizeBytes;
+    const failedAllPaths = errors.length === sizeTargets.length;
+    const partialFailure = errors.length > 0 && !failedAllPaths;
+    return {
+      repoIndex,
+      repoName,
+      sizeBytes: failedAllPaths ? null : sizeBytes,
+      sizeFormatted: failedAllPaths ? "N/A" : partialFailure ? `\u2265${formatBytes(sizeBytes)}` : formatBytes(sizeBytes),
+      bareSizeBytes,
+      worktreeSizeBytes,
+      error: errors.length > 0 ? errors.join("; ") : void 0
+    };
+  }
   async getBranchesForRepo(repoIndex) {
     if (repoIndex < 0 || repoIndex >= this.syncServices.length) {
       throw new Error(`Invalid repository index: ${repoIndex}`);
@@ -6599,11 +6823,15 @@ var InteractiveUIService = class {
       throw new Error(`Invalid repository index: ${repoIndex}`);
     }
     const service = this.syncServices[repoIndex];
-    if (!service.isInitialized()) {
-      await service.initialize();
+    const result = await service.runQueuedRepoOperation(async () => {
+      if (!service.isInitialized()) {
+        await service.initializeUnlocked();
+      }
+      await service.getGitService().fetchAll();
+    });
+    if (!result.started) {
+      throw new Error("Another process holds the repository lock; fetch skipped. Try again.");
     }
-    const gitService = service.getGitService();
-    await gitService.fetchAll();
   }
   async createAndPushBranch(repoIndex, baseBranch, branchName) {
     if (repoIndex < 0 || repoIndex >= this.syncServices.length) {
@@ -6611,25 +6839,35 @@ var InteractiveUIService = class {
     }
     const service = this.syncServices[repoIndex];
     const gitService = service.getGitService();
-    const maxAttempts = 10;
-    let finalName = branchName;
-    let suffix = 0;
-    for (let attempt = 0; attempt < maxAttempts; attempt++) {
-      try {
-        await gitService.createBranch(finalName, baseBranch);
-        await gitService.pushBranch(finalName);
-        return { success: true, finalName };
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        if (errorMessage.includes("already exists")) {
-          suffix++;
-          finalName = `${branchName}-${suffix}`;
-          continue;
+    const result = await service.runQueuedRepoOperation(async () => {
+      const maxAttempts = 10;
+      let finalName = branchName;
+      let suffix = 0;
+      for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+          await gitService.createBranch(finalName, baseBranch);
+          await gitService.pushBranch(finalName);
+          return { success: true, finalName };
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          if (errorMessage.includes("already exists")) {
+            suffix++;
+            finalName = `${branchName}-${suffix}`;
+            continue;
+          }
+          return { success: false, finalName: branchName, error: errorMessage };
         }
-        return { success: false, finalName: branchName, error: errorMessage };
       }
+      return { success: false, finalName: branchName, error: `Failed to create branch after ${maxAttempts} attempts` };
+    });
+    if (!result.started) {
+      return {
+        success: false,
+        finalName: branchName,
+        error: "Another process holds the repository lock; branch not created. Try again."
+      };
     }
-    return { success: false, finalName: branchName, error: `Failed to create branch after ${maxAttempts} attempts` };
+    return result.value;
   }
   async getWorktreesForRepo(repoIndex) {
     if (repoIndex < 0 || repoIndex >= this.syncServices.length) {
@@ -6731,7 +6969,12 @@ var InteractiveUIService = class {
     const gitService = service.getGitService();
     const worktreeDir = service.config.worktreeDir;
     const worktreePath = this.pathResolution.getBranchWorktreePath(worktreeDir, branchName);
-    await gitService.addWorktree(branchName, worktreePath);
+    const result = await service.runQueuedRepoOperation(async () => {
+      await gitService.addWorktree(branchName, worktreePath);
+    });
+    if (!result.started) {
+      throw new Error("Another process holds the repository lock; worktree not created. Try again.");
+    }
   }
   openEditorInWorktree(worktreePath) {
     const editor = process.env.EDITOR || process.env.VISUAL || "code";
@@ -6870,19 +7113,28 @@ var InteractiveUIService = class {
   }
   async runSyncServices(services) {
     const syncResults = await Promise.allSettled(
-      services.map(
-        (service) => this.limit(async () => {
+      services.map((service) => {
+        const repoName = service.config.name || service.config.repoUrl;
+        return this.limit(async () => {
           service.clearRecordedSkips();
-          if (!service.isInitialized()) {
-            await service.initialize();
+          try {
+            if (!service.isInitialized()) {
+              await service.initialize();
+            }
+            const result = await service.sync();
+            return { service, result };
+          } finally {
+            this.events.emit("setSyncProgress", {
+              repo: repoName,
+              phase: "complete",
+              message: "Finished",
+              completed: true
+            });
           }
-          const result = await service.sync();
-          return { service, result };
         }).catch((error) => {
-          const repoName = service.config.name || service.config.repoUrl;
           throw Object.assign(error instanceof Error ? error : new Error(String(error)), { repoName });
-        })
-      )
+        });
+      })
     );
     const failures = [];
     const skipped = [];
@@ -6977,6 +7229,10 @@ var InteractiveUIService = class {
       unsubscribe();
     }
     this.unsubscribeCallbacks = [];
+    for (const unsubscribe of this.progressUnsubscribers) {
+      unsubscribe();
+    }
+    this.progressUnsubscribers = [];
     if (this.ownsEvents) {
       this.events.removeAllListeners();
     }
@@ -7106,11 +7362,14 @@ async function generateConfigFile(input2, configPath, options = {}) {
     const useRelativeBare = !bareRepoDirRelative.startsWith("../../../");
     repository.bareRepoDir = useRelativeBare ? `./${bareRepoDirRelative}` : input2.bareRepoDir;
   }
+  const defaults = {
+    cronSchedule: input2.cronSchedule
+  };
+  if (input2.runOnce) {
+    defaults.runOnce = input2.runOnce;
+  }
   const configObject = {
-    defaults: {
-      cronSchedule: input2.cronSchedule,
-      runOnce: input2.runOnce
-    },
+    defaults,
     repositories: [repository]
   };
   const configContent = `// @ts-check
@@ -7293,7 +7552,7 @@ async function runMultipleRepositories(configFile, repositories, configPath) {
   const globalLogger = Logger.createDefault();
   const runOnce = configFile.defaults?.runOnce ?? false;
   const maxParallel = configFile.parallelism?.maxRepositories ?? configFile.defaults?.parallelism?.maxRepositories ?? DEFAULT_CONFIG.PARALLELISM.MAX_REPOSITORIES;
-  const limit = pLimit3(maxParallel);
+  const limit = pLimit4(maxParallel);
   if (runOnce) {
     globalLogger.info(`
 \u{1F504} Syncing ${repositories.length} repositories...`);