claudekit-cli 3.5.2 → 3.6.1

package/dist/index.js

@@ -12725,6 +12725,116 @@ var require_emoji_regex2 = __commonJS((exports, module) => {
   };
 });
 
+// src/utils/install-error-handler.ts
+import { existsSync as existsSync5, readFileSync as readFileSync4, unlinkSync as unlinkSync2 } from "node:fs";
+import { join as join17 } from "node:path";
+function parseNameReason(str) {
+  const colonIndex = str.indexOf(":");
+  if (colonIndex === -1) {
+    return [str.trim(), undefined];
+  }
+  return [str.slice(0, colonIndex).trim(), str.slice(colonIndex + 1).trim()];
+}
+function displayInstallErrors(skillsDir) {
+  const summaryPath = join17(skillsDir, ".install-error-summary.json");
+  if (!existsSync5(summaryPath)) {
+    logger.error("Skills installation failed. Run with --verbose for details.");
+    return;
+  }
+  let summary;
+  try {
+    summary = JSON.parse(readFileSync4(summaryPath, "utf-8"));
+  } catch (parseError) {
+    logger.error("Failed to parse error summary. File may be corrupted.");
+    logger.debug(`Parse error: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+    return;
+  }
+  try {
+    if (summary.critical_failures.length > 0) {
+      logger.error("");
+      logger.error("━━━ Critical Failures ━━━");
+      for (const failure of summary.critical_failures) {
+        const [name2, reason] = parseNameReason(failure);
+        logger.error(`  ✗ ${name2}`);
+        if (reason)
+          logger.error(`    Reason: ${reason}`);
+      }
+      logger.error("");
+      logger.error("These must be fixed before skills can work.");
+    }
+    if (summary.optional_failures.length > 0) {
+      logger.warning("");
+      logger.warning("━━━ Optional Package Failures ━━━");
+      for (const failure of summary.optional_failures) {
+        const [name2, reason] = parseNameReason(failure);
+        logger.warning(`  ! ${name2}`);
+        if (reason)
+          logger.info(`    Reason: ${reason}`);
+      }
+    }
+    if (summary.skipped.length > 0) {
+      logger.info("");
+      logger.info("━━━ Skipped (No sudo) ━━━");
+      for (const skipped of summary.skipped) {
+        const [name2] = parseNameReason(skipped);
+        logger.info(`  ~ ${name2}`);
+      }
+    }
+    logger.info("");
+    logger.info("━━━ How to Fix ━━━");
+    logger.info("");
+    if (summary.optional_failures.some((f3) => f3.includes("no wheel") || f3.includes("build tools") || f3.includes("build failed")) && summary.remediation.build_tools) {
+      logger.info("Install build tools (one-time):");
+      logger.info(`  ${summary.remediation.build_tools}`);
+      logger.info("");
+    }
+    if (summary.skipped.length > 0 && summary.remediation.sudo_packages) {
+      logger.info("Install system packages:");
+      logger.info(`  ${summary.remediation.sudo_packages}`);
+      logger.info("");
+    }
+    if (summary.optional_failures.length > 0 && summary.remediation.pip_retry) {
+      logger.info("Then retry failed packages manually:");
+      logger.info(`  ${summary.remediation.pip_retry}`);
+    }
+    try {
+      unlinkSync2(summaryPath);
+    } catch (cleanupError) {
+      if (cleanupError.code !== "ENOENT") {
+        logger.debug(`Failed to cleanup summary file: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`);
+      }
+    }
+  } catch (displayError) {
+    logger.error("Failed to display error summary.");
+    logger.debug(`Display error: ${displayError instanceof Error ? displayError.message : String(displayError)}`);
+  }
+}
+async function checkNeedsSudoPackages() {
+  if (process.platform !== "linux") {
+    return false;
+  }
+  const { exec: exec5 } = await import("node:child_process");
+  const { promisify: promisify5 } = await import("node:util");
+  const execAsync5 = promisify5(exec5);
+  try {
+    await Promise.all([
+      execAsync5("which ffmpeg", { timeout: WHICH_COMMAND_TIMEOUT_MS }),
+      execAsync5("which convert", { timeout: WHICH_COMMAND_TIMEOUT_MS })
+    ]);
+    return false;
+  } catch {
+    return true;
+  }
+}
+function hasInstallState(skillsDir) {
+  const stateFilePath = join17(skillsDir, ".install-state.json");
+  return existsSync5(stateFilePath);
+}
+var WHICH_COMMAND_TIMEOUT_MS = 5000;
+var init_install_error_handler = __esm(() => {
+  init_logger();
+});
+
 // src/utils/package-installer.ts
 var exports_package_installer = {};
 __export(exports_package_installer, {
@@ -12741,7 +12851,7 @@ __export(exports_package_installer, {
   getPackageVersion: () => getPackageVersion
 });
 import { exec as exec5, execFile as execFile2, spawn } from "node:child_process";
-import { resolve as resolve2 } from "node:path";
+import { join as join18, resolve as resolve2 } from "node:path";
 import { promisify as promisify5 } from "node:util";
 function executeInteractiveScript(command, args, options) {
   return new Promise((resolve3, reject) => {
@@ -12935,9 +13045,8 @@ async function installOpenCode() {
   try {
     logger.info(`Installing ${displayName}...`);
     const { unlink: unlink2 } = await import("node:fs/promises");
-    const { join: join17 } = await import("node:path");
     const { tmpdir: tmpdir3 } = await import("node:os");
-    const tempScriptPath = join17(tmpdir3(), "opencode-install.sh");
+    const tempScriptPath = join18(tmpdir3(), "opencode-install.sh");
     try {
       logger.info("Downloading OpenCode installation script...");
       await execFileAsync("curl", ["-fsSL", "https://opencode.ai/install", "-o", tempScriptPath], {
@@ -13047,13 +13156,12 @@ async function installSkillsDependencies(skillsDir) {
     };
   }
   try {
-    const { existsSync: existsSync5 } = await import("node:fs");
+    const { existsSync: existsSync6 } = await import("node:fs");
     const { readFile: readFile9 } = await import("node:fs/promises");
-    const { join: join17 } = await import("node:path");
     const clack = await Promise.resolve().then(() => (init_dist2(), exports_dist));
     const platform8 = process.platform;
     const scriptName = platform8 === "win32" ? "install.ps1" : "install.sh";
-    const scriptPath = join17(skillsDir, scriptName);
+    const scriptPath = join18(skillsDir, scriptName);
     try {
       validateScriptPath(skillsDir, scriptPath);
     } catch (error) {
@@ -13065,11 +13173,11 @@ async function installSkillsDependencies(skillsDir) {
         error: `Path validation failed: ${errorMessage}`
       };
     }
-    if (!existsSync5(scriptPath)) {
+    if (!existsSync6(scriptPath)) {
       logger.warning(`Skills installation script not found: ${scriptPath}`);
       logger.info("");
       logger.info("\uD83D\uDCD6 Manual Installation Instructions:");
-      logger.info(`  See: ${join17(skillsDir, "INSTALLATION.md")}`);
+      logger.info(`  See: ${join18(skillsDir, "INSTALLATION.md")}`);
       logger.info("");
       logger.info("Quick start:");
       logger.info("  cd .claude/skills/ai-multimodal/scripts");
@@ -13113,7 +13221,7 @@ async function installSkillsDependencies(skillsDir) {
       logger.info(`  ${platform8 === "win32" ? `powershell -File "${scriptPath}"` : `bash ${scriptPath}`}`);
       logger.info("");
       logger.info("Or see complete guide:");
-      logger.info(`  ${join17(skillsDir, "INSTALLATION.md")}`);
+      logger.info(`  ${join18(skillsDir, "INSTALLATION.md")}`);
       return {
         success: false,
         package: displayName,
@@ -13122,6 +13230,47 @@ async function installSkillsDependencies(skillsDir) {
     }
     logger.info(`Installing ${displayName}...`);
     logger.info(`Running: ${scriptPath}`);
+    const scriptArgs = ["--yes"];
+    if (hasInstallState(skillsDir)) {
+      if (isNonInteractive()) {
+        logger.info("Resuming previous installation (non-interactive mode)...");
+        scriptArgs.push("--resume");
+      } else {
+        const shouldResume = await clack.confirm({
+          message: "Previous installation was interrupted. Resume?",
+          initialValue: true
+        });
+        if (!clack.isCancel(shouldResume) && shouldResume) {
+          scriptArgs.push("--resume");
+          logger.info("Resuming previous installation...");
+        }
+      }
+    }
+    if (platform8 === "linux") {
+      const needsSudo = await checkNeedsSudoPackages();
+      if (needsSudo) {
+        if (isNonInteractive()) {
+          logger.info("Skipping system packages in non-interactive mode.");
+          logger.info("Install manually: sudo apt-get install -y ffmpeg imagemagick");
+        } else {
+          logger.info("");
+          logger.info("System packages (requires sudo):");
+          logger.info("  • ffmpeg - Video/audio processing");
+          logger.info("  • imagemagick - Image editing & conversion");
+          logger.info("");
+          const shouldInstallSudo = await clack.confirm({
+            message: "Install these packages? (requires sudo password)",
+            initialValue: true
+          });
+          if (!clack.isCancel(shouldInstallSudo) && shouldInstallSudo) {
+            scriptArgs.push("--with-sudo");
+          } else {
+            logger.info("Skipping system packages. Install manually later:");
+            logger.info("  sudo apt-get install -y ffmpeg imagemagick");
+          }
+        }
+      }
+    }
     const scriptEnv = {
       ...process.env,
       NON_INTERACTIVE: "1"
@@ -13137,7 +13286,7 @@ async function installSkillsDependencies(skillsDir) {
         env: scriptEnv
       });
     } else {
-      await executeInteractiveScript("bash", [scriptPath, "--yes"], {
+      await executeInteractiveScript("bash", [scriptPath, ...scriptArgs], {
         timeout: 600000,
         cwd: skillsDir,
         env: scriptEnv
@@ -13150,13 +13299,34 @@ async function installSkillsDependencies(skillsDir) {
     };
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : "Unknown error";
-    logger.error(`Failed to install ${displayName}: ${errorMessage}`);
+    const exitCodeMatch = errorMessage.match(/exited with code (\d+)/);
+    const exitCode = exitCodeMatch ? Number.parseInt(exitCodeMatch[1], 10) : 1;
+    if (exitCode === EXIT_CODE_PARTIAL_SUCCESS) {
+      displayInstallErrors(skillsDir);
+      logger.info("");
+      logger.success("Core functionality is available despite some package failures.");
+      return {
+        success: true,
+        package: displayName,
+        version: PARTIAL_INSTALL_VERSION
+      };
+    }
+    if (exitCode === EXIT_CODE_CRITICAL_FAILURE) {
+      displayInstallErrors(skillsDir);
+      logger.error("");
+      logger.error("Skills installation failed. See above for details.");
+      return {
+        success: false,
+        package: displayName,
+        error: "Critical dependencies missing"
+      };
+    }
+    logger.error(`Unexpected error: ${errorMessage}`);
     logger.info("");
     logger.info("\uD83D\uDCD6 Manual Installation Instructions:");
     logger.info("");
     logger.info("See complete guide:");
-    const { join: join17 } = await import("node:path");
-    logger.info(`  cat ${join17(skillsDir, "INSTALLATION.md")}`);
+    logger.info(`  cat ${join18(skillsDir, "INSTALLATION.md")}`);
     logger.info("");
     logger.info("Quick start:");
     logger.info("  cd .claude/skills/ai-multimodal/scripts");
@@ -13177,19 +13347,24 @@ async function handleSkillsInstallation(skillsDir) {
   try {
     const skillsResult = await installSkillsDependencies(skillsDir);
     if (skillsResult.success) {
-      logger.success("Skills dependencies installed successfully");
+      if (skillsResult.version === PARTIAL_INSTALL_VERSION) {
+        logger.success("Skills core dependencies installed (some optional packages skipped)");
+      } else {
+        logger.success("Skills dependencies installed successfully");
+      }
     } else {
-      logger.warning(`Skills installation failed: ${skillsResult.error || "Unknown error"}`);
-      logger.info(`You can install skills dependencies manually later by running the installation script in ${skillsDir}`);
+      logger.warning(`Skills installation incomplete: ${skillsResult.error || "Unknown error"}`);
+      logger.info("You can install skills dependencies manually. See INSTALLATION.md");
     }
-  } catch (error) {
-    logger.warning(`Skills installation failed: ${error instanceof Error ? error.message : String(error)}`);
+  } catch {
+    logger.warning("Skills installation failed");
     logger.info("You can install skills dependencies manually later");
   }
 }
-var execAsync5, execFileAsync, NPM_PACKAGE_REGEX;
+var execAsync5, execFileAsync, PARTIAL_INSTALL_VERSION = "partial", EXIT_CODE_CRITICAL_FAILURE = 1, EXIT_CODE_PARTIAL_SUCCESS = 2, NPM_PACKAGE_REGEX;
 var init_package_installer = __esm(() => {
   init_environment();
+  init_install_error_handler();
   init_logger();
   execAsync5 = promisify5(exec5);
   execFileAsync = promisify5(execFile2);
@@ -14144,8 +14319,8 @@ var init_help_interceptor = __esm(() => {
 });
 
 // src/index.ts
-import { existsSync as existsSync7, readFileSync as readFileSync4 } from "fs";
-import { join as join31 } from "path";
+import { existsSync as existsSync8, readFileSync as readFileSync5 } from "fs";
+import { join as join33 } from "path";
 
 // node_modules/cac/dist/index.mjs
 import { EventEmitter } from "events";
@@ -14750,7 +14925,7 @@ var cac = (name = "") => new CAC(name);
 // package.json
 var package_default = {
   name: "claudekit-cli",
-  version: "3.5.2",
+  version: "3.6.1",
   description: "CLI tool for bootstrapping and updating ClaudeKit projects",
   type: "module",
   repository: {
@@ -16459,6 +16634,7 @@ Note: Do NOT use 'Paste an authentication token' - use web browser login.`);
       if (token && token.length > 0) {
         return token;
       }
+      logger.debug("gh auth token returned empty result");
       return null;
     } catch (error) {
       if (error?.stderr) {
@@ -17757,7 +17933,7 @@ async function doctorCommand(options = {}) {
 
 // src/commands/init.ts
 var import_fs_extra17 = __toESM(require_lib(), 1);
-import { join as join26, resolve as resolve4 } from "node:path";
+import { join as join28, resolve as resolve4 } from "node:path";
 
 // src/lib/commands-prefix.ts
 init_logger();
@@ -29012,7 +29188,7 @@ class FileMerger {
       const isWindows5 = process.platform === "win32";
       let processedContent = content;
       if (this.isGlobal) {
-        const homeVar = isWindows5 ? "%USERPROFILE%" : "$HOME";
+        const homeVar = isWindows5 ? '"%USERPROFILE%"' : '"$HOME"';
         processedContent = this.transformClaudePaths(content, homeVar);
         if (processedContent !== content) {
           logger.debug(`Transformed .claude/ paths to ${homeVar}/.claude/ in settings.json for global installation`);
@@ -29031,12 +29207,17 @@ class FileMerger {
     }
   }
   transformClaudePaths(content, prefix) {
+    if (/\.claude\/[^\s"']*[;`$&|><]/.test(content)) {
+      logger.warning("Potentially unsafe characters detected in .claude/ paths");
+      throw new Error("Settings file contains potentially unsafe path characters");
+    }
     let transformed = content;
     const jsonSafePrefix = prefix.includes('"') ? prefix.replace(/"/g, "\\\"") : prefix;
+    const rawPrefix = prefix.replace(/"/g, "");
     transformed = transformed.replace(/(node\s+)(?:\.\/)?\.claude\//g, `$1${jsonSafePrefix}/.claude/`);
-    if (prefix.includes("HOME") || prefix.includes("USERPROFILE")) {
-      transformed = transformed.replace(/\$CLAUDE_PROJECT_DIR/g, prefix);
-      transformed = transformed.replace(/%CLAUDE_PROJECT_DIR%/g, prefix);
+    if (rawPrefix.includes("HOME") || rawPrefix.includes("USERPROFILE")) {
+      transformed = transformed.replace(/\$CLAUDE_PROJECT_DIR/g, rawPrefix);
+      transformed = transformed.replace(/%CLAUDE_PROJECT_DIR%/g, rawPrefix);
     }
     return transformed;
   }
@@ -29905,11 +30086,11 @@ class PromptsManager {
 init_dist2();
 init_logger();
 var import_fs_extra10 = __toESM(require_lib(), 1);
-import { join as join18 } from "node:path";
+import { join as join20 } from "node:path";
 
 // src/lib/config-generator.ts
 var import_fs_extra9 = __toESM(require_lib(), 1);
-import { join as join17 } from "node:path";
+import { join as join19 } from "node:path";
 async function generateEnvFile(targetDir, values) {
   const lines = [
     "# Generated by ClaudeKit CLI setup wizard",
@@ -29921,7 +30102,7 @@ async function generateEnvFile(targetDir, values) {
       lines.push(`${key}=${value}`);
     }
   }
-  const envPath = join17(targetDir, ".env");
+  const envPath = join19(targetDir, ".env");
   await import_fs_extra9.writeFile(envPath, `${lines.join(`
 `)}
 `, { mode: 384 });
@@ -29992,7 +30173,7 @@ async function parseEnvFile(path9) {
   }
 }
 async function checkGlobalConfig() {
-  const globalEnvPath = join18(PathResolver.getGlobalKitDir(), ".env");
+  const globalEnvPath = join20(PathResolver.getGlobalKitDir(), ".env");
   if (!await import_fs_extra10.pathExists(globalEnvPath))
     return false;
   const env2 = await parseEnvFile(globalEnvPath);
@@ -30008,7 +30189,7 @@ async function runSetupWizard(options) {
   let globalEnv = {};
   const hasGlobalConfig = !isGlobal && await checkGlobalConfig();
   if (!isGlobal) {
-    const globalEnvPath = join18(PathResolver.getGlobalKitDir(), ".env");
+    const globalEnvPath = join20(PathResolver.getGlobalKitDir(), ".env");
     if (await import_fs_extra10.pathExists(globalEnvPath)) {
       globalEnv = await parseEnvFile(globalEnvPath);
     }
@@ -30061,7 +30242,7 @@ async function runSetupWizard(options) {
     }
   }
   await generateEnvFile(targetDir, values);
-  f2.success(`Configuration saved to ${join18(targetDir, ".env")}`);
+  f2.success(`Configuration saved to ${join20(targetDir, ".env")}`);
   return true;
 }
 
@@ -30069,7 +30250,7 @@ async function runSetupWizard(options) {
 init_logger();
 var import_fs_extra12 = __toESM(require_lib(), 1);
 import { readdir as readdir8 } from "node:fs/promises";
-import { join as join20 } from "node:path";
+import { join as join22 } from "node:path";
 
 // src/lib/skills-manifest.ts
 init_types2();
@@ -30077,7 +30258,7 @@ init_logger();
 var import_fs_extra11 = __toESM(require_lib(), 1);
 import { createHash as createHash2 } from "node:crypto";
 import { readFile as readFile10, readdir as readdir7, writeFile as writeFile9 } from "node:fs/promises";
-import { join as join19, relative as relative6 } from "node:path";
+import { join as join21, relative as relative6 } from "node:path";
 
 class SkillsManifestManager {
   static MANIFEST_FILENAME = ".skills-manifest.json";
@@ -30099,12 +30280,12 @@ class SkillsManifestManager {
     return manifest;
   }
   static async writeManifest(skillsDir, manifest) {
-    const manifestPath = join19(skillsDir, SkillsManifestManager.MANIFEST_FILENAME);
+    const manifestPath = join21(skillsDir, SkillsManifestManager.MANIFEST_FILENAME);
     await writeFile9(manifestPath, JSON.stringify(manifest, null, 2), "utf-8");
     logger.debug(`Wrote manifest to: ${manifestPath}`);
   }
   static async readManifest(skillsDir) {
-    const manifestPath = join19(skillsDir, SkillsManifestManager.MANIFEST_FILENAME);
+    const manifestPath = join21(skillsDir, SkillsManifestManager.MANIFEST_FILENAME);
     if (!await import_fs_extra11.pathExists(manifestPath)) {
       logger.debug(`No manifest found at: ${manifestPath}`);
       return null;
@@ -30127,7 +30308,7 @@ class SkillsManifestManager {
       return "flat";
     }
     for (const dir of dirs.slice(0, 3)) {
-      const dirPath = join19(skillsDir, dir.name);
+      const dirPath = join21(skillsDir, dir.name);
       const subEntries = await readdir7(dirPath, { withFileTypes: true });
       const hasSubdirs = subEntries.some((entry) => entry.isDirectory());
       if (hasSubdirs) {
@@ -30146,7 +30327,7 @@ class SkillsManifestManager {
       const entries = await readdir7(skillsDir, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isDirectory() && entry.name !== "node_modules" && !entry.name.startsWith(".")) {
-          const skillPath = join19(skillsDir, entry.name);
+          const skillPath = join21(skillsDir, entry.name);
           const hash = await SkillsManifestManager.hashDirectory(skillPath);
           skills.push({
             name: entry.name,
@@ -30158,11 +30339,11 @@ class SkillsManifestManager {
       const categories = await readdir7(skillsDir, { withFileTypes: true });
       for (const category of categories) {
         if (category.isDirectory() && category.name !== "node_modules" && !category.name.startsWith(".")) {
-          const categoryPath = join19(skillsDir, category.name);
+          const categoryPath = join21(skillsDir, category.name);
           const skillEntries = await readdir7(categoryPath, { withFileTypes: true });
           for (const skillEntry of skillEntries) {
             if (skillEntry.isDirectory() && !skillEntry.name.startsWith(".")) {
-              const skillPath = join19(categoryPath, skillEntry.name);
+              const skillPath = join21(categoryPath, skillEntry.name);
               const hash = await SkillsManifestManager.hashDirectory(skillPath);
               skills.push({
                 name: skillEntry.name,
@@ -30192,7 +30373,7 @@ class SkillsManifestManager {
     const files = [];
     const entries = await readdir7(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join19(dirPath, entry.name);
+      const fullPath = join21(dirPath, entry.name);
       if (entry.name.startsWith(".") || entry.name === "node_modules") {
         continue;
       }
@@ -30435,12 +30616,12 @@ class SkillsMigrationDetector {
     let totalSkillLikeCount = 0;
     const allSkills = [];
     for (const dir of dirs) {
-      const dirPath = join20(skillsDir, dir.name);
+      const dirPath = join22(skillsDir, dir.name);
       const subEntries = await readdir8(dirPath, { withFileTypes: true });
       const subdirs = subEntries.filter((entry) => entry.isDirectory() && !entry.name.startsWith("."));
       if (subdirs.length > 0) {
         for (const subdir of subdirs.slice(0, 3)) {
-          const subdirPath = join20(dirPath, subdir.name);
+          const subdirPath = join22(dirPath, subdir.name);
           const subdirFiles = await readdir8(subdirPath, { withFileTypes: true });
           const hasSkillMarker = subdirFiles.some((file) => file.isFile() && (file.name === "skill.md" || file.name === "README.md" || file.name === "readme.md" || file.name === "config.json" || file.name === "package.json"));
           if (hasSkillMarker) {
@@ -30479,14 +30660,14 @@ init_types2();
 init_logger();
 var import_fs_extra15 = __toESM(require_lib(), 1);
 import { copyFile as copyFile2, mkdir as mkdir7, readdir as readdir11, rm as rm2 } from "node:fs/promises";
-import { join as join23 } from "node:path";
+import { join as join25 } from "node:path";
 
 // src/lib/skills-backup-manager.ts
 init_types2();
 init_logger();
 var import_fs_extra13 = __toESM(require_lib(), 1);
 import { copyFile, mkdir as mkdir6, readdir as readdir9, rm, stat as stat4 } from "node:fs/promises";
-import { basename as basename2, join as join21, normalize as normalize2 } from "node:path";
+import { basename as basename2, join as join23, normalize as normalize2 } from "node:path";
 function validatePath2(path9, paramName) {
   if (!path9 || typeof path9 !== "string") {
     throw new SkillsMigrationError(`${paramName} must be a non-empty string`);
@@ -30512,7 +30693,7 @@ class SkillsBackupManager {
     const timestamp = Date.now();
     const randomSuffix = Math.random().toString(36).substring(2, 8);
     const backupDirName = `${SkillsBackupManager.BACKUP_PREFIX}${timestamp}-${randomSuffix}`;
-    const backupDir = parentDir ? join21(parentDir, backupDirName) : join21(skillsDir, "..", backupDirName);
+    const backupDir = parentDir ? join23(parentDir, backupDirName) : join23(skillsDir, "..", backupDirName);
     logger.info(`Creating backup at: ${backupDir}`);
     try {
       await mkdir6(backupDir, { recursive: true });
@@ -30563,7 +30744,7 @@ class SkillsBackupManager {
     }
     try {
       const entries = await readdir9(parentDir, { withFileTypes: true });
-      const backups = entries.filter((entry) => entry.isDirectory() && entry.name.startsWith(SkillsBackupManager.BACKUP_PREFIX)).map((entry) => join21(parentDir, entry.name));
+      const backups = entries.filter((entry) => entry.isDirectory() && entry.name.startsWith(SkillsBackupManager.BACKUP_PREFIX)).map((entry) => join23(parentDir, entry.name));
       backups.sort().reverse();
       return backups;
     } catch (error) {
@@ -30591,8 +30772,8 @@ class SkillsBackupManager {
   static async copyDirectory(sourceDir, destDir) {
     const entries = await readdir9(sourceDir, { withFileTypes: true });
     for (const entry of entries) {
-      const sourcePath = join21(sourceDir, entry.name);
-      const destPath = join21(destDir, entry.name);
+      const sourcePath = join23(sourceDir, entry.name);
+      const destPath = join23(destDir, entry.name);
       if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.isSymbolicLink()) {
         continue;
       }
@@ -30608,7 +30789,7 @@ class SkillsBackupManager {
     let size = 0;
     const entries = await readdir9(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join21(dirPath, entry.name);
+      const fullPath = join23(dirPath, entry.name);
       if (entry.isSymbolicLink()) {
         continue;
       }
@@ -30639,7 +30820,7 @@ var import_fs_extra14 = __toESM(require_lib(), 1);
 import { createHash as createHash3 } from "node:crypto";
 import { createReadStream as createReadStream2 } from "node:fs";
 import { readFile as readFile11, readdir as readdir10 } from "node:fs/promises";
-import { join as join22, normalize as normalize3, relative as relative7 } from "node:path";
+import { join as join24, normalize as normalize3, relative as relative7 } from "node:path";
 function validatePath3(path9, paramName) {
   if (!path9 || typeof path9 !== "string") {
     throw new SkillsMigrationError(`${paramName} must be a non-empty string`);
@@ -30786,13 +30967,13 @@ class SkillsCustomizationScanner {
     if (dirs.length === 0) {
       return ["flat", []];
     }
-    const firstDirPath = join22(skillsDir, dirs[0].name);
+    const firstDirPath = join24(skillsDir, dirs[0].name);
     const subEntries = await readdir10(firstDirPath, { withFileTypes: true });
     const subdirs = subEntries.filter((entry) => entry.isDirectory() && !entry.name.startsWith("."));
     if (subdirs.length > 0) {
       let skillLikeCount = 0;
       for (const subdir of subdirs.slice(0, 3)) {
-        const subdirPath = join22(firstDirPath, subdir.name);
+        const subdirPath = join24(firstDirPath, subdir.name);
         const subdirFiles = await readdir10(subdirPath, { withFileTypes: true });
         const hasSkillMarker = subdirFiles.some((file) => file.isFile() && (file.name === "skill.md" || file.name === "README.md" || file.name === "readme.md" || file.name === "config.json" || file.name === "package.json"));
         if (hasSkillMarker) {
@@ -30802,7 +30983,7 @@ class SkillsCustomizationScanner {
       if (skillLikeCount > 0) {
         const skills = [];
         for (const dir of dirs) {
-          const categoryPath = join22(skillsDir, dir.name);
+          const categoryPath = join24(skillsDir, dir.name);
           const skillDirs = await readdir10(categoryPath, { withFileTypes: true });
           skills.push(...skillDirs.filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name));
         }
@@ -30812,7 +30993,7 @@ class SkillsCustomizationScanner {
     return ["flat", dirs.map((dir) => dir.name)];
   }
   static async findSkillPath(skillsDir, skillName) {
-    const flatPath = join22(skillsDir, skillName);
+    const flatPath = join24(skillsDir, skillName);
     if (await import_fs_extra14.pathExists(flatPath)) {
       return { path: flatPath, category: undefined };
     }
@@ -30821,8 +31002,8 @@ class SkillsCustomizationScanner {
       if (!entry.isDirectory() || entry.name.startsWith(".") || entry.name === "node_modules") {
         continue;
       }
-      const categoryPath = join22(skillsDir, entry.name);
-      const skillPath = join22(categoryPath, skillName);
+      const categoryPath = join24(skillsDir, entry.name);
+      const skillPath = join24(categoryPath, skillName);
       if (await import_fs_extra14.pathExists(skillPath)) {
         return { path: skillPath, category: entry.name };
       }
@@ -30833,7 +31014,7 @@ class SkillsCustomizationScanner {
     const files = [];
     const entries = await readdir10(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join22(dirPath, entry.name);
+      const fullPath = join24(dirPath, entry.name);
       if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.isSymbolicLink()) {
         continue;
       }
@@ -31076,7 +31257,7 @@ class SkillsMigrator {
         }
       }
       if (options.backup && !options.dryRun) {
-        const claudeDir = join23(currentSkillsDir, "..");
+        const claudeDir = join25(currentSkillsDir, "..");
         result.backupPath = await SkillsBackupManager.createBackup(currentSkillsDir, claudeDir);
         logger.success(`Backup created at: ${result.backupPath}`);
       }
@@ -31128,7 +31309,7 @@ class SkillsMigrator {
     const migrated = [];
     const preserved = [];
     const errors2 = [];
-    const tempDir = join23(currentSkillsDir, "..", ".skills-migration-temp");
+    const tempDir = join25(currentSkillsDir, "..", ".skills-migration-temp");
     await mkdir7(tempDir, { recursive: true });
     try {
       for (const mapping of mappings) {
@@ -31149,9 +31330,9 @@ class SkillsMigrator {
             }
           }
           const category = mapping.category;
-          const targetPath = category ? join23(tempDir, category, skillName) : join23(tempDir, skillName);
+          const targetPath = category ? join25(tempDir, category, skillName) : join25(tempDir, skillName);
           if (category) {
-            await mkdir7(join23(tempDir, category), { recursive: true });
+            await mkdir7(join25(tempDir, category), { recursive: true });
           }
           await SkillsMigrator.copySkillDirectory(currentSkillPath, targetPath);
           migrated.push(skillName);
@@ -31185,8 +31366,8 @@ class SkillsMigrator {
     await mkdir7(destDir, { recursive: true });
     const entries = await readdir11(sourceDir, { withFileTypes: true });
     for (const entry of entries) {
-      const sourcePath = join23(sourceDir, entry.name);
-      const destPath = join23(destDir, entry.name);
+      const sourcePath = join25(sourceDir, entry.name);
+      const destPath = join25(destDir, entry.name);
       if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.isSymbolicLink()) {
         continue;
       }
@@ -31205,18 +31386,18 @@ init_types2();
 // src/utils/config.ts
 init_types2();
 init_logger();
-import { existsSync as existsSync5 } from "node:fs";
+import { existsSync as existsSync6 } from "node:fs";
 import { mkdir as mkdir8, readFile as readFile12, rename as rename2, rm as rm3, writeFile as writeFile10 } from "node:fs/promises";
 import { chmod as chmod2 } from "node:fs/promises";
 import { platform as platform8 } from "node:os";
-import { join as join24 } from "node:path";
+import { join as join26 } from "node:path";
 var PROJECT_CONFIG_FILE = ".ck.json";
 
 class ConfigManager {
   static config = null;
   static globalFlag = false;
   static getProjectConfigDir(projectDir, global3) {
-    return global3 ? projectDir : join24(projectDir, ".claude");
+    return global3 ? projectDir : join26(projectDir, ".claude");
   }
   static setGlobalFlag(global3) {
     ConfigManager.globalFlag = global3;
@@ -31231,7 +31412,7 @@ class ConfigManager {
     }
     const configFile = PathResolver.getConfigFile(ConfigManager.globalFlag);
     try {
-      if (existsSync5(configFile)) {
+      if (existsSync6(configFile)) {
         const content = await readFile12(configFile, "utf-8");
         const data = JSON.parse(content);
         ConfigManager.config = ConfigSchema.parse(data);
@@ -31249,7 +31430,7 @@ class ConfigManager {
       const validConfig = ConfigSchema.parse(config);
       const configDir = PathResolver.getConfigDir(ConfigManager.globalFlag);
       const configFile = PathResolver.getConfigFile(ConfigManager.globalFlag);
-      if (!existsSync5(configDir)) {
+      if (!existsSync6(configDir)) {
         await mkdir8(configDir, { recursive: true });
         if (platform8() !== "win32") {
           await chmod2(configDir, 448);
@@ -31283,9 +31464,9 @@ class ConfigManager {
   }
   static async loadProjectConfig(projectDir, global3 = false) {
     const configDir = ConfigManager.getProjectConfigDir(projectDir, global3);
-    const configPath = join24(configDir, PROJECT_CONFIG_FILE);
+    const configPath = join26(configDir, PROJECT_CONFIG_FILE);
     try {
-      if (existsSync5(configPath)) {
+      if (existsSync6(configPath)) {
         const content = await readFile12(configPath, "utf-8");
         const data = JSON.parse(content);
         const folders = FoldersConfigSchema.parse(data.paths || data);
@@ -31299,9 +31480,9 @@ class ConfigManager {
   }
   static async saveProjectConfig(projectDir, folders, global3 = false) {
     const configDir = ConfigManager.getProjectConfigDir(projectDir, global3);
-    const configPath = join24(configDir, PROJECT_CONFIG_FILE);
+    const configPath = join26(configDir, PROJECT_CONFIG_FILE);
     try {
-      if (!existsSync5(configDir)) {
+      if (!existsSync6(configDir)) {
         await mkdir8(configDir, { recursive: true });
       }
       const validFolders = FoldersConfigSchema.parse(folders);
@@ -31331,21 +31512,21 @@ class ConfigManager {
   }
   static projectConfigExists(projectDir, global3 = false) {
     const configDir = ConfigManager.getProjectConfigDir(projectDir, global3);
-    return existsSync5(join24(configDir, PROJECT_CONFIG_FILE));
+    return existsSync6(join26(configDir, PROJECT_CONFIG_FILE));
   }
   static async migrateNestedConfig(globalDir) {
-    const correctPath = join24(globalDir, PROJECT_CONFIG_FILE);
-    const incorrectPath = join24(globalDir, ".claude", PROJECT_CONFIG_FILE);
-    if (existsSync5(correctPath)) {
+    const correctPath = join26(globalDir, PROJECT_CONFIG_FILE);
+    const incorrectPath = join26(globalDir, ".claude", PROJECT_CONFIG_FILE);
+    if (existsSync6(correctPath)) {
       logger.debug("Config already exists at correct location, skipping migration");
       return false;
     }
-    if (existsSync5(incorrectPath)) {
+    if (existsSync6(incorrectPath)) {
       try {
         logger.info("Migrating .ck.json from nested location to correct location...");
         await rename2(incorrectPath, correctPath);
         logger.success(`Migrated ${PROJECT_CONFIG_FILE} to ${correctPath}`);
-        const nestedClaudeDir = join24(globalDir, ".claude");
+        const nestedClaudeDir = join26(globalDir, ".claude");
         try {
           await rm3(nestedClaudeDir, { recursive: false });
           logger.debug("Removed empty nested .claude directory");
@@ -31368,7 +31549,7 @@ init_environment();
 // src/utils/file-scanner.ts
 init_logger();
 var import_fs_extra16 = __toESM(require_lib(), 1);
-import { join as join25, relative as relative8, resolve as resolve3 } from "node:path";
+import { join as join27, relative as relative8, resolve as resolve3 } from "node:path";
 var SKIP_DIRS = [
   "node_modules",
   ".venv",
@@ -31395,7 +31576,7 @@ class FileScanner {
           logger.debug(`Skipping directory: ${entry}`);
           continue;
         }
-        const fullPath = join25(dirPath, entry);
+        const fullPath = join27(dirPath, entry);
         if (!FileScanner.isSafePath(basePath, fullPath)) {
           logger.warning(`Skipping potentially unsafe path: ${entry}`);
           continue;
@@ -31430,14 +31611,27 @@ class FileScanner {
     return files;
   }
   static async findCustomFiles(destDir, sourceDir, subPath) {
-    const destSubDir = join25(destDir, subPath);
-    const sourceSubDir = join25(sourceDir, subPath);
+    const destSubDir = join27(destDir, subPath);
+    const sourceSubDir = join27(sourceDir, subPath);
+    logger.debug(`findCustomFiles - destDir: ${destDir}`);
+    logger.debug(`findCustomFiles - sourceDir: ${sourceDir}`);
+    logger.debug(`findCustomFiles - subPath: "${subPath}"`);
+    logger.debug(`findCustomFiles - destSubDir: ${destSubDir}`);
+    logger.debug(`findCustomFiles - sourceSubDir: ${sourceSubDir}`);
     const destFiles = await FileScanner.getFiles(destSubDir, destDir);
     const sourceFiles = await FileScanner.getFiles(sourceSubDir, sourceDir);
+    logger.debug(`findCustomFiles - destFiles count: ${destFiles.length}`);
+    logger.debug(`findCustomFiles - sourceFiles count: ${sourceFiles.length}`);
+    const sourceExists = await import_fs_extra16.pathExists(sourceSubDir);
+    if (sourceExists && sourceFiles.length === 0 && destFiles.length > 100) {
+      logger.warning(`Source directory exists but is empty while destination has ${destFiles.length} files. This may indicate an extraction issue. Skipping custom file detection.`);
+      return [];
+    }
     const sourceFileSet = new Set(sourceFiles);
     const customFiles = destFiles.filter((file) => !sourceFileSet.has(file));
     if (customFiles.length > 0) {
-      logger.info(`Found ${customFiles.length} custom file(s) in ${subPath}/`);
+      const displayPath = subPath || destSubDir;
+      logger.info(`Found ${customFiles.length} custom file(s) in ${displayPath}`);
       customFiles.slice(0, 5).forEach((file) => logger.debug(`  - ${file}`));
       if (customFiles.length > 5) {
         logger.debug(`  ... and ${customFiles.length - 5} more`);
@@ -31472,8 +31666,11 @@ async function initCommand(options) {
       logger.info("Running in non-interactive mode (--yes flag)");
     }
     if (validOptions.global) {
-      const localSettingsPath = join26(process.cwd(), ".claude", "settings.json");
-      if (await import_fs_extra17.pathExists(localSettingsPath)) {
+      const globalKitDir = PathResolver.getGlobalKitDir();
+      const cwdResolved = resolve4(process.cwd());
+      const isInGlobalDir = cwdResolved === globalKitDir || cwdResolved === resolve4(globalKitDir, "..");
+      const localSettingsPath = join28(process.cwd(), ".claude", "settings.json");
+      if (!isInGlobalDir && await import_fs_extra17.pathExists(localSettingsPath)) {
         if (isNonInteractive2) {
           logger.warning("Local .claude/settings.json detected. Local settings take precedence over global.");
           logger.warning("Consider removing local installation: rm -rf .claude");
@@ -31484,7 +31681,7 @@ async function initCommand(options) {
             return;
           }
           if (choice === "remove") {
-            const localClaudeDir = join26(process.cwd(), ".claude");
+            const localClaudeDir = join28(process.cwd(), ".claude");
             try {
               await import_fs_extra17.remove(localClaudeDir);
               logger.success("Removed local .claude/ directory");
@@ -31543,7 +31740,7 @@ async function initCommand(options) {
     }
     if (validOptions.fresh) {
       const prefix = PathResolver.getPathPrefix(validOptions.global);
-      const claudeDir2 = prefix ? join26(resolvedDir, prefix) : resolvedDir;
+      const claudeDir2 = prefix ? join28(resolvedDir, prefix) : resolvedDir;
       const canProceed = await handleFreshInstallation(claudeDir2, prompts);
       if (!canProceed) {
         return;
@@ -31680,7 +31877,7 @@ async function initCommand(options) {
       }
     }
     if (!validOptions.fresh) {
-      const newSkillsDir = join26(extractDir, ".claude", "skills");
+      const newSkillsDir = join28(extractDir, ".claude", "skills");
       const currentSkillsDir = PathResolver.buildSkillsPath(resolvedDir, validOptions.global);
       if (await import_fs_extra17.pathExists(newSkillsDir) && await import_fs_extra17.pathExists(currentSkillsDir)) {
         logger.info("Checking for skills directory migration...");
@@ -31705,7 +31902,7 @@ async function initCommand(options) {
     let customClaudeFiles = [];
     if (!validOptions.fresh) {
       logger.info("Scanning for custom .claude files...");
-      const scanSourceDir = validOptions.global ? join26(extractDir, ".claude") : extractDir;
+      const scanSourceDir = validOptions.global ? join28(extractDir, ".claude") : extractDir;
       const scanTargetSubdir = validOptions.global ? "" : ".claude";
       customClaudeFiles = await FileScanner.findCustomFiles(resolvedDir, scanSourceDir, scanTargetSubdir);
     } else {
@@ -31734,7 +31931,7 @@ async function initCommand(options) {
       merger.addIgnorePatterns(validOptions.exclude);
     }
     merger.setGlobalFlag(validOptions.global);
-    const claudeDir = validOptions.global ? resolvedDir : join26(resolvedDir, ".claude");
+    const claudeDir = validOptions.global ? resolvedDir : join28(resolvedDir, ".claude");
     const releaseManifest = await ReleaseManifestLoader.load(extractDir);
     if (!validOptions.fresh && await import_fs_extra17.pathExists(claudeDir)) {
       const legacyDetection = await LegacyMigration.detectLegacy(claudeDir);
@@ -31756,7 +31953,7 @@ async function initCommand(options) {
         return;
       }
     }
-    const sourceDir = validOptions.global ? join26(extractDir, ".claude") : extractDir;
+    const sourceDir = validOptions.global ? join28(extractDir, ".claude") : extractDir;
     await merger.merge(sourceDir, resolvedDir, false);
     const manifestWriter = new ManifestWriter;
     const installedFiles = merger.getAllInstalledFiles();
@@ -31765,7 +31962,7 @@ async function initCommand(options) {
       if (!validOptions.global && !installedPath.startsWith(".claude/"))
         continue;
       const relativePath = validOptions.global ? installedPath : installedPath.replace(/^\.claude\//, "");
-      const filePath = join26(claudeDir, relativePath);
+      const filePath = join28(claudeDir, relativePath);
       const manifestEntry = releaseManifest ? ReleaseManifestLoader.findFile(releaseManifest, installedPath) : null;
       const ownership = manifestEntry ? "ck" : "user";
       filesToTrack.push({
@@ -31786,8 +31983,8 @@ async function initCommand(options) {
     trackingSpinner.succeed(`Tracked ${trackResult.success} files`);
     await manifestWriter.writeManifest(claudeDir, kitConfig.name, release.tag_name, validOptions.global ? "global" : "local");
     if (validOptions.global) {
-      const claudeMdSource = join26(extractDir, "CLAUDE.md");
-      const claudeMdDest = join26(resolvedDir, "CLAUDE.md");
+      const claudeMdSource = join28(extractDir, "CLAUDE.md");
+      const claudeMdDest = join28(resolvedDir, "CLAUDE.md");
       if (await import_fs_extra17.pathExists(claudeMdSource)) {
         if (!await import_fs_extra17.pathExists(claudeMdDest)) {
           await import_fs_extra17.copy(claudeMdSource, claudeMdDest);
@@ -31807,7 +32004,7 @@ async function initCommand(options) {
       await handleSkillsInstallation2(skillsDir);
     }
     if (!validOptions.skipSetup && !isNonInteractive2) {
-      const envPath = join26(claudeDir, ".env");
+      const envPath = join28(claudeDir, ".env");
       if (!await import_fs_extra17.pathExists(envPath)) {
         const shouldSetup = await prompts.confirm("Set up API keys now? (Gemini API key for ai-multimodal skill, optional webhooks)");
         if (shouldSetup) {
@@ -31839,7 +32036,7 @@ Protected files (.env, etc.) were not modified.`;
 
 // src/commands/new.ts
 var import_fs_extra18 = __toESM(require_lib(), 1);
-import { join as join27, resolve as resolve5 } from "node:path";
+import { join as join29, resolve as resolve5 } from "node:path";
 init_types2();
 init_environment();
 init_logger();
@@ -32010,7 +32207,7 @@ async function newCommand(options) {
       await CommandsPrefix.cleanupCommandsDirectory(resolvedDir, false);
     }
     await merger.merge(extractDir, resolvedDir, true);
-    const claudeDir = join27(resolvedDir, ".claude");
+    const claudeDir = join29(resolvedDir, ".claude");
     const manifestWriter = new ManifestWriter;
     const releaseManifest = await ReleaseManifestLoader.load(extractDir);
     const installedFiles = merger.getAllInstalledFiles();
@@ -32019,7 +32216,7 @@ async function newCommand(options) {
       if (!installedPath.startsWith(".claude/"))
         continue;
       const relativePath = installedPath.replace(/^\.claude\//, "");
-      const filePath = join27(claudeDir, relativePath);
+      const filePath = join29(claudeDir, relativePath);
       const manifestEntry = releaseManifest ? ReleaseManifestLoader.findFile(releaseManifest, installedPath) : null;
       const ownership = manifestEntry ? "ck" : "user";
       filesToTrack.push({
@@ -32075,7 +32272,7 @@ init_dist2();
 var import_fs_extra19 = __toESM(require_lib(), 1);
 var import_picocolors10 = __toESM(require_picocolors(), 1);
 import { readdirSync, rmSync } from "node:fs";
-import { dirname as dirname4, join as join28 } from "node:path";
+import { dirname as dirname4, join as join30 } from "node:path";
 init_types2();
 init_logger();
 async function detectInstallations() {
@@ -32166,7 +32363,7 @@ async function analyzeInstallation(installation, forceOverwrite) {
     return result;
   }
   for (const trackedFile of metadata.files) {
-    const filePath = join28(installation.path, trackedFile.path);
+    const filePath = join30(installation.path, trackedFile.path);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -32224,7 +32421,7 @@ async function removeInstallations(installations, options) {
       let removedCount = 0;
       let cleanedDirs = 0;
       for (const item of analysis.toDelete) {
-        const filePath = join28(installation.path, item.path);
+        const filePath = join30(installation.path, item.path);
         if (await import_fs_extra19.pathExists(filePath)) {
           await import_fs_extra19.remove(filePath);
           removedCount++;
@@ -32326,7 +32523,7 @@ import { promisify as promisify6 } from "node:util";
 // package.json
 var package_default2 = {
   name: "claudekit-cli",
-  version: "3.5.2",
+  version: "3.6.1",
   description: "CLI tool for bootstrapping and updating ClaudeKit projects",
   type: "module",
   repository: {
@@ -32771,20 +32968,20 @@ var import_picocolors12 = __toESM(require_picocolors(), 1);
 
 // src/lib/version-cache.ts
 init_logger();
-import { existsSync as existsSync6 } from "node:fs";
+import { existsSync as existsSync7 } from "node:fs";
 import { mkdir as mkdir9, readFile as readFile13, writeFile as writeFile11 } from "node:fs/promises";
-import { join as join29 } from "node:path";
+import { join as join31 } from "node:path";
 class VersionCacheManager {
   static CACHE_FILENAME = "version-check.json";
   static CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000;
   static getCacheFile() {
     const cacheDir = PathResolver.getCacheDir(false);
-    return join29(cacheDir, VersionCacheManager.CACHE_FILENAME);
+    return join31(cacheDir, VersionCacheManager.CACHE_FILENAME);
   }
   static async load() {
     const cacheFile = VersionCacheManager.getCacheFile();
     try {
-      if (!existsSync6(cacheFile)) {
+      if (!existsSync7(cacheFile)) {
         logger.debug("Version check cache not found");
         return null;
       }
@@ -32805,7 +33002,7 @@ class VersionCacheManager {
     const cacheFile = VersionCacheManager.getCacheFile();
     const cacheDir = PathResolver.getCacheDir(false);
     try {
-      if (!existsSync6(cacheDir)) {
+      if (!existsSync7(cacheDir)) {
         await mkdir9(cacheDir, { recursive: true, mode: 448 });
       }
       await writeFile11(cacheFile, JSON.stringify(cache2, null, 2), "utf-8");
@@ -32827,7 +33024,7 @@ class VersionCacheManager {
   static async clear() {
     const cacheFile = VersionCacheManager.getCacheFile();
     try {
-      if (existsSync6(cacheFile)) {
+      if (existsSync7(cacheFile)) {
         const fs12 = await import("node:fs/promises");
         await fs12.unlink(cacheFile);
         logger.debug("Version check cache cleared");
@@ -33255,7 +33452,7 @@ var logger2 = new Logger2;
 
 // src/utils/path-resolver.ts
 import { homedir as homedir2, platform as platform9 } from "node:os";
-import { join as join30, normalize as normalize4 } from "node:path";
+import { join as join32, normalize as normalize4 } from "node:path";
 
 class PathResolver2 {
   static getTestHomeDir() {
@@ -33288,50 +33485,50 @@ class PathResolver2 {
   static getConfigDir(global3 = false) {
     const testHome = PathResolver2.getTestHomeDir();
     if (testHome) {
-      return global3 ? join30(testHome, ".config", "claude") : join30(testHome, ".claudekit");
+      return global3 ? join32(testHome, ".config", "claude") : join32(testHome, ".claudekit");
     }
     if (!global3) {
-      return join30(homedir2(), ".claudekit");
+      return join32(homedir2(), ".claudekit");
     }
     const os2 = platform9();
     if (os2 === "win32") {
-      const localAppData = process.env.LOCALAPPDATA || join30(homedir2(), "AppData", "Local");
-      return join30(localAppData, "claude");
+      const localAppData = process.env.LOCALAPPDATA || join32(homedir2(), "AppData", "Local");
+      return join32(localAppData, "claude");
     }
     const xdgConfigHome = process.env.XDG_CONFIG_HOME;
     if (xdgConfigHome) {
-      return join30(xdgConfigHome, "claude");
+      return join32(xdgConfigHome, "claude");
     }
-    return join30(homedir2(), ".config", "claude");
+    return join32(homedir2(), ".config", "claude");
   }
   static getConfigFile(global3 = false) {
-    return join30(PathResolver2.getConfigDir(global3), "config.json");
+    return join32(PathResolver2.getConfigDir(global3), "config.json");
   }
   static getCacheDir(global3 = false) {
     const testHome = PathResolver2.getTestHomeDir();
     if (testHome) {
-      return global3 ? join30(testHome, ".cache", "claude") : join30(testHome, ".claudekit", "cache");
+      return global3 ? join32(testHome, ".cache", "claude") : join32(testHome, ".claudekit", "cache");
     }
     if (!global3) {
-      return join30(homedir2(), ".claudekit", "cache");
+      return join32(homedir2(), ".claudekit", "cache");
     }
     const os2 = platform9();
     if (os2 === "win32") {
-      const localAppData = process.env.LOCALAPPDATA || join30(homedir2(), "AppData", "Local");
-      return join30(localAppData, "claude", "cache");
+      const localAppData = process.env.LOCALAPPDATA || join32(homedir2(), "AppData", "Local");
+      return join32(localAppData, "claude", "cache");
     }
     const xdgCacheHome = process.env.XDG_CACHE_HOME;
     if (xdgCacheHome) {
-      return join30(xdgCacheHome, "claude");
+      return join32(xdgCacheHome, "claude");
     }
-    return join30(homedir2(), ".cache", "claude");
+    return join32(homedir2(), ".cache", "claude");
   }
   static getGlobalKitDir() {
     const testHome = PathResolver2.getTestHomeDir();
     if (testHome) {
-      return join30(testHome, ".claude");
+      return join32(testHome, ".claude");
     }
-    return join30(homedir2(), ".claude");
+    return join32(homedir2(), ".claude");
   }
   static getPathPrefix(global3) {
     return global3 ? "" : ".claude";
@@ -33339,9 +33536,9 @@ class PathResolver2 {
   static buildSkillsPath(baseDir, global3) {
     const prefix = PathResolver2.getPathPrefix(global3);
     if (prefix) {
-      return join30(baseDir, prefix, "skills");
+      return join32(baseDir, prefix, "skills");
     }
-    return join30(baseDir, "skills");
+    return join32(baseDir, "skills");
   }
   static buildComponentPath(baseDir, component, global3) {
     if (!PathResolver2.isPathSafe(component)) {
@@ -33349,9 +33546,9 @@ class PathResolver2 {
     }
     const prefix = PathResolver2.getPathPrefix(global3);
     if (prefix) {
-      return join30(baseDir, prefix, component);
+      return join32(baseDir, prefix, component);
     }
-    return join30(baseDir, component);
+    return join32(baseDir, component);
   }
 }
 
@@ -33369,13 +33566,13 @@ async function displayVersion() {
   let localKitVersion = null;
   let isGlobalOnlyKit = false;
   const globalKitDir = PathResolver2.getGlobalKitDir();
-  const globalMetadataPath = join31(globalKitDir, "metadata.json");
+  const globalMetadataPath = join33(globalKitDir, "metadata.json");
   const prefix = PathResolver2.getPathPrefix(false);
-  const localMetadataPath = prefix ? join31(process.cwd(), prefix, "metadata.json") : join31(process.cwd(), "metadata.json");
+  const localMetadataPath = prefix ? join33(process.cwd(), prefix, "metadata.json") : join33(process.cwd(), "metadata.json");
   const isLocalSameAsGlobal = localMetadataPath === globalMetadataPath;
-  if (!isLocalSameAsGlobal && existsSync7(localMetadataPath)) {
+  if (!isLocalSameAsGlobal && existsSync8(localMetadataPath)) {
     try {
-      const rawMetadata = JSON.parse(readFileSync4(localMetadataPath, "utf-8"));
+      const rawMetadata = JSON.parse(readFileSync5(localMetadataPath, "utf-8"));
       const metadata = MetadataSchema2.parse(rawMetadata);
       if (metadata.version) {
         const kitName = metadata.name || "ClaudeKit";
@@ -33387,9 +33584,9 @@ async function displayVersion() {
       logger2.verbose("Failed to parse local metadata.json", { error });
     }
   }
-  if (existsSync7(globalMetadataPath)) {
+  if (existsSync8(globalMetadataPath)) {
     try {
-      const rawMetadata = JSON.parse(readFileSync4(globalMetadataPath, "utf-8"));
+      const rawMetadata = JSON.parse(readFileSync5(globalMetadataPath, "utf-8"));
       const metadata = MetadataSchema2.parse(rawMetadata);
       if (metadata.version) {
         const kitName = metadata.name || "ClaudeKit";

package/package.json

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