claudekit-cli 4.5.0-dev.1 → 4.5.0-dev.2

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.5.0-dev.1",
-	"generatedAt": "2026-06-23T14:44:56.668Z",
+	"version": "4.5.0-dev.2",
+	"generatedAt": "2026-06-23T15:12:22.158Z",
 	"commands": {
 		"agents": {
 			"name": "agents",

package/dist/index.js

@@ -64236,7 +64236,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.5.0-dev.1",
+    version: "4.5.0-dev.2",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -64898,7 +64898,7 @@ import { spawnSync as spawnSync3 } from "node:child_process";
 import { existsSync as existsSync45, readFileSync as readFileSync13, readdirSync as readdirSync8, statSync as statSync9, writeFileSync as writeFileSync5 } from "node:fs";
 import { readdir as readdir17 } from "node:fs/promises";
 import { homedir as homedir40, tmpdir } from "node:os";
-import { join as join64, resolve as resolve33 } from "node:path";
+import { dirname as dirname29, join as join64, resolve as resolve33 } from "node:path";
 function resolveDoctorCkExecutable(platformName = process.platform) {
   return platformName === "win32" ? "ck.cmd" : "ck";
 }
@@ -64930,8 +64930,22 @@ function getCanonicalGlobalCommandRoot() {
   const defaultGlobalDir = join64(homedir40(), ".claude").replace(/\\/g, "/");
   return configuredGlobalDir === defaultGlobalDir ? "$HOME" : configuredGlobalDir;
 }
+function readManagedHookNamesForClaudeDir(claudeDir3) {
+  const manifestPath = join64(claudeDir3, "hooks", "managed-hooks.json");
+  if (!existsSync45(manifestPath))
+    return new Set;
+  try {
+    const data = JSON.parse(readFileSync13(manifestPath, "utf-8"));
+    if (!Array.isArray(data.managedHooks))
+      return new Set;
+    return new Set(data.managedHooks.filter((name) => typeof name === "string"));
+  } catch {
+    return new Set;
+  }
+}
 function getClaudeSettingsFiles(projectDir) {
   const globalClaudeDir = PathResolver.getGlobalKitDir();
+  const globalManagedHookNames = readManagedHookNamesForClaudeDir(globalClaudeDir);
   const ccsSettingsDir = join64(process.env.CK_TEST_HOME ?? homedir40(), ".ccs");
   const candidates = [
     {
@@ -64947,12 +64961,14 @@ function getClaudeSettingsFiles(projectDir) {
     {
       path: resolve33(globalClaudeDir, "settings.json"),
       label: "global settings.json",
-      root: getCanonicalGlobalCommandRoot()
+      root: getCanonicalGlobalCommandRoot(),
+      managedHookNames: globalManagedHookNames
     },
     {
       path: resolve33(globalClaudeDir, "settings.local.json"),
       label: "global settings.local.json",
-      root: getCanonicalGlobalCommandRoot()
+      root: getCanonicalGlobalCommandRoot(),
+      managedHookNames: globalManagedHookNames
     }
   ];
   try {
@@ -64968,30 +64984,84 @@ function getClaudeSettingsFiles(projectDir) {
   } catch {}
   return candidates.filter((candidate) => existsSync45(candidate.path));
 }
+function isProjectScopedCanonicalHookCommand(cmd) {
+  return /^node\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/\S+/.test(cmd) || /^bash\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/hooks\/node-hook-runner\.sh\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/\S+/.test(cmd);
+}
+function isProjectScopedStatusLineCommand(cmd) {
+  return /^node\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/statusline\.cjs(?:\s|$)/.test(cmd) || /^bash\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/hooks\/node-hook-runner\.sh\s+"\$CLAUDE_PROJECT_DIR"\/\.claude\/statusline\.cjs(?:\s|$)/.test(cmd);
+}
+function extractHookNames(command) {
+  const normalized = command.replace(/\\/g, "/");
+  const names = [];
+  const pattern = /\/hooks\/([^/"'\s]+)\.(?:cjs|mjs|js)(?:["'\s]|$)/g;
+  for (const match of normalized.matchAll(pattern)) {
+    if (match[1])
+      names.push(match[1]);
+  }
+  return names;
+}
+function getManagedHookNames(settingsFile) {
+  return settingsFile.managedHookNames ?? readManagedHookNamesForClaudeDir(dirname29(settingsFile.path));
+}
+function isManagedHookCommand(command, settingsFile) {
+  const managedHookNames = getManagedHookNames(settingsFile);
+  if (managedHookNames.size === 0)
+    return false;
+  return extractHookNames(command).some((name) => managedHookNames.has(name));
+}
+function shouldRepairManagedGlobalProjectRoot(command, settingsFile, eventName) {
+  if (settingsFile.root === "$CLAUDE_PROJECT_DIR")
+    return false;
+  if (eventName === "statusLine" && isProjectScopedStatusLineCommand(command))
+    return true;
+  if (!isProjectScopedCanonicalHookCommand(command))
+    return false;
+  return isManagedHookCommand(command, settingsFile);
+}
 function isAlreadyCanonical(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 isAlreadyCanonicalForSettingsFile(cmd, settingsFile) {
+  if (isAlreadyCanonical(cmd))
+    return true;
+  const root = settingsFile.root.replace(/\\/g, "/").replace(/\/+$/, "");
+  if (root === "$HOME" || root === "$CLAUDE_PROJECT_DIR")
+    return false;
+  const command = cmd.replace(/\\/g, "/");
+  const escapedRoot = escapeRegex2(root);
+  return new RegExp(`^node\\s+"${escapedRoot}/[^"]+"`).test(command) || new RegExp(`^bash\\s+"${escapedRoot}/hooks/node-hook-runner\\.sh"\\s+"${escapedRoot}/[^"]+"`).test(command);
+}
 function collectHookCommandFindings(settings, settingsFile) {
+  const findings = [];
+  const collectCommand = (eventName, command, matcher) => {
+    if (isAlreadyCanonicalForSettingsFile(command, settingsFile) && !shouldRepairManagedGlobalProjectRoot(command, settingsFile, eventName)) {
+      return;
+    }
+    const repair = repairClaudeHookCommandPath(command, settingsFile.root);
+    if (!repair.changed || !repair.issue) {
+      return;
+    }
+    findings.push({
+      path: settingsFile.path,
+      label: settingsFile.label,
+      eventName,
+      matcher,
+      command,
+      expected: repair.command,
+      issue: repair.issue
+    });
+  };
+  const statusLine = settings.statusLine;
+  if (typeof statusLine?.command === "string") {
+    collectCommand("statusLine", statusLine.command);
+  }
   if (!settings.hooks) {
-    return [];
+    return findings;
   }
-  const findings = [];
   for (const [eventName, entries] of Object.entries(settings.hooks)) {
     for (const entry of entries) {
       if ("command" in entry && typeof entry.command === "string") {
-        if (isAlreadyCanonical(entry.command))
-          continue;
-        const repair = repairClaudeHookCommandPath(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
-          });
-        }
+        collectCommand(eventName, entry.command);
       }
       if (!("hooks" in entry) || !entry.hooks) {
         continue;
@@ -65000,21 +65070,7 @@ function collectHookCommandFindings(settings, settingsFile) {
         if (!hook.command) {
           continue;
         }
-        if (isAlreadyCanonical(hook.command))
-          continue;
-        const repair = repairClaudeHookCommandPath(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
-        });
+        collectCommand(eventName, hook.command, "matcher" in entry ? entry.matcher : undefined);
       }
     }
   }
@@ -65022,7 +65078,7 @@ function collectHookCommandFindings(settings, settingsFile) {
 }
 async function repairHookCommandsInSettingsFile(settingsFile) {
   const settings = await SettingsMerger.readSettingsFile(settingsFile.path);
-  if (!settings?.hooks) {
+  if (!settings) {
     return 0;
   }
   const findings = collectHookCommandFindings(settings, settingsFile);
@@ -65031,26 +65087,36 @@ async function repairHookCommandsInSettingsFile(settingsFile) {
   }
   const repairMap = new Map(findings.map((f3) => [f3.command, f3.expected]));
   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 fixed = repairMap.get(entry.command);
-        if (fixed !== undefined) {
-          entry.command = fixed;
-          repaired++;
+  const statusLine = settings.statusLine;
+  if (typeof statusLine?.command === "string") {
+    const fixed = repairMap.get(statusLine.command);
+    if (fixed !== undefined) {
+      statusLine.command = fixed;
+      repaired++;
+    }
+  }
+  if (settings.hooks) {
+    for (const entries of Object.values(settings.hooks)) {
+      for (const entry of entries) {
+        if ("command" in entry && typeof entry.command === "string") {
+          const fixed = repairMap.get(entry.command);
+          if (fixed !== undefined) {
+            entry.command = fixed;
+            repaired++;
+          }
         }
-      }
-      if (!("hooks" in entry) || !entry.hooks) {
-        continue;
-      }
-      for (const hook of entry.hooks) {
-        if (!hook.command) {
+        if (!("hooks" in entry) || !entry.hooks) {
           continue;
         }
-        const fixed = repairMap.get(hook.command);
-        if (fixed !== undefined) {
-          hook.command = fixed;
-          repaired++;
+        for (const hook of entry.hooks) {
+          if (!hook.command) {
+            continue;
+          }
+          const fixed = repairMap.get(hook.command);
+          if (fixed !== undefined) {
+            hook.command = fixed;
+            repaired++;
+          }
         }
       }
     }
@@ -68106,7 +68172,7 @@ import { exec as exec2, spawn as spawn2 } from "node:child_process";
 import { existsSync as existsSync47 } from "node:fs";
 import { readdir as readdir19 } from "node:fs/promises";
 import { builtinModules } from "node:module";
-import { dirname as dirname29, join as join68 } from "node:path";
+import { dirname as dirname30, join as join68 } from "node:path";
 import { promisify as promisify9 } from "node:util";
 function selectKitForUpdate(params) {
   const { hasLocal, hasGlobal, localKits, globalKits } = params;
@@ -68160,30 +68226,32 @@ function extractCkHookName(command) {
   const match = normalized.match(/\/hooks\/([^/"'\s]+)\.(?:cjs|mjs|js)(?:["'\s]|$)/);
   return match?.[1] ?? null;
 }
-function collectSettingsHookCommands(settings) {
-  const commands = new Set;
+function commandUsesProjectDirRoot(command) {
+  return /\$\{?CLAUDE_PROJECT_DIR\}?|%CLAUDE_PROJECT_DIR%/.test(command);
+}
+function collectSettingsHookRegistrations(settings, options2 = {}) {
+  const registrations = new Map;
+  const addCommand = (command) => {
+    const hookName = extractCkHookName(command);
+    if (!hookName)
+      return;
+    const previous = registrations.get(hookName);
+    const hasCorrectScope = previous?.hasCorrectScope || !(options2.isGlobal === true && commandUsesProjectDirRoot(command));
+    registrations.set(hookName, { hasCorrectScope });
+  };
   for (const entries of Object.values(settings.hooks ?? {})) {
     for (const entry of entries) {
       if (typeof entry.command === "string") {
-        commands.add(normalizeCommand(entry.command));
+        addCommand(entry.command);
       }
       for (const hook of entry.hooks ?? []) {
         if (typeof hook.command === "string") {
-          commands.add(normalizeCommand(hook.command));
+          addCommand(hook.command);
         }
       }
     }
   }
-  return commands;
-}
-function collectSettingsHookNames(settings) {
-  const names = new Set;
-  for (const command of collectSettingsHookCommands(settings)) {
-    const hookName = extractCkHookName(command);
-    if (hookName)
-      names.add(hookName);
-  }
-  return names;
+  return registrations;
 }
 async function readManagedHookNames(claudeDir3) {
   const manifestPath = join68(claudeDir3, "hooks", MANAGED_HOOKS_MANIFEST);
@@ -68211,7 +68279,7 @@ async function readDisabledHookNames(claudeDir3) {
     return new Set;
   }
 }
-async function countMissingCkHookRegistrations(claudeDir3, kit) {
+async function countMissingCkHookRegistrations(claudeDir3, kit, options2 = {}) {
   const settingsPath = join68(claudeDir3, "settings.json");
   if (!existsSync47(settingsPath))
     return 0;
@@ -68219,7 +68287,7 @@ async function countMissingCkHookRegistrations(claudeDir3, kit) {
   if (managedHooks.length === 0)
     return 0;
   const settings = parseJsonContent(await import_fs_extra8.readFile(settingsPath, "utf-8"));
-  const liveHookNames = collectSettingsHookNames(settings);
+  const liveHookRegistrations = collectSettingsHookRegistrations(settings, options2);
   const disabledHooks = await readDisabledHookNames(claudeDir3);
   const hooksDir = join68(claudeDir3, "hooks");
   let missing = 0;
@@ -68228,7 +68296,7 @@ async function countMissingCkHookRegistrations(claudeDir3, kit) {
       continue;
     if (!existsSync47(join68(hooksDir, `${name}.cjs`)))
       continue;
-    if (!liveHookNames.has(name))
+    if (!liveHookRegistrations.get(name)?.hasCorrectScope)
       missing++;
   }
   return missing;
@@ -68337,7 +68405,7 @@ async function promptKitUpdate(beta, yes, deps) {
       }
       try {
         const countMissingHookRefsFn = deps?.countMissingHookFileReferencesFn ?? countMissingHookFileReferences;
-        const missingHookRefs = await countMissingHookRefsFn(dirname29(setup.project.path));
+        const missingHookRefs = await countMissingHookRefsFn(dirname30(setup.project.path));
         if (missingHookRefs > 0) {
           logger.warning(`Detected ${missingHookRefs} local broken hook registration(s); reinstalling local kit content`);
           forceKitReinstall = true;
@@ -68366,7 +68434,7 @@ async function promptKitUpdate(beta, yes, deps) {
         logger.verbose(`Selected hook dependency self-heal check skipped: ${error instanceof Error ? error.message : "unknown"}`);
       }
       try {
-        const missingHookRegistrations = await countMissingCkHookRegistrations(selectedClaudeDir, selection.kit);
+        const missingHookRegistrations = await countMissingCkHookRegistrations(selectedClaudeDir, selection.kit, { isGlobal: selection.isGlobal });
         if (missingHookRegistrations > 0) {
           logger.warning(`Detected ${missingHookRegistrations} ${selection.isGlobal ? "global" : "local"} missing hook registration(s); reinstalling kit content`);
           forceKitReinstall = true;
@@ -68407,7 +68475,7 @@ async function promptKitUpdate(beta, yes, deps) {
     if (alreadyAtLatest) {
       try {
         const countMissingHookRefsFn = deps?.countMissingHookFileReferencesFn ?? countMissingHookFileReferences;
-        const projectDir = setup.project.path ? dirname29(setup.project.path) : process.cwd();
+        const projectDir = setup.project.path ? dirname30(setup.project.path) : process.cwd();
         const missingHookRefs = await countMissingHookRefsFn(projectDir);
         if (missingHookRefs > 0) {
           logger.warning(`Detected ${missingHookRefs} broken hook registration(s); reinstalling kit content`);
@@ -68648,7 +68716,6 @@ var init_post_update_handler = __esm(() => {
   init_metadata_migration();
   init_version_utils();
   init_claudekit_scanner();
-  init_command_normalizer();
   init_logger();
   init_safe_prompts();
   init_types3();
@@ -69501,7 +69568,7 @@ var init_routes = __esm(() => {
 
 // src/domains/web-server/static-server.ts
 import { existsSync as existsSync49 } from "node:fs";
-import { basename as basename24, dirname as dirname30, join as join71, resolve as resolve35 } from "node:path";
+import { basename as basename24, dirname as dirname31, join as join71, resolve as resolve35 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function addRuntimeUiCandidate(candidates, runtimePath) {
   if (!runtimePath) {
@@ -69511,7 +69578,7 @@ function addRuntimeUiCandidate(candidates, runtimePath) {
   if (!looksLikePath) {
     return;
   }
-  const entryDir = dirname30(resolve35(runtimePath));
+  const entryDir = dirname31(resolve35(runtimePath));
   if (basename24(entryDir) === "dist") {
     candidates.add(join71(entryDir, "ui"));
   }
@@ -69572,7 +69639,7 @@ var import_express, __dirname3;
 var init_static_server = __esm(() => {
   init_logger();
   import_express = __toESM(require_express2(), 1);
-  __dirname3 = dirname30(fileURLToPath2(import.meta.url));
+  __dirname3 = dirname31(fileURLToPath2(import.meta.url));
 });
 
 // node_modules/ws/lib/constants.js
@@ -75082,7 +75149,7 @@ var init_skills_installer2 = __esm(() => {
 // src/services/package-installer/gemini-mcp/config-manager.ts
 import { existsSync as existsSync62 } from "node:fs";
 import { mkdir as mkdir23, readFile as readFile49, writeFile as writeFile25 } from "node:fs/promises";
-import { dirname as dirname33, join as join92 } from "node:path";
+import { dirname as dirname34, join as join92 } from "node:path";
 async function readJsonFile(filePath) {
   try {
     const content = await readFile49(filePath, "utf-8");
@@ -75122,7 +75189,7 @@ ${geminiPattern}
   }
 }
 async function createNewSettingsWithMerge(geminiSettingsPath, mcpConfigPath) {
-  const linkDir = dirname33(geminiSettingsPath);
+  const linkDir = dirname34(geminiSettingsPath);
   if (!existsSync62(linkDir)) {
     await mkdir23(linkDir, { recursive: true });
     logger.debug(`Created directory: ${linkDir}`);
@@ -75241,9 +75308,9 @@ var init_validation = __esm(() => {
 // src/services/package-installer/gemini-mcp/linker-core.ts
 import { existsSync as existsSync64 } from "node:fs";
 import { mkdir as mkdir24, symlink as symlink3 } from "node:fs/promises";
-import { dirname as dirname34, join as join94 } from "node:path";
+import { dirname as dirname35, join as join94 } from "node:path";
 async function createSymlink(targetPath, linkPath, projectDir, isGlobal) {
-  const linkDir = dirname34(linkPath);
+  const linkDir = dirname35(linkPath);
   if (!existsSync64(linkDir)) {
     await mkdir24(linkDir, { recursive: true });
     logger.debug(`Created directory: ${linkDir}`);
@@ -78635,7 +78702,7 @@ var init_sqlite_client = __esm(() => {
 
 // src/commands/content/phases/db-manager.ts
 import { existsSync as existsSync83, mkdirSync as mkdirSync8 } from "node:fs";
-import { dirname as dirname53 } from "node:path";
+import { dirname as dirname54 } from "node:path";
 function initDatabase(dbPath) {
   ensureParentDir(dbPath);
   const db = openDatabase(dbPath);
@@ -78656,7 +78723,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 = dirname53(dbPath);
+  const dir = dirname54(dbPath);
   if (dir && !existsSync83(dir)) {
     mkdirSync8(dir, { recursive: true });
   }
@@ -89169,7 +89236,7 @@ init_path_resolver();
 import { existsSync as existsSync58 } from "node:fs";
 import { readFile as readFile44 } from "node:fs/promises";
 import { homedir as homedir43 } from "node:os";
-import { dirname as dirname31, join as join80, normalize as normalize6, resolve as resolve37 } from "node:path";
+import { dirname as dirname32, join as join80, normalize as normalize6, resolve as resolve37 } from "node:path";
 async function checkPathRefsValid(projectDir) {
   const globalClaudeMd = join80(PathResolver.getGlobalKitDir(), "CLAUDE.md");
   const projectClaudeMd = join80(projectDir, ".claude", "CLAUDE.md");
@@ -89200,7 +89267,7 @@ async function checkPathRefsValid(projectDir) {
         autoFixable: false
       };
     }
-    const baseDir = dirname31(claudeMdPath);
+    const baseDir = dirname32(claudeMdPath);
     const home5 = homedir43();
     const broken = [];
     for (const ref of refs) {
@@ -91047,14 +91114,14 @@ class AutoHealer {
 import { execSync as execSync4, spawnSync as spawnSync6 } from "node:child_process";
 import { readFileSync as readFileSync17, unlinkSync as unlinkSync2, writeFileSync as writeFileSync6 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
-import { dirname as dirname32, join as join87 } from "node:path";
+import { dirname as dirname33, join as join87 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 init_environment();
 init_logger();
 init_dist2();
 function getCliVersion4() {
   try {
-    const __dirname4 = dirname32(fileURLToPath4(import.meta.url));
+    const __dirname4 = dirname33(fileURLToPath4(import.meta.url));
     const pkgPath = join87(__dirname4, "../../../package.json");
     const pkg = JSON.parse(readFileSync17(pkgPath, "utf-8"));
     return pkg.version || "unknown";
@@ -95657,7 +95724,7 @@ import path10 from "node:path";
 
 // node_modules/tar/dist/esm/list.js
 import fs10 from "node:fs";
-import { dirname as dirname35, parse as parse4 } from "path";
+import { dirname as dirname36, parse as parse4 } from "path";
 
 // node_modules/tar/dist/esm/options.js
 var argmap = new Map([
@@ -98557,7 +98624,7 @@ var filesFilter = (opt, files) => {
       if (m2 !== undefined) {
         ret = m2;
       } else {
-        ret = mapHas(dirname35(file), root);
+        ret = mapHas(dirname36(file), root);
       }
     }
     map.set(file, ret);
@@ -102300,7 +102367,7 @@ import { join as join121 } from "node:path";
 
 // src/domains/installation/deletion-handler.ts
 import { existsSync as existsSync65, lstatSync as lstatSync3, readdirSync as readdirSync9, rmSync as rmSync2, rmdirSync, unlinkSync as unlinkSync4 } from "node:fs";
-import { dirname as dirname37, join as join106, relative as relative21, resolve as resolve42, sep as sep11 } from "node:path";
+import { dirname as dirname38, join as join106, relative as relative21, resolve as resolve42, sep as sep11 } from "node:path";
 
 // src/services/file-operations/manifest/manifest-reader.ts
 init_metadata_migration();
@@ -102526,7 +102593,7 @@ function expandGlobPatterns(patterns, claudeDir3) {
 var MAX_CLEANUP_ITERATIONS = 50;
 function cleanupEmptyDirectories(filePath, claudeDir3) {
   const normalizedClaudeDir = resolve42(claudeDir3);
-  let currentDir = resolve42(dirname37(filePath));
+  let currentDir = resolve42(dirname38(filePath));
   let iterations = 0;
   while (currentDir !== normalizedClaudeDir && currentDir.startsWith(normalizedClaudeDir) && iterations < MAX_CLEANUP_ITERATIONS) {
     iterations++;
@@ -102535,7 +102602,7 @@ function cleanupEmptyDirectories(filePath, claudeDir3) {
       if (entries.length === 0) {
         rmdirSync(currentDir);
         logger.debug(`Removed empty directory: ${currentDir}`);
-        currentDir = resolve42(dirname37(currentDir));
+        currentDir = resolve42(dirname38(currentDir));
       } else {
         break;
       }
@@ -102658,7 +102725,7 @@ init_logger();
 init_types3();
 var import_fs_extra16 = __toESM(require_lib(), 1);
 var import_ignore3 = __toESM(require_ignore(), 1);
-import { dirname as dirname41, join as join111, relative as relative24 } from "node:path";
+import { dirname as dirname42, join as join111, relative as relative24 } from "node:path";
 
 // src/domains/installation/selective-merger.ts
 import { stat as stat18 } from "node:fs/promises";
@@ -102834,7 +102901,7 @@ class SelectiveMerger {
 
 // src/domains/installation/merger/deleted-skill-preservation.ts
 init_metadata_migration();
-import { dirname as dirname38, join as join107, relative as relative22 } from "node:path";
+import { dirname as dirname39, join as join107, relative as relative22 } from "node:path";
 var import_fs_extra13 = __toESM(require_lib(), 1);
 async function findIgnoredSkillDirectories({
   files,
@@ -102883,8 +102950,8 @@ function findSourceSkillRoots(files, sourceDir) {
     const metadataPath = toMetadataPath(normalizedPath);
     if (!metadataPath?.endsWith("/SKILL.md"))
       continue;
-    const metadataRoot = dirname38(metadataPath).replace(/\\/g, "/");
-    const sourceRoot = dirname38(normalizedPath).replace(/\\/g, "/");
+    const metadataRoot = dirname39(metadataPath).replace(/\\/g, "/");
+    const sourceRoot = dirname39(normalizedPath).replace(/\\/g, "/");
     sourceSkillRoots.set(metadataRoot, sourceRoot);
   }
   return sourceSkillRoots;
@@ -104404,13 +104471,13 @@ class FileScanner {
 // src/domains/installation/merger/settings-processor.ts
 import { execSync as execSync5 } from "node:child_process";
 import { homedir as homedir46 } from "node:os";
-import { dirname as dirname40, join as join110 } from "node:path";
+import { dirname as dirname41, join as join110 } from "node:path";
 
 // src/domains/config/installed-settings-tracker.ts
 init_shared();
 import { existsSync as existsSync66 } from "node:fs";
 import { mkdir as mkdir31, readFile as readFile52, writeFile as writeFile27 } from "node:fs/promises";
-import { dirname as dirname39, join as join109 } from "node:path";
+import { dirname as dirname40, join as join109 } from "node:path";
 var CK_JSON_FILE = ".ck.json";
 
 class InstalledSettingsTracker {
@@ -104461,7 +104528,7 @@ class InstalledSettingsTracker {
         data.kits[this.kitName] = {};
       }
       data.kits[this.kitName].installedSettings = settings;
-      await mkdir31(dirname39(ckJsonPath), { recursive: true });
+      await mkdir31(dirname40(ckJsonPath), { recursive: true });
       await writeFile27(ckJsonPath, JSON.stringify(data, null, 2), "utf-8");
       logger.debug(`Saved installed settings to ${ckJsonPath}`);
     } catch (error) {
@@ -105104,7 +105171,7 @@ class SettingsProcessor {
     return true;
   }
   async repairSiblingSettingsLocal(destFile) {
-    const settingsLocalPath = join110(dirname40(destFile), "settings.local.json");
+    const settingsLocalPath = join110(dirname41(destFile), "settings.local.json");
     if (settingsLocalPath === destFile || !await import_fs_extra15.pathExists(settingsLocalPath)) {
       return;
     }
@@ -105201,7 +105268,7 @@ class SettingsProcessor {
     }
   }
   async dynamicTeamHookHandlerExists(destFile, handler) {
-    return import_fs_extra15.pathExists(join110(dirname40(destFile), "hooks", handler));
+    return import_fs_extra15.pathExists(join110(dirname41(destFile), "hooks", handler));
   }
   removeDynamicTeamHookRegistrations(settings) {
     let removed = 0;
@@ -105453,10 +105520,10 @@ class CopyExecutor {
   }
   trackInstalledFile(relativePath) {
     this.installedFiles.add(relativePath);
-    let dir = dirname41(relativePath);
+    let dir = dirname42(relativePath);
     while (dir && dir !== "." && dir !== "/") {
       this.installedDirectories.add(`${dir}/`);
-      dir = dirname41(dir);
+      dir = dirname42(dir);
     }
   }
   async loadIgnoredSkillDirectories(files, sourceDir, destDir) {
@@ -108660,7 +108727,7 @@ async function runPreflightChecks() {
 // src/domains/installation/fresh-installer.ts
 init_metadata_migration();
 import { existsSync as existsSync67, readdirSync as readdirSync10, rmSync as rmSync3, rmdirSync as rmdirSync2, unlinkSync as unlinkSync5 } from "node:fs";
-import { basename as basename28, dirname as dirname42, join as join133, resolve as resolve44 } from "node:path";
+import { basename as basename28, dirname as dirname43, join as join133, resolve as resolve44 } from "node:path";
 init_logger();
 init_safe_spinner();
 var import_fs_extra35 = __toESM(require_lib(), 1);
@@ -108713,14 +108780,14 @@ async function analyzeFreshInstallation(claudeDir3) {
 }
 function cleanupEmptyDirectories2(filePath, claudeDir3) {
   const normalizedClaudeDir = resolve44(claudeDir3);
-  let currentDir = resolve44(dirname42(filePath));
+  let currentDir = resolve44(dirname43(filePath));
   while (currentDir !== normalizedClaudeDir && currentDir.startsWith(normalizedClaudeDir)) {
     try {
       const entries = readdirSync10(currentDir);
       if (entries.length === 0) {
         rmdirSync2(currentDir);
         logger.debug(`Removed empty directory: ${currentDir}`);
-        currentDir = resolve44(dirname42(currentDir));
+        currentDir = resolve44(dirname43(currentDir));
       } else {
         break;
       }
@@ -108910,7 +108977,7 @@ async function handleFreshInstallation(claudeDir3, prompts) {
 var import_fs_extra36 = __toESM(require_lib(), 1);
 import { cp as cp5, mkdir as mkdir35, readdir as readdir42, rename as rename11, rm as rm16, stat as stat22 } from "node:fs/promises";
 import { homedir as homedir47 } from "node:os";
-import { dirname as dirname43, join as join134, normalize as normalize11, resolve as resolve45 } from "node:path";
+import { dirname as dirname44, join as join134, normalize as normalize11, resolve as resolve45 } from "node:path";
 var LEGACY_KIT_MARKERS = [
   "metadata.json",
   ".ck.json",
@@ -109023,7 +109090,7 @@ async function repairLegacyWindowsGlobalKitDir(options2) {
   if (targetExists) {
     await rm16(targetDir, { recursive: true, force: true });
   }
-  await mkdir35(dirname43(targetDir), { recursive: true });
+  await mkdir35(dirname44(targetDir), { recursive: true });
   await moveDirectory(legacyDir, targetDir);
   return { status: "repaired", reason: "repaired", legacyDir, candidateDirs };
 }
@@ -109422,7 +109489,7 @@ async function handleSelection(ctx) {
 }
 // src/commands/init/phases/sync-handler.ts
 import { copyFile as copyFile8, mkdir as mkdir37, open as open5, readFile as readFile61, rename as rename12, stat as stat23, unlink as unlink13, writeFile as writeFile35 } from "node:fs/promises";
-import { dirname as dirname44, join as join136, resolve as resolve47 } from "node:path";
+import { dirname as dirname45, join as join136, resolve as resolve47 } from "node:path";
 init_logger();
 init_path_resolver();
 var import_fs_extra38 = __toESM(require_lib(), 1);
@@ -109541,7 +109608,7 @@ async function acquireSyncLock(global3) {
   const lockPath = join136(cacheDir, ".sync-lock");
   const startTime = Date.now();
   const lockTimeout = getLockTimeout();
-  await mkdir37(dirname44(lockPath), { recursive: true });
+  await mkdir37(dirname45(lockPath), { recursive: true });
   while (Date.now() - startTime < lockTimeout) {
     try {
       const handle = await open5(lockPath, "wx");
@@ -110767,7 +110834,7 @@ init_dist2();
 init_model_taxonomy();
 import { mkdir as mkdir39, readFile as readFile66, writeFile as writeFile39 } from "node:fs/promises";
 import { homedir as homedir51 } from "node:os";
-import { dirname as dirname45, join as join143 } from "node:path";
+import { dirname as dirname46, join as join143 } from "node:path";
 
 // src/commands/portable/models-dev-cache.ts
 init_logger();
@@ -111120,7 +111187,7 @@ async function ensureOpenCodeModel(options2) {
     }
     const chosenModel2 = response2.action === "custom" ? response2.value : suggestion2.model;
     const next2 = { ...existing, model: chosenModel2 };
-    await mkdir39(dirname45(configPath), { recursive: true });
+    await mkdir39(dirname46(configPath), { recursive: true });
     await writeFile39(configPath, `${JSON.stringify(next2, null, 2)}
 `, "utf-8");
     return { path: configPath, action: "added", model: chosenModel2, reason: suggestion2.reason };
@@ -111131,7 +111198,7 @@ async function ensureOpenCodeModel(options2) {
       throw new OpenCodeAuthRequiredError(suggestion.failure);
     }
     const next2 = { ...existing ?? {}, model: suggestion.model };
-    await mkdir39(dirname45(configPath), { recursive: true });
+    await mkdir39(dirname46(configPath), { recursive: true });
     await writeFile39(configPath, `${JSON.stringify(next2, null, 2)}
 `, "utf-8");
     return {
@@ -111153,7 +111220,7 @@ async function ensureOpenCodeModel(options2) {
   }
   const chosenModel = response.action === "custom" ? response.value : suggestion.ok ? suggestion.model : "";
   const next = { ...existing ?? {}, model: chosenModel };
-  await mkdir39(dirname45(configPath), { recursive: true });
+  await mkdir39(dirname46(configPath), { recursive: true });
   await writeFile39(configPath, `${JSON.stringify(next, null, 2)}
 `, "utf-8");
   return {
@@ -111166,7 +111233,7 @@ async function ensureOpenCodeModel(options2) {
 
 // src/commands/portable/plan-display.ts
 var import_picocolors28 = __toESM(require_picocolors(), 1);
-import { basename as basename29, dirname as dirname46, extname as extname8 } from "node:path";
+import { basename as basename29, dirname as dirname47, extname as extname8 } from "node:path";
 var DEFAULT_MAX_PLAN_GROUP_ITEMS = 20;
 var TYPE_ORDER = [
   "agent",
@@ -111392,21 +111459,21 @@ function collectPlannedWhereLines(plan) {
   return destinations.map((destination) => `${formatDisplayPath(destination)} -> ${formatCdHint(resolveCdTarget(destination))}`);
 }
 function resolveCdTarget(destination) {
-  return extname8(destination).length > 0 ? dirname46(destination) : destination;
+  return extname8(destination).length > 0 ? dirname47(destination) : destination;
 }
 function normalizeWhereDestination(path17, portableType) {
   if (portableType === "agent" || portableType === "command" || portableType === "skill") {
-    return dirname46(path17);
+    return dirname47(path17);
   }
   if (portableType === "hooks") {
-    return dirname46(path17);
+    return dirname47(path17);
   }
   if (portableType === "rules") {
     const fileName = basename29(path17).toLowerCase();
     if (fileName === "agents.md" || fileName === "gemini.md" || fileName === ".goosehints" || fileName === "custom_modes.yaml" || fileName === "custom_modes.yml") {
       return path17;
     }
-    return dirname46(path17);
+    return dirname47(path17);
   }
   return path17;
 }
@@ -113227,7 +113294,7 @@ Please use only one download method.`);
 // src/commands/plan/plan-command.ts
 init_output_manager();
 import { existsSync as existsSync71, statSync as statSync12 } from "node:fs";
-import { dirname as dirname50, isAbsolute as isAbsolute14, join as join149, parse as parse7, resolve as resolve53 } from "node:path";
+import { dirname as dirname51, isAbsolute as isAbsolute14, join as join149, parse as parse7, resolve as resolve53 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
 init_config();
@@ -113237,18 +113304,18 @@ init_logger();
 init_output_manager();
 var import_picocolors32 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync70, statSync as statSync11 } from "node:fs";
-import { basename as basename31, dirname as dirname48, join as join148, relative as relative32, resolve as resolve51 } from "node:path";
+import { basename as basename31, dirname as dirname49, join as join148, relative as relative32, resolve as resolve51 } from "node:path";
 
 // src/commands/plan/plan-dependencies.ts
 init_config();
 init_plan_parser();
 init_plans_registry();
 import { existsSync as existsSync69 } from "node:fs";
-import { dirname as dirname47, join as join147 } from "node:path";
+import { dirname as dirname48, join as join147 } from "node:path";
 async function resolvePlanDependencies(references, currentPlanFile, options2 = {}) {
   if (references.length === 0)
     return [];
-  const currentPlanDir = dirname47(currentPlanFile);
+  const currentPlanDir = dirname48(currentPlanFile);
   const projectRoot = findProjectRoot(currentPlanDir);
   const config = options2.preloadedConfig ?? (await CkConfigManager.loadFull(projectRoot)).config;
   const defaultScope = inferPlanScopeForDir(currentPlanDir, config);
@@ -113335,7 +113402,7 @@ async function handleParse(target, options2) {
     console.log(JSON.stringify({ file: relative32(process.cwd(), planFile), frontmatter, phases }, null, 2));
     return;
   }
-  const title = typeof frontmatter.title === "string" ? frontmatter.title : basename31(dirname48(planFile));
+  const title = typeof frontmatter.title === "string" ? frontmatter.title : basename31(dirname49(planFile));
   console.log();
   console.log(import_picocolors32.default.bold(`  Plan: ${title}`));
   console.log(`  File: ${planFile}`);
@@ -113446,7 +113513,7 @@ async function handleStatus(target, options2) {
         const blockedBy2 = await resolvePlanDependencies(s.blockedBy, pf, { preloadedConfig });
         const blocks2 = await resolvePlanDependencies(s.blocks, pf, { preloadedConfig });
         const bar = progressBar(s.completed, s.totalPhases);
-        const title2 = s.title ?? basename31(dirname48(pf));
+        const title2 = s.title ?? basename31(dirname49(pf));
         console.log(`  ${import_picocolors32.default.bold(title2)}`);
         console.log(`  ${bar}`);
         if (s.inProgress > 0)
@@ -113465,7 +113532,7 @@ async function handleStatus(target, options2) {
         }
         console.log();
       } catch {
-        console.log(`  [X] Failed to read: ${basename31(dirname48(pf))}`);
+        console.log(`  [X] Failed to read: ${basename31(dirname49(pf))}`);
         console.log();
       }
     }
@@ -113492,7 +113559,7 @@ async function handleStatus(target, options2) {
     console.log(JSON.stringify({ ...summary, dependencyStatus: { blockedBy, blocks } }, null, 2));
     return;
   }
-  const title = summary.title ?? basename31(dirname48(planFile));
+  const title = summary.title ?? basename31(dirname49(planFile));
   console.log();
   console.log(import_picocolors32.default.bold(`  ${title}`));
   if (summary.status)
@@ -113555,7 +113622,7 @@ async function handleKanban(target, options2) {
     process.exitCode = 1;
     return;
   }
-  const route = `/plans?dir=${encodeURIComponent(dirname48(dirname48(planFile)))}&view=kanban`;
+  const route = `/plans?dir=${encodeURIComponent(dirname49(dirname49(planFile)))}&view=kanban`;
   const url = `http://localhost:${server.port}${route}`;
   console.log();
   console.log(import_picocolors32.default.bold("  ClaudeKit Dashboard — Plans"));
@@ -113590,7 +113657,7 @@ init_plan_parser();
 init_plans_registry();
 init_output_manager();
 var import_picocolors33 = __toESM(require_picocolors(), 1);
-import { basename as basename32, dirname as dirname49, relative as relative33, resolve as resolve52 } from "node:path";
+import { basename as basename32, dirname as dirname50, relative as relative33, resolve as resolve52 } from "node:path";
 function quoteReadTarget(filePath) {
   return `"${filePath.replace(/\\/g, "/").replace(/"/g, "\\\"")}"`;
 }
@@ -113704,7 +113771,7 @@ async function handleCheck(target, options2) {
     process.exitCode = 1;
     return;
   }
-  const planDir = dirname49(planFile);
+  const planDir = dirname50(planFile);
   let planStatus = "pending";
   try {
     const projectRoot = findProjectRoot(planDir);
@@ -113753,7 +113820,7 @@ async function handleUncheck(target, options2) {
     process.exitCode = 1;
     return;
   }
-  const planDir = dirname49(planFile);
+  const planDir = dirname50(planFile);
   try {
     const projectRoot = findProjectRoot(planDir);
     const summary = buildPlanSummary(planFile);
@@ -113792,7 +113859,7 @@ async function handleAddPhase(target, options2) {
   try {
     const result = addPhase(planFile, target, options2.after);
     try {
-      const planDir = dirname49(planFile);
+      const planDir = dirname50(planFile);
       const projectRoot = findProjectRoot(planDir);
       updateRegistryAddPhase({
         planDir,
@@ -113846,7 +113913,7 @@ function resolvePlanFile(target, baseDir) {
       const candidate = join149(dir, "plan.md");
       if (existsSync71(candidate))
         return candidate;
-      dir = dirname50(dir);
+      dir = dirname51(dir);
     }
   }
   return null;
@@ -115132,7 +115199,7 @@ var import_fs_extra43 = __toESM(require_lib(), 1);
 // src/commands/uninstall/analysis-handler.ts
 init_metadata_migration();
 import { readdirSync as readdirSync11, rmSync as rmSync4 } from "node:fs";
-import { dirname as dirname51, join as join152 } from "node:path";
+import { dirname as dirname52, join as join152 } from "node:path";
 init_logger();
 init_safe_prompts();
 var import_fs_extra42 = __toESM(require_lib(), 1);
@@ -115154,7 +115221,7 @@ function classifyFileByOwnership(ownership, forceOverwrite, deleteReason) {
 }
 async function cleanupEmptyDirectories3(filePath, installationRoot) {
   let cleaned = 0;
-  let currentDir = dirname51(filePath);
+  let currentDir = dirname52(filePath);
   while (currentDir !== installationRoot && currentDir.startsWith(installationRoot)) {
     try {
       const entries = readdirSync11(currentDir);
@@ -115162,7 +115229,7 @@ async function cleanupEmptyDirectories3(filePath, installationRoot) {
         rmSync4(currentDir, { recursive: true });
         cleaned++;
         logger.debug(`Removed empty directory: ${currentDir}`);
-        currentDir = dirname51(currentDir);
+        currentDir = dirname52(currentDir);
       } else {
         break;
       }
@@ -117084,7 +117151,7 @@ init_file_io();
 init_logger();
 import { existsSync as existsSync74 } from "node:fs";
 import { mkdir as mkdir41, readFile as readFile70 } from "node:fs/promises";
-import { dirname as dirname52 } from "node:path";
+import { dirname as dirname53 } from "node:path";
 var PROCESSED_ISSUES_CAP = 500;
 async function readCkJson(projectDir) {
   const configPath = CkConfigManager.getProjectConfigPath(projectDir);
@@ -117114,7 +117181,7 @@ async function loadWatchState(projectDir) {
 }
 async function saveWatchState(projectDir, state) {
   const configPath = CkConfigManager.getProjectConfigPath(projectDir);
-  const configDir = dirname52(configPath);
+  const configDir = dirname53(configPath);
   if (!existsSync74(configDir)) {
     await mkdir41(configDir, { recursive: true });
   }

package/package.json

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