claudekit-cli 3.41.3-dev.2 → 3.41.3-dev.3

package/dist/index.js

@@ -44768,6 +44768,58 @@ import { join as join20 } from "node:path";
 function escapeRegex(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+function normalizeCommandRoot(root) {
+  return root.replace(/\\/g, "/").replace(/\/+$/, "");
+}
+function formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix = "") {
+  const normalizedRoot = normalizeCommandRoot(root);
+  let normalizedRelativePath = relativePath.replace(/\\/g, "/").replace(/^\/+/, "");
+  if (normalizedRoot !== "$HOME" && normalizedRoot !== "$CLAUDE_PROJECT_DIR") {
+    normalizedRelativePath = normalizedRelativePath.replace(/^\.claude\//, "");
+  }
+  return normalizedRoot === "$CLAUDE_PROJECT_DIR" ? `${nodePrefix}"${normalizedRoot}"/${normalizedRelativePath}${suffix}` : `${nodePrefix}"${normalizedRoot}/${normalizedRelativePath}"${suffix}`;
+}
+function isNodeClaudeCommand(cmd) {
+  if (!cmd)
+    return false;
+  return /^\s*node\s+/.test(cmd) && (cmd.includes(".claude/") || cmd.includes(".claude\\"));
+}
+function repairClaudeNodeCommandPath(cmd, root) {
+  if (!cmd || !isNodeClaudeCommand(cmd)) {
+    return { command: cmd ?? "", changed: false, issue: null };
+  }
+  const bareRelativeMatch = cmd.match(/^(node\s+)(?:\.\/)?(\.claude[/\\][^\s"]+)(.*)$/);
+  if (bareRelativeMatch) {
+    const [, nodePrefix, relativePath, suffix] = bareRelativeMatch;
+    const command = formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix);
+    return { command, changed: command !== cmd, issue: "raw-relative" };
+  }
+  const embeddedQuotedMatch = cmd.match(/^(node\s+)"(?:\$HOME|\$CLAUDE_PROJECT_DIR|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)[/\\](\.claude[/\\][^"]+)"(.*)$/);
+  if (embeddedQuotedMatch) {
+    const [, nodePrefix, relativePath, suffix] = embeddedQuotedMatch;
+    const command = formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix);
+    return { command, changed: command !== cmd, issue: "invalid-format" };
+  }
+  const varOnlyQuotedMatch = cmd.match(/^(node\s+)"(?:\$HOME|\$CLAUDE_PROJECT_DIR|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)"[/\\](\.claude[/\\][^\s"]+)(.*)$/);
+  if (varOnlyQuotedMatch) {
+    const [, nodePrefix, relativePath, suffix] = varOnlyQuotedMatch;
+    const command = formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix);
+    return { command, changed: command !== cmd, issue: "invalid-format" };
+  }
+  const tildeMatch = cmd.match(/^(node\s+)~[/\\](\.claude[/\\][^\s"]+)(.*)$/);
+  if (tildeMatch) {
+    const [, nodePrefix, relativePath, suffix] = tildeMatch;
+    const command = formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix);
+    return { command, changed: command !== cmd, issue: "invalid-format" };
+  }
+  const unquotedMatch = cmd.match(/^(node\s+)(?:\$HOME|\$CLAUDE_PROJECT_DIR|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)[/\\](\.claude[/\\][^\s"]+)(.*)$/);
+  if (unquotedMatch) {
+    const [, nodePrefix, relativePath, suffix] = unquotedMatch;
+    const command = formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix);
+    return { command, changed: command !== cmd, issue: "invalid-format" };
+  }
+  return { command: cmd, changed: false, issue: null };
+}
 function normalizeCommand(cmd) {
   if (!cmd)
     return "";
@@ -57271,7 +57323,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.41.3-dev.2",
+    version: "3.41.3-dev.3",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -65865,10 +65917,10 @@ var init_config_manager2 = __esm(() => {
 
 // src/services/package-installer/gemini-mcp/validation.ts
 import { existsSync as existsSync51, lstatSync, readlinkSync } from "node:fs";
-import { homedir as homedir31 } from "node:os";
+import { homedir as homedir32 } from "node:os";
 import { join as join78 } from "node:path";
 function getGlobalMcpConfigPath() {
-  return join78(homedir31(), ".claude", ".mcp.json");
+  return join78(homedir32(), ".claude", ".mcp.json");
 }
 function getLocalMcpConfigPath(projectDir) {
   return join78(projectDir, ".mcp.json");
@@ -65889,7 +65941,7 @@ function findMcpConfigPath(projectDir) {
 }
 function getGeminiSettingsPath(projectDir, isGlobal) {
   if (isGlobal) {
-    return join78(homedir31(), ".gemini", "settings.json");
+    return join78(homedir32(), ".gemini", "settings.json");
   }
   return join78(projectDir, ".gemini", "settings.json");
 }
@@ -68517,7 +68569,7 @@ var init_content_validator = __esm(() => {
 import { createHash as createHash7 } from "node:crypto";
 import { existsSync as existsSync66, mkdirSync as mkdirSync4, readFileSync as readFileSync15, readdirSync as readdirSync9, statSync as statSync11 } from "node:fs";
 import { rename as rename10, writeFile as writeFile35 } from "node:fs/promises";
-import { homedir as homedir36 } from "node:os";
+import { homedir as homedir37 } from "node:os";
 import { basename as basename23, join as join138 } from "node:path";
 function getCachedContext(repoPath) {
   const cachePath = getCacheFilePath(repoPath);
@@ -68592,7 +68644,7 @@ function getCacheFilePath(repoPath) {
 }
 var CACHE_DIR, CACHE_TTL_MS4;
 var init_context_cache_manager = __esm(() => {
-  CACHE_DIR = join138(homedir36(), ".claudekit", "cache");
+  CACHE_DIR = join138(homedir37(), ".claudekit", "cache");
   CACHE_TTL_MS4 = 24 * 60 * 60 * 1000;
 });
 
@@ -69046,10 +69098,10 @@ IMPORTANT: Generate the image and output the path as JSON: {"imagePath": "/path/
 // src/commands/content/phases/photo-generator.ts
 import { execSync as execSync7 } from "node:child_process";
 import { existsSync as existsSync68, mkdirSync as mkdirSync5, readdirSync as readdirSync11 } from "node:fs";
-import { homedir as homedir37 } from "node:os";
+import { homedir as homedir38 } from "node:os";
 import { join as join140 } from "node:path";
 async function generatePhoto(_content, context, config, platform16, contentId, contentLogger) {
-  const mediaDir = join140(config.contentDir.replace(/^~/, homedir37()), "media", String(contentId));
+  const mediaDir = join140(config.contentDir.replace(/^~/, homedir38()), "media", String(contentId));
   if (!existsSync68(mediaDir)) {
     mkdirSync5(mediaDir, { recursive: true });
   }
@@ -69163,7 +69215,7 @@ var init_content_creator = __esm(() => {
 
 // src/commands/content/phases/content-logger.ts
 import { createWriteStream as createWriteStream4, existsSync as existsSync69, mkdirSync as mkdirSync6, statSync as statSync12 } from "node:fs";
-import { homedir as homedir38 } from "node:os";
+import { homedir as homedir39 } from "node:os";
 import { join as join141 } from "node:path";
 
 class ContentLogger {
@@ -69172,7 +69224,7 @@ class ContentLogger {
   logDir;
   maxBytes;
   constructor(maxBytes = 0) {
-    this.logDir = join141(homedir38(), ".claudekit", "logs");
+    this.logDir = join141(homedir39(), ".claudekit", "logs");
     this.maxBytes = maxBytes;
   }
   init() {
@@ -69270,7 +69322,7 @@ var init_sqlite_client = () => {};
 
 // src/commands/content/phases/db-manager.ts
 import { existsSync as existsSync70, mkdirSync as mkdirSync7 } from "node:fs";
-import { dirname as dirname35 } from "node:path";
+import { dirname as dirname36 } from "node:path";
 function initDatabase(dbPath) {
   ensureParentDir(dbPath);
   const db = openDatabase(dbPath);
@@ -69291,7 +69343,7 @@ function runRetentionCleanup(db, retentionDays = 90) {
   db.prepare("DELETE FROM git_events WHERE processed = 1 AND created_at < ?").run(cutoff);
 }
 function ensureParentDir(dbPath) {
-  const dir = dirname35(dbPath);
+  const dir = dirname36(dbPath);
   if (dir && !existsSync70(dir)) {
     mkdirSync7(dir, { recursive: true });
   }
@@ -70771,11 +70823,11 @@ var init_setup_wizard = __esm(() => {
 
 // src/commands/content/content-review-commands.ts
 import { existsSync as existsSync73 } from "node:fs";
-import { homedir as homedir39 } from "node:os";
+import { homedir as homedir40 } from "node:os";
 async function queueContent() {
   const cwd2 = process.cwd();
   const config = await loadContentConfig(cwd2);
-  const dbPath = config.dbPath.replace(/^~/, homedir39());
+  const dbPath = config.dbPath.replace(/^~/, homedir40());
   if (!existsSync73(dbPath)) {
     logger.info("No content database found. Run 'ck content setup' first.");
     return;
@@ -70802,7 +70854,7 @@ async function queueContent() {
 async function approveContentCmd(id) {
   const cwd2 = process.cwd();
   const config = await loadContentConfig(cwd2);
-  const dbPath = config.dbPath.replace(/^~/, homedir39());
+  const dbPath = config.dbPath.replace(/^~/, homedir40());
   const db = initDatabase(dbPath);
   try {
     approveContent(db, Number.parseInt(id, 10));
@@ -70814,7 +70866,7 @@ async function approveContentCmd(id) {
 async function rejectContentCmd(id, reason) {
   const cwd2 = process.cwd();
   const config = await loadContentConfig(cwd2);
-  const dbPath = config.dbPath.replace(/^~/, homedir39());
+  const dbPath = config.dbPath.replace(/^~/, homedir40());
   const db = initDatabase(dbPath);
   try {
     rejectContent(db, Number.parseInt(id, 10), reason);
@@ -70845,7 +70897,7 @@ __export(exports_content_subcommands, {
   approveContentCmd: () => approveContentCmd
 });
 import { existsSync as existsSync74, readFileSync as readFileSync18, unlinkSync as unlinkSync5 } from "node:fs";
-import { homedir as homedir40 } from "node:os";
+import { homedir as homedir41 } from "node:os";
 import { join as join146 } from "node:path";
 function isDaemonRunning() {
   const lockFile = join146(LOCK_DIR, `${LOCK_NAME2}.lock`);
@@ -70919,7 +70971,7 @@ async function statusContent() {
   } catch {}
 }
 async function logsContent(options2) {
-  const logDir = join146(homedir40(), ".claudekit", "logs");
+  const logDir = join146(homedir41(), ".claudekit", "logs");
   const dateStr = new Date().toISOString().slice(0, 10).replace(/-/g, "");
   const logPath = join146(logDir, `content-${dateStr}.log`);
   if (!existsSync74(logPath)) {
@@ -70953,12 +71005,12 @@ var init_content_subcommands = __esm(() => {
   init_setup_wizard();
   init_state_manager();
   init_content_review_commands();
-  LOCK_DIR = join146(homedir40(), ".claudekit", "locks");
+  LOCK_DIR = join146(homedir41(), ".claudekit", "locks");
 });
 
 // src/commands/content/content-command.ts
 import { existsSync as existsSync75, mkdirSync as mkdirSync8, unlinkSync as unlinkSync6, writeFileSync as writeFileSync6 } from "node:fs";
-import { homedir as homedir41 } from "node:os";
+import { homedir as homedir42 } from "node:os";
 import { join as join147 } from "node:path";
 async function contentCommand(options2) {
   const cwd2 = process.cwd();
@@ -70991,7 +71043,7 @@ async function contentCommand(options2) {
     if (!existsSync75(LOCK_DIR2))
       mkdirSync8(LOCK_DIR2, { recursive: true });
     writeFileSync6(LOCK_FILE, String(process.pid), "utf-8");
-    const dbPath = config.dbPath.replace(/^~/, homedir41());
+    const dbPath = config.dbPath.replace(/^~/, homedir42());
     const db = initDatabase(dbPath);
     contentLogger.info(`Database initialised at ${dbPath}`);
     const adapters = initializeAdapters(config);
@@ -71137,7 +71189,7 @@ var init_content_command = __esm(() => {
   init_publisher();
   init_review_manager();
   init_state_manager();
-  LOCK_DIR2 = join147(homedir41(), ".claudekit", "locks");
+  LOCK_DIR2 = join147(homedir42(), ".claudekit", "locks");
   LOCK_FILE = join147(LOCK_DIR2, "ck-content.lock");
 });
 
@@ -78888,13 +78940,15 @@ async function checkEnvKeys(setup) {
   return results;
 }
 // src/domains/health-checks/checkers/hook-health-checker.ts
+init_settings_merger();
 init_claudekit_constants();
+init_command_normalizer();
 init_logger();
 init_path_resolver();
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { existsSync as existsSync47, readFileSync as readFileSync12, statSync as statSync7, writeFileSync as writeFileSync4 } from "node:fs";
 import { readdir as readdir14 } from "node:fs/promises";
-import { tmpdir } from "node:os";
+import { homedir as homedir30, tmpdir } from "node:os";
 import { join as join67, resolve as resolve19 } from "node:path";
 var HOOK_CHECK_TIMEOUT_MS = 5000;
 var PYTHON_CHECK_TIMEOUT_MS = 3000;
@@ -78911,6 +78965,117 @@ function getHooksDir(projectDir) {
 function isPathWithin(filePath, parentDir) {
   return resolve19(filePath).startsWith(resolve19(parentDir));
 }
+function getCanonicalGlobalCommandRoot() {
+  const configuredGlobalDir = PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "");
+  const defaultGlobalDir = join67(homedir30(), ".claude").replace(/\\/g, "/");
+  return configuredGlobalDir === defaultGlobalDir ? "$HOME" : configuredGlobalDir;
+}
+function getClaudeSettingsFiles(projectDir) {
+  const globalClaudeDir = PathResolver.getGlobalKitDir();
+  const candidates = [
+    {
+      path: resolve19(projectDir, ".claude", "settings.json"),
+      label: "project settings.json",
+      root: "$CLAUDE_PROJECT_DIR"
+    },
+    {
+      path: resolve19(projectDir, ".claude", "settings.local.json"),
+      label: "project settings.local.json",
+      root: "$CLAUDE_PROJECT_DIR"
+    },
+    {
+      path: resolve19(globalClaudeDir, "settings.json"),
+      label: "global settings.json",
+      root: getCanonicalGlobalCommandRoot()
+    },
+    {
+      path: resolve19(globalClaudeDir, "settings.local.json"),
+      label: "global settings.local.json",
+      root: getCanonicalGlobalCommandRoot()
+    }
+  ];
+  return candidates.filter((candidate) => existsSync47(candidate.path));
+}
+function collectHookCommandFindings(settings, settingsFile) {
+  if (!settings.hooks) {
+    return [];
+  }
+  const findings = [];
+  for (const [eventName, entries] of Object.entries(settings.hooks)) {
+    for (const entry of entries) {
+      if ("command" in entry && typeof entry.command === "string") {
+        const repair = repairClaudeNodeCommandPath(entry.command, settingsFile.root);
+        if (repair.changed && repair.issue) {
+          findings.push({
+            path: settingsFile.path,
+            label: settingsFile.label,
+            eventName,
+            command: entry.command,
+            expected: repair.command,
+            issue: repair.issue
+          });
+        }
+      }
+      if (!("hooks" in entry) || !entry.hooks) {
+        continue;
+      }
+      for (const hook of entry.hooks) {
+        if (!hook.command) {
+          continue;
+        }
+        const repair = repairClaudeNodeCommandPath(hook.command, settingsFile.root);
+        if (!repair.changed || !repair.issue) {
+          continue;
+        }
+        findings.push({
+          path: settingsFile.path,
+          label: settingsFile.label,
+          eventName,
+          matcher: "matcher" in entry ? entry.matcher : undefined,
+          command: hook.command,
+          expected: repair.command,
+          issue: repair.issue
+        });
+      }
+    }
+  }
+  return findings;
+}
+async function repairHookCommandsInSettingsFile(settingsFile) {
+  const settings = await SettingsMerger.readSettingsFile(settingsFile.path);
+  if (!settings?.hooks) {
+    return 0;
+  }
+  let repaired = 0;
+  for (const entries of Object.values(settings.hooks)) {
+    for (const entry of entries) {
+      if ("command" in entry && typeof entry.command === "string") {
+        const repair = repairClaudeNodeCommandPath(entry.command, settingsFile.root);
+        if (repair.changed) {
+          entry.command = repair.command;
+          repaired++;
+        }
+      }
+      if (!("hooks" in entry) || !entry.hooks) {
+        continue;
+      }
+      for (const hook of entry.hooks) {
+        if (!hook.command) {
+          continue;
+        }
+        const repair = repairClaudeNodeCommandPath(hook.command, settingsFile.root);
+        if (repair.changed) {
+          hook.command = repair.command;
+          repaired++;
+        }
+      }
+    }
+  }
+  if (repaired > 0) {
+    await SettingsMerger.writeSettingsFile(settingsFile.path, settings);
+  }
+  return repaired;
+}
 async function checkHookSyntax(projectDir) {
   const hooksDir = getHooksDir(projectDir);
   if (!hooksDir) {
@@ -79221,6 +79386,82 @@ async function checkHookRuntime(projectDir) {
     };
   }
 }
+async function checkHookCommandPaths(projectDir) {
+  const settingsFiles = getClaudeSettingsFiles(projectDir);
+  if (settingsFiles.length === 0) {
+    return {
+      id: "hook-command-paths",
+      name: "Hook Command Paths",
+      group: "claudekit",
+      priority: "standard",
+      status: "info",
+      message: "No Claude settings files",
+      autoFixable: false
+    };
+  }
+  const findings = [];
+  for (const settingsFile of settingsFiles) {
+    const settings = await SettingsMerger.readSettingsFile(settingsFile.path);
+    if (!settings) {
+      continue;
+    }
+    findings.push(...collectHookCommandFindings(settings, settingsFile));
+  }
+  if (findings.length === 0) {
+    return {
+      id: "hook-command-paths",
+      name: "Hook Command Paths",
+      group: "claudekit",
+      priority: "standard",
+      status: "pass",
+      message: `${settingsFiles.length} settings file(s) canonical`,
+      autoFixable: false
+    };
+  }
+  const details = findings.slice(0, 5).map((finding) => {
+    const matcher = finding.matcher ? ` [${finding.matcher}]` : "";
+    return `${finding.label} :: ${finding.eventName}${matcher} :: ${finding.issue} :: ${finding.command}`;
+  }).join(`
+`);
+  return {
+    id: "hook-command-paths",
+    name: "Hook Command Paths",
+    group: "claudekit",
+    priority: "standard",
+    status: "fail",
+    message: `${findings.length} stale hook command path(s)`,
+    details,
+    suggestion: "Run: ck doctor --fix",
+    autoFixable: true,
+    fix: {
+      id: "fix-hook-command-paths",
+      description: "Canonicalize stale .claude hook command paths in settings files",
+      execute: async () => {
+        try {
+          let repaired = 0;
+          for (const settingsFile of settingsFiles) {
+            repaired += await repairHookCommandsInSettingsFile(settingsFile);
+          }
+          if (repaired === 0) {
+            return {
+              success: true,
+              message: "No stale hook command paths needed repair"
+            };
+          }
+          return {
+            success: true,
+            message: `Repaired ${repaired} stale hook command path(s)`
+          };
+        } catch (error) {
+          return {
+            success: false,
+            message: `Failed to repair hook command paths: ${error}`
+          };
+        }
+      }
+    }
+  };
+}
 async function checkHookConfig(projectDir) {
   const projectConfigPath = join67(projectDir, ".claude", ".ck.json");
   const globalConfigPath = join67(PathResolver.getGlobalKitDir(), ".ck.json");
@@ -79720,6 +79961,8 @@ class ClaudekitChecker {
     results.push(await checkHookDeps(this.projectDir));
     logger.verbose("ClaudekitChecker: Checking hook runtime");
     results.push(await checkHookRuntime(this.projectDir));
+    logger.verbose("ClaudekitChecker: Checking hook command paths");
+    results.push(await checkHookCommandPaths(this.projectDir));
     logger.verbose("ClaudekitChecker: Checking hook config");
     results.push(await checkHookConfig(this.projectDir));
     logger.verbose("ClaudekitChecker: Checking hook crash logs");
@@ -80084,7 +80327,7 @@ import { platform as platform8 } from "node:os";
 init_environment();
 init_path_resolver();
 import { constants as constants3, access as access3, mkdir as mkdir16, readFile as readFile34, unlink as unlink8, writeFile as writeFile17 } from "node:fs/promises";
-import { arch as arch2, homedir as homedir30, platform as platform7 } from "node:os";
+import { arch as arch2, homedir as homedir31, platform as platform7 } from "node:os";
 import { join as join69, normalize as normalize7 } from "node:path";
 function shouldSkipExpensiveOperations4() {
   return shouldSkipExpensiveOperations();
@@ -80107,7 +80350,7 @@ async function checkPlatformDetect() {
   };
 }
 async function checkHomeDirResolution() {
-  const nodeHome = normalize7(homedir30());
+  const nodeHome = normalize7(homedir31());
   const rawEnvHome = getHomeDirectoryFromEnv(platform7());
   const envHome = rawEnvHome ? normalize7(rawEnvHome) : "";
   const match = nodeHome === envHome && envHome !== "";
@@ -92434,7 +92677,7 @@ init_logger();
 init_types3();
 var import_fs_extra15 = __toESM(require_lib(), 1);
 var import_ignore3 = __toESM(require_ignore(), 1);
-import { dirname as dirname28, join as join95, relative as relative13 } from "node:path";
+import { dirname as dirname29, join as join95, relative as relative13 } from "node:path";
 
 // src/domains/installation/selective-merger.ts
 import { stat as stat14 } from "node:fs/promises";
@@ -94104,8 +94347,8 @@ class FileScanner {
 
 // src/domains/installation/merger/settings-processor.ts
 import { execSync as execSync4 } from "node:child_process";
-import { homedir as homedir32 } from "node:os";
-import { join as join94 } from "node:path";
+import { homedir as homedir33 } from "node:os";
+import { dirname as dirname28, join as join94 } from "node:path";
 
 // src/domains/config/installed-settings-tracker.ts
 init_shared();
@@ -94284,6 +94527,7 @@ class SettingsProcessor {
         }
         await this.injectTeamHooksIfSupported(destFile);
       }
+      await this.repairSiblingSettingsLocal(destFile);
     } catch (error) {
       logger.error(`Failed to process settings.json: ${error}`);
       await import_fs_extra14.copy(sourceFile, destFile, { overwrite: true });
@@ -94549,34 +94793,7 @@ class SettingsProcessor {
     return fixed;
   }
   fixSingleCommandPath(cmd) {
-    if (!cmd.includes(".claude/") && !cmd.includes(".claude\\"))
-      return cmd;
-    const bareRelativeMatch = cmd.match(/^(node\s+)(?:\.\/)?(\.claude[/\\][^\s"]+)(.*)$/);
-    if (bareRelativeMatch) {
-      const [, nodePrefix, relativePath, suffix] = bareRelativeMatch;
-      return this.formatCommandPath(nodePrefix, this.isGlobal ? this.getCanonicalGlobalCommandRoot() : "$CLAUDE_PROJECT_DIR", relativePath, suffix);
-    }
-    const embeddedQuotedMatch = cmd.match(/^(node\s+)"(\$HOME|\$CLAUDE_PROJECT_DIR|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)[/\\](\.claude[/\\][^"]+)"(.*)$/);
-    if (embeddedQuotedMatch) {
-      const [, nodePrefix, capturedVar, relativePath, suffix] = embeddedQuotedMatch;
-      return this.formatCommandPath(nodePrefix, capturedVar, relativePath, suffix);
-    }
-    const varOnlyQuotedMatch = cmd.match(/^(node\s+)"(\$HOME|\$CLAUDE_PROJECT_DIR|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)"[/\\](\.claude[/\\][^\s"]+)(.*)$/);
-    if (varOnlyQuotedMatch) {
-      const [, nodePrefix, capturedVar, relativePath, suffix] = varOnlyQuotedMatch;
-      return this.formatCommandPath(nodePrefix, capturedVar, relativePath, suffix);
-    }
-    const tildeMatch = cmd.match(/^(node\s+)~[/\\](\.claude[/\\][^\s"]+)(.*)$/);
-    if (tildeMatch) {
-      const [, nodePrefix, relativePath, suffix] = tildeMatch;
-      return this.formatCommandPath(nodePrefix, "$HOME", relativePath, suffix);
-    }
-    const unquotedMatch = cmd.match(/^(node\s+)(\$HOME|\$CLAUDE_PROJECT_DIR|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)[/\\](\.claude[/\\][^\s"]+)(.*)$/);
-    if (unquotedMatch) {
-      const [, nodePrefix, capturedVar, relativePath, suffix] = unquotedMatch;
-      return this.formatCommandPath(nodePrefix, capturedVar, relativePath, suffix);
-    }
-    return cmd;
+    return repairClaudeNodeCommandPath(cmd, this.getClaudeCommandRoot()).command;
   }
   formatCommandPath(nodePrefix, capturedVar, relativePath, suffix = "") {
     const canonicalRoot = this.canonicalizePathRoot(capturedVar);
@@ -94616,9 +94833,33 @@ class SettingsProcessor {
       return false;
     }
     const configuredGlobalDir = PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "");
-    const defaultGlobalDir = join94(homedir32(), ".claude").replace(/\\/g, "/");
+    const defaultGlobalDir = join94(homedir33(), ".claude").replace(/\\/g, "/");
     return configuredGlobalDir !== defaultGlobalDir;
   }
+  getClaudeCommandRoot() {
+    return this.isGlobal ? this.getCanonicalGlobalCommandRoot() : "$CLAUDE_PROJECT_DIR";
+  }
+  async repairSettingsFile(filePath) {
+    const settings = await SettingsMerger.readSettingsFile(filePath);
+    if (!settings) {
+      return false;
+    }
+    const pathsFixed = this.fixHookCommandPaths(settings);
+    if (!pathsFixed) {
+      return false;
+    }
+    await SettingsMerger.writeSettingsFile(filePath, settings);
+    return true;
+  }
+  async repairSiblingSettingsLocal(destFile) {
+    const settingsLocalPath = join94(dirname28(destFile), "settings.local.json");
+    if (settingsLocalPath === destFile || !await import_fs_extra14.pathExists(settingsLocalPath)) {
+      return;
+    }
+    if (await this.repairSettingsFile(settingsLocalPath)) {
+      logger.info(`Repaired stale .claude command paths in ${settingsLocalPath}`);
+    }
+  }
   detectClaudeCodeVersion() {
     if (this.cachedVersion !== undefined)
       return this.cachedVersion;
@@ -94873,10 +95114,10 @@ class CopyExecutor {
   }
   trackInstalledFile(relativePath) {
     this.installedFiles.add(relativePath);
-    let dir = dirname28(relativePath);
+    let dir = dirname29(relativePath);
     while (dir && dir !== "." && dir !== "/") {
       this.installedDirectories.add(`${dir}/`);
-      dir = dirname28(dir);
+      dir = dirname29(dir);
     }
   }
 }
@@ -97978,7 +98219,7 @@ async function runPreflightChecks() {
 // src/domains/installation/fresh-installer.ts
 init_metadata_migration();
 import { existsSync as existsSync55, readdirSync as readdirSync6, rmSync as rmSync4, rmdirSync as rmdirSync2, unlinkSync as unlinkSync4 } from "node:fs";
-import { basename as basename18, dirname as dirname29, join as join117, resolve as resolve26 } from "node:path";
+import { basename as basename18, dirname as dirname30, join as join117, resolve as resolve26 } from "node:path";
 init_logger();
 init_safe_spinner();
 var import_fs_extra34 = __toESM(require_lib(), 1);
@@ -98027,14 +98268,14 @@ async function analyzeFreshInstallation(claudeDir2) {
 }
 function cleanupEmptyDirectories2(filePath, claudeDir2) {
   const normalizedClaudeDir = resolve26(claudeDir2);
-  let currentDir = resolve26(dirname29(filePath));
+  let currentDir = resolve26(dirname30(filePath));
   while (currentDir !== normalizedClaudeDir && currentDir.startsWith(normalizedClaudeDir)) {
     try {
       const entries = readdirSync6(currentDir);
       if (entries.length === 0) {
         rmdirSync2(currentDir);
         logger.debug(`Removed empty directory: ${currentDir}`);
-        currentDir = resolve26(dirname29(currentDir));
+        currentDir = resolve26(dirname30(currentDir));
       } else {
         break;
       }
@@ -98580,7 +98821,7 @@ async function handleSelection(ctx) {
 }
 // src/commands/init/phases/sync-handler.ts
 import { copyFile as copyFile8, mkdir as mkdir32, open as open5, readFile as readFile50, rename as rename7, stat as stat18, unlink as unlink11, writeFile as writeFile30 } from "node:fs/promises";
-import { dirname as dirname30, join as join119, resolve as resolve28 } from "node:path";
+import { dirname as dirname31, join as join119, resolve as resolve28 } from "node:path";
 init_logger();
 init_path_resolver();
 var import_fs_extra36 = __toESM(require_lib(), 1);
@@ -98699,7 +98940,7 @@ async function acquireSyncLock(global3) {
   const lockPath = join119(cacheDir, ".sync-lock");
   const startTime = Date.now();
   const lockTimeout = getLockTimeout();
-  await mkdir32(dirname30(lockPath), { recursive: true });
+  await mkdir32(dirname31(lockPath), { recursive: true });
   while (Date.now() - startTime < lockTimeout) {
     try {
       const handle = await open5(lockPath, "wx");
@@ -99235,7 +99476,7 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 // src/services/transformers/global-path-transformer.ts
 init_logger();
 import { readFile as readFile52, readdir as readdir35, writeFile as writeFile32 } from "node:fs/promises";
-import { homedir as homedir33, platform as platform15 } from "node:os";
+import { homedir as homedir34, platform as platform15 } from "node:os";
 import { extname as extname6, join as join122 } from "node:path";
 var IS_WINDOWS3 = platform15() === "win32";
 var HOME_PREFIX = IS_WINDOWS3 ? "%USERPROFILE%" : "$HOME";
@@ -99246,7 +99487,7 @@ function normalizeInstallPath(path15) {
   return path15.replace(/\\/g, "/").replace(/\/+$/, "");
 }
 function getDefaultGlobalClaudeDir() {
-  return normalizeInstallPath(join122(homedir33(), ".claude"));
+  return normalizeInstallPath(join122(homedir34(), ".claude"));
 }
 function getCustomGlobalClaudeDir(targetClaudeDir) {
   if (!targetClaudeDir)
@@ -99657,7 +99898,7 @@ init_dist2();
 var import_picocolors29 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync56 } from "node:fs";
 import { readFile as readFile53, rm as rm15, unlink as unlink12 } from "node:fs/promises";
-import { homedir as homedir34 } from "node:os";
+import { homedir as homedir35 } from "node:os";
 import { basename as basename19, join as join124, resolve as resolve29 } from "node:path";
 init_logger();
 init_agents_discovery();
@@ -100096,7 +100337,7 @@ async function processMetadataDeletions(skillSourcePath, installGlobally) {
   }
   if (!sourceMetadata.deletions || sourceMetadata.deletions.length === 0)
     return;
-  const claudeDir2 = installGlobally ? join124(homedir34(), ".claude") : join124(process.cwd(), ".claude");
+  const claudeDir2 = installGlobally ? join124(homedir35(), ".claude") : join124(process.cwd(), ".claude");
   if (!existsSync56(claudeDir2))
     return;
   try {
@@ -100252,7 +100493,7 @@ async function migrateCommand(options2) {
     let installGlobally = options2.global ?? false;
     if (options2.global === undefined && !options2.yes) {
       const projectTarget = join124(process.cwd(), ".claude");
-      const globalTarget = join124(homedir34(), ".claude");
+      const globalTarget = join124(homedir35(), ".claude");
       const scopeChoice = await ie({
         message: "Installation scope",
         options: [
@@ -100304,7 +100545,7 @@ async function migrateCommand(options2) {
     }
     const providerNames = selectedProviders.map((prov) => import_picocolors29.default.cyan(providers[prov].displayName)).join(", ");
     f2.message(`  Providers: ${providerNames}`);
-    const targetDir = installGlobally ? join124(homedir34(), ".claude") : join124(process.cwd(), ".claude");
+    const targetDir = installGlobally ? join124(homedir35(), ".claude") : join124(process.cwd(), ".claude");
     f2.message(`  Scope: ${installGlobally ? "Global" : "Project"} ${import_picocolors29.default.dim(`-> ${targetDir}`)}`);
     const cmdProviders = getProvidersSupporting("commands");
     const unsupportedCmd = selectedProviders.filter((pv) => !cmdProviders.includes(pv));
@@ -101077,7 +101318,7 @@ Please use only one download method.`);
 // src/commands/plan/plan-command.ts
 init_output_manager();
 import { existsSync as existsSync58, statSync as statSync9 } from "node:fs";
-import { dirname as dirname32, join as join128, parse as parse6, resolve as resolve33 } from "node:path";
+import { dirname as dirname33, join as join128, parse as parse6, resolve as resolve33 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
 init_plan_parser();
@@ -101085,7 +101326,7 @@ init_logger();
 init_output_manager();
 var import_picocolors31 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync57, statSync as statSync8 } from "node:fs";
-import { basename as basename20, dirname as dirname31, join as join127, relative as relative21, resolve as resolve31 } from "node:path";
+import { basename as basename20, dirname as dirname32, join as join127, relative as relative21, resolve as resolve31 } from "node:path";
 async function handleParse(target, options2) {
   const planFile = resolvePlanFile(target);
   if (!planFile) {
@@ -101106,7 +101347,7 @@ async function handleParse(target, options2) {
     console.log(JSON.stringify({ file: relative21(process.cwd(), planFile), frontmatter, phases }, null, 2));
     return;
   }
-  const title = typeof frontmatter.title === "string" ? frontmatter.title : basename20(dirname31(planFile));
+  const title = typeof frontmatter.title === "string" ? frontmatter.title : basename20(dirname32(planFile));
   console.log();
   console.log(import_picocolors31.default.bold(`  Plan: ${title}`));
   console.log(`  File: ${planFile}`);
@@ -101186,14 +101427,14 @@ async function handleStatus(target, options2) {
       try {
         const s = buildPlanSummary(pf);
         const bar = progressBar(s.completed, s.totalPhases);
-        const title2 = s.title ?? basename20(dirname31(pf));
+        const title2 = s.title ?? basename20(dirname32(pf));
         console.log(`  ${import_picocolors31.default.bold(title2)}`);
         console.log(`  ${bar}`);
         if (s.inProgress > 0)
           console.log(`  [~] ${s.inProgress} in progress`);
         console.log();
       } catch {
-        console.log(`  [X] Failed to read: ${basename20(dirname31(pf))}`);
+        console.log(`  [X] Failed to read: ${basename20(dirname32(pf))}`);
         console.log();
       }
     }
@@ -101217,7 +101458,7 @@ async function handleStatus(target, options2) {
     console.log(JSON.stringify(summary, null, 2));
     return;
   }
-  const title = summary.title ?? basename20(dirname31(planFile));
+  const title = summary.title ?? basename20(dirname32(planFile));
   console.log();
   console.log(import_picocolors31.default.bold(`  ${title}`));
   if (summary.status)
@@ -101444,7 +101685,7 @@ function resolvePlanFile(target) {
       const candidate = join128(dir, "plan.md");
       if (existsSync58(candidate))
         return candidate;
-      dir = dirname32(dir);
+      dir = dirname33(dir);
     }
   }
   return null;
@@ -102478,7 +102719,7 @@ var import_fs_extra41 = __toESM(require_lib(), 1);
 // src/commands/uninstall/analysis-handler.ts
 init_metadata_migration();
 import { readdirSync as readdirSync7, rmSync as rmSync5 } from "node:fs";
-import { dirname as dirname33, join as join129 } from "node:path";
+import { dirname as dirname34, join as join129 } from "node:path";
 init_logger();
 init_safe_prompts();
 var import_fs_extra40 = __toESM(require_lib(), 1);
@@ -102500,7 +102741,7 @@ function classifyFileByOwnership(ownership, forceOverwrite, deleteReason) {
 }
 async function cleanupEmptyDirectories3(filePath, installationRoot) {
   let cleaned = 0;
-  let currentDir = dirname33(filePath);
+  let currentDir = dirname34(filePath);
   while (currentDir !== installationRoot && currentDir.startsWith(installationRoot)) {
     try {
       const entries = readdirSync7(currentDir);
@@ -102508,7 +102749,7 @@ async function cleanupEmptyDirectories3(filePath, installationRoot) {
         rmSync5(currentDir, { recursive: true });
         cleaned++;
         logger.debug(`Removed empty directory: ${currentDir}`);
-        currentDir = dirname33(currentDir);
+        currentDir = dirname34(currentDir);
       } else {
         break;
       }
@@ -104352,7 +104593,7 @@ init_file_io();
 init_logger();
 import { existsSync as existsSync61 } from "node:fs";
 import { mkdir as mkdir34, readFile as readFile55 } from "node:fs/promises";
-import { dirname as dirname34 } from "node:path";
+import { dirname as dirname35 } from "node:path";
 var PROCESSED_ISSUES_CAP = 500;
 async function readCkJson(projectDir) {
   const configPath = CkConfigManager.getProjectConfigPath(projectDir);
@@ -104382,7 +104623,7 @@ async function loadWatchState(projectDir) {
 }
 async function saveWatchState(projectDir, state) {
   const configPath = CkConfigManager.getProjectConfigPath(projectDir);
-  const configDir = dirname34(configPath);
+  const configDir = dirname35(configPath);
   if (!existsSync61(configDir)) {
     await mkdir34(configDir, { recursive: true });
   }
@@ -104549,7 +104790,7 @@ async function scanForRepos(parentDir) {
 init_logger();
 import { spawnSync as spawnSync7 } from "node:child_process";
 import { existsSync as existsSync63 } from "node:fs";
-import { homedir as homedir35 } from "node:os";
+import { homedir as homedir36 } from "node:os";
 import { join as join135 } from "node:path";
 async function validateSetup(cwd2) {
   const workDir = cwd2 ?? process.cwd();
@@ -104581,7 +104822,7 @@ Run this command from a directory with a GitHub remote.`);
   } catch {
     throw new Error(`Failed to parse repository info: ${ghRepo.stdout}`);
   }
-  const skillsPath = join135(homedir35(), ".claude", "skills");
+  const skillsPath = join135(homedir36(), ".claude", "skills");
   const skillsAvailable = existsSync63(skillsPath);
   if (!skillsAvailable) {
     logger.warning(`ClaudeKit Engineer skills not found at ${skillsPath}`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "3.41.3-dev.2",
+	"version": "3.41.3-dev.3",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {