fix(worktree): handle Windows native realpath prefixes in path comparison

Author: kenryu42

dist/bin/cc-safety-net.js

@@ -1740,10 +1740,14 @@ function sameFilesystemPath(left, right) {
       return true;
     }
   } catch {}
-  return normalizePathForComparison(realpathSync(left)) === normalizePathForComparison(realpathSync(right));
+  return getCanonicalPathForComparison(left) === getCanonicalPathForComparison(right);
+}
+function getCanonicalPathForComparison(path) {
+  return normalizePathForComparison(realpathSync.native(path));
 }
 function normalizePathForComparison(path) {
-  let normalized = path.replace(/\\/g, "/");
+  let normalized = path.replace(/^\\\\\?\\UNC\\/i, "//").replace(/^\\\\\?\\/i, "");
+  normalized = normalized.replace(/\\/g, "/");
   if (normalized.length > 1 && normalized.endsWith("/")) {
     normalized = normalized.slice(0, -1);
   }

dist/core/worktree.d.ts

@@ -7,3 +7,5 @@ export interface GitExecutionContext {
 export declare function hasGitContextEnvOverride(envAssignments?: ReadonlyMap<string, string>): boolean;
 export declare function getGitExecutionContext(tokens: readonly string[], cwd: string | undefined): GitExecutionContext;
 export declare function isLinkedWorktree(cwd: string): boolean;
+/** @internal Exported for testing */
+export declare function normalizePathForComparison(path: string): string;

dist/index.js

@@ -594,10 +594,14 @@ function sameFilesystemPath(left, right) {
       return true;
     }
   } catch {}
-  return normalizePathForComparison(realpathSync(left)) === normalizePathForComparison(realpathSync(right));
+  return getCanonicalPathForComparison(left) === getCanonicalPathForComparison(right);
+}
+function getCanonicalPathForComparison(path) {
+  return normalizePathForComparison(realpathSync.native(path));
 }
 function normalizePathForComparison(path) {
-  let normalized = path.replace(/\\/g, "/");
+  let normalized = path.replace(/^\\\\\?\\UNC\\/i, "//").replace(/^\\\\\?\\/i, "");
+  normalized = normalized.replace(/\\/g, "/");
   if (normalized.length > 1 && normalized.endsWith("/")) {
     normalized = normalized.slice(0, -1);
   }

src/core/worktree.ts

@@ -209,14 +209,17 @@ function sameFilesystemPath(left: string, right: string): boolean {
     // Fall through to realpath comparison for platforms where stat identity is unavailable.
   }
 
-  return (
-    normalizePathForComparison(realpathSync(left)) ===
-    normalizePathForComparison(realpathSync(right))
-  );
+  return getCanonicalPathForComparison(left) === getCanonicalPathForComparison(right);
 }
 
-function normalizePathForComparison(path: string): string {
-  let normalized = path.replace(/\\/g, '/');
+function getCanonicalPathForComparison(path: string): string {
+  return normalizePathForComparison(realpathSync.native(path));
+}
+
+/** @internal Exported for testing */
+export function normalizePathForComparison(path: string): string {
+  let normalized = path.replace(/^\\\\\?\\UNC\\/i, '//').replace(/^\\\\\?\\/i, '');
+  normalized = normalized.replace(/\\/g, '/');
   if (normalized.length > 1 && normalized.endsWith('/')) {
     normalized = normalized.slice(0, -1);
   }

tests/core/worktree.test.ts

@@ -14,6 +14,7 @@ import {
   getGitExecutionContext,
   hasGitContextEnvOverride,
   isLinkedWorktree,
+  normalizePathForComparison,
 } from '@/core/worktree';
 import {
   createLinkedWorktreeFixture,
@@ -180,6 +181,15 @@ describe('worktree env context overrides', () => {
 });
 
 describe('linked worktree detection', () => {
+  test('normalizes Windows native realpath prefixes for comparison', () => {
+    expect(normalizePathForComparison('\\\\?\\C:\\Temp\\Linked\\.git\\')).toBe(
+      process.platform === 'win32' ? 'c:/temp/linked/.git' : 'C:/Temp/Linked/.git',
+    );
+    expect(normalizePathForComparison('\\\\?\\UNC\\server\\share\\linked\\.git')).toBe(
+      '//server/share/linked/.git',
+    );
+  });
+
   test('detects linked worktrees and symlinked directories inside them', () => {
     const fixture = createLinkedWorktreeFixture();
     const nested = join(fixture.linkedWorktree, 'nested');