agent-shim 8.5.1 → 8.5.2

package/dist/cli.cjs

@@ -55107,18 +55107,14 @@ function discoverClaudeBinary(options) {
       version: highestVersion
     };
   }
-  const ownInstallDirs = new Set(options.ownInstallDirs.map((dir) => import_node_path3.default.resolve(dir)));
   for (const dir of options.pathDirs) {
-    if (ownInstallDirs.has(import_node_path3.default.resolve(dir))) {
-      continue;
-    }
     const found = options.findExecutableInDir(dir, "claude");
-    if (found !== void 0) {
+    if (found !== void 0 && !options.isOwnBinary(found)) {
       return { path: found, source: "path-fallback" };
     }
   }
   throw new Error(
-    `Could not find a claude binary. Looked for genuinely-executable versioned binaries under "${versionsDir}" (missing, empty, or containing nothing executable) and for a "claude" executable on PATH (excluding this tool's own install directory). Install Claude Code, or set the versions directory / PATH correctly, then try again.`
+    `Could not find a claude binary. Looked for genuinely-executable versioned binaries under "${versionsDir}" (missing, empty, or containing nothing executable) and for a "claude" executable on PATH (never this tool's own binary). Install Claude Code, or set the versions directory / PATH correctly, then try again.`
   );
 }
 
@@ -55970,12 +55966,12 @@ function resolveContentSourcePath(env) {
 function realContentSourcePath() {
   return resolveContentSourcePath({ isSea: (0, import_node_sea.isSea)(), execPath: process.execPath, argv1: process.argv[1] });
 }
-function realResolveClaudeBinary(ownInstallDirs) {
+function realResolveClaudeBinary(isOwnBinary) {
   return () => discoverClaudeBinary({
     listVersionsDir,
     pathDirs: (process.env.PATH ?? "").split(import_node_path6.default.delimiter).filter((dir) => dir !== ""),
     findExecutableInDir,
-    ownInstallDirs: [...ownInstallDirs]
+    isOwnBinary
   });
 }
 
@@ -56017,13 +56013,19 @@ function commandFilename(ownExecutablePath, commandName) {
 function isInvokedAsClaude(invokedName) {
   return invokedName === "claude" || invokedName.toLowerCase() === "claude.exe";
 }
-function resolveOwnInstallDirs(paths, ownExecutablePath) {
-  const dirs = [import_node_path7.default.dirname(ownExecutablePath)];
+function resolveOwnBinaryCheck(paths, contentSourcePath) {
   const state = readJson(paths.claudeShimFile, ClaudeShimStateSchema);
-  if (state !== void 0) {
-    dirs.push(import_node_path7.default.dirname(state.targetPath));
-  }
-  return dirs;
+  const recordedTarget = state === void 0 ? void 0 : import_node_path7.default.resolve(state.targetPath);
+  let ownStat;
+  return (candidate) => {
+    if (recordedTarget !== void 0 && import_node_path7.default.resolve(candidate) === recordedTarget) {
+      return true;
+    }
+    ownStat ??= statOrUndefined(contentSourcePath);
+    const candidateStat = statOrUndefined(candidate);
+    return ownStat !== void 0 && candidateStat !== void 0 && // A platform reporting no inode number for either file must not read every candidate as this tool.
+    ownStat.ino !== 0 && candidateStat.ino !== 0 && candidateStat.dev === ownStat.dev && candidateStat.ino === ownStat.ino;
+  };
 }
 function resolveClaudeTargetPath(ownExecutablePath, dir) {
   return import_node_path7.default.join(dir ?? import_node_path7.default.dirname(ownExecutablePath), claudeTargetFilename(ownExecutablePath));
@@ -56044,6 +56046,16 @@ function lstatOrUndefined(target) {
     throw error62;
   }
 }
+function statOrUndefined(target) {
+  try {
+    return import_node_fs4.default.statSync(target);
+  } catch (error62) {
+    if (isEnoent3(error62)) {
+      return void 0;
+    }
+    throw error62;
+  }
+}
 var nodeLinkFs = { link: import_node_fs4.default.linkSync, copyFile: import_node_fs4.default.copyFileSync, chmod: import_node_fs4.default.chmodSync };
 function enableClaudeShim(params, linkFs = nodeLinkFs) {
   const realContentPath = import_node_fs4.default.realpathSync(params.contentSourcePath);
@@ -61040,7 +61052,7 @@ function registerIdentityCommand(program2, deps) {
 // package.json
 var package_default = {
   name: "agent-shim",
-  version: "8.5.1",
+  version: "8.5.2",
   description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   license: "MIT",
   author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -69034,7 +69046,7 @@ function collectDoctorReport(params) {
   const ownExecutablePath = realOwnExecutablePath();
   let binaryDiscovery;
   try {
-    const binary = realResolveClaudeBinary(resolveOwnInstallDirs(paths, ownExecutablePath))();
+    const binary = realResolveClaudeBinary(resolveOwnBinaryCheck(paths, realContentSourcePath()))();
     binaryDiscovery = { ok: true, binary };
   } catch (error62) {
     binaryDiscovery = { ok: false, message: error62 instanceof Error ? error62.message : String(error62) };
@@ -71114,7 +71126,7 @@ function realPrepareLaunchParams(paths, options) {
     fs: realFsPort,
     proc: options.proc,
     log: options.log,
-    resolveClaudeBinary: realResolveClaudeBinary(resolveOwnInstallDirs(paths, realOwnExecutablePath())),
+    resolveClaudeBinary: realResolveClaudeBinary(resolveOwnBinaryCheck(paths, realContentSourcePath())),
     farm: farm.runtime,
     headroom: realHeadroomPort(paths, { spawnDaemon: options.spawnDaemon, cwd: farm.runtime.cwd }),
     frontdoor: realFrontDoorPort(paths, options.spawnDaemon),

package/dist/index.cjs

@@ -6987,18 +6987,14 @@ function discoverClaudeBinary(options) {
       version: highestVersion
     };
   }
-  const ownInstallDirs = new Set(options.ownInstallDirs.map((dir) => import_node_path20.default.resolve(dir)));
   for (const dir of options.pathDirs) {
-    if (ownInstallDirs.has(import_node_path20.default.resolve(dir))) {
-      continue;
-    }
     const found = options.findExecutableInDir(dir, "claude");
-    if (found !== void 0) {
+    if (found !== void 0 && !options.isOwnBinary(found)) {
       return { path: found, source: "path-fallback" };
     }
   }
   throw new Error(
-    `Could not find a claude binary. Looked for genuinely-executable versioned binaries under "${versionsDir}" (missing, empty, or containing nothing executable) and for a "claude" executable on PATH (excluding this tool's own install directory). Install Claude Code, or set the versions directory / PATH correctly, then try again.`
+    `Could not find a claude binary. Looked for genuinely-executable versioned binaries under "${versionsDir}" (missing, empty, or containing nothing executable) and for a "claude" executable on PATH (never this tool's own binary). Install Claude Code, or set the versions directory / PATH correctly, then try again.`
   );
 }
 
@@ -7396,12 +7392,18 @@ function realOwnExecutablePath() {
     findExecutableInDir
   });
 }
-function realResolveClaudeBinary(ownInstallDirs) {
+function resolveContentSourcePath(env) {
+  return env.isSea ? env.execPath : env.argv1 ?? env.execPath;
+}
+function realContentSourcePath() {
+  return resolveContentSourcePath({ isSea: (0, import_node_sea.isSea)(), execPath: process.execPath, argv1: process.argv[1] });
+}
+function realResolveClaudeBinary(isOwnBinary) {
   return () => discoverClaudeBinary({
     listVersionsDir,
     pathDirs: (process.env.PATH ?? "").split(import_node_path21.default.delimiter).filter((dir) => dir !== ""),
     findExecutableInDir,
-    ownInstallDirs: [...ownInstallDirs]
+    isOwnBinary
   });
 }
 
@@ -7817,13 +7819,32 @@ var ClaudeShimStateSchema = import_zod11.z.strictObject({
 function commandFilename(ownExecutablePath, commandName) {
   return ownExecutablePath.toLowerCase().endsWith(".exe") ? `${commandName}.exe` : commandName;
 }
-function resolveOwnInstallDirs(paths, ownExecutablePath) {
-  const dirs = [import_node_path23.default.dirname(ownExecutablePath)];
+function resolveOwnBinaryCheck(paths, contentSourcePath) {
   const state = readJson(paths.claudeShimFile, ClaudeShimStateSchema);
-  if (state !== void 0) {
-    dirs.push(import_node_path23.default.dirname(state.targetPath));
+  const recordedTarget = state === void 0 ? void 0 : import_node_path23.default.resolve(state.targetPath);
+  let ownStat;
+  return (candidate) => {
+    if (recordedTarget !== void 0 && import_node_path23.default.resolve(candidate) === recordedTarget) {
+      return true;
+    }
+    ownStat ??= statOrUndefined(contentSourcePath);
+    const candidateStat = statOrUndefined(candidate);
+    return ownStat !== void 0 && candidateStat !== void 0 && // A platform reporting no inode number for either file must not read every candidate as this tool.
+    ownStat.ino !== 0 && candidateStat.ino !== 0 && candidateStat.dev === ownStat.dev && candidateStat.ino === ownStat.ino;
+  };
+}
+function isEnoent4(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
+}
+function statOrUndefined(target) {
+  try {
+    return import_node_fs7.default.statSync(target);
+  } catch (error) {
+    if (isEnoent4(error)) {
+      return void 0;
+    }
+    throw error;
   }
-  return dirs;
 }
 var nodeLinkFs = { link: import_node_fs7.default.linkSync, copyFile: import_node_fs7.default.copyFileSync, chmod: import_node_fs7.default.chmodSync };
 function findPathShadow(params) {
@@ -8264,7 +8285,7 @@ function collectDoctorReport(params) {
   const ownExecutablePath = realOwnExecutablePath();
   let binaryDiscovery;
   try {
-    const binary = realResolveClaudeBinary(resolveOwnInstallDirs(paths, ownExecutablePath))();
+    const binary = realResolveClaudeBinary(resolveOwnBinaryCheck(paths, realContentSourcePath()))();
     binaryDiscovery = { ok: true, binary };
   } catch (error) {
     binaryDiscovery = { ok: false, message: error instanceof Error ? error.message : String(error) };
@@ -9240,7 +9261,7 @@ function realPrepareLaunchParams(paths, options) {
     fs: realFsPort,
     proc: options.proc,
     log: options.log,
-    resolveClaudeBinary: realResolveClaudeBinary(resolveOwnInstallDirs(paths, realOwnExecutablePath())),
+    resolveClaudeBinary: realResolveClaudeBinary(resolveOwnBinaryCheck(paths, realContentSourcePath())),
     farm: farm.runtime,
     headroom: realHeadroomPort(paths, { spawnDaemon: options.spawnDaemon, cwd: farm.runtime.cwd }),
     frontdoor: realFrontDoorPort(paths, options.spawnDaemon),

package/dist/index.mjs

@@ -6803,18 +6803,14 @@ function discoverClaudeBinary(options) {
       version: highestVersion
     };
   }
-  const ownInstallDirs = new Set(options.ownInstallDirs.map((dir) => path20.resolve(dir)));
   for (const dir of options.pathDirs) {
-    if (ownInstallDirs.has(path20.resolve(dir))) {
-      continue;
-    }
     const found = options.findExecutableInDir(dir, "claude");
-    if (found !== void 0) {
+    if (found !== void 0 && !options.isOwnBinary(found)) {
       return { path: found, source: "path-fallback" };
     }
   }
   throw new Error(
-    `Could not find a claude binary. Looked for genuinely-executable versioned binaries under "${versionsDir}" (missing, empty, or containing nothing executable) and for a "claude" executable on PATH (excluding this tool's own install directory). Install Claude Code, or set the versions directory / PATH correctly, then try again.`
+    `Could not find a claude binary. Looked for genuinely-executable versioned binaries under "${versionsDir}" (missing, empty, or containing nothing executable) and for a "claude" executable on PATH (never this tool's own binary). Install Claude Code, or set the versions directory / PATH correctly, then try again.`
   );
 }
 
@@ -7212,12 +7208,18 @@ function realOwnExecutablePath() {
     findExecutableInDir
   });
 }
-function realResolveClaudeBinary(ownInstallDirs) {
+function resolveContentSourcePath(env) {
+  return env.isSea ? env.execPath : env.argv1 ?? env.execPath;
+}
+function realContentSourcePath() {
+  return resolveContentSourcePath({ isSea: isSea(), execPath: process.execPath, argv1: process.argv[1] });
+}
+function realResolveClaudeBinary(isOwnBinary) {
   return () => discoverClaudeBinary({
     listVersionsDir,
     pathDirs: (process.env.PATH ?? "").split(path21.delimiter).filter((dir) => dir !== ""),
     findExecutableInDir,
-    ownInstallDirs: [...ownInstallDirs]
+    isOwnBinary
   });
 }
 
@@ -7633,13 +7635,32 @@ var ClaudeShimStateSchema = z11.strictObject({
 function commandFilename(ownExecutablePath, commandName) {
   return ownExecutablePath.toLowerCase().endsWith(".exe") ? `${commandName}.exe` : commandName;
 }
-function resolveOwnInstallDirs(paths, ownExecutablePath) {
-  const dirs = [path23.dirname(ownExecutablePath)];
+function resolveOwnBinaryCheck(paths, contentSourcePath) {
   const state = readJson(paths.claudeShimFile, ClaudeShimStateSchema);
-  if (state !== void 0) {
-    dirs.push(path23.dirname(state.targetPath));
+  const recordedTarget = state === void 0 ? void 0 : path23.resolve(state.targetPath);
+  let ownStat;
+  return (candidate) => {
+    if (recordedTarget !== void 0 && path23.resolve(candidate) === recordedTarget) {
+      return true;
+    }
+    ownStat ??= statOrUndefined(contentSourcePath);
+    const candidateStat = statOrUndefined(candidate);
+    return ownStat !== void 0 && candidateStat !== void 0 && // A platform reporting no inode number for either file must not read every candidate as this tool.
+    ownStat.ino !== 0 && candidateStat.ino !== 0 && candidateStat.dev === ownStat.dev && candidateStat.ino === ownStat.ino;
+  };
+}
+function isEnoent4(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
+}
+function statOrUndefined(target) {
+  try {
+    return fs8.statSync(target);
+  } catch (error) {
+    if (isEnoent4(error)) {
+      return void 0;
+    }
+    throw error;
   }
-  return dirs;
 }
 var nodeLinkFs = { link: fs8.linkSync, copyFile: fs8.copyFileSync, chmod: fs8.chmodSync };
 function findPathShadow(params) {
@@ -8080,7 +8101,7 @@ function collectDoctorReport(params) {
   const ownExecutablePath = realOwnExecutablePath();
   let binaryDiscovery;
   try {
-    const binary = realResolveClaudeBinary(resolveOwnInstallDirs(paths, ownExecutablePath))();
+    const binary = realResolveClaudeBinary(resolveOwnBinaryCheck(paths, realContentSourcePath()))();
     binaryDiscovery = { ok: true, binary };
   } catch (error) {
     binaryDiscovery = { ok: false, message: error instanceof Error ? error.message : String(error) };
@@ -9056,7 +9077,7 @@ function realPrepareLaunchParams(paths, options) {
     fs: realFsPort,
     proc: options.proc,
     log: options.log,
-    resolveClaudeBinary: realResolveClaudeBinary(resolveOwnInstallDirs(paths, realOwnExecutablePath())),
+    resolveClaudeBinary: realResolveClaudeBinary(resolveOwnBinaryCheck(paths, realContentSourcePath())),
     farm: farm.runtime,
     headroom: realHeadroomPort(paths, { spawnDaemon: options.spawnDaemon, cwd: farm.runtime.cwd }),
     frontdoor: realFrontDoorPort(paths, options.spawnDaemon),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-shim",
-  "version": "8.5.1",
+  "version": "8.5.2",
   "description": "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   "license": "MIT",
   "author": "Joseph Mearman <joseph@mearman.co.uk>",