claudekit-cli 4.2.1 → 4.2.3

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.2.1",
-	"generatedAt": "2026-05-12T16:32:49.942Z",
+	"version": "4.2.3",
+	"generatedAt": "2026-05-12T19:34:12.422Z",
 	"commands": {
 		"agents": {
 			"name": "agents",

package/dist/index.js

@@ -45544,6 +45544,45 @@ function formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix = "
   }
   return normalizedRoot === "$CLAUDE_PROJECT_DIR" ? `${nodePrefix}"${normalizedRoot}"/${normalizedRelativePath}${suffix}` : `${nodePrefix}"${normalizedRoot}/${normalizedRelativePath}"${suffix}`;
 }
+function resolveClaudePathArg(arg, root) {
+  const normalizedArg = arg.replace(/\\/g, "/");
+  const bareRelativeMatch = normalizedArg.match(/^(?:\.\/)?(\.claude\/.+)$/);
+  if (bareRelativeMatch) {
+    return { root, relativePath: bareRelativeMatch[1] };
+  }
+  const variableMatch = normalizedArg.match(/^(?:\$HOME|\$\{HOME\}|\$CLAUDE_PROJECT_DIR|\$\{CLAUDE_PROJECT_DIR\}|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)\/(\.claude\/.+)$/);
+  if (variableMatch) {
+    return { root, relativePath: variableMatch[1] };
+  }
+  const tildeMatch = normalizedArg.match(/^~\/(\.claude\/.+)$/);
+  if (tildeMatch) {
+    return { root, relativePath: tildeMatch[1] };
+  }
+  const absoluteMatch = normalizedArg.match(/^((?:[A-Za-z]:\/|\/).*?\/\.claude\/.+)$/);
+  if (absoluteMatch) {
+    const absolutePath = absoluteMatch[1];
+    const dotClaudeIdx = absolutePath.indexOf("/.claude/");
+    if (dotClaudeIdx === -1) {
+      return null;
+    }
+    const isWin2 = process.platform === "win32";
+    const cmp = (s) => isWin2 ? s.toLowerCase() : s;
+    const globalRoots = [
+      `${homedir12().replace(/\\/g, "/").replace(/\/+$/, "")}/.claude/`,
+      `${PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "")}/`
+    ];
+    const isUnderGlobal = globalRoots.some((g2) => cmp(absolutePath).startsWith(cmp(g2)));
+    const resolvedRoot = isUnderGlobal ? "$HOME" : root;
+    return {
+      root: resolvedRoot,
+      relativePath: absolutePath.slice(dotClaudeIdx + 1)
+    };
+  }
+  return null;
+}
+function formatCanonicalClaudeArg(pathArg) {
+  return formatCanonicalClaudeCommand("", pathArg.root, pathArg.relativePath);
+}
 function isNodeClaudeCommand(cmd) {
   if (!cmd)
     return false;
@@ -45611,6 +45650,39 @@ function repairClaudeNodeCommandPath(cmd, root) {
   }
   return { command: cmd, changed: false, issue: null };
 }
+function repairClaudeHookRunnerCommandPath(cmd, root) {
+  if (!cmd) {
+    return { command: cmd ?? "", changed: false, issue: null };
+  }
+  const runnerMatch = cmd.match(/^(\s*bash\s+)(?:"([^"]+)"|([^\s"]+))\s+(?:"([^"]+)"|([^\s"]+))(.*)$/);
+  if (!runnerMatch) {
+    return { command: cmd, changed: false, issue: null };
+  }
+  const [, bashPrefix, quotedRunner, unquotedRunner, quotedTarget, unquotedTarget, suffix] = runnerMatch;
+  const runnerArg = quotedRunner ?? unquotedRunner;
+  const targetArg = quotedTarget ?? unquotedTarget;
+  const runnerPath = resolveClaudePathArg(runnerArg, root);
+  if (!runnerPath || runnerPath.relativePath.replace(/\\/g, "/") !== ".claude/hooks/node-hook-runner.sh") {
+    return { command: cmd, changed: false, issue: null };
+  }
+  const targetPath = resolveClaudePathArg(targetArg, root);
+  if (!targetPath) {
+    return { command: cmd, changed: false, issue: null };
+  }
+  const command = `${bashPrefix}${formatCanonicalClaudeArg(runnerPath)} ${formatCanonicalClaudeArg(targetPath)}${suffix}`;
+  return {
+    command,
+    changed: command !== cmd,
+    issue: command !== cmd ? "invalid-format" : null
+  };
+}
+function repairClaudeHookCommandPath(cmd, root) {
+  const nodeRepair = repairClaudeNodeCommandPath(cmd, root);
+  if (nodeRepair.changed || nodeRepair.issue || isNodeClaudeCommand(cmd)) {
+    return nodeRepair;
+  }
+  return repairClaudeHookRunnerCommandPath(cmd, root);
+}
 function normalizeCommand(cmd) {
   if (!cmd)
     return "";
@@ -62890,7 +62962,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.2.1",
+    version: "4.2.3",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -85190,12 +85262,13 @@ async function applyBudgetDefaults(settingsPath, projectClaudeDir, requiredFract
 var ENGINEER_SKILL_COUNT_THRESHOLD = 20;
 async function checkSkillBudget(setup, projectDir) {
   const projectClaudeDir = resolve31(projectDir, ".claude");
-  const globalClaudeDir = PathResolver.getGlobalKitDir();
+  const globalClaudeDir = resolve31(PathResolver.getGlobalKitDir());
+  const projectScopeAliasesGlobal = projectClaudeDir === globalClaudeDir;
   const [projectSkills, globalSkills] = await Promise.all([
-    scanSkills2(join75(projectClaudeDir, "skills")),
+    projectScopeAliasesGlobal ? Promise.resolve([]) : scanSkills2(join75(projectClaudeDir, "skills")),
     scanSkills2(join75(globalClaudeDir, "skills"))
   ]);
-  if (!isEngineerLikeProject(setup, projectSkills))
+  if (!isEngineerLikeProject(setup, [...projectSkills, ...globalSkills]))
     return [];
   const settingsPath = join75(projectClaudeDir, "settings.json");
   const settings = await readProjectSettings(settingsPath);
@@ -85216,7 +85289,10 @@ function isEngineerLikeProject(setup, projectSkills) {
   const metadataText = [
     setup.project.metadata?.name,
     setup.project.metadata?.description,
-    setup.project.metadata?.repository?.url
+    setup.project.metadata?.repository?.url,
+    setup.global.metadata?.name,
+    setup.global.metadata?.description,
+    setup.global.metadata?.repository?.url
   ].filter(Boolean).join(" ").toLowerCase();
   return metadataText.includes("engineer") || projectSkills.length >= ENGINEER_SKILL_COUNT_THRESHOLD;
 }
@@ -86280,7 +86356,7 @@ function getClaudeSettingsFiles(projectDir) {
   return candidates.filter((candidate) => existsSync56(candidate.path));
 }
 function isAlreadyCanonical(cmd) {
-  return /^node\s+"\$HOME\/\.claude\/[^"]+"/.test(cmd) || /^node\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/\S+/.test(cmd);
+  return /^node\s+"\$HOME\/\.claude\/[^"]+"/.test(cmd) || /^node\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/\S+/.test(cmd) || /^bash\s+"\$HOME\/\.claude\/hooks\/node-hook-runner\.sh"\s+"\$HOME\/\.claude\/[^"]+"/.test(cmd) || /^bash\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/hooks\/node-hook-runner\.sh\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/\S+/.test(cmd);
 }
 function collectHookCommandFindings(settings, settingsFile) {
   if (!settings.hooks) {
@@ -86292,7 +86368,7 @@ function collectHookCommandFindings(settings, settingsFile) {
       if ("command" in entry && typeof entry.command === "string") {
         if (isAlreadyCanonical(entry.command))
           continue;
-        const repair = repairClaudeNodeCommandPath(entry.command, settingsFile.root);
+        const repair = repairClaudeHookCommandPath(entry.command, settingsFile.root);
         if (repair.changed && repair.issue) {
           findings.push({
             path: settingsFile.path,
@@ -86313,7 +86389,7 @@ function collectHookCommandFindings(settings, settingsFile) {
         }
         if (isAlreadyCanonical(hook.command))
           continue;
-        const repair = repairClaudeNodeCommandPath(hook.command, settingsFile.root);
+        const repair = repairClaudeHookCommandPath(hook.command, settingsFile.root);
         if (!repair.changed || !repair.issue) {
           continue;
         }
@@ -102339,7 +102415,7 @@ class SettingsProcessor {
     return fixed;
   }
   fixSingleCommandPath(cmd) {
-    return repairClaudeNodeCommandPath(cmd, this.getClaudeCommandRoot()).command;
+    return repairClaudeHookCommandPath(cmd, this.getClaudeCommandRoot()).command;
   }
   formatCommandPath(nodePrefix, capturedVar, relativePath, suffix = "") {
     const canonicalRoot = this.canonicalizePathRoot(capturedVar);
@@ -111466,7 +111542,7 @@ import { readFile as readFile65 } from "node:fs/promises";
 import { join as join149 } from "node:path";
 
 // src/commands/skills/installed-skills-inventory.ts
-import { join as join148 } from "node:path";
+import { join as join148, resolve as resolve53 } from "node:path";
 init_path_resolver();
 var SCOPE_SORT_ORDER = {
   project: 0,
@@ -111474,9 +111550,11 @@ var SCOPE_SORT_ORDER = {
 };
 async function getActiveClaudeSkillInstallations(options2 = {}) {
   const projectDir = options2.projectDir ?? process.cwd();
-  const globalDir = options2.globalDir ?? PathResolver.getGlobalKitDir();
+  const globalDir = resolve53(options2.globalDir ?? PathResolver.getGlobalKitDir());
+  const projectClaudeDir = resolve53(projectDir, ".claude");
+  const projectScopeAliasesGlobal = projectClaudeDir === globalDir;
   const [projectSkills, globalSkills] = await Promise.all([
-    scanSkills2(join148(projectDir, ".claude", "skills")),
+    projectScopeAliasesGlobal ? Promise.resolve([]) : scanSkills2(join148(projectClaudeDir, "skills")),
     scanSkills2(join148(globalDir, "skills"))
   ]);
   const projectIds = new Set(projectSkills.map((skill) => skill.id));
@@ -112220,7 +112298,7 @@ async function detectInstallations() {
 
 // src/commands/uninstall/removal-handler.ts
 import { readdirSync as readdirSync10, rmSync as rmSync5 } from "node:fs";
-import { basename as basename30, join as join151, resolve as resolve53, sep as sep13 } from "node:path";
+import { basename as basename30, join as join151, resolve as resolve54, sep as sep13 } from "node:path";
 init_logger();
 init_safe_prompts();
 init_safe_spinner();
@@ -112404,8 +112482,8 @@ async function restoreUninstallBackup(backup) {
 }
 async function isPathSafeToRemove(filePath, baseDir) {
   try {
-    const resolvedPath = resolve53(filePath);
-    const resolvedBase = resolve53(baseDir);
+    const resolvedPath = resolve54(filePath);
+    const resolvedBase = resolve54(baseDir);
     if (!resolvedPath.startsWith(resolvedBase + sep13) && resolvedPath !== resolvedBase) {
       logger.debug(`Path outside installation directory: ${filePath}`);
       return false;
@@ -112413,7 +112491,7 @@ async function isPathSafeToRemove(filePath, baseDir) {
     const stats = await import_fs_extra41.lstat(filePath);
     if (stats.isSymbolicLink()) {
       const realPath = await import_fs_extra41.realpath(filePath);
-      const resolvedReal = resolve53(realPath);
+      const resolvedReal = resolve54(realPath);
       if (!resolvedReal.startsWith(resolvedBase + sep13) && resolvedReal !== resolvedBase) {
         logger.debug(`Symlink points outside installation directory: ${filePath} -> ${realPath}`);
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "4.2.1",
+	"version": "4.2.3",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {