sync-worktrees 3.6.0 → 3.6.2

package/dist/index.js

@@ -2756,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,
@@ -3808,7 +3809,7 @@ var GitService = class {
     const bareGit = this.getCachedGit(this.bareRepoPath);
     const checkRef = async (ref) => {
       try {
-        await bareGit.raw(["show-ref", "--verify", "--quiet", ref]);
+        await bareGit.raw(["show-ref", "--verify", ref]);
         return true;
       } catch {
         return false;
@@ -3825,10 +3826,22 @@ var GitService = class {
     const branches = await bareGit.branch();
     return branches.all;
   }
+  async resolveCreateBranchBaseRef(bareGit, baseBranch) {
+    const candidates = baseBranch.startsWith(GIT_CONSTANTS.REMOTE_PREFIX) || baseBranch.startsWith("refs/") ? [baseBranch] : [`${GIT_CONSTANTS.REMOTE_PREFIX}${baseBranch}`, baseBranch];
+    for (const candidate of candidates) {
+      try {
+        await bareGit.revparse(["--verify", candidate]);
+        return candidate;
+      } catch {
+      }
+    }
+    return candidates[0];
+  }
   async createBranch(branchName, baseBranch) {
     const bareGit = this.getCachedGit(this.bareRepoPath);
-    await bareGit.raw(["branch", branchName, `origin/${baseBranch}`]);
-    this.logger.info(`Created branch '${branchName}' from '${baseBranch}'`);
+    const baseRef = await this.resolveCreateBranchBaseRef(bareGit, baseBranch);
+    await bareGit.raw(["branch", branchName, baseRef]);
+    this.logger.info(`Created branch '${branchName}' from '${baseRef}'`);
   }
   async pushBranch(branchName) {
     const bareGit = this.getCachedGit(this.bareRepoPath);
@@ -3940,17 +3953,9 @@ var WorktreeSyncService = class {
     this.progressListeners.add(listener);
     return () => this.progressListeners.delete(listener);
   }
-  emitProgress(event) {
-    for (const listener of this.progressListeners) {
-      try {
-        listener(event);
-      } catch {
-      }
-    }
-  }
-  async sync() {
+  async runExclusiveRepoOperation(operation) {
     if (this.syncInProgress) {
-      this.logger.warn("\u26A0\uFE0F  Sync already in progress, skipping...");
+      this.logger.warn("\u26A0\uFE0F  Another repository operation is already in progress, skipping...");
       return { started: false, reason: "in_progress" };
     }
     const release = await this.acquireBareLock();
@@ -3959,36 +3964,55 @@ var WorktreeSyncService = class {
       return { started: false, reason: "locked" };
     }
     this.syncInProgress = true;
-    this.logger.info(`[${(/* @__PURE__ */ new Date()).toISOString()}] Starting worktree synchronization...`);
-    const totalTimer = new Timer();
-    const phaseTimer = new PhaseTimer();
-    const syncContext = { lfsSkipEnabled: false };
-    const retryOptions = this.createRetryOptions(syncContext);
     try {
-      await retry(() => this.runSyncAttempt(phaseTimer, syncContext), retryOptions);
-    } catch (error) {
-      this.logger.error("\n\u274C Error during worktree synchronization after all retry attempts:", error);
-      throw error;
+      return { started: true, value: await operation() };
     } finally {
-      if (syncContext.lfsSkipEnabled && !this.config.skipLfs) {
-        this.gitService.setLfsSkipEnabled(false);
-      }
       this.syncInProgress = false;
       try {
         await release();
       } catch (releaseError) {
         this.logger.warn(`Failed to release sync lock: ${getErrorMessage(releaseError)}`);
       }
-      this.logger.info(`[${(/* @__PURE__ */ new Date()).toISOString()}] Synchronization finished.
-`);
-      if (this.config.debug) {
-        const totalDuration = totalTimer.stop();
-        const phaseResults = phaseTimer.getResults();
-        const repoName = this.config.name;
-        this.logger.table(formatTimingTable(totalDuration, phaseResults, repoName));
+    }
+  }
+  emitProgress(event) {
+    for (const listener of this.progressListeners) {
+      try {
+        listener(event);
+      } catch {
       }
     }
-    return { started: true };
+  }
+  async sync() {
+    const result = await this.runExclusiveRepoOperation(async () => {
+      if (!this.isInitialized()) {
+        await this.initialize();
+      }
+      this.logger.info(`[${(/* @__PURE__ */ new Date()).toISOString()}] Starting worktree synchronization...`);
+      const totalTimer = new Timer();
+      const phaseTimer = new PhaseTimer();
+      const syncContext = { lfsSkipEnabled: false };
+      const retryOptions = this.createRetryOptions(syncContext);
+      try {
+        await retry(() => this.runSyncAttempt(phaseTimer, syncContext), retryOptions);
+      } catch (error) {
+        this.logger.error("\n\u274C Error during worktree synchronization after all retry attempts:", error);
+        throw error;
+      } finally {
+        if (syncContext.lfsSkipEnabled && !this.config.skipLfs) {
+          this.gitService.setLfsSkipEnabled(false);
+        }
+        this.logger.info(`[${(/* @__PURE__ */ new Date()).toISOString()}] Synchronization finished.
+`);
+        if (this.config.debug) {
+          const totalDuration = totalTimer.stop();
+          const phaseResults = phaseTimer.getResults();
+          const repoName = this.config.name;
+          this.logger.table(formatTimingTable(totalDuration, phaseResults, repoName));
+        }
+      }
+    });
+    return result.started ? { started: true } : result;
   }
   async acquireBareLock() {
     if (process.env.NODE_ENV === ENV_CONSTANTS.NODE_ENV_TEST) {
@@ -4000,15 +4024,9 @@ var WorktreeSyncService = class {
       };
     }
     const barePath = this.gitService.getBareRepoPath();
-    const lockTarget = path8.join(barePath, "HEAD");
-    try {
-      await fs6.access(lockTarget);
-    } catch {
-      return async () => {
-      };
-    }
+    await fs6.mkdir(barePath, { recursive: true });
     try {
-      const release = await lockfile.lock(lockTarget, {
+      const release = await lockfile.lock(barePath, {
         stale: DEFAULT_CONFIG.LOCK_STALE_MS,
         update: DEFAULT_CONFIG.LOCK_UPDATE_MS,
         retries: 0,