@ganglion/xacpx 0.17.0-beta.8 → 0.17.0-beta.9

package/dist/cli.js

@@ -35409,7 +35409,7 @@ import { execFile as execFile2 } from "node:child_process";
 import { createHash as createHash4 } from "node:crypto";
 import { lstat, mkdir as mkdir10, realpath as realpath2 } from "node:fs/promises";
 import { homedir as homedir13 } from "node:os";
-import { basename as basename4, isAbsolute as isAbsolute4, join as join23, resolve as resolve4, sep as sep2 } from "node:path";
+import { basename as basename4, isAbsolute as isAbsolute4, join as join23, resolve as resolve4, sep as sep2, win32 as win322 } from "node:path";
 import { promisify as promisify2 } from "node:util";
 function expandHome3(path14) {
   if (path14 === "~")
@@ -35418,14 +35418,48 @@ function expandHome3(path14) {
     return resolve4(homedir13(), path14.slice(2));
   return path14;
 }
+function worktreePathsEqual(left, right, platform = process.platform) {
+  if (platform === "win32") {
+    return normalizeWindowsWorktreePath(left) === normalizeWindowsWorktreePath(right);
+  }
+  return left === right;
+}
+function worktreePathIsWithin(parent, child, platform = process.platform) {
+  const normalizedParent = platform === "win32" ? normalizeWindowsWorktreePath(parent) : parent;
+  const normalizedChild = platform === "win32" ? normalizeWindowsWorktreePath(child) : child;
+  if (normalizedParent === normalizedChild)
+    return false;
+  const separator = platform === "win32" ? win322.sep : sep2;
+  const parentPrefix = normalizedParent.endsWith(separator) ? normalizedParent : normalizedParent + separator;
+  return normalizedChild.startsWith(parentPrefix);
+}
+function normalizeWindowsWorktreePath(path14) {
+  let normalized = win322.normalize(path14);
+  const folded = normalized.toLowerCase();
+  if (folded.startsWith("\\\\?\\unc\\")) {
+    normalized = `\\\\${normalized.slice(8)}`;
+  } else if (folded.startsWith("\\\\?\\")) {
+    normalized = normalized.slice(4);
+  }
+  normalized = win322.normalize(normalized);
+  const root = win322.parse(normalized).root;
+  while (normalized.length > root.length && normalized.endsWith(win322.sep)) {
+    normalized = normalized.slice(0, -1);
+  }
+  return normalized.toLowerCase();
+}
 
 class WorkspaceGit {
   listWorkspaces;
   managedWorktreesRoot;
+  platform;
+  runGitOverride;
   writeTails = new Map;
   constructor(listWorkspaces, options = {}) {
     this.listWorkspaces = listWorkspaces;
     this.managedWorktreesRoot = options.managedWorktreesRoot ?? join23(homedir13(), ".xacpx", "worktrees");
+    this.platform = options.platform ?? process.platform;
+    this.runGitOverride = options.runGit;
   }
   async rootFor(workspace3) {
     const ref = this.listWorkspaces().find((item) => item.name === workspace3);
@@ -35441,6 +35475,8 @@ class WorkspaceGit {
     return (await this.runRaw(root, args)).trim();
   }
   async runRaw(root, args) {
+    if (this.runGitOverride)
+      return await this.runGitOverride(root, args);
     const result = await execFileAsync2("git", ["-C", root, ...args], {
       timeout: GIT_TIMEOUT_MS2,
       killSignal: "SIGKILL",
@@ -35624,7 +35660,7 @@ class WorkspaceGit {
         await mkdir10(repoDir);
       }
       const realRepoDir = await realpath2(repoDir);
-      if (!realRepoDir.startsWith(managedRoot + sep2))
+      if (!worktreePathIsWithin(managedRoot, realRepoDir, this.platform))
         throw new Error("worktree-path-unsafe");
       const target = join23(realRepoDir, branchKey);
       try {
@@ -35640,7 +35676,7 @@ class WorkspaceGit {
         await this.run(root, ["worktree", "add", target, branch]);
       }
       const createdPath = await realpath2(target);
-      if (!createdPath.startsWith(managedRoot + sep2))
+      if (!worktreePathIsWithin(managedRoot, createdPath, this.platform))
         throw new Error("worktree-path-unsafe");
       return { path: createdPath, branch, linked: true };
     });
@@ -35650,10 +35686,10 @@ class WorkspaceGit {
       const root = await this.rootFor(workspace3);
       const managedRoot = await realpath2(this.managedWorktreesRoot);
       const target = await realpath2(path14);
-      if (!target.startsWith(managedRoot + sep2))
+      if (!worktreePathIsWithin(managedRoot, target, this.platform))
         throw new Error("worktree-outside-managed-root");
       const worktrees = await this.readWorktrees(root);
-      const worktree = worktrees.find((item) => item.path === target);
+      const worktree = worktrees.find((item) => worktreePathsEqual(item.path, target, this.platform));
       if (!worktree)
         throw new Error("worktree-not-found");
       if (worktree.current)
@@ -35767,7 +35803,7 @@ class WorkspaceGit {
       path: item.path,
       ...item.branch ? { branch: item.branch } : {},
       ...item.detached ? { detached: true } : {},
-      current: item.path === currentRoot,
+      current: worktreePathsEqual(item.path, currentRoot, this.platform),
       linked: index !== 0
     }));
   }

package/dist/control/workspace-git.d.ts

@@ -57,13 +57,20 @@ export interface GitWorktreeCreateResult {
     branch: string;
     linked: true;
 }
+export declare function worktreePathsEqual(left: string, right: string, platform?: NodeJS.Platform): boolean;
+export declare function worktreePathIsWithin(parent: string, child: string, platform?: NodeJS.Platform): boolean;
+export interface WorkspaceGitOptions {
+    managedWorktreesRoot?: string;
+    platform?: NodeJS.Platform;
+    runGit?: (root: string, args: string[]) => Promise<string>;
+}
 export declare class WorkspaceGit {
     private readonly listWorkspaces;
     private readonly managedWorktreesRoot;
+    private readonly platform;
+    private readonly runGitOverride;
     private readonly writeTails;
-    constructor(listWorkspaces: () => GitWorkspaceRef[], options?: {
-        managedWorktreesRoot?: string;
-    });
+    constructor(listWorkspaces: () => GitWorkspaceRef[], options?: WorkspaceGitOptions);
     private rootFor;
     private run;
     private runRaw;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ganglion/xacpx",
-  "version": "0.17.0-beta.8",
+  "version": "0.17.0-beta.9",
   "description": "随时随地通过聊天频道（微信 / 飞书 / 元宝等）远程控制 `acpx` 上的 Claude Code、Codex 等 Agents。",
   "keywords": [
     "acpx",