fix(worktree): improve symlink copy handling

- Introduced isSubPath utility to determine if a path is a subpath of another.
- Enhanced copySymbolicLink function to handle symbolic links more accurately based on subpath checks, ensuring correct link resolution.

Author: jackiotyu

src/core/util/copyWorktreeFiles.ts

@@ -8,6 +8,7 @@ import { createReadStream, createWriteStream } from 'fs';
 import { Config } from '@/core/config/setting';
 import { actionProgressWrapper } from '@/core/ui/progress';
 import { withResolvers } from '@/core/util/promise';
+import { isSubPath } from '@/core/util/folder';
 
 async function copyFile(source: string, target: string, stat: Stats, signal: AbortSignal) {
     if (stat.isDirectory()) {
@@ -35,14 +36,17 @@ async function copySymbolicLink(source: string, target: string) {
     const realTargetPath = await fs.realpath(source);
     const linkStat = await fs.stat(realTargetPath);
 
-    // Calculate the new link path relative to the target directory
-    const relativePath = path.relative(sourceDir, realTargetPath);
-    const linkTarget = path.resolve(targetDir, relativePath);
-
     // Determine link type based on target type
     const linkType: 'file' | 'dir' | 'junction' = linkStat.isDirectory() ? 'dir' : 'file';
 
-    await fs.symlink(linkTarget, target, linkType);
+    // Calculate the new link path relative to the target directory
+    if (isSubPath(sourceDir, realTargetPath)) {
+        const relativePath = path.relative(sourceDir, realTargetPath);
+        const linkTarget = path.resolve(targetDir, relativePath);
+        await fs.symlink(linkTarget, target, linkType);
+    } else {
+        await fs.symlink(realTargetPath, target, linkType);
+    }
 }
 
 /**

src/core/util/folder.ts

@@ -73,3 +73,12 @@ export const getBaseBundleDir = (baseDir: string) => `${baseDir}.repoBackup`;
 export const findPrefixPath = (fsPath: string, strList: string[]) => {
     return strList.find((str) => fsPath.startsWith(str));
 };
+
+// check if child is a subpath of parent
+export const isSubPath = (parent: string, child: string) => {
+    const parentReal = path.resolve(parent);
+    const childReal = path.resolve(child);
+    if (parentReal === childReal) return false;
+    const relative = path.relative(parentReal, childReal);
+    return !relative.startsWith(`..${path.sep}`) && relative !== '..';
+};