skillrepo 1.6.0 → 1.6.1

package/package.json

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

package/src/lib/fs-utils.mjs

@@ -3,7 +3,7 @@
  * Creates directories as needed, handles errors cleanly.
  */
 
-import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync } from "node:fs";
+import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync, chmodSync } from "node:fs";
 import { dirname } from "node:path";
 
 /**
@@ -35,6 +35,15 @@ export function writeFileSafe(filePath, content) {
   writeFileSync(filePath, content, "utf-8");
 }
 
+/**
+ * Write a file and mark it executable (0o755).
+ * Used for hook scripts that have shebangs and are invoked directly.
+ */
+export function writeExecutable(filePath, content) {
+  writeFileSafe(filePath, content);
+  chmodSync(filePath, 0o755);
+}
+
 /**
  * Check if a path exists (file or directory).
  */

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

@@ -8,13 +8,21 @@
  */
 
 import { unlinkSync } from "node:fs";
-import { readFileSafe, writeFileSafe } from "../fs-utils.mjs";
+import { readFileSafe, writeFileSafe, writeExecutable } from "../fs-utils.mjs";
 import { claudeSettingsLocal, claudeSyncHook, claudePromptHook, claudePreToolHook, claudeHooksDir } from "../paths.mjs";
 import { join } from "node:path";
 
-const DEFAULT_SYNC_COMMAND = "node .claude/hooks/skillrepo-sync.mjs";
-const DEFAULT_PROMPT_COMMAND = "node .claude/hooks/skillrepo-prompt-match.mjs";
-const DEFAULT_PRETOOL_COMMAND = "node .claude/hooks/skillrepo-pretool-match.mjs";
+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",
+]);
 
 /**
  * Extract a hook command from a hooks config group, falling back to a default.
@@ -46,6 +54,26 @@ function hasCommand(groups, command) {
   );
 }
 
+/**
+ * Replace legacy `node .claude/hooks/...` commands with the new direct-execution
+ * format. Returns true if any replacement was made.
+ */
+function replaceLegacyCommands(groups) {
+  if (!Array.isArray(groups)) return false;
+  let replaced = 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;
+      }
+    }
+  }
+  return replaced;
+}
+
 /**
  * Merge SkillRepo hooks into .claude/settings.local.json and write hook scripts.
  * @param {object} hooksConfig - The hooks config object from the server payload (settingsHooks.hooks)
@@ -60,16 +88,17 @@ export function mergeHooksConfig(hooksConfig, syncHookContent, promptHookContent
   const preToolCommand = extractCommand(hooksConfig, "PreToolUse", DEFAULT_PRETOOL_COMMAND);
   const results = [];
 
-  // Always write hook scripts (latest version from server)
+  // 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`).
   const syncExisted = readFileSafe(claudeSyncHook()) !== null;
-  writeFileSafe(claudeSyncHook(), syncHookContent);
+  writeExecutable(claudeSyncHook(), syncHookContent);
   results.push({
     path: ".claude/hooks/skillrepo-sync.mjs",
     action: syncExisted ? "updated" : "created",
   });
 
   const promptExisted = readFileSafe(claudePromptHook()) !== null;
-  writeFileSafe(claudePromptHook(), promptHookContent);
+  writeExecutable(claudePromptHook(), promptHookContent);
   results.push({
     path: ".claude/hooks/skillrepo-prompt-match.mjs",
     action: promptExisted ? "updated" : "created",
@@ -77,7 +106,7 @@ export function mergeHooksConfig(hooksConfig, syncHookContent, promptHookContent
 
   if (preToolHookContent) {
     const preToolExisted = readFileSafe(claudePreToolHook()) !== null;
-    writeFileSafe(claudePreToolHook(), preToolHookContent);
+    writeExecutable(claudePreToolHook(), preToolHookContent);
     results.push({
       path: ".claude/hooks/skillrepo-pretool-match.mjs",
       action: preToolExisted ? "updated" : "created",
@@ -111,6 +140,13 @@ 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])) {
+      changed = true;
+    }
+  }
+
   // Merge SessionStart
   if (!Array.isArray(config.hooks.SessionStart)) config.hooks.SessionStart = [];
   if (!hasCommand(config.hooks.SessionStart, syncCommand)) {

package/src/lib/write-configs.mjs

@@ -4,7 +4,7 @@
  */
 
 import { resolve } from "node:path";
-import { readFileSafe, writeFileSafe } from "./fs-utils.mjs";
+import { readFileSafe, writeFileSafe, writeExecutable } from "./fs-utils.mjs";
 import { claudeSkillrepoMd, claudeSkillrepoIndex, claudeSkillrepoConfig } from "./paths.mjs";
 
 /**
@@ -95,7 +95,7 @@ export function writeAllConfigs({ ides, mcpUrl, apiKey, payload }) {
     }
     if (payload.cursor?.sessionHook) {
       const existed = readFileSafe(payload.cursor.sessionHook.path) !== null;
-      writeFileSafe(payload.cursor.sessionHook.path, payload.cursor.sessionHook.content);
+      writeExecutable(payload.cursor.sessionHook.path, payload.cursor.sessionHook.content);
       results.push({ path: payload.cursor.sessionHook.path, action: existed ? "updated" : "created" });
     }
     if (payload.cursor?.skillIndex) {

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 } from "fs";
+import { readFileSync, writeFileSync, mkdirSync, existsSync, chmodSync } from "fs";
 import { join, dirname } from "path";
 
 const SETUP_URL = "${setupUrl}";
@@ -223,6 +223,11 @@ 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" },
@@ -234,8 +239,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) safeWrite(cc.promptHook.path, cc.promptHook.content);
-  if (cc.preToolHook?.content) safeWrite(cc.preToolHook.path, cc.preToolHook.content);
+  if (cc.promptHook?.content) writeExecutable(cc.promptHook.path, cc.promptHook.content);
+  if (cc.preToolHook?.content) writeExecutable(cc.preToolHook.path, cc.preToolHook.content);
 } catch { /* silently fail */ }
 
 // Repo profiling
@@ -473,12 +478,13 @@ import { tmpdir } from "os";
 
 const CONTENT_URL = "${contentUrl}";
 
-let hookConfig = { maxTotalBytes: 10000, reinjectionLineThreshold: 50 };
+let hookConfig = { maxTotalBytes: 10000, reinjectionLineThreshold: 50, maxSkillsPerPrompt: 3 };
 try {
   const cfg = JSON.parse(readFileSync(join(process.cwd(), ".claude", "skillrepo-config.json"), "utf-8"));
   if (cfg.hookInjection) hookConfig = { ...hookConfig, ...cfg.hookInjection };
 } catch {}
 const MAX_BYTES = hookConfig.maxTotalBytes;
+const MAX_SKILLS = hookConfig.maxSkillsPerPrompt;
 const REINJECT_THRESHOLD = hookConfig.reinjectionLineThreshold ?? 50;
 
 let dynamicSignals = [];
@@ -489,13 +495,8 @@ try {
   }
 } catch {}
 
-const FALLBACK_SIGNALS = [
-  { toolName: "skill__affaan-m__frontend-patterns", files: ["**/*.tsx", "**/*.jsx", "**/*.css"], project: [], tasks: [] },
-  { toolName: "skill__affaan-m__e2e-testing", files: ["**/*.test.*", "**/*.spec.*"], project: [], tasks: [] },
-  { toolName: "skill__atxpace__gh-issue-workflow", files: [], project: [], tasks: ["github issue", "pull request"] },
-  { toolName: "skill__affaan-m__api-routes", files: ["**/api/**/route.ts", "**/api/**/route.tsx"], project: [], tasks: [] },
-];
-const SIGNALS = dynamicSignals.length > 0 ? dynamicSignals : FALLBACK_SIGNALS;
+const SIGNALS = dynamicSignals;
+if (SIGNALS.length === 0) { process.stdout.write("{}"); process.exit(0); }
 
 // Minimal glob matcher — self-contained, no npm deps.
 function matchGlob(filePath, pattern) {
@@ -621,7 +622,7 @@ if (matchedSkills.length === 0) { process.stdout.write("{}"); process.exit(0); }
 
 const { path: statePath, state } = readState(sessionId);
 const currentLines = countTranscriptLines(transcriptPath);
-const candidates = matchedSkills.filter((s) => shouldReinject(s.toolName, state, currentLines));
+const candidates = matchedSkills.filter((s) => shouldReinject(s.toolName, state, currentLines)).slice(0, MAX_SKILLS);
 if (candidates.length === 0) { process.stdout.write("{}"); process.exit(0); }
 
 const contents = [];
@@ -675,21 +676,21 @@ function buildSettingsHooks() {
       {
         matcher: "startup|resume",
         hooks: [
-          { type: "command", command: "node .claude/hooks/skillrepo-sync.mjs" },
+          { type: "command", command: ".claude/hooks/skillrepo-sync.mjs" },
         ],
       },
     ],
     UserPromptSubmit: [
       {
         hooks: [
-          { type: "command", command: "node .claude/hooks/skillrepo-prompt-match.mjs" },
+          { type: "command", command: ".claude/hooks/skillrepo-prompt-match.mjs" },
         ],
       },
     ],
     PreToolUse: [
       {
         hooks: [
-          { type: "command", command: "node .claude/hooks/skillrepo-pretool-match.mjs" },
+          { type: "command", command: ".claude/hooks/skillrepo-pretool-match.mjs" },
         ],
       },
     ],
@@ -766,7 +767,7 @@ function buildCursorHooksJson() {
     hooks: [
       {
         event: "sessionStart",
-        command: "node .cursor/hooks/skillrepo-session.mjs",
+        command: ".cursor/hooks/skillrepo-session.mjs",
       },
     ],
   }, null, 2) + "\n";

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

@@ -23,9 +23,9 @@ const PROMPT_CONTENT = "// prompt hook";
 const PRETOOL_CONTENT = "// pretool hook";
 
 const HOOKS_CONFIG = {
-  SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-sync.mjs" }] }],
-  UserPromptSubmit: [{ hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-prompt-match.mjs" }] }],
-  PreToolUse: [{ hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-pretool-match.mjs" }] }],
+  SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: ".claude/hooks/skillrepo-sync.mjs" }] }],
+  UserPromptSubmit: [{ hooks: [{ type: "command", command: ".claude/hooks/skillrepo-prompt-match.mjs" }] }],
+  PreToolUse: [{ hooks: [{ type: "command", command: ".claude/hooks/skillrepo-pretool-match.mjs" }] }],
 };
 
 describe("Hooks settings.local.json merger", () => {
@@ -86,8 +86,8 @@ describe("Hooks settings.local.json merger", () => {
     // Pre-existing with both hooks already
     const existing = {
       hooks: {
-        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-sync.mjs" }] }],
-        UserPromptSubmit: [{ hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-prompt-match.mjs" }] }],
+        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: ".claude/hooks/skillrepo-sync.mjs" }] }],
+        UserPromptSubmit: [{ hooks: [{ type: "command", command: ".claude/hooks/skillrepo-prompt-match.mjs" }] }],
       },
     };
     mkdirSync(join(tempDir, ".claude"), { recursive: true });
@@ -105,7 +105,7 @@ describe("Hooks settings.local.json merger", () => {
     // Only SessionStart installed
     const existing = {
       hooks: {
-        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-sync.mjs" }] }],
+        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: ".claude/hooks/skillrepo-sync.mjs" }] }],
       },
     };
     mkdirSync(join(tempDir, ".claude"), { recursive: true });
@@ -119,7 +119,7 @@ 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, "node .claude/hooks/skillrepo-prompt-match.mjs");
+    assert.equal(config.hooks.UserPromptSubmit[0].hooks[0].command, ".claude/hooks/skillrepo-prompt-match.mjs");
   });
 
   it("always updates hook scripts even when settings merge is skipped", async () => {
@@ -132,8 +132,8 @@ describe("Hooks settings.local.json merger", () => {
     mkdirSync(join(tempDir, ".claude"), { recursive: true });
     const existing = {
       hooks: {
-        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-sync.mjs" }] }],
-        UserPromptSubmit: [{ hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-prompt-match.mjs" }] }],
+        SessionStart: [{ matcher: "startup|resume", hooks: [{ type: "command", command: ".claude/hooks/skillrepo-sync.mjs" }] }],
+        UserPromptSubmit: [{ hooks: [{ type: "command", command: ".claude/hooks/skillrepo-prompt-match.mjs" }] }],
       },
     };
     writeFileSync(join(tempDir, ".claude/settings.local.json"), JSON.stringify(existing, null, 2));
@@ -203,7 +203,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, "node .claude/hooks/skillrepo-sync.mjs");
+    assert.equal(config.hooks.SessionStart[0].hooks[0].command, ".claude/hooks/skillrepo-sync.mjs");
   });
 
   it("documents partial write when JSON parse fails (hook scripts written before throw)", async () => {
@@ -244,7 +244,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, "node .claude/hooks/skillrepo-pretool-match.mjs");
+    assert.equal(config.hooks.PreToolUse[0].hooks[0].command, ".claude/hooks/skillrepo-pretool-match.mjs");
   });
 
   it("skips pretool hook when preToolHookContent is not provided", async () => {
@@ -270,4 +270,43 @@ describe("Hooks settings.local.json merger", () => {
     const config = JSON.parse(readFileSync(join(tempDir, ".claude/settings.local.json"), "utf-8"));
     assert.equal(config.hooks.PreToolUse.length, 1, "should not duplicate PreToolUse entry");
   });
+
+  it("migrates legacy 'node .claude/hooks/...' commands to direct execution", async () => {
+    const { mergeHooksConfig } = await import("../../lib/mergers/hooks-json.mjs");
+
+    // Pre-existing settings with OLD command format (node .claude/hooks/...)
+    const oldSettings = {
+      hooks: {
+        SessionStart: [{
+          matcher: "startup|resume",
+          hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-sync.mjs" }]
+        }],
+        UserPromptSubmit: [{
+          hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-prompt-match.mjs" }]
+        }],
+        PreToolUse: [{
+          hooks: [{ type: "command", command: "node .claude/hooks/skillrepo-pretool-match.mjs" }]
+        }]
+      }
+    };
+    mkdirSync(join(tempDir, ".claude"), { recursive: true });
+    writeFileSync(join(tempDir, ".claude/settings.local.json"), JSON.stringify(oldSettings, null, 2));
+    mkdirSync(join(tempDir, ".claude/hooks"), { recursive: true });
+
+    // Run merger with NEW hook config (HOOKS_CONFIG uses .claude/hooks/... without "node" prefix)
+    const { results } = mergeHooksConfig(HOOKS_CONFIG, SYNC_CONTENT, PROMPT_CONTENT, PRETOOL_CONTENT);
+
+    // Settings should show "merged" (not "created" or "skipped")
+    const settingsResult = results.find((r) => r.path.includes("settings.local.json"));
+    assert.equal(settingsResult.action, "merged");
+
+    // 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.equal(config.hooks.UserPromptSubmit.length, 1);
+    assert.equal(config.hooks.UserPromptSubmit[0].hooks[0].command, ".claude/hooks/skillrepo-prompt-match.mjs");
+    assert.equal(config.hooks.PreToolUse.length, 1);
+    assert.equal(config.hooks.PreToolUse[0].hooks[0].command, ".claude/hooks/skillrepo-pretool-match.mjs");
+  });
 });