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

package/dist/index.js

@@ -54366,7 +54366,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.36.0-dev.1",
+    version: "3.36.0-dev.2",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -65598,6 +65598,121 @@ var init_skill_migration_merger = __esm(() => {
   import_fs_extra31 = __toESM(require_lib3(), 1);
 });
 
+// src/services/standalone-skill-cleanup.ts
+var exports_standalone_skill_cleanup = {};
+__export(exports_standalone_skill_cleanup, {
+  cleanupOverlappingStandaloneSkills: () => cleanupOverlappingStandaloneSkills
+});
+import { readFile as readFile48, readdir as readdir32 } from "node:fs/promises";
+import { join as join101 } from "node:path";
+async function listSkillDirs(dir) {
+  if (!await import_fs_extra32.pathExists(dir))
+    return new Set;
+  try {
+    const entries = await readdir32(dir, { withFileTypes: true });
+    const dirs = entries.filter((e2) => e2.isDirectory());
+    const results = await Promise.all(dirs.map(async (e2) => {
+      const exists = await import_fs_extra32.pathExists(join101(dir, e2.name, "SKILL.md"));
+      return exists ? e2.name : null;
+    }));
+    return new Set(results.filter(Boolean));
+  } catch {
+    return new Set;
+  }
+}
+async function getSkillOwnershipMap(claudeDir2) {
+  const ownershipMap = new Map;
+  const metadataPath = join101(claudeDir2, "metadata.json");
+  if (!await import_fs_extra32.pathExists(metadataPath))
+    return ownershipMap;
+  let trackedFiles;
+  try {
+    const content = await readFile48(metadataPath, "utf-8");
+    const metadata = JSON.parse(content);
+    trackedFiles = extractTrackedSkillFiles2(metadata);
+  } catch {
+    logger.debug("standalone-skill-cleanup: could not read metadata");
+    return ownershipMap;
+  }
+  for (const file of trackedFiles) {
+    const skillDirName = extractSkillDirName(file.path);
+    if (!skillDirName)
+      continue;
+    const existing = ownershipMap.get(skillDirName);
+    if (file.ownership === "user" || file.ownership === "ck-modified") {
+      ownershipMap.set(skillDirName, "user");
+    } else if (!existing) {
+      ownershipMap.set(skillDirName, "ck");
+    }
+  }
+  return ownershipMap;
+}
+function extractTrackedSkillFiles2(metadata) {
+  const files = [];
+  if (metadata.kits && typeof metadata.kits === "object") {
+    for (const kit of Object.values(metadata.kits)) {
+      if (kit.files) {
+        files.push(...kit.files.filter((f3) => f3.path?.startsWith("skills/")));
+      }
+    }
+  }
+  if (Array.isArray(metadata.files)) {
+    files.push(...metadata.files.filter((f3) => f3.path?.startsWith("skills/")));
+  }
+  return files;
+}
+function extractSkillDirName(filePath) {
+  const normalized = filePath.replace(/\\/g, "/");
+  const parts = normalized.split("/").filter(Boolean);
+  if (parts.length < 2 || parts[0] !== "skills")
+    return null;
+  return parts[1];
+}
+async function cleanupOverlappingStandaloneSkills(claudeDir2, pluginSkillsDir) {
+  const standaloneSkillsDir = join101(claudeDir2, "skills");
+  const result = {
+    removed: [],
+    preserved: [],
+    pluginSkillsDir
+  };
+  const [pluginSkills, standaloneSkills] = await Promise.all([
+    listSkillDirs(pluginSkillsDir),
+    listSkillDirs(standaloneSkillsDir)
+  ]);
+  if (pluginSkills.size === 0 || standaloneSkills.size === 0) {
+    logger.debug(`standalone-skill-cleanup: nothing to clean (plugin=${pluginSkills.size}, standalone=${standaloneSkills.size})`);
+    return result;
+  }
+  const overlaps = [...standaloneSkills].filter((name2) => pluginSkills.has(name2));
+  if (overlaps.length === 0)
+    return result;
+  const ownershipMap = await getSkillOwnershipMap(claudeDir2);
+  for (const skillName of overlaps) {
+    const ownership = ownershipMap.get(skillName);
+    const skillPath = join101(standaloneSkillsDir, skillName);
+    if (ownership === "user" || ownership === undefined) {
+      result.preserved.push(skillName);
+      const reason = ownership === "user" ? "user-owned/modified" : "untracked";
+      logger.debug(`standalone-skill-cleanup: preserved ${skillName} (${reason})`);
+      continue;
+    }
+    try {
+      await import_fs_extra32.remove(skillPath);
+      result.removed.push(skillName);
+      logger.debug(`standalone-skill-cleanup: removed standalone ${skillName} (plugin has it)`);
+    } catch (error) {
+      result.preserved.push(skillName);
+      logger.debug(`standalone-skill-cleanup: could not remove ${skillName}: ${error}`);
+    }
+  }
+  return result;
+}
+var import_fs_extra32;
+var init_standalone_skill_cleanup = __esm(() => {
+  init_logger();
+  import_fs_extra32 = __toESM(require_lib3(), 1);
+});
+
 // src/domains/help/commands/common-options.ts
 var filterOptionsGroup, folderOptionsGroup;
 var init_common_options = __esm(() => {
@@ -89428,21 +89543,21 @@ Please use only one download method.`);
 }
 // src/commands/init/phases/post-install-handler.ts
 init_projects_registry();
-import { join as join101 } from "node:path";
+import { join as join102 } from "node:path";
 init_cc_version_checker();
 init_logger();
 init_path_resolver();
-var import_fs_extra32 = __toESM(require_lib3(), 1);
+var import_fs_extra33 = __toESM(require_lib3(), 1);
 async function handlePostInstall(ctx) {
   if (ctx.cancelled || !ctx.extractDir || !ctx.resolvedDir || !ctx.claudeDir) {
     return ctx;
   }
   if (ctx.options.global) {
-    const claudeMdSource = join101(ctx.extractDir, "CLAUDE.md");
-    const claudeMdDest = join101(ctx.resolvedDir, "CLAUDE.md");
-    if (await import_fs_extra32.pathExists(claudeMdSource)) {
-      if (ctx.options.fresh || !await import_fs_extra32.pathExists(claudeMdDest)) {
-        await import_fs_extra32.copy(claudeMdSource, claudeMdDest);
+    const claudeMdSource = join102(ctx.extractDir, "CLAUDE.md");
+    const claudeMdDest = join102(ctx.resolvedDir, "CLAUDE.md");
+    if (await import_fs_extra33.pathExists(claudeMdSource)) {
+      if (ctx.options.fresh || !await import_fs_extra33.pathExists(claudeMdDest)) {
+        await import_fs_extra33.copy(claudeMdSource, claudeMdDest);
         logger.success(ctx.options.fresh ? "Replaced CLAUDE.md in global directory (fresh install)" : "Copied CLAUDE.md to global directory");
       } else {
         logger.debug("CLAUDE.md already exists in global directory (preserved)");
@@ -89532,6 +89647,19 @@ async function handlePostInstall(ctx) {
       logger.debug(`Deferred skill deletion failed: ${error}`);
     }
   }
+  if (pluginVerified) {
+    try {
+      const { cleanupOverlappingStandaloneSkills: cleanupOverlappingStandaloneSkills2 } = await Promise.resolve().then(() => (init_standalone_skill_cleanup(), exports_standalone_skill_cleanup));
+      const globalClaudeDir = PathResolver.getGlobalKitDir();
+      const pluginSkillsDir = join102(PathResolver.getClaudeKitDir(), "marketplace", "plugins", "ck", "skills");
+      const overlap = await cleanupOverlappingStandaloneSkills2(globalClaudeDir, pluginSkillsDir);
+      if (overlap.removed.length > 0) {
+        logger.info(`Cleaned up ${overlap.removed.length} standalone skill(s) now provided by /ck:* plugin`);
+      }
+    } catch (error) {
+      logger.info(`Standalone skill cleanup failed: ${error}`);
+    }
+  }
   if (!ctx.isNonInteractive) {
     const { isGeminiInstalled: isGeminiInstalled2 } = await Promise.resolve().then(() => (init_package_installer(), exports_package_installer));
     const { checkExistingGeminiConfig: checkExistingGeminiConfig2, findMcpConfigPath: findMcpConfigPath2, processGeminiMcpLinking: processGeminiMcpLinking2 } = await Promise.resolve().then(() => (init_gemini_mcp_linker(), exports_gemini_mcp_linker));
@@ -89558,7 +89686,7 @@ async function handlePostInstall(ctx) {
   }
   if (!ctx.options.skipSetup) {
     await promptSetupWizardIfNeeded({
-      envPath: join101(ctx.claudeDir, ".env"),
+      envPath: join102(ctx.claudeDir, ".env"),
       claudeDir: ctx.claudeDir,
       isGlobal: ctx.options.global,
       isNonInteractive: ctx.isNonInteractive,
@@ -89594,7 +89722,7 @@ function extractSkillDirFromDeletionPath(path14) {
 init_config_manager();
 init_github_client();
 import { mkdir as mkdir30 } from "node:fs/promises";
-import { join as join103, resolve as resolve21 } from "node:path";
+import { join as join104, resolve as resolve21 } from "node:path";
 
 // src/domains/github/kit-access-checker.ts
 init_logger();
@@ -89727,9 +89855,9 @@ init_metadata_migration();
 init_manifest_reader();
 init_logger();
 init_safe_spinner();
-var import_fs_extra33 = __toESM(require_lib3(), 1);
+var import_fs_extra34 = __toESM(require_lib3(), 1);
 import { existsSync as existsSync50, readdirSync as readdirSync4, rmSync as rmSync3, rmdirSync as rmdirSync2, unlinkSync as unlinkSync4 } from "node:fs";
-import { dirname as dirname22, join as join102, resolve as resolve20 } from "node:path";
+import { dirname as dirname22, join as join103, resolve as resolve20 } from "node:path";
 var CLAUDEKIT_SUBDIRECTORIES = ["commands", "agents", "skills", "rules", "hooks"];
 async function analyzeFreshInstallation(claudeDir2) {
   const metadata = await readManifest(claudeDir2);
@@ -89799,7 +89927,7 @@ async function removeFilesByOwnership(claudeDir2, analysis, includeModified) {
   const filesToRemove = includeModified ? [...analysis.ckFiles, ...analysis.ckModifiedFiles] : analysis.ckFiles;
   const filesToPreserve = includeModified ? analysis.userFiles : [...analysis.ckModifiedFiles, ...analysis.userFiles];
   for (const file of filesToRemove) {
-    const fullPath = join102(claudeDir2, file.path);
+    const fullPath = join103(claudeDir2, file.path);
     try {
       if (existsSync50(fullPath)) {
         unlinkSync4(fullPath);
@@ -89824,13 +89952,13 @@ async function removeFilesByOwnership(claudeDir2, analysis, includeModified) {
   };
 }
 async function updateMetadataAfterFresh(claudeDir2, removedFiles) {
-  const metadataPath = join102(claudeDir2, "metadata.json");
-  if (!await import_fs_extra33.pathExists(metadataPath)) {
+  const metadataPath = join103(claudeDir2, "metadata.json");
+  if (!await import_fs_extra34.pathExists(metadataPath)) {
     return;
   }
   let content;
   try {
-    content = await import_fs_extra33.readFile(metadataPath, "utf-8");
+    content = await import_fs_extra34.readFile(metadataPath, "utf-8");
   } catch (readError) {
     logger.warning(`Failed to read metadata.json: ${readError instanceof Error ? readError.message : String(readError)}`);
     return;
@@ -89856,7 +89984,7 @@ async function updateMetadataAfterFresh(claudeDir2, removedFiles) {
     metadata.files = metadata.files.filter((f3) => !removedSet.has(f3.path));
   }
   try {
-    await import_fs_extra33.writeFile(metadataPath, JSON.stringify(metadata, null, 2));
+    await import_fs_extra34.writeFile(metadataPath, JSON.stringify(metadata, null, 2));
     logger.debug(`Updated metadata.json, removed ${removedFiles.length} file entries`);
   } catch (writeError) {
     logger.warning(`Failed to write metadata.json: ${writeError instanceof Error ? writeError.message : String(writeError)}`);
@@ -89867,16 +89995,16 @@ async function removeSubdirectoriesFallback(claudeDir2) {
   const removedFiles = [];
   let removedDirCount = 0;
   for (const subdir of CLAUDEKIT_SUBDIRECTORIES) {
-    const subdirPath = join102(claudeDir2, subdir);
-    if (await import_fs_extra33.pathExists(subdirPath)) {
+    const subdirPath = join103(claudeDir2, subdir);
+    if (await import_fs_extra34.pathExists(subdirPath)) {
       rmSync3(subdirPath, { recursive: true, force: true });
       removedDirCount++;
       removedFiles.push(`${subdir}/ (entire directory)`);
       logger.debug(`Removed subdirectory: ${subdir}/`);
     }
   }
-  const metadataPath = join102(claudeDir2, "metadata.json");
-  if (await import_fs_extra33.pathExists(metadataPath)) {
+  const metadataPath = join103(claudeDir2, "metadata.json");
+  if (await import_fs_extra34.pathExists(metadataPath)) {
     unlinkSync4(metadataPath);
     removedFiles.push("metadata.json");
   }
@@ -89889,7 +90017,7 @@ async function removeSubdirectoriesFallback(claudeDir2) {
   };
 }
 async function handleFreshInstallation(claudeDir2, prompts) {
-  if (!await import_fs_extra33.pathExists(claudeDir2)) {
+  if (!await import_fs_extra34.pathExists(claudeDir2)) {
     logger.info(".claude directory does not exist, proceeding with fresh installation");
     return true;
   }
@@ -89925,7 +90053,7 @@ init_manifest_reader();
 init_logger();
 init_path_resolver();
 init_types3();
-var import_fs_extra34 = __toESM(require_lib3(), 1);
+var import_fs_extra35 = __toESM(require_lib3(), 1);
 
 // src/commands/init/types.ts
 function isSyncContext(ctx) {
@@ -90116,7 +90244,7 @@ async function handleSelection(ctx) {
       return { ...ctx, cancelled: true };
     }
   }
-  if (!await import_fs_extra34.pathExists(resolvedDir)) {
+  if (!await import_fs_extra35.pathExists(resolvedDir)) {
     if (ctx.options.global) {
       await mkdir30(resolvedDir, { recursive: true });
       logger.info(`Created global directory: ${resolvedDir}`);
@@ -90128,7 +90256,7 @@ async function handleSelection(ctx) {
   }
   if (!ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir2 = prefix ? join103(resolvedDir, prefix) : resolvedDir;
+    const claudeDir2 = prefix ? join104(resolvedDir, prefix) : resolvedDir;
     try {
       const existingMetadata = await readManifest(claudeDir2);
       if (existingMetadata?.kits) {
@@ -90160,7 +90288,7 @@ async function handleSelection(ctx) {
   }
   if (ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir2 = prefix ? join103(resolvedDir, prefix) : resolvedDir;
+    const claudeDir2 = prefix ? join104(resolvedDir, prefix) : resolvedDir;
     const canProceed = await handleFreshInstallation(claudeDir2, ctx.prompts);
     if (!canProceed) {
       return { ...ctx, cancelled: true };
@@ -90179,7 +90307,7 @@ async function handleSelection(ctx) {
     logger.info("Fetching available versions...");
     let currentVersion = null;
     try {
-      const metadataPath = ctx.options.global ? join103(PathResolver.getGlobalKitDir(), "metadata.json") : join103(resolvedDir, ".claude", "metadata.json");
+      const metadataPath = ctx.options.global ? join104(PathResolver.getGlobalKitDir(), "metadata.json") : join104(resolvedDir, ".claude", "metadata.json");
       const metadata = await readClaudeKitMetadata(metadataPath);
       currentVersion = metadata?.version || null;
       if (currentVersion) {
@@ -90253,27 +90381,27 @@ async function handleSelection(ctx) {
   };
 }
 // src/commands/init/phases/sync-handler.ts
-import { copyFile as copyFile8, mkdir as mkdir31, open as open4, readFile as readFile49, rename as rename7, stat as stat17, unlink as unlink11, writeFile as writeFile30 } from "node:fs/promises";
-import { dirname as dirname23, join as join104, resolve as resolve22 } from "node:path";
+import { copyFile as copyFile8, mkdir as mkdir31, open as open4, readFile as readFile50, rename as rename7, stat as stat17, unlink as unlink11, writeFile as writeFile30 } from "node:fs/promises";
+import { dirname as dirname23, join as join105, resolve as resolve22 } from "node:path";
 init_cc_version_checker();
 init_manifest_reader();
 init_logger();
 init_path_resolver();
-var import_fs_extra35 = __toESM(require_lib3(), 1);
+var import_fs_extra36 = __toESM(require_lib3(), 1);
 var import_picocolors23 = __toESM(require_picocolors(), 1);
 async function handleSync(ctx) {
   if (!ctx.options.sync) {
     return ctx;
   }
   const resolvedDir = ctx.options.global ? PathResolver.getGlobalKitDir() : resolve22(ctx.options.dir || ".");
-  const claudeDir2 = ctx.options.global ? resolvedDir : join104(resolvedDir, ".claude");
-  if (!await import_fs_extra35.pathExists(claudeDir2)) {
+  const claudeDir2 = ctx.options.global ? resolvedDir : join105(resolvedDir, ".claude");
+  if (!await import_fs_extra36.pathExists(claudeDir2)) {
     logger.error("Cannot sync: no .claude directory found");
     ctx.prompts.note("Run 'ck init' without --sync to install first.", "No Installation Found");
     return { ...ctx, cancelled: true };
   }
-  const metadataPath = join104(claudeDir2, "metadata.json");
-  if (!await import_fs_extra35.pathExists(metadataPath)) {
+  const metadataPath = join105(claudeDir2, "metadata.json");
+  if (!await import_fs_extra36.pathExists(metadataPath)) {
     logger.error("Cannot sync: no metadata.json found");
     ctx.prompts.note(`Your installation may be from an older version.
 Run 'ck init' to update.`, "Legacy Installation");
@@ -90381,7 +90509,7 @@ function isProcessAlive(pid) {
 }
 async function readLockPayload(lockPath) {
   try {
-    const raw2 = await readFile49(lockPath, "utf-8");
+    const raw2 = await readFile50(lockPath, "utf-8");
     const parsed = JSON.parse(raw2);
     if (typeof parsed.pid === "number" && Number.isInteger(parsed.pid) && parsed.pid > 0) {
       return {
@@ -90394,7 +90522,7 @@ async function readLockPayload(lockPath) {
 }
 async function acquireSyncLock(global3) {
   const cacheDir = PathResolver.getCacheDir(global3);
-  const lockPath = join104(cacheDir, ".sync-lock");
+  const lockPath = join105(cacheDir, ".sync-lock");
   const startTime = Date.now();
   const lockTimeout = getLockTimeout();
   await mkdir31(dirname23(lockPath), { recursive: true });
@@ -90454,12 +90582,12 @@ async function executeSyncMerge(ctx) {
   const releaseLock = await acquireSyncLock(ctx.options.global);
   try {
     const trackedFiles = ctx.syncTrackedFiles;
-    const upstreamDir = ctx.options.global ? join104(ctx.extractDir, ".claude") : ctx.extractDir;
+    const upstreamDir = ctx.options.global ? join105(ctx.extractDir, ".claude") : ctx.extractDir;
     let deletions = [];
     try {
-      const sourceMetadataPath = join104(upstreamDir, "metadata.json");
-      if (await import_fs_extra35.pathExists(sourceMetadataPath)) {
-        const content = await readFile49(sourceMetadataPath, "utf-8");
+      const sourceMetadataPath = join105(upstreamDir, "metadata.json");
+      if (await import_fs_extra36.pathExists(sourceMetadataPath)) {
+        const content = await readFile50(sourceMetadataPath, "utf-8");
         const sourceMetadata = JSON.parse(content);
         deletions = sourceMetadata.deletions || [];
       }
@@ -90757,7 +90885,7 @@ async function createBackup(claudeDir2, files, backupDir) {
   for (const file of files) {
     try {
       const sourcePath = await validateSyncPath(claudeDir2, file.path);
-      if (await import_fs_extra35.pathExists(sourcePath)) {
+      if (await import_fs_extra36.pathExists(sourcePath)) {
         const targetPath = await validateSyncPath(backupDir, file.path);
         const targetDir = dirname23(targetPath);
         await mkdir31(targetDir, { recursive: true });
@@ -90792,7 +90920,7 @@ function extractSkillDirFromDeletionPath2(path14) {
 }
 // src/commands/init/phases/transform-handler.ts
 init_config_manager();
-import { join as join108 } from "node:path";
+import { join as join109 } from "node:path";
 
 // src/services/transformers/folder-path-transformer.ts
 init_logger();
@@ -90801,40 +90929,40 @@ init_types3();
 // src/services/transformers/folder-transform/folder-renamer.ts
 init_logger();
 init_types3();
-var import_fs_extra36 = __toESM(require_lib3(), 1);
+var import_fs_extra37 = __toESM(require_lib3(), 1);
 import { rename as rename8, rm as rm13 } from "node:fs/promises";
-import { join as join105, relative as relative18 } from "node:path";
+import { join as join106, relative as relative18 } from "node:path";
 async function collectDirsToRename(extractDir, folders) {
   const dirsToRename = [];
   if (folders.docs !== DEFAULT_FOLDERS.docs) {
-    const docsPath = join105(extractDir, DEFAULT_FOLDERS.docs);
-    if (await import_fs_extra36.pathExists(docsPath)) {
+    const docsPath = join106(extractDir, DEFAULT_FOLDERS.docs);
+    if (await import_fs_extra37.pathExists(docsPath)) {
       dirsToRename.push({
         from: docsPath,
-        to: join105(extractDir, folders.docs)
+        to: join106(extractDir, folders.docs)
       });
     }
-    const claudeDocsPath = join105(extractDir, ".claude", DEFAULT_FOLDERS.docs);
-    if (await import_fs_extra36.pathExists(claudeDocsPath)) {
+    const claudeDocsPath = join106(extractDir, ".claude", DEFAULT_FOLDERS.docs);
+    if (await import_fs_extra37.pathExists(claudeDocsPath)) {
       dirsToRename.push({
         from: claudeDocsPath,
-        to: join105(extractDir, ".claude", folders.docs)
+        to: join106(extractDir, ".claude", folders.docs)
       });
     }
   }
   if (folders.plans !== DEFAULT_FOLDERS.plans) {
-    const plansPath = join105(extractDir, DEFAULT_FOLDERS.plans);
-    if (await import_fs_extra36.pathExists(plansPath)) {
+    const plansPath = join106(extractDir, DEFAULT_FOLDERS.plans);
+    if (await import_fs_extra37.pathExists(plansPath)) {
       dirsToRename.push({
         from: plansPath,
-        to: join105(extractDir, folders.plans)
+        to: join106(extractDir, folders.plans)
       });
     }
-    const claudePlansPath = join105(extractDir, ".claude", DEFAULT_FOLDERS.plans);
-    if (await import_fs_extra36.pathExists(claudePlansPath)) {
+    const claudePlansPath = join106(extractDir, ".claude", DEFAULT_FOLDERS.plans);
+    if (await import_fs_extra37.pathExists(claudePlansPath)) {
       dirsToRename.push({
         from: claudePlansPath,
-        to: join105(extractDir, ".claude", folders.plans)
+        to: join106(extractDir, ".claude", folders.plans)
       });
     }
   }
@@ -90846,7 +90974,7 @@ async function moveAcrossDevices(src, dest) {
   } catch (e2) {
     if (e2.code === "EXDEV") {
       logger.debug(`Cross-device move detected, using copy+delete: ${src} -> ${dest}`);
-      await import_fs_extra36.copy(src, dest, { overwrite: true });
+      await import_fs_extra37.copy(src, dest, { overwrite: true });
       await rm13(src, { recursive: true, force: true });
     } else {
       throw e2;
@@ -90874,8 +91002,8 @@ async function renameFolders(dirsToRename, extractDir, options2) {
 // src/services/transformers/folder-transform/path-replacer.ts
 init_logger();
 init_types3();
-import { readFile as readFile50, readdir as readdir32, writeFile as writeFile31 } from "node:fs/promises";
-import { join as join106, relative as relative19 } from "node:path";
+import { readFile as readFile51, readdir as readdir33, writeFile as writeFile31 } from "node:fs/promises";
+import { join as join107, relative as relative19 } from "node:path";
 var TRANSFORMABLE_FILE_PATTERNS = [
   ".md",
   ".txt",
@@ -90926,9 +91054,9 @@ function compileReplacements(replacements) {
 async function transformFileContents(dir, compiledReplacements, options2) {
   let filesChanged = 0;
   let replacementsCount = 0;
-  const entries = await readdir32(dir, { withFileTypes: true });
+  const entries = await readdir33(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = join106(dir, entry.name);
+    const fullPath = join107(dir, entry.name);
     if (entry.isDirectory()) {
       if (entry.name === "node_modules" || entry.name === ".git") {
         continue;
@@ -90941,7 +91069,7 @@ async function transformFileContents(dir, compiledReplacements, options2) {
       if (!shouldTransform)
         continue;
       try {
-        const content = await readFile50(fullPath, "utf-8");
+        const content = await readFile51(fullPath, "utf-8");
         let newContent = content;
         let changeCount = 0;
         for (const { regex: regex2, replacement } of compiledReplacements) {
@@ -91063,9 +91191,9 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 
 // src/services/transformers/global-path-transformer.ts
 init_logger();
-import { readFile as readFile51, readdir as readdir33, writeFile as writeFile32 } from "node:fs/promises";
+import { readFile as readFile52, readdir as readdir34, writeFile as writeFile32 } from "node:fs/promises";
 import { platform as platform13 } from "node:os";
-import { extname as extname6, join as join107 } from "node:path";
+import { extname as extname6, join as join108 } from "node:path";
 var IS_WINDOWS3 = platform13() === "win32";
 var HOME_PREFIX = IS_WINDOWS3 ? "%USERPROFILE%" : "$HOME";
 function getHomeDirPrefix() {
@@ -91173,9 +91301,9 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
   let filesSkipped = 0;
   const skippedFiles = [];
   async function processDirectory2(dir) {
-    const entries = await readdir33(dir, { withFileTypes: true });
+    const entries = await readdir34(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join107(dir, entry.name);
+      const fullPath = join108(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name.startsWith(".") && entry.name !== ".claude") {
           continue;
@@ -91183,7 +91311,7 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
         await processDirectory2(fullPath);
       } else if (entry.isFile() && shouldTransformFile3(entry.name)) {
         try {
-          const content = await readFile51(fullPath, "utf-8");
+          const content = await readFile52(fullPath, "utf-8");
           const { transformed, changes } = transformContent(content);
           if (changes > 0) {
             await writeFile32(fullPath, transformed, "utf-8");
@@ -91251,7 +91379,7 @@ async function handleTransforms(ctx) {
       logger.debug(ctx.options.global ? "Saved folder configuration to ~/.claude/.ck.json" : "Saved folder configuration to .claude/.ck.json");
     }
   }
-  const claudeDir2 = ctx.options.global ? ctx.resolvedDir : join108(ctx.resolvedDir, ".claude");
+  const claudeDir2 = ctx.options.global ? ctx.resolvedDir : join109(ctx.resolvedDir, ".claude");
   return {
     ...ctx,
     foldersConfig,
@@ -91445,7 +91573,7 @@ init_checksum_utils();
 init_config_discovery();
 var import_picocolors25 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync51 } from "node:fs";
-import { readFile as readFile52, rm as rm14, unlink as unlink12 } from "node:fs/promises";
+import { readFile as readFile53, rm as rm14, unlink as unlink12 } from "node:fs/promises";
 import { resolve as resolve23 } from "node:path";
 
 // src/commands/portable/conflict-resolver.ts
@@ -92018,7 +92146,7 @@ async function migrateCommand(options2) {
       for (const action of conflictActions) {
         if (!action.diff && action.targetPath && existsSync51(action.targetPath)) {
           try {
-            const targetContent = await readFile52(action.targetPath, "utf-8");
+            const targetContent = await readFile53(action.targetPath, "utf-8");
             const sourceItem = agents2.find((a3) => a3.name === action.item) || commands.find((c2) => c2.name === action.item) || (configItem?.name === action.item ? configItem : null) || ruleItems.find((r2) => r2.name === action.item);
             if (sourceItem) {
               const providerConfig = providers[action.provider];
@@ -92225,7 +92353,7 @@ async function computeTargetStates(selectedProviders, global3) {
       exists: true
     };
     try {
-      const content = await readFile52(entry.path, "utf-8");
+      const content = await readFile53(entry.path, "utf-8");
       state.currentChecksum = computeContentChecksum(content);
     } catch (error) {
       logger.debug(`[migrate] Failed to read target for checksum: ${entry.path} (${String(error)})`);
@@ -92288,7 +92416,7 @@ import { resolve as resolve24 } from "node:path";
 init_logger();
 init_path_resolver();
 init_types3();
-var import_fs_extra37 = __toESM(require_lib3(), 1);
+var import_fs_extra38 = __toESM(require_lib3(), 1);
 async function directorySetup(validOptions, prompts) {
   const isNonInteractive2 = !process.stdin.isTTY || process.env.CI === "true" || process.env.NON_INTERACTIVE === "true";
   const config = await ConfigManager.get();
@@ -92387,8 +92515,8 @@ async function directorySetup(validOptions, prompts) {
       return null;
     }
   }
-  if (await import_fs_extra37.pathExists(resolvedDir)) {
-    const files = await import_fs_extra37.readdir(resolvedDir);
+  if (await import_fs_extra38.pathExists(resolvedDir)) {
+    const files = await import_fs_extra38.readdir(resolvedDir);
     const isEmpty = files.length === 0;
     if (!isEmpty) {
       if (isNonInteractive2) {
@@ -92426,7 +92554,7 @@ async function handleDirectorySetup(ctx) {
 // src/commands/new/phases/project-creation.ts
 init_config_manager();
 init_github_client();
-import { join as join109 } from "node:path";
+import { join as join110 } from "node:path";
 init_logger();
 init_output_manager();
 init_types3();
@@ -92552,7 +92680,7 @@ async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2
   output.section("Installing");
   logger.verbose("Installation target", { directory: resolvedDir });
   const merger = new FileMerger;
-  const claudeDir2 = join109(resolvedDir, ".claude");
+  const claudeDir2 = join110(resolvedDir, ".claude");
   merger.setMultiKitContext(claudeDir2, kit);
   if (validOptions.exclude && validOptions.exclude.length > 0) {
     merger.addIgnorePatterns(validOptions.exclude);
@@ -92599,7 +92727,7 @@ async function handleProjectCreation(ctx) {
 }
 // src/commands/new/phases/post-setup.ts
 init_projects_registry();
-import { join as join110 } from "node:path";
+import { join as join111 } from "node:path";
 init_package_installer();
 init_logger();
 init_path_resolver();
@@ -92631,9 +92759,9 @@ async function postSetup(resolvedDir, validOptions, isNonInteractive2, prompts)
       withSudo: validOptions.withSudo
     });
   }
-  const claudeDir2 = join110(resolvedDir, ".claude");
+  const claudeDir2 = join111(resolvedDir, ".claude");
   await promptSetupWizardIfNeeded({
-    envPath: join110(claudeDir2, ".env"),
+    envPath: join111(claudeDir2, ".env"),
     claudeDir: claudeDir2,
     isGlobal: false,
     isNonInteractive: isNonInteractive2,
@@ -93600,7 +93728,7 @@ var import_picocolors32 = __toESM(require_picocolors(), 1);
 // src/commands/uninstall/installation-detector.ts
 init_claudekit_scanner();
 init_path_resolver();
-var import_fs_extra38 = __toESM(require_lib3(), 1);
+var import_fs_extra39 = __toESM(require_lib3(), 1);
 function hasClaudeKitComponents(components) {
   return components.agents > 0 || components.commands > 0 || components.rules > 0 || components.skills > 0;
 }
@@ -93615,7 +93743,7 @@ async function detectInstallations() {
       installations.push({
         type: "local",
         path: setup.project.path,
-        exists: await import_fs_extra38.pathExists(setup.project.path),
+        exists: await import_fs_extra39.pathExists(setup.project.path),
         hasMetadata,
         components: setup.project.components
       });
@@ -93628,7 +93756,7 @@ async function detectInstallations() {
       installations.push({
         type: "global",
         path: setup.global.path,
-        exists: await import_fs_extra38.pathExists(setup.global.path),
+        exists: await import_fs_extra39.pathExists(setup.global.path),
         hasMetadata,
         components: setup.global.components
       });
@@ -93639,16 +93767,16 @@ async function detectInstallations() {
 
 // src/commands/uninstall/removal-handler.ts
 import { readdirSync as readdirSync6, rmSync as rmSync5 } from "node:fs";
-import { join as join112, resolve as resolve26, sep as sep5 } from "node:path";
+import { join as join113, resolve as resolve26, sep as sep5 } from "node:path";
 init_logger();
 init_safe_prompts();
 init_safe_spinner();
-var import_fs_extra39 = __toESM(require_lib3(), 1);
+var import_fs_extra40 = __toESM(require_lib3(), 1);
 
 // src/commands/uninstall/analysis-handler.ts
 init_metadata_migration();
 import { readdirSync as readdirSync5, rmSync as rmSync4 } from "node:fs";
-import { dirname as dirname24, join as join111 } from "node:path";
+import { dirname as dirname24, join as join112 } from "node:path";
 init_logger();
 init_safe_prompts();
 var import_picocolors31 = __toESM(require_picocolors(), 1);
@@ -93696,7 +93824,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
   if (uninstallManifest.isMultiKit && kit && metadata?.kits?.[kit]) {
     const kitFiles = metadata.kits[kit].files || [];
     for (const trackedFile of kitFiles) {
-      const filePath = join111(installation.path, trackedFile.path);
+      const filePath = join112(installation.path, trackedFile.path);
       if (uninstallManifest.filesToPreserve.includes(trackedFile.path)) {
         result.toPreserve.push({ path: trackedFile.path, reason: "shared with other kit" });
         continue;
@@ -93726,7 +93854,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
     return result;
   }
   for (const trackedFile of allTrackedFiles) {
-    const filePath = join111(installation.path, trackedFile.path);
+    const filePath = join112(installation.path, trackedFile.path);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -93771,7 +93899,7 @@ function displayDryRunPreview(analysis, installationType) {
 // src/commands/uninstall/removal-handler.ts
 async function isDirectory(filePath) {
   try {
-    const stats = await import_fs_extra39.lstat(filePath);
+    const stats = await import_fs_extra40.lstat(filePath);
     return stats.isDirectory();
   } catch {
     logger.debug(`Failed to check if path is directory: ${filePath}`);
@@ -93786,9 +93914,9 @@ async function isPathSafeToRemove(filePath, baseDir) {
       logger.debug(`Path outside installation directory: ${filePath}`);
       return false;
     }
-    const stats = await import_fs_extra39.lstat(filePath);
+    const stats = await import_fs_extra40.lstat(filePath);
     if (stats.isSymbolicLink()) {
-      const realPath = await import_fs_extra39.realpath(filePath);
+      const realPath = await import_fs_extra40.realpath(filePath);
       const resolvedReal = resolve26(realPath);
       if (!resolvedReal.startsWith(resolvedBase + sep5) && resolvedReal !== resolvedBase) {
         logger.debug(`Symlink points outside installation directory: ${filePath} -> ${realPath}`);
@@ -93823,15 +93951,15 @@ async function removeInstallations(installations, options2) {
       let removedCount = 0;
       let cleanedDirs = 0;
       for (const item of analysis.toDelete) {
-        const filePath = join112(installation.path, item.path);
-        if (!await import_fs_extra39.pathExists(filePath))
+        const filePath = join113(installation.path, item.path);
+        if (!await import_fs_extra40.pathExists(filePath))
           continue;
         if (!await isPathSafeToRemove(filePath, installation.path)) {
           logger.debug(`Skipping unsafe path: ${item.path}`);
           continue;
         }
         const isDir = await isDirectory(filePath);
-        await import_fs_extra39.remove(filePath);
+        await import_fs_extra40.remove(filePath);
         removedCount++;
         logger.debug(`Removed ${isDir ? "directory" : "file"}: ${item.path}`);
         if (!isDir) {
@@ -94222,7 +94350,7 @@ init_logger();
 init_path_resolver();
 init_types3();
 import { existsSync as existsSync53, readFileSync as readFileSync10 } from "node:fs";
-import { join as join113 } from "node:path";
+import { join as join114 } from "node:path";
 var packageVersion = package_default.version;
 function formatInstalledKits(metadata) {
   if (!metadata.kits || Object.keys(metadata.kits).length === 0) {
@@ -94254,9 +94382,9 @@ async function displayVersion() {
   let localKitVersion = null;
   let isGlobalOnlyKit = false;
   const globalKitDir = PathResolver.getGlobalKitDir();
-  const globalMetadataPath = join113(globalKitDir, "metadata.json");
+  const globalMetadataPath = join114(globalKitDir, "metadata.json");
   const prefix = PathResolver.getPathPrefix(false);
-  const localMetadataPath = prefix ? join113(process.cwd(), prefix, "metadata.json") : join113(process.cwd(), "metadata.json");
+  const localMetadataPath = prefix ? join114(process.cwd(), prefix, "metadata.json") : join114(process.cwd(), "metadata.json");
   const isLocalSameAsGlobal = localMetadataPath === globalMetadataPath;
   if (!isLocalSameAsGlobal && existsSync53(localMetadataPath)) {
     try {
@@ -94649,7 +94777,7 @@ var output2 = new OutputManager2;
 
 // src/shared/temp-cleanup.ts
 init_logger();
-var import_fs_extra40 = __toESM(require_lib3(), 1);
+var import_fs_extra41 = __toESM(require_lib3(), 1);
 import { rmSync as rmSync6 } from "node:fs";
 var tempDirs2 = new Set;
 async function cleanup() {
@@ -94658,7 +94786,7 @@ async function cleanup() {
   logger.debug(`Cleaning up ${tempDirs2.size} temporary director(ies)...`);
   for (const dir of tempDirs2) {
     try {
-      await import_fs_extra40.remove(dir);
+      await import_fs_extra41.remove(dir);
       logger.debug(`Cleaned up temp directory: ${dir}`);
     } catch (error) {
       logger.debug(`Failed to clean temp directory ${dir}: ${error}`);

package/package.json

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