sync-worktrees 3.6.1 → 3.6.3

package/README.md

@@ -113,6 +113,8 @@ Add the server to your MCP client config. Use `npx` if the package is not instal
 
 If installed globally, replace `command` with `sync-worktrees-mcp` and drop `args`. `SYNC_WORKTREES_CONFIG` is optional — without it the server runs in **auto-detect mode**: when the client's CWD sits inside a worktree managed by sync-worktrees, the server locates the bare repo, enumerates sibling worktrees, and enables per-worktree operations. Sync and initialize require a loaded config (or call `load_config` at runtime).
 
+At session start, agents should call `detect_context` with `includeAllWorktrees: true`. With a loaded config, that returns config-driven `siblingRepositories` for every other configured repo, including nested `worktreeDir` paths, plus `allWorktreesByRepo` keyed by repository name. If a configured repo cannot be enumerated, `allWorktreeErrorsByRepo` carries the per-repo error.
+
 Client-specific locations:
 
 | Client | Config file |
@@ -125,10 +127,10 @@ Client-specific locations:
 
 | Tool | Purpose |
 |------|---------|
-| `detect_context` | Inspect a path, resolve the bare repo, enumerate sibling worktrees, report capabilities. |
-| `list_worktrees` | List worktrees with status label (`clean`/`dirty`/`stale`/`current`), divergence, `safeToRemove`, last sync. |
+| `detect_context` | Inspect a path, resolve the bare repo, enumerate sibling worktrees, report config-driven sibling repositories and capabilities. Pass `includeAllWorktrees: true` to include every configured repo's worktrees keyed by repo name. |
+| `list_worktrees` | List worktrees with status label (`clean`/`dirty`/`stale`/`current`), divergence, `safeToRemove`, last sync. Without `repoName` and with a loaded config, results are grouped across all configured repos. |
 | `get_worktree_status` | Detailed status for one worktree (dirty files, unpushed commits, stashes, operation in progress). |
-| `create_worktree` | Create a worktree for a branch; optionally create the branch from `baseBranch` and push. |
+| `create_worktree` | Create a worktree for a branch; optionally create the branch from `baseBranch`. Newly created branches are pushed to origin unless `push=false`. |
 | `remove_worktree` | Remove a worktree after safety checks; `force=true` skips validation. |
 | `update_worktree` | Fast-forward one worktree to match upstream. |
 | `sync` | Full sync cycle (fetch, create, prune, update). Requires config. Streams progress notifications. |
@@ -142,6 +144,7 @@ All tools that target a single repo accept an optional `repoName`. When omitted,
 
 - `remove_worktree` refuses to delete worktrees with uncommitted changes, unpushed commits, stashes, or operations in progress (merge/rebase/cherry-pick/revert/bisect). Pass `force=true` to override.
 - `create_worktree` rejects sanitized-path collisions (e.g. `feature/foo` vs `feature-foo` both resolving to `feature-foo/`) before touching disk.
+- Branches created by sync-worktrees use `--no-track` first, then publish with `git push -u origin <branch>`, so they do not inherit `origin/main` as their upstream.
 - Path-targeted tools verify the supplied path is a registered worktree of the selected repository.
 
 ## Options

package/dist/index.js

@@ -3809,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;
@@ -3826,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", "--no-track", branchName, baseRef]);
+    this.logger.info(`Created branch '${branchName}' from '${baseRef}'`);
   }
   async pushBranch(branchName) {
     const bareGit = this.getCachedGit(this.bareRepoPath);
@@ -3941,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();
@@ -3960,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) {
@@ -4001,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,