claude-spotter 1.4.10 → 1.4.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-spotter",
-  "version": "1.4.10",
+  "version": "1.4.11",
   "description": "Audit agent running alongside Claude Code that catches missed tool calls — 気づく役と実行する役の分離",
   "type": "module",
   "bin": {

package/src/cli/codex-hook-cmd.mjs

@@ -1,8 +1,8 @@
 import { spawnSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, realpathSync } from 'node:fs';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { delimiter, dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createAuditorBackend } from '../core/auditor-backend.mjs';
 import { codexLastAssistantMessage, readCodexUsedTools } from '../core/codex-transcript.mjs';
@@ -315,7 +315,7 @@ export async function runCodexHookDiagnosticsCommand({
   writeOutput(JSON.stringify(result, null, 2) + '\n');
 }
 
-export async function installCodexHooks({ codexHome = defaultCodexHome(), nodePath = process.execPath, spotterBin = SPOTTER_BIN } = {}) {
+export async function installCodexHooks({ codexHome = defaultCodexHome(), nodePath = resolveCodexHookNodePath(), spotterBin = SPOTTER_BIN } = {}) {
   const hooksPath = join(codexHome, 'hooks.json');
   const configPath = join(codexHome, 'config.toml');
   const current = await loadJson(hooksPath);
@@ -340,6 +340,41 @@ export async function installCodexHooks({ codexHome = defaultCodexHome(), nodePa
   };
 }
 
+function safeRealpath(path, realpath = realpathSync.native) {
+  try {
+    return realpath(path);
+  } catch {
+    return null;
+  }
+}
+
+export function resolveCodexHookNodePath({
+  env = process.env,
+  execPath = process.execPath,
+  platform = process.platform,
+  exists = existsSync,
+  realpath = realpathSync.native,
+} = {}) {
+  const execRealpath = safeRealpath(execPath, realpath);
+  const pathEnv = env.PATH || env.Path || '';
+  const names = platform === 'win32'
+    ? ['node.exe', 'node.cmd', 'node.bat', 'node']
+    : ['node'];
+
+  for (const dir of pathEnv.split(delimiter).filter(Boolean)) {
+    for (const name of names) {
+      const candidate = join(dir, name);
+      if (!exists(candidate)) continue;
+      const candidateRealpath = safeRealpath(candidate, realpath);
+      if (execRealpath && candidateRealpath && candidateRealpath === execRealpath) {
+        return candidate;
+      }
+    }
+  }
+
+  return execPath;
+}
+
 export async function uninstallCodexHooks({ codexHome = defaultCodexHome() } = {}) {
   const hooksPath = join(codexHome, 'hooks.json');
   const current = await loadJson(hooksPath);

package/src/core/codex-sidecar-runner.mjs

@@ -468,7 +468,7 @@ function execPortable(execFileFn, cmd, args, spawnOptions) {
     windowsHide: true,
     maxBuffer: 10 * 1024 * 1024,
   };
-  if (process.platform === 'win32') {
+  if (process.platform === 'win32' && cmd !== process.execPath) {
     return execFileFn('cmd.exe', ['/c', cmd, ...args], options);
   }
   return execFileFn(cmd, args, options);

package/src/version.mjs

@@ -1,2 +1,7 @@
-import pkg from '../package.json' with { type: 'json' };
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, resolve } from 'node:path';
+
+const pkgPath = resolve(dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
+const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
 export const version = pkg.version;