sync-worktrees 3.5.0 → 3.6.1

package/dist/index.js

@@ -25,7 +25,8 @@ var GIT_CONSTANTS = {
     REMOTES: "refs/remotes/origin",
     REMOTES_ORIGIN: "refs/remotes/origin/*"
   },
-  FETCH_CONFIG: "+refs/heads/*:refs/remotes/origin/*"
+  FETCH_CONFIG: "+refs/heads/*:refs/remotes/origin/*",
+  PROGRESS_BUCKET_PERCENT: 25
 };
 var GIT_OPERATIONS = {
   MERGE_HEAD: "MERGE_HEAD",
@@ -2755,10 +2756,11 @@ var WorktreeStatusService = class {
     const reasons = [];
     if (!isClean) reasons.push("uncommitted changes");
     if (hasUnpushedCommits) reasons.push("unpushed commits");
+    if (hasStashedChanges) reasons.push("stashed changes");
     if (hasOperationInProgress) reasons.push("operation in progress");
     if (hasModifiedSubmodules) reasons.push("modified submodules");
     if (upstreamGone) reasons.push("upstream gone");
-    const canRemove = isClean && !hasUnpushedCommits && !hasOperationInProgress && !hasModifiedSubmodules;
+    const canRemove = isClean && !hasUnpushedCommits && !hasStashedChanges && !hasOperationInProgress && !hasModifiedSubmodules;
     const details = includeDetails ? this.buildStatusDetails(snap) : void 0;
     return {
       isClean,
@@ -3098,13 +3100,33 @@ var GitService = class {
     const key = `${path6.resolve(dirPath)}::${useLfsSkip ? "1" : "0"}`;
     let git = this.gitInstances.get(key);
     if (!git) {
-      const block = this.getFetchTimeoutMs();
-      const base = block > 0 ? simpleGit4(dirPath, { timeout: { block } }) : simpleGit4(dirPath);
+      const base = simpleGit4(dirPath, this.buildSimpleGitOptions(this.getFetchTimeoutMs()));
       git = useLfsSkip ? base.env({ [ENV_CONSTANTS.GIT_LFS_SKIP_SMUDGE]: "1" }) : base;
       this.gitInstances.set(key, git);
     }
     return git;
   }
+  buildSimpleGitOptions(blockMs) {
+    const options = { progress: this.makeProgressHandler() };
+    if (blockMs > 0) options.timeout = { block: blockMs };
+    return options;
+  }
+  makeProgressHandler() {
+    const lastBucket = /* @__PURE__ */ new Map();
+    return (event) => {
+      if (event.method !== "fetch" && event.method !== "clone" && event.method !== "pull") return;
+      const key = `${event.method}:${event.stage}`;
+      const bucket = Math.floor(event.progress / GIT_CONSTANTS.PROGRESS_BUCKET_PERCENT);
+      let last = lastBucket.get(key) ?? -1;
+      if (bucket < last) {
+        last = -1;
+      }
+      if (bucket <= last && event.progress < 100) return;
+      lastBucket.set(key, bucket);
+      const total = event.total > 0 ? `${event.processed}/${event.total}` : `${event.processed}`;
+      this.logger.info(`  \u21B3 ${event.method} ${event.stage}: ${event.progress}% (${total})`);
+    };
+  }
   updateLogger(logger) {
     this.logger = logger;
     this.sparseCheckoutService.updateLogger(logger);
@@ -3116,10 +3138,9 @@ var GitService = class {
     } catch {
       this.logger.info(`Cloning from "${repoUrl}" as bare repository into "${this.bareRepoPath}"...`);
       await fs4.mkdir(path6.dirname(this.bareRepoPath), { recursive: true });
-      const cloneBlock = this.getCloneTimeoutMs();
-      const cloneBase = cloneBlock > 0 ? simpleGit4({ timeout: { block: cloneBlock } }) : simpleGit4();
+      const cloneBase = simpleGit4(this.buildSimpleGitOptions(this.getCloneTimeoutMs()));
       const cloneGit = this.isLfsSkipEnabled() ? cloneBase.env({ [ENV_CONSTANTS.GIT_LFS_SKIP_SMUDGE]: "1" }) : cloneBase;
-      await cloneGit.clone(repoUrl, this.bareRepoPath, ["--bare"]);
+      await cloneGit.clone(repoUrl, this.bareRepoPath, ["--bare", "--progress"]);
       this.logger.info("\u2705 Clone successful.");
     }
     const bareGit = this.getCachedGit(this.bareRepoPath);
@@ -3133,7 +3154,7 @@ var GitService = class {
       await bareGit.addConfig("remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*");
     }
     this.logger.info("Fetching remote branches...");
-    await bareGit.fetch(["--all"]);
+    await bareGit.fetch(["--all", "--progress"]);
     this.defaultBranch = await this.detectDefaultBranch(bareGit);
     this.mainWorktreePath = path6.join(this.config.worktreeDir, this.defaultBranch);
     let needsMainWorktree = true;
@@ -3211,12 +3232,12 @@ var GitService = class {
     this.assertInitialized();
     this.logger.info("Fetching latest data from remote...");
     const git = this.getCachedGit(this.mainWorktreePath, this.isLfsSkipEnabled());
-    await git.fetch(["--all", "--prune"]);
+    await git.fetch(["--all", "--prune", "--progress"]);
   }
   async fetchBranch(branchName) {
     this.assertInitialized();
     const git = this.getCachedGit(this.mainWorktreePath, this.isLfsSkipEnabled());
-    await git.fetch(["origin", branchName, "--prune"]);
+    await git.fetch(["origin", branchName, "--prune", "--progress"]);
   }
   assertInitialized() {
     if (!this.git) {