gitnexus 1.6.6-rc.19 → 1.6.6-rc.20

package/dist/mcp/local/local-backend.js

@@ -191,6 +191,26 @@ function tryRealpath(p) {
  */
 export function resolveWorktreeCwd(repoPath, launchCwd) {
     try {
+        // Verify repoPath is a git root before comparing against its canonical
+        // root. If getGitRoot returns a different path, repoPath is an arbitrary
+        // subdirectory — skip both the linked-worktree guard and auto-detection
+        // and fall through to the repoPath fallback.
+        const repoGitRoot = getGitRoot(repoPath);
+        const repoCanonical = repoGitRoot && tryRealpath(repoGitRoot) === tryRealpath(repoPath)
+            ? getCanonicalRepoRoot(repoPath)
+            : null;
+        // Early exit: if repoPath is a linked worktree (differs from its canonical
+        // main-checkout root), return it unchanged. Do NOT override it with the
+        // server's launch directory — that would silently replace the explicitly-
+        // resolved worktree index with the main checkout.
+        //
+        // getCanonicalRepoRoot returns the main-checkout path for both the checkout
+        // and all linked worktrees:
+        //   repoPath === canonical → main checkout (auto-detect may fire below)
+        //   repoPath !== canonical → linked worktree (return as-is)
+        if (repoCanonical && tryRealpath(repoPath) !== tryRealpath(repoCanonical)) {
+            return repoPath;
+        }
         const launchGitRoot = getGitRoot(launchCwd);
         if (launchGitRoot) {
             // Normalise via realpathSync before comparing so macOS /var → /private/var
@@ -199,8 +219,10 @@ export function resolveWorktreeCwd(repoPath, launchCwd) {
             const realRepo = tryRealpath(repoPath);
             if (realLaunch !== realRepo) {
                 const launchCanonical = getCanonicalRepoRoot(launchCwd);
-                const repoCanonical = getCanonicalRepoRoot(repoPath);
-                if (launchCanonical && repoCanonical && launchCanonical === repoCanonical) {
+                // Use tryRealpath on both canonical values for cross-platform safety.
+                if (launchCanonical &&
+                    repoCanonical &&
+                    tryRealpath(launchCanonical) === tryRealpath(repoCanonical)) {
                     return launchGitRoot;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitnexus",
-  "version": "1.6.6-rc.19",
+  "version": "1.6.6-rc.20",
   "description": "Graph-powered code intelligence for AI agents. Index any codebase, query via MCP or CLI.",
   "author": "Abhigyan Patwari",
   "license": "PolyForm-Noncommercial-1.0.0",