diff --git a/gitnexus/hooks/claude/gitnexus-hook.cjs b/gitnexus/hooks/claude/gitnexus-hook.cjs
index 8b146acfc..0394b2c4f 100755
--- a/gitnexus/hooks/claude/gitnexus-hook.cjs
+++ b/gitnexus/hooks/claude/gitnexus-hook.cjs
@@ -103,20 +103,68 @@ function extractPattern(toolName, toolInput) {
 
 /**
  * Resolve the gitnexus CLI path.
- * 1. Relative path (works when script is inside npm package)
- * 2. require.resolve (works when gitnexus is globally installed)
- * 3. Fall back to npx (returns empty string)
+ * 1. Injected constant (set by `gitnexus setup` when copying this file)
+ * 2. Relative path (works when script is inside npm package)
+ * 3. require.resolve (works when gitnexus is in Node module path)
+ * 4. Discover from installed binary via which/where
+ * 5. npm root -g fallback
+ * 6. Fall back to npx (returns empty string)
  */
 function resolveCliPath() {
-  let cliPath = path.resolve(__dirname, '..', '..', 'dist', 'cli', 'index.js');
-  if (!fs.existsSync(cliPath)) {
-    try {
-      cliPath = require.resolve('gitnexus/dist/cli/index.js');
-    } catch {
-      cliPath = '';
-    }
+  // 1. Injected absolute path (populated by `gitnexus setup`)
+  if (typeof GITNEXUS_CLI_PATH !== 'undefined' && GITNEXUS_CLI_PATH && fs.existsSync(GITNEXUS_CLI_PATH)) {
+    return GITNEXUS_CLI_PATH;
   }
-  return cliPath;
+
+  // 2. Relative path (works when running from inside the npm package tree)
+  let cliPath = path.resolve(__dirname, '..', '..', 'dist', 'cli', 'index.js');
+  if (fs.existsSync(cliPath)) return cliPath;
+
+  // 3. require.resolve
+  try {
+    return require.resolve('gitnexus/dist/cli/index.js');
+  } catch { /* continue */ }
+
+  // 4. Discover from installed binary location
+  const isWin = process.platform === 'win32';
+  try {
+    const whichResult = spawnSync(isWin ? 'where' : 'which', ['gitnexus'], {
+      encoding: 'utf-8',
+      timeout: 3000,
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    const binPath = (whichResult.stdout || '').split(/\r?\n/)[0].trim();
+    if (binPath) {
+      const binDir = path.dirname(binPath);
+      const candidates = [
+        // npm global on Windows: <prefix>/gitnexus -> <prefix>/node_modules/gitnexus/
+        path.join(binDir, 'node_modules', 'gitnexus', 'dist', 'cli', 'index.js'),
+        // npm global on Unix: <prefix>/bin/gitnexus -> <prefix>/lib/node_modules/gitnexus/
+        path.join(binDir, '..', 'lib', 'node_modules', 'gitnexus', 'dist', 'cli', 'index.js'),
+      ];
+      for (const c of candidates) {
+        if (fs.existsSync(c)) return c;
+      }
+    }
+  } catch { /* continue */ }
+
+  // 5. npm root -g fallback (needs shell:true on Windows for .cmd wrapper)
+  try {
+    const npmResult = spawnSync(isWin ? 'npm.cmd' : 'npm', ['root', '-g'], {
+      encoding: 'utf-8',
+      timeout: 5000,
+      shell: isWin,
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    const globalRoot = (npmResult.stdout || '').trim();
+    if (globalRoot) {
+      const candidate = path.join(globalRoot, 'gitnexus', 'dist', 'cli', 'index.js');
+      if (fs.existsSync(candidate)) return candidate;
+    }
+  } catch { /* continue */ }
+
+  // 6. Fall back to npx
+  return '';
 }
 
 /**
diff --git a/gitnexus/src/cli/setup.ts b/gitnexus/src/cli/setup.ts
index 4e89549ab..6cddb1e60 100644
--- a/gitnexus/src/cli/setup.ts
+++ b/gitnexus/src/cli/setup.ts
@@ -169,15 +169,16 @@ async function installClaudeCodeHooks(result: SetupResult): Promise<void> {
     const dest = path.join(destHooksDir, 'gitnexus-hook.cjs');
     try {
       let content = await fs.readFile(src, 'utf-8');
-      // Inject resolved CLI path so the copied hook can find the CLI
-      // even when it's no longer inside the npm package tree
+      // Inject resolved CLI path as a constant at the top of the hook file.
+      // Previous approach used String.replace() targeting a specific line, but
+      // failed silently due to indentation mismatch (2-space indent in source
+      // vs no indent in the match string). Prepending a constant is robust
+      // regardless of formatting. See #108, #132.
       const resolvedCli = path.join(__dirname, '..', 'cli', 'index.js');
       const normalizedCli = path.resolve(resolvedCli).replace(/\\/g, '/');
       const jsonCli = JSON.stringify(normalizedCli);
-      content = content.replace(
-        "let cliPath = path.resolve(__dirname, '..', '..', 'dist', 'cli', 'index.js');",
-        `let cliPath = ${jsonCli};`,
-      );
+      content = `const GITNEXUS_CLI_PATH = ${jsonCli};
+` + content;
       await fs.writeFile(dest, content, 'utf-8');
     } catch {
       // Script not found in source — skip