sync-worktrees 4.0.0 → 4.2.0

package/dist/mcp-server.js

@@ -6,7 +6,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 // src/mcp/context.ts
 import * as fs10 from "fs/promises";
 import * as path14 from "path";
-import pLimit2 from "p-limit";
+import pLimit3 from "p-limit";
 import simpleGit6 from "simple-git";
 
 // src/constants.ts
@@ -127,6 +127,8 @@ var SyncWorktreesError = class extends Error {
 Caused by: ${cause.stack}`;
     }
   }
+  code;
+  cause;
 };
 var GitError = class extends SyncWorktreesError {
   constructor(message, code, cause) {
@@ -149,6 +151,8 @@ var WorktreeNotCleanError = class extends WorktreeError {
     this.path = path16;
     this.reasons = reasons;
   }
+  path;
+  reasons;
 };
 var ConfigError = class extends SyncWorktreesError {
   constructor(message, code, cause) {
@@ -161,12 +165,15 @@ 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;
 };
 
 // src/utils/branch-filter.ts
@@ -886,6 +893,9 @@ function defaultConsoleOutput(msg, level) {
   else console.log(msg);
 }
 
+// src/services/worktree-sync.service.ts
+import pLimit2 from "p-limit";
+
 // src/utils/lfs-error.ts
 function getErrorMessage(error) {
   if (error instanceof Error) {
@@ -1110,7 +1120,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,
@@ -1316,6 +1326,7 @@ var SyncOutcomeAccumulator = class {
   constructor(options) {
     this.options = options;
   }
+  options;
   counts = cloneCounts(EMPTY_COUNTS);
   actions = [];
   add(action) {
@@ -1402,6 +1413,9 @@ var CloneSyncService = class {
     this.progressEmitter = options.progressEmitter;
     this.onSkip = options.onSkip;
   }
+  config;
+  gitService;
+  logger;
   initialized = false;
   resolvedBranch = null;
   branchCreatedActions;
@@ -2408,6 +2422,7 @@ var WorktreeStatusService = class {
     this.config = config;
     this.logger = logger ?? Logger.createDefault();
   }
+  config;
   gitInstances = /* @__PURE__ */ new Map();
   logger;
   async checkWorktreeStatus(worktreePath) {
@@ -2756,8 +2771,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);
@@ -2765,6 +2781,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;
@@ -2798,7 +2816,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;
   }
@@ -3657,6 +3677,9 @@ var RepoOperationLock = class {
     this.gitService = gitService;
     this.logger = logger;
   }
+  config;
+  gitService;
+  logger;
   updateLogger(logger) {
     this.logger = logger;
   }
@@ -3718,6 +3741,9 @@ var SyncRetryPolicy = class {
     this.gitService = gitService;
     this.logger = logger;
   }
+  config;
+  gitService;
+  logger;
   updateLogger(logger) {
     this.logger = logger;
   }
@@ -3938,6 +3964,10 @@ var WorktreeModeSyncRunner = class {
     this.logger = logger;
     this.progressEmitter = progressEmitter;
   }
+  config;
+  gitService;
+  logger;
+  progressEmitter;
   pathResolution = new PathResolutionService();
   updateLogger(logger) {
     this.logger = logger;
@@ -4618,7 +4648,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(
@@ -4636,10 +4666,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;
@@ -4691,7 +4726,7 @@ var WorktreeSyncService = class {
     return this.gitService.isInitialized();
   }
   isSyncInProgress() {
-    return this.syncInProgress;
+    return this.repoMutex.activeCount + this.repoMutex.pendingCount > 0;
   }
   getGitService() {
     return this.gitService;
@@ -4707,34 +4742,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);
@@ -5337,7 +5369,7 @@ var RepositoryContext = class {
     if (!options.detailed) {
       return entries.map(buildLean);
     }
-    const limit = pLimit2(DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS);
+    const limit = pLimit3(DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS);
     return Promise.all(
       entries.map(
         (entry) => limit(async () => {
@@ -5566,7 +5598,7 @@ import { z } from "zod";
 
 // src/mcp/handlers.ts
 import * as path15 from "path";
-import pLimit3 from "p-limit";
+import pLimit4 from "p-limit";
 
 // src/utils/disk-space.ts
 import fastFolderSize from "fast-folder-size";
@@ -5813,7 +5845,7 @@ async function handleDetectContext(ctx, params, _extra) {
     return formatToolResponse(response);
   }
   const statusService = new WorktreeStatusService();
-  const statusLimit = pLimit3(DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS);
+  const statusLimit = pLimit4(DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS);
   const enriched = await enrichDetectedWorktrees(response.allWorktrees, statusService, statusLimit);
   let allWorktreesByRepo = response.allWorktreesByRepo;
   if (allWorktreesByRepo) {
@@ -5849,8 +5881,8 @@ async function enrichDetectedWorktrees(worktrees, statusService, limit) {
 async function handleListWorktrees(ctx, params, _extra) {
   const configuredRepoNames = params.repoName ? [] : ctx.getConfiguredRepositoryNames();
   if (configuredRepoNames.length > 0) {
-    const limit = pLimit3(DEFAULT_CONFIG.PARALLELISM.MAX_REPOSITORIES);
-    const statusLimit = pLimit3(DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS);
+    const limit = pLimit4(DEFAULT_CONFIG.PARALLELISM.MAX_REPOSITORIES);
+    const statusLimit = pLimit4(DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS);
     const repositories = await Promise.all(
       configuredRepoNames.map(
         (repoName) => limit(async () => {
@@ -5878,7 +5910,7 @@ async function handleListWorktrees(ctx, params, _extra) {
   const results = await listWorktreesForRepo(ctx, params.repoName, params.includeSize);
   return formatToolResponse({ worktrees: results });
 }
-async function listWorktreesForRepo(ctx, repoName, includeSize, limit = pLimit3(DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS)) {
+async function listWorktreesForRepo(ctx, repoName, includeSize, limit = pLimit4(DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS)) {
   const { discovered, service, git } = await getReadyService(ctx, repoName, {
     capability: "listWorktrees",
     toolName: "list_worktrees"