skillrepo 1.6.1 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillrepo",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Set up SkillRepo in any IDE — one command",
   "type": "module",
   "bin": {

package/src/lib/fs-utils.mjs

@@ -37,7 +37,7 @@ export function writeFileSafe(filePath, content) {
 
 /**
  * Write a file and mark it executable (0o755).
- * Used for hook scripts that have shebangs and are invoked directly.
+ * Used for the Cursor session hook which is invoked directly via shebang.
  */
 export function writeExecutable(filePath, content) {
   writeFileSafe(filePath, content);

package/src/lib/mergers/hooks-json.mjs

@@ -8,70 +8,59 @@
  */
 
 import { unlinkSync } from "node:fs";
-import { readFileSafe, writeFileSafe, writeExecutable } from "../fs-utils.mjs";
+import { readFileSafe, writeFileSafe } from "../fs-utils.mjs";
 import { claudeSettingsLocal, claudeSyncHook, claudePromptHook, claudePreToolHook, claudeHooksDir } from "../paths.mjs";
 import { join } from "node:path";
 
-const DEFAULT_SYNC_COMMAND = ".claude/hooks/skillrepo-sync.mjs";
-const DEFAULT_PROMPT_COMMAND = ".claude/hooks/skillrepo-prompt-match.mjs";
-const DEFAULT_PRETOOL_COMMAND = ".claude/hooks/skillrepo-pretool-match.mjs";
-
-// Legacy commands used before v1.6.1 — recognized during migration so
-// re-running init replaces them rather than duplicating.
-const LEGACY_COMMANDS = new Set([
-  "node .claude/hooks/skillrepo-sync.mjs",
-  "node .claude/hooks/skillrepo-prompt-match.mjs",
-  "node .claude/hooks/skillrepo-pretool-match.mjs",
-]);
+// The three hook script paths (relative to project root).
+const HOOK_SCRIPTS = {
+  sync: ".claude/hooks/skillrepo-sync.mjs",
+  prompt: ".claude/hooks/skillrepo-prompt-match.mjs",
+  pretool: ".claude/hooks/skillrepo-pretool-match.mjs",
+};
 
 /**
- * Extract a hook command from a hooks config group, falling back to a default.
- * @param {object} hooksConfig - The hooks config object from the server payload
- * @param {string} eventName - e.g. "SessionStart" or "UserPromptSubmit"
- * @param {string} fallback - default command if extraction fails
- * @returns {string}
+ * Build the full command string for a hook script.
+ * Uses process.execPath (the absolute path to the current Node binary)
+ * so hooks work on nvm/fnm/mise systems where `node` is not on /bin/sh's PATH.
  */
-function extractCommand(hooksConfig, eventName, fallback) {
-  try {
-    return hooksConfig[eventName][0].hooks[0].command || fallback;
-  } catch {
-    return fallback;
-  }
+function buildCommand(scriptPath) {
+  return `"${process.execPath}" ${scriptPath}`;
 }
 
 /**
- * Check if a command is already installed in a hook group array.
- * @param {Array} groups
- * @param {string} command
- * @returns {boolean}
+ * Check if a SkillRepo hook for the given script path is already installed,
+ * regardless of how node was referenced (bare `node`, shebang, or full path).
  */
-function hasCommand(groups, command) {
+function hasSkillRepoHook(groups, scriptPath) {
   if (!Array.isArray(groups)) return false;
   return groups.some(
     (group) =>
       Array.isArray(group.hooks) &&
-      group.hooks.some((h) => h.command === command)
+      group.hooks.some((h) => h.command?.includes(scriptPath))
   );
 }
 
 /**
- * Replace legacy `node .claude/hooks/...` commands with the new direct-execution
- * format. Returns true if any replacement was made.
+ * Replace any existing SkillRepo hook command with the current node path.
+ * Handles all legacy formats: `node .claude/hooks/...`, `.claude/hooks/...`,
+ * or `/old/path/to/node .claude/hooks/...`.
+ * Returns true if any replacement was made.
  */
-function replaceLegacyCommands(groups) {
+function updateExistingCommands(groups, scriptPath) {
   if (!Array.isArray(groups)) return false;
-  let replaced = false;
+  const newCommand = buildCommand(scriptPath);
+  let updated = false;
   for (const group of groups) {
     if (!Array.isArray(group.hooks)) continue;
     for (const hook of group.hooks) {
-      if (LEGACY_COMMANDS.has(hook.command)) {
-        // Strip the "node " prefix → ".claude/hooks/..."
-        hook.command = hook.command.replace(/^node /, "");
-        replaced = true;
+      if (hook.command?.includes(scriptPath) && hook.command !== newCommand) {
+        hook.command = newCommand;
+        updated = true;
       }
     }
   }
-  return replaced;
+  return updated;
 }
 
 /**
@@ -82,33 +71,32 @@ function replaceLegacyCommands(groups) {
  * @param {string} [preToolHookContent] - The pretool-match hook script content (optional for backward compat)
  * @returns {{ results: { path: string; action: string }[] }}
  */
+// NOTE: The hooksConfig parameter is accepted for backward compatibility but
+// its command strings are not used. All commands are built locally using
+// process.execPath to ensure hooks work on nvm/fnm/mise systems.
 export function mergeHooksConfig(hooksConfig, syncHookContent, promptHookContent, preToolHookContent) {
-  const syncCommand = extractCommand(hooksConfig, "SessionStart", DEFAULT_SYNC_COMMAND);
-  const promptCommand = extractCommand(hooksConfig, "UserPromptSubmit", DEFAULT_PROMPT_COMMAND);
-  const preToolCommand = extractCommand(hooksConfig, "PreToolUse", DEFAULT_PRETOOL_COMMAND);
   const results = [];
 
-  // Always write hook scripts (latest version from server) and mark executable.
-  // Scripts have #!/usr/bin/env node shebangs and are invoked directly (not via `node`).
+  // Always write hook scripts (latest version from server).
   const syncExisted = readFileSafe(claudeSyncHook()) !== null;
-  writeExecutable(claudeSyncHook(), syncHookContent);
+  writeFileSafe(claudeSyncHook(), syncHookContent);
   results.push({
-    path: ".claude/hooks/skillrepo-sync.mjs",
+    path: HOOK_SCRIPTS.sync,
     action: syncExisted ? "updated" : "created",
   });
 
   const promptExisted = readFileSafe(claudePromptHook()) !== null;
-  writeExecutable(claudePromptHook(), promptHookContent);
+  writeFileSafe(claudePromptHook(), promptHookContent);
   results.push({
-    path: ".claude/hooks/skillrepo-prompt-match.mjs",
+    path: HOOK_SCRIPTS.prompt,
     action: promptExisted ? "updated" : "created",
   });
 
   if (preToolHookContent) {
     const preToolExisted = readFileSafe(claudePreToolHook()) !== null;
-    writeExecutable(claudePreToolHook(), preToolHookContent);
+    writeFileSafe(claudePreToolHook(), preToolHookContent);
     results.push({
-      path: ".claude/hooks/skillrepo-pretool-match.mjs",
+      path: HOOK_SCRIPTS.pretool,
       action: preToolExisted ? "updated" : "created",
     });
   }
@@ -140,16 +128,28 @@ export function mergeHooksConfig(hooksConfig, syncHookContent, promptHookContent
   if (!config.hooks) config.hooks = {};
   let changed = false;
 
-  // Migrate legacy "node .claude/hooks/..." commands to direct execution
-  for (const event of ["SessionStart", "UserPromptSubmit", "PreToolUse"]) {
-    if (Array.isArray(config.hooks[event]) && replaceLegacyCommands(config.hooks[event])) {
+  // Build commands using the absolute node path from this machine.
+  // This ensures hooks work on nvm/fnm/mise systems where `node` is
+  // not on /bin/sh's PATH.
+  const syncCommand = buildCommand(HOOK_SCRIPTS.sync);
+  const promptCommand = buildCommand(HOOK_SCRIPTS.prompt);
+  const preToolCommand = buildCommand(HOOK_SCRIPTS.pretool);
+
+  // Update existing SkillRepo hook commands to use the current node path
+  // (handles all legacy formats: bare `node`, shebang paths, old full paths)
+  for (const [event, scriptPath] of [
+    ["SessionStart", HOOK_SCRIPTS.sync],
+    ["UserPromptSubmit", HOOK_SCRIPTS.prompt],
+    ["PreToolUse", HOOK_SCRIPTS.pretool],
+  ]) {
+    if (Array.isArray(config.hooks[event]) && updateExistingCommands(config.hooks[event], scriptPath)) {
       changed = true;
     }
   }
 
   // Merge SessionStart
   if (!Array.isArray(config.hooks.SessionStart)) config.hooks.SessionStart = [];
-  if (!hasCommand(config.hooks.SessionStart, syncCommand)) {
+  if (!hasSkillRepoHook(config.hooks.SessionStart, HOOK_SCRIPTS.sync)) {
     config.hooks.SessionStart.push({
       matcher: "startup|resume",
       hooks: [{ type: "command", command: syncCommand }],
@@ -159,7 +159,7 @@ export function mergeHooksConfig(hooksConfig, syncHookContent, promptHookContent
 
   // Merge UserPromptSubmit
   if (!Array.isArray(config.hooks.UserPromptSubmit)) config.hooks.UserPromptSubmit = [];
-  if (!hasCommand(config.hooks.UserPromptSubmit, promptCommand)) {
+  if (!hasSkillRepoHook(config.hooks.UserPromptSubmit, HOOK_SCRIPTS.prompt)) {
     config.hooks.UserPromptSubmit.push({
       hooks: [{ type: "command", command: promptCommand }],
     });
@@ -169,7 +169,7 @@ export function mergeHooksConfig(hooksConfig, syncHookContent, promptHookContent
   // Merge PreToolUse
   if (preToolHookContent) {
     if (!Array.isArray(config.hooks.PreToolUse)) config.hooks.PreToolUse = [];
-    if (!hasCommand(config.hooks.PreToolUse, preToolCommand)) {
+    if (!hasSkillRepoHook(config.hooks.PreToolUse, HOOK_SCRIPTS.pretool)) {
       config.hooks.PreToolUse.push({
         hooks: [{ type: "command", command: preToolCommand }],
       });

package/src/test/e2e/payload-factory.mjs

@@ -187,7 +187,7 @@ function buildSyncHook(baseUrl) {
   return `#!/usr/bin/env node
 // SkillRepo SessionStart hook — auto-refreshes skill config files.
 // Installed by npx skillrepo init. Commit this file to your repo.
-import { readFileSync, writeFileSync, mkdirSync, existsSync, chmodSync } from "fs";
+import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
 import { join, dirname } from "path";
 
 const SETUP_URL = "${setupUrl}";
@@ -223,11 +223,6 @@ function safeWrite(relPath, content) {
   writeFileSync(p, content, "utf-8");
 }
 
-function writeExecutable(relPath, content) {
-  safeWrite(relPath, content);
-  chmodSync(join(process.cwd(), relPath), 0o755);
-}
-
 try {
   const res = await fetch(SETUP_URL, {
     headers: { Authorization: \`Bearer \${API_KEY}\`, Accept: "application/json" },
@@ -239,8 +234,8 @@ try {
   if (cc.skillrepoMd?.content) safeWrite(cc.skillrepoMd.path, cc.skillrepoMd.content);
   if (cc.skillIndex?.content) safeWrite(cc.skillIndex.path, cc.skillIndex.content);
   if (cc.skillrepoConfig?.content) safeWrite(cc.skillrepoConfig.path, cc.skillrepoConfig.content);
-  if (cc.promptHook?.content) writeExecutable(cc.promptHook.path, cc.promptHook.content);
-  if (cc.preToolHook?.content) writeExecutable(cc.preToolHook.path, cc.preToolHook.content);
+  if (cc.promptHook?.content) safeWrite(cc.promptHook.path, cc.promptHook.content);
+  if (cc.preToolHook?.content) safeWrite(cc.preToolHook.path, cc.preToolHook.content);
 } catch { /* silently fail */ }
 
 // Repo profiling

package/src/test/mergers/hooks-json.test.mjs

@@ -22,6 +22,7 @@ const SYNC_CONTENT = "// sync hook";
 const PROMPT_CONTENT = "// prompt hook";
 const PRETOOL_CONTENT = "// pretool hook";
 
+// Server payload hook commands (bare script paths — the CLI builds full commands locally)
 const HOOKS_CONFIG = {
   SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: ".claude/hooks/skillrepo-sync.mjs" }] }],
   UserPromptSubmit: [{ hooks: [{ type: "command", command: ".claude/hooks/skillrepo-prompt-match.mjs" }] }],
@@ -80,14 +81,15 @@ describe("Hooks settings.local.json merger", () => {
     assert.equal(config.hooks.UserPromptSubmit.length, 1);
   });
 
-  it("skips merge when hooks are already installed", async () => {
+  it("skips merge when hooks are already installed with current node path", async () => {
     const { mergeHooksConfig } = await import("../../lib/mergers/hooks-json.mjs");
 
-    // Pre-existing with both hooks already
+    // Pre-existing with hooks using the CURRENT node path (already up to date)
+    const nodeCmd = (script) => `"${process.execPath}" ${script}`;
     const existing = {
       hooks: {
-        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: ".claude/hooks/skillrepo-sync.mjs" }] }],
-        UserPromptSubmit: [{ hooks: [{ type: "command", command: ".claude/hooks/skillrepo-prompt-match.mjs" }] }],
+        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: nodeCmd(".claude/hooks/skillrepo-sync.mjs") }] }],
+        UserPromptSubmit: [{ hooks: [{ type: "command", command: nodeCmd(".claude/hooks/skillrepo-prompt-match.mjs") }] }],
       },
     };
     mkdirSync(join(tempDir, ".claude"), { recursive: true });
@@ -119,21 +121,22 @@ describe("Hooks settings.local.json merger", () => {
     const config = JSON.parse(readFileSync(join(tempDir, ".claude/settings.local.json"), "utf-8"));
     assert.equal(config.hooks.SessionStart.length, 1);
     assert.equal(config.hooks.UserPromptSubmit.length, 1);
-    assert.equal(config.hooks.UserPromptSubmit[0].hooks[0].command, ".claude/hooks/skillrepo-prompt-match.mjs");
+    assert.ok(config.hooks.UserPromptSubmit[0].hooks[0].command.endsWith(".claude/hooks/skillrepo-prompt-match.mjs"), "Command should end with script path");
   });
 
   it("always updates hook scripts even when settings merge is skipped", async () => {
     const { mergeHooksConfig } = await import("../../lib/mergers/hooks-json.mjs");
 
-    // Install once with old scripts
+    // Install once with old scripts but current-format commands
+    const nodeCmd = (script) => `"${process.execPath}" ${script}`;
     mkdirSync(join(tempDir, ".claude/hooks"), { recursive: true });
     writeFileSync(join(tempDir, ".claude/hooks/skillrepo-sync.mjs"), "// old sync");
     writeFileSync(join(tempDir, ".claude/hooks/skillrepo-prompt-match.mjs"), "// old prompt");
     mkdirSync(join(tempDir, ".claude"), { recursive: true });
     const existing = {
       hooks: {
-        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: ".claude/hooks/skillrepo-sync.mjs" }] }],
-        UserPromptSubmit: [{ hooks: [{ type: "command", command: ".claude/hooks/skillrepo-prompt-match.mjs" }] }],
+        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: nodeCmd(".claude/hooks/skillrepo-sync.mjs") }] }],
+        UserPromptSubmit: [{ hooks: [{ type: "command", command: nodeCmd(".claude/hooks/skillrepo-prompt-match.mjs") }] }],
       },
     };
     writeFileSync(join(tempDir, ".claude/settings.local.json"), JSON.stringify(existing, null, 2));
@@ -149,7 +152,7 @@ describe("Hooks settings.local.json merger", () => {
     assert.equal(promptResult.action, "updated");
     assert.equal(readFileSync(join(tempDir, ".claude/hooks/skillrepo-prompt-match.mjs"), "utf-8"), "// new prompt");
 
-    // Settings skipped
+    // Settings skipped (commands already use current node path)
     const settingsResult = results.find((r) => r.path.includes("settings.local.json"));
     assert.equal(settingsResult.action, "skipped");
   });
@@ -203,7 +206,7 @@ describe("Hooks settings.local.json merger", () => {
     const config = JSON.parse(readFileSync(join(tempDir, ".claude/settings.local.json"), "utf-8"));
     assert.ok(Array.isArray(config.hooks.SessionStart), "SessionStart should be an array");
     assert.equal(config.hooks.SessionStart.length, 1);
-    assert.equal(config.hooks.SessionStart[0].hooks[0].command, ".claude/hooks/skillrepo-sync.mjs");
+    assert.ok(config.hooks.SessionStart[0].hooks[0].command.endsWith(".claude/hooks/skillrepo-sync.mjs"), "Command should end with script path");
   });
 
   it("documents partial write when JSON parse fails (hook scripts written before throw)", async () => {
@@ -244,7 +247,7 @@ describe("Hooks settings.local.json merger", () => {
     const config = JSON.parse(readFileSync(join(tempDir, ".claude/settings.local.json"), "utf-8"));
     assert.ok(Array.isArray(config.hooks.PreToolUse), "PreToolUse should be an array");
     assert.equal(config.hooks.PreToolUse.length, 1);
-    assert.equal(config.hooks.PreToolUse[0].hooks[0].command, ".claude/hooks/skillrepo-pretool-match.mjs");
+    assert.ok(config.hooks.PreToolUse[0].hooks[0].command.endsWith(".claude/hooks/skillrepo-pretool-match.mjs"), "Command should end with script path");
   });
 
   it("skips pretool hook when preToolHookContent is not provided", async () => {
@@ -271,10 +274,10 @@ describe("Hooks settings.local.json merger", () => {
     assert.equal(config.hooks.PreToolUse.length, 1, "should not duplicate PreToolUse entry");
   });
 
-  it("migrates legacy 'node .claude/hooks/...' commands to direct execution", async () => {
+  it("migrates any non-current-node-path commands to use process.execPath", async () => {
     const { mergeHooksConfig } = await import("../../lib/mergers/hooks-json.mjs");
 
-    // Pre-existing settings with OLD command format (node .claude/hooks/...)
+    // Pre-existing settings with bare `node` command format
     const oldSettings = {
       hooks: {
         SessionStart: [{
@@ -303,10 +306,55 @@ describe("Hooks settings.local.json merger", () => {
     // Read the result and verify: ONE entry per event, with NEW command format
     const config = JSON.parse(readFileSync(join(tempDir, ".claude/settings.local.json"), "utf-8"));
     assert.equal(config.hooks.SessionStart.length, 1);
-    assert.equal(config.hooks.SessionStart[0].hooks[0].command, ".claude/hooks/skillrepo-sync.mjs");
+    assert.ok(config.hooks.SessionStart[0].hooks[0].command.includes(process.execPath), "Command should contain full node path");
+    assert.ok(config.hooks.SessionStart[0].hooks[0].command.endsWith(".claude/hooks/skillrepo-sync.mjs"), "Command should end with script path");
     assert.equal(config.hooks.UserPromptSubmit.length, 1);
-    assert.equal(config.hooks.UserPromptSubmit[0].hooks[0].command, ".claude/hooks/skillrepo-prompt-match.mjs");
+    assert.ok(config.hooks.UserPromptSubmit[0].hooks[0].command.includes(process.execPath), "Command should contain full node path");
+    assert.ok(config.hooks.UserPromptSubmit[0].hooks[0].command.endsWith(".claude/hooks/skillrepo-prompt-match.mjs"), "Command should end with script path");
     assert.equal(config.hooks.PreToolUse.length, 1);
-    assert.equal(config.hooks.PreToolUse[0].hooks[0].command, ".claude/hooks/skillrepo-pretool-match.mjs");
+    assert.ok(config.hooks.PreToolUse[0].hooks[0].command.includes(process.execPath), "Command should contain full node path");
+    assert.ok(config.hooks.PreToolUse[0].hooks[0].command.endsWith(".claude/hooks/skillrepo-pretool-match.mjs"), "Command should end with script path");
+  });
+
+  it("migrates bare shebang-style commands (v1.6.1 format)", async () => {
+    const { mergeHooksConfig } = await import("../../lib/mergers/hooks-json.mjs");
+
+    // v1.6.1 used bare script paths relying on shebang execution
+    const oldSettings = {
+      hooks: {
+        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: ".claude/hooks/skillrepo-sync.mjs" }] }],
+      }
+    };
+    mkdirSync(join(tempDir, ".claude/hooks"), { recursive: true });
+    writeFileSync(join(tempDir, ".claude/settings.local.json"), JSON.stringify(oldSettings, null, 2));
+
+    const { results } = mergeHooksConfig(HOOKS_CONFIG, SYNC_CONTENT, PROMPT_CONTENT);
+
+    const config = JSON.parse(readFileSync(join(tempDir, ".claude/settings.local.json"), "utf-8"));
+    assert.equal(config.hooks.SessionStart.length, 1, "Should not duplicate");
+    const cmd = config.hooks.SessionStart[0].hooks[0].command;
+    assert.ok(cmd.includes(process.execPath), "Should contain full node path");
+    assert.ok(cmd.endsWith(".claude/hooks/skillrepo-sync.mjs"), "Should end with script path");
+  });
+
+  it("migrates old full-path-to-node commands (nvm version change)", async () => {
+    const { mergeHooksConfig } = await import("../../lib/mergers/hooks-json.mjs");
+
+    // User ran init with an older nvm node version
+    const oldSettings = {
+      hooks: {
+        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: "/usr/local/bin/node .claude/hooks/skillrepo-sync.mjs" }] }],
+      }
+    };
+    mkdirSync(join(tempDir, ".claude/hooks"), { recursive: true });
+    writeFileSync(join(tempDir, ".claude/settings.local.json"), JSON.stringify(oldSettings, null, 2));
+
+    const { results } = mergeHooksConfig(HOOKS_CONFIG, SYNC_CONTENT, PROMPT_CONTENT);
+
+    const config = JSON.parse(readFileSync(join(tempDir, ".claude/settings.local.json"), "utf-8"));
+    assert.equal(config.hooks.SessionStart.length, 1, "Should not duplicate");
+    const cmd = config.hooks.SessionStart[0].hooks[0].command;
+    assert.ok(cmd.includes(process.execPath), "Should contain CURRENT node path");
+    assert.ok(!cmd.includes("/usr/local/bin/node"), "Should NOT contain old node path");
   });
 });