sync-worktrees 3.6.0 → 3.6.2

package/dist/mcp-server.js

@@ -1485,10 +1485,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,
@@ -2537,7 +2538,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;
@@ -2554,10 +2555,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);
@@ -2669,17 +2682,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();
@@ -2688,36 +2693,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) {
@@ -2729,15 +2753,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,
@@ -4000,21 +4018,11 @@ function ensureCapability(discovered, key, toolName) {
     throw new CapabilityUnavailableError(toolName, reasons);
   }
 }
-async function ensureNotSyncing(ctx, repoName) {
-  const entry = ctx.getEntry(repoName);
-  if (!entry?.service) return;
-  if (entry.service.isSyncInProgress()) {
-    throw new SyncInProgressError(entry.name);
-  }
-}
 async function getReadyService(ctx, repoName, options = {}) {
   const discovered = ctx.getDiscoveredContext(repoName);
   if (options.capability && options.toolName) {
     ensureCapability(discovered, options.capability, options.toolName);
   }
-  if (options.ensureNotSyncing) {
-    await ensureNotSyncing(ctx, repoName);
-  }
   const service = await ctx.getService(repoName);
   if (options.ensureInitialized && !service.isInitialized()) {
     await service.initialize();
@@ -4025,6 +4033,14 @@ async function getReadyService(ctx, repoName, options = {}) {
     git: service.getGitService()
   };
 }
+async function runExclusiveRepoOperation(ctx, repoName, service, operation) {
+  const result = await service.runExclusiveRepoOperation(operation);
+  if (!result.started) {
+    const name = ctx.getEntry(repoName)?.name ?? repoName ?? "unknown";
+    throw new SyncInProgressError(name);
+  }
+  return result.value;
+}
 async function ensureRepoWorktreePath(ctx, params, git) {
   await ensurePathBelongsToRepo(ctx, params.path, params.repoName, git);
   return path10.resolve(params.path);
@@ -4136,69 +4152,74 @@ async function handleCreateWorktree(ctx, params, _extra) {
   }
   const { service, git } = await getReadyService(ctx, params.repoName, {
     capability: "createWorktree",
-    toolName: "create_worktree",
-    ensureInitialized: true,
-    ensureNotSyncing: true
+    toolName: "create_worktree"
   });
-  const existence = await git.branchExists(branchName);
-  let created = false;
-  let pushed = false;
-  if (!existence.local && !existence.remote) {
-    if (!baseBranch) {
-      throw new Error(`Branch '${branchName}' does not exist. Provide 'baseBranch' to create it.`);
-    }
-    await git.createBranch(branchName, baseBranch);
-    created = true;
-  }
-  const worktreeDir = service.config.worktreeDir;
-  const worktreePath = pathResolution.getBranchWorktreePath(worktreeDir, branchName);
-  const existing = await git.getWorktrees();
-  const collision = existing.find((w) => pathsEqual(w.path, worktreePath) && w.branch !== branchName);
-  if (collision) {
-    throw new Error(
-      `Sanitized worktree path '${worktreePath}' collides with existing branch '${collision.branch}'. Rename or remove the conflicting branch first.`
-    );
-  }
-  await git.addWorktree(branchName, worktreePath);
-  ctx.invalidateDiscovered();
-  if (created && push) {
-    await git.pushBranch(branchName);
-    pushed = true;
-  }
-  return formatToolResponse({
-    success: true,
-    branchName,
-    worktreePath: path10.resolve(worktreePath),
-    created,
-    pushed
+  return runExclusiveRepoOperation(ctx, params.repoName, service, async () => {
+    if (!service.isInitialized()) {
+      await service.initialize();
+    }
+    const existence = await git.branchExists(branchName);
+    let created = false;
+    let pushed = false;
+    if (!existence.local && !existence.remote) {
+      if (!baseBranch) {
+        throw new Error(`Branch '${branchName}' does not exist. Provide 'baseBranch' to create it.`);
+      }
+      await git.createBranch(branchName, baseBranch);
+      created = true;
+    }
+    const worktreeDir = service.config.worktreeDir;
+    const worktreePath = pathResolution.getBranchWorktreePath(worktreeDir, branchName);
+    const existing = await git.getWorktrees();
+    const collision = existing.find((w) => pathsEqual(w.path, worktreePath) && w.branch !== branchName);
+    if (collision) {
+      throw new Error(
+        `Sanitized worktree path '${worktreePath}' collides with existing branch '${collision.branch}'. Rename or remove the conflicting branch first.`
+      );
+    }
+    await git.addWorktree(branchName, worktreePath);
+    ctx.invalidateDiscovered();
+    if (created && push) {
+      await git.pushBranch(branchName);
+      pushed = true;
+    }
+    return formatToolResponse({
+      success: true,
+      branchName,
+      worktreePath: path10.resolve(worktreePath),
+      created,
+      pushed
+    });
   });
 }
 async function handleRemoveWorktree(ctx, params, _extra) {
-  const { git } = await getReadyService(ctx, params.repoName, {
+  const { service, git } = await getReadyService(ctx, params.repoName, {
     capability: "removeWorktree",
-    toolName: "remove_worktree",
-    ensureInitialized: true,
-    ensureNotSyncing: true
+    toolName: "remove_worktree"
   });
-  const removedPath = await ensureRepoWorktreePath(ctx, params, git);
-  if (!params.force) {
-    const status = await git.getFullWorktreeStatus(params.path, false);
-    if (!status.canRemove) {
-      throw new Error(`Cannot remove worktree: ${status.reasons.join(", ")}. Use force=true to override.`);
+  return runExclusiveRepoOperation(ctx, params.repoName, service, async () => {
+    if (!service.isInitialized()) {
+      await service.initialize();
     }
-  }
-  await git.removeWorktree(params.path);
-  ctx.invalidateDiscovered();
-  return formatToolResponse({
-    success: true,
-    removedPath
+    const removedPath = await ensureRepoWorktreePath(ctx, params, git);
+    if (!params.force) {
+      const status = await git.getFullWorktreeStatus(params.path, false);
+      if (!status.canRemove) {
+        throw new Error(`Cannot remove worktree: ${status.reasons.join(", ")}. Use force=true to override.`);
+      }
+    }
+    await git.removeWorktree(params.path);
+    ctx.invalidateDiscovered();
+    return formatToolResponse({
+      success: true,
+      removedPath
+    });
   });
 }
 async function handleSync(ctx, params, extra) {
   const { service } = await getReadyService(ctx, params.repoName, {
     capability: "sync",
-    toolName: "sync",
-    ensureInitialized: true
+    toolName: "sync"
   });
   const dispose = attachProgressReporter(service, extra);
   try {
@@ -4215,35 +4236,39 @@ async function handleSync(ctx, params, extra) {
   }
 }
 async function handleUpdateWorktree(ctx, params, _extra) {
-  const { git } = await getReadyService(ctx, params.repoName, {
+  const { service, git } = await getReadyService(ctx, params.repoName, {
     capability: "updateWorktree",
-    toolName: "update_worktree",
-    ensureInitialized: true,
-    ensureNotSyncing: true
+    toolName: "update_worktree"
   });
-  const worktreePath = await ensureRepoWorktreePath(ctx, params, git);
-  await git.updateWorktree(params.path);
-  ctx.invalidateDiscovered();
-  return formatToolResponse({
-    success: true,
-    worktreePath
+  return runExclusiveRepoOperation(ctx, params.repoName, service, async () => {
+    if (!service.isInitialized()) {
+      await service.initialize();
+    }
+    const worktreePath = await ensureRepoWorktreePath(ctx, params, git);
+    await git.updateWorktree(params.path);
+    ctx.invalidateDiscovered();
+    return formatToolResponse({
+      success: true,
+      worktreePath
+    });
   });
 }
 async function handleInitialize(ctx, params, extra) {
   const { service } = await getReadyService(ctx, params.repoName, {
     capability: "initialize",
-    toolName: "initialize",
-    ensureNotSyncing: true
+    toolName: "initialize"
   });
   const dispose = attachProgressReporter(service, extra);
   try {
-    await service.initialize();
-    const git = service.getGitService();
-    ctx.invalidateDiscovered();
-    return formatToolResponse({
-      success: true,
-      defaultBranch: git.getDefaultBranch(),
-      worktreeDir: service.config.worktreeDir
+    return await runExclusiveRepoOperation(ctx, params.repoName, service, async () => {
+      await service.initialize();
+      const git = service.getGitService();
+      ctx.invalidateDiscovered();
+      return formatToolResponse({
+        success: true,
+        defaultBranch: git.getDefaultBranch(),
+        worktreeDir: service.config.worktreeDir
+      });
     });
   } finally {
     dispose();
@@ -4496,7 +4521,7 @@ function createServer(context, snapshot) {
   server.registerTool(
     "load_config",
     {
-      description: "Load or reload a sync-worktrees JavaScript config file into the server's session. Replaces any previously loaded repositories. Call this before sync/initialize/create_worktree when using a config-driven workflow. Returns: { configPath, currentRepository, repositories: [{ name, repoPath, worktreeDir, ... }] }.",
+      description: "Load or reload a sync-worktrees JavaScript config file into the server's session. Replaces any previously loaded repositories. Call this before sync/initialize/create_worktree when using a config-driven workflow. Returns: { configPath, currentRepository, repositories: [{ name, repoUrl, worktreeDir, source }] }.",
       inputSchema: {
         configPath: z.string().optional().describe(
           "Path to the config file. If omitted, falls back to the SYNC_WORKTREES_CONFIG env var. Errors if neither is set."