claudekit-cli 3.35.0-dev.17 → 3.35.0-dev.19

package/dist/index.js

@@ -49746,7 +49746,7 @@ var init_skills_discovery = __esm(() => {
 
 // src/domains/web-server/routes/migration-routes.ts
 import { existsSync as existsSync19 } from "node:fs";
-import { readFile as readFile14 } from "node:fs/promises";
+import { readFile as readFile14, rm as rm5 } from "node:fs/promises";
 import { resolve as resolve7 } from "node:path";
 function isDisallowedControlCode(codePoint) {
   return codePoint >= 0 && codePoint <= 8 || codePoint >= 11 && codePoint <= 31 || codePoint >= 127 && codePoint <= 159;
@@ -49950,6 +49950,41 @@ function normalizeIncludeOptions(input) {
     rules: typeof parsed.rules === "boolean" ? parsed.rules : defaults.rules
   };
 }
+function shouldExecuteAction(action) {
+  if (action.action === "install" || action.action === "update")
+    return true;
+  if (action.action === "conflict") {
+    const resolution = action.resolution?.type;
+    return resolution === "overwrite" || resolution === "smart-merge" || resolution === "resolved";
+  }
+  return false;
+}
+async function executePlanDeleteAction(action, options2) {
+  const preservePaths = options2?.preservePaths ?? new Set;
+  const shouldPreserveTarget = action.targetPath.length > 0 && preservePaths.has(resolve7(action.targetPath));
+  try {
+    if (!shouldPreserveTarget && action.targetPath && existsSync19(action.targetPath)) {
+      await rm5(action.targetPath, { recursive: true, force: true });
+    }
+    await removePortableInstallation(action.item, action.type, action.provider, action.global);
+    return {
+      provider: action.provider,
+      providerDisplayName: providers[action.provider]?.displayName || action.provider,
+      success: true,
+      path: action.targetPath,
+      skipped: shouldPreserveTarget,
+      skipReason: shouldPreserveTarget ? "Registry entry removed; target preserved because newer action wrote same path" : undefined
+    };
+  } catch (error) {
+    return {
+      provider: action.provider,
+      providerDisplayName: providers[action.provider]?.displayName || action.provider,
+      success: false,
+      path: action.targetPath,
+      error: error instanceof Error ? error.message : "Delete action failed"
+    };
+  }
+}
 function countEnabledTypes(include) {
   return MIGRATION_TYPES.filter((type) => include[type]).length;
 }
@@ -50245,10 +50280,76 @@ function registerMigrationRoutes(app) {
             }
           }
         }
-        res.status(501).json({
-          error: "Plan-based execution not yet implemented. Use standard migration endpoint.",
-          phase: "planned-for-future",
-          code: "PLAN_EXECUTION_NOT_IMPLEMENTED"
+        const execActions = plan.actions.filter(shouldExecuteAction);
+        const deleteActions = plan.actions.filter((a3) => a3.action === "delete");
+        const includeAll = {
+          agents: true,
+          commands: true,
+          skills: true,
+          config: true,
+          rules: true
+        };
+        const discovered2 = await discoverMigrationItems(includeAll);
+        const agentByName = new Map(discovered2.agents.map((item) => [item.name, item]));
+        const commandByName = new Map(discovered2.commands.map((item) => [item.name, item]));
+        const skillByName = new Map(discovered2.skills.map((item) => [item.name, item]));
+        const configByName = new Map(discovered2.configItem ? [[discovered2.configItem.name, discovered2.configItem]] : []);
+        const ruleByName = new Map(discovered2.ruleItems.map((item) => [item.name, item]));
+        const allResults = [];
+        for (const action of execActions) {
+          const provider = action.provider;
+          const installOpts = { global: action.global };
+          if (action.type === "agent") {
+            const item = agentByName.get(action.item);
+            if (!item || !getProvidersSupporting("agents").includes(provider))
+              continue;
+            allResults.push(...await installPortableItems([item], [provider], "agent", installOpts));
+          } else if (action.type === "command") {
+            const item = commandByName.get(action.item);
+            if (!item || !getProvidersSupporting("commands").includes(provider))
+              continue;
+            allResults.push(...await installPortableItems([item], [provider], "command", installOpts));
+          } else if (action.type === "skill") {
+            const item = skillByName.get(action.item);
+            if (!item || !getProvidersSupporting("skills").includes(provider))
+              continue;
+            allResults.push(...await installSkillDirectories([item], [provider], installOpts));
+          } else if (action.type === "config") {
+            const item = configByName.get(action.item);
+            if (!item || !getProvidersSupporting("config").includes(provider))
+              continue;
+            allResults.push(...await installPortableItems([item], [provider], "config", installOpts));
+          } else if (action.type === "rules") {
+            const item = ruleByName.get(action.item);
+            if (!item || !getProvidersSupporting("rules").includes(provider))
+              continue;
+            allResults.push(...await installPortableItems([item], [provider], "rules", installOpts));
+          }
+        }
+        const plannedSkillActions = execActions.filter((a3) => a3.type === "skill").length;
+        if (discovered2.skills.length > 0 && plannedSkillActions === 0) {
+          const planProviders = [
+            ...new Set(plan.actions.map((a3) => a3.provider))
+          ];
+          const skillProviders = planProviders.filter((pv) => getProvidersSupporting("skills").includes(pv));
+          if (skillProviders.length > 0) {
+            const globalFromPlan = plan.actions[0]?.global ?? false;
+            allResults.push(...await installSkillDirectories(discovered2.skills, skillProviders, {
+              global: globalFromPlan
+            }));
+          }
+        }
+        const writtenPaths = new Set(allResults.filter((r2) => r2.success && !r2.skipped && r2.path.length > 0).map((r2) => resolve7(r2.path)));
+        for (const deleteAction of deleteActions) {
+          allResults.push(await executePlanDeleteAction(deleteAction, { preservePaths: writtenPaths }));
+        }
+        const installed2 = allResults.filter((r2) => r2.success && !r2.skipped).length;
+        const skipped2 = allResults.filter((r2) => r2.skipped).length;
+        const failed2 = allResults.filter((r2) => !r2.success).length;
+        res.status(200).json({
+          results: allResults,
+          warnings: [],
+          counts: { installed: installed2, skipped: skipped2, failed: failed2 }
         });
         return;
       }
@@ -51808,7 +51909,7 @@ var init_skills_installer = __esm(() => {
 
 // src/commands/skills/skills-uninstaller.ts
 import { existsSync as existsSync27 } from "node:fs";
-import { rm as rm5 } from "node:fs/promises";
+import { rm as rm6 } from "node:fs/promises";
 import { join as join32 } from "node:path";
 async function uninstallSkillFromAgent(skill, agent, global3) {
   const agentConfig = agents[agent];
@@ -51830,7 +51931,7 @@ async function uninstallSkillFromAgent(skill, agent, global3) {
   const fileExists = existsSync27(path4);
   try {
     if (fileExists) {
-      await rm5(path4, { recursive: true, force: true });
+      await rm6(path4, { recursive: true, force: true });
     }
     await removeInstallation(skill, agent, global3);
     return {
@@ -51870,7 +51971,7 @@ async function forceUninstallSkill(skill, agent, global3) {
     };
   }
   try {
-    await rm5(path4, { recursive: true, force: true });
+    await rm6(path4, { recursive: true, force: true });
     await removeInstallation(skill, agent, global3);
     return {
       skill,
@@ -53065,7 +53166,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.35.0-dev.17",
+    version: "3.35.0-dev.19",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -74321,7 +74422,7 @@ async function validateExtraction(extractDir) {
 
 // src/domains/installation/extraction/tar-extractor.ts
 init_logger();
-import { copyFile as copyFile3, mkdir as mkdir21, readdir as readdir15, rm as rm6, stat as stat10 } from "node:fs/promises";
+import { copyFile as copyFile3, mkdir as mkdir21, readdir as readdir15, rm as rm7, stat as stat10 } from "node:fs/promises";
 import { join as join70 } from "node:path";
 
 // node_modules/@isaacs/fs-minipass/dist/esm/index.js
@@ -81313,10 +81414,10 @@ class TarExtractor {
         await moveDirectoryContents(tempExtractDir, destDir, shouldExclude, sizeTracker);
       }
       logger.debug(`Moved contents to: ${destDir}`);
-      await rm6(tempExtractDir, { recursive: true, force: true });
+      await rm7(tempExtractDir, { recursive: true, force: true });
     } catch (error) {
       try {
-        await rm6(tempExtractDir, { recursive: true, force: true });
+        await rm7(tempExtractDir, { recursive: true, force: true });
       } catch {}
       throw error;
     }
@@ -81328,7 +81429,7 @@ init_environment();
 init_logger();
 var import_extract_zip = __toESM(require_extract_zip(), 1);
 import { execFile as execFile8 } from "node:child_process";
-import { copyFile as copyFile4, mkdir as mkdir22, readdir as readdir16, rm as rm7, stat as stat11 } from "node:fs/promises";
+import { copyFile as copyFile4, mkdir as mkdir22, readdir as readdir16, rm as rm8, stat as stat11 } from "node:fs/promises";
 import { join as join71 } from "node:path";
 class ZipExtractor {
   async tryNativeUnzip(archivePath, destDir) {
@@ -81400,10 +81501,10 @@ class ZipExtractor {
         await moveDirectoryContents(tempExtractDir, destDir, shouldExclude, sizeTracker);
       }
       logger.debug(`Moved contents to: ${destDir}`);
-      await rm7(tempExtractDir, { recursive: true, force: true });
+      await rm8(tempExtractDir, { recursive: true, force: true });
     } catch (error) {
       try {
-        await rm7(tempExtractDir, { recursive: true, force: true });
+        await rm8(tempExtractDir, { recursive: true, force: true });
       } catch {}
       throw error;
     }
@@ -86214,7 +86315,7 @@ import { join as join95 } from "node:path";
 
 // src/domains/skills/migrator/migration-executor.ts
 init_logger();
-import { copyFile as copyFile5, mkdir as mkdir26, readdir as readdir26, rm as rm8 } from "node:fs/promises";
+import { copyFile as copyFile5, mkdir as mkdir26, readdir as readdir26, rm as rm9 } from "node:fs/promises";
 import { join as join91 } from "node:path";
 var import_fs_extra24 = __toESM(require_lib3(), 1);
 
@@ -86437,14 +86538,14 @@ async function executeInternal(mappings, customizations, currentSkillsDir, inter
         logger.error(`Failed to migrate ${mapping.skillName}: ${error instanceof Error ? error.message : "Unknown error"}`);
       }
     }
-    await rm8(currentSkillsDir, { recursive: true, force: true });
+    await rm9(currentSkillsDir, { recursive: true, force: true });
     await mkdir26(currentSkillsDir, { recursive: true });
     await copySkillDirectory(tempDir, currentSkillsDir);
-    await rm8(tempDir, { recursive: true, force: true });
+    await rm9(tempDir, { recursive: true, force: true });
     return { migrated, preserved, errors: errors2 };
   } catch (error) {
     try {
-      await rm8(tempDir, { recursive: true, force: true });
+      await rm9(tempDir, { recursive: true, force: true });
     } catch {}
     throw error;
   }
@@ -86485,7 +86586,7 @@ function validateMigrationPath(path14, paramName) {
 init_logger();
 init_types3();
 var import_fs_extra25 = __toESM(require_lib3(), 1);
-import { copyFile as copyFile6, mkdir as mkdir27, readdir as readdir27, rm as rm9, stat as stat16 } from "node:fs/promises";
+import { copyFile as copyFile6, mkdir as mkdir27, readdir as readdir27, rm as rm10, stat as stat16 } from "node:fs/promises";
 import { basename as basename9, join as join92, normalize as normalize8 } from "node:path";
 function validatePath2(path14, paramName) {
   if (!path14 || typeof path14 !== "string") {
@@ -86521,7 +86622,7 @@ class SkillsBackupManager {
       return backupDir;
     } catch (error) {
       try {
-        await rm9(backupDir, { recursive: true, force: true });
+        await rm10(backupDir, { recursive: true, force: true });
       } catch {}
       throw new SkillsMigrationError(`Failed to create backup: ${error instanceof Error ? error.message : "Unknown error"}`);
     }
@@ -86535,7 +86636,7 @@ class SkillsBackupManager {
     logger.info(`Restoring from backup: ${backupDir}`);
     try {
       if (await import_fs_extra25.pathExists(targetDir)) {
-        await rm9(targetDir, { recursive: true, force: true });
+        await rm10(targetDir, { recursive: true, force: true });
       }
       await mkdir27(targetDir, { recursive: true });
       await SkillsBackupManager.copyDirectory(backupDir, targetDir);
@@ -86551,7 +86652,7 @@ class SkillsBackupManager {
     }
     logger.debug(`Deleting backup: ${backupDir}`);
     try {
-      await rm9(backupDir, { recursive: true, force: true });
+      await rm10(backupDir, { recursive: true, force: true });
       logger.debug("Backup deleted successfully");
     } catch (error) {
       logger.warning(`Failed to delete backup: ${error instanceof Error ? error.message : "Unknown error"}`);
@@ -87011,7 +87112,7 @@ async function handleMigration(ctx) {
   return ctx;
 }
 // src/commands/init/phases/opencode-handler.ts
-import { cp as cp3, readdir as readdir31, rm as rm10 } from "node:fs/promises";
+import { cp as cp3, readdir as readdir31, rm as rm11 } from "node:fs/promises";
 import { join as join98 } from "node:path";
 
 // src/services/transformers/opencode-path-transformer.ts
@@ -87147,7 +87248,7 @@ async function handleOpenCode(ctx) {
       await cp3(sourcePath, targetPath, { recursive: true });
       logger.verbose(`Copied: ${entry.name}`);
     }
-    await rm10(openCodeSource, { recursive: true, force: true });
+    await rm11(openCodeSource, { recursive: true, force: true });
     logger.success(`OpenCode config installed to ${targetDir}`);
   } else {
     logger.debug("Local mode: .opencode will be placed at project root");
@@ -87239,16 +87340,7 @@ async function handlePostInstall(ctx) {
     return ctx;
   }
   if (ctx.options.global) {
-    const claudeMdSource = join99(ctx.extractDir, "CLAUDE.md");
-    const claudeMdDest = join99(ctx.resolvedDir, "CLAUDE.md");
-    if (await import_fs_extra30.pathExists(claudeMdSource)) {
-      if (!await import_fs_extra30.pathExists(claudeMdDest)) {
-        await import_fs_extra30.copy(claudeMdSource, claudeMdDest);
-        logger.success("Copied CLAUDE.md to global directory");
-      } else {
-        logger.debug("CLAUDE.md already exists in global directory (preserved)");
-      }
-    }
+    await handleGlobalClaudeMd(ctx);
   }
   let installSkills = ctx.options.installSkills;
   if (!ctx.isNonInteractive && !installSkills) {
@@ -87308,6 +87400,49 @@ async function handlePostInstall(ctx) {
     installSkills
   };
 }
+function normalizeLineEndings(content) {
+  return content.replace(/\r\n/g, `
+`);
+}
+async function handleGlobalClaudeMd(ctx) {
+  if (!ctx.extractDir || !ctx.resolvedDir)
+    return;
+  const claudeMdSource = join99(ctx.extractDir, "CLAUDE.md");
+  const claudeMdDest = join99(ctx.resolvedDir, "CLAUDE.md");
+  if (!await import_fs_extra30.pathExists(claudeMdSource))
+    return;
+  const destExists = await import_fs_extra30.pathExists(claudeMdDest);
+  if (!destExists) {
+    await import_fs_extra30.copy(claudeMdSource, claudeMdDest);
+    logger.success("Copied CLAUDE.md to global directory");
+    return;
+  }
+  if (ctx.options.fresh || ctx.options.forceOverwrite) {
+    await import_fs_extra30.copy(claudeMdSource, claudeMdDest);
+    logger.success("Updated CLAUDE.md in global directory");
+    return;
+  }
+  const [srcContent, destContent] = await Promise.all([
+    import_fs_extra30.readFile(claudeMdSource, "utf-8"),
+    import_fs_extra30.readFile(claudeMdDest, "utf-8")
+  ]);
+  if (normalizeLineEndings(srcContent) === normalizeLineEndings(destContent)) {
+    logger.debug("CLAUDE.md already up to date");
+    return;
+  }
+  if (!ctx.isNonInteractive) {
+    const shouldOverwrite = await ctx.prompts.confirm(`CLAUDE.md has changed in the new version. Update it?
+  (Your customizations will be replaced)`);
+    if (!shouldOverwrite) {
+      logger.info("CLAUDE.md preserved (user chose to keep existing)");
+      return;
+    }
+  } else {
+    logger.warning("Updating CLAUDE.md (content differs from new version)");
+  }
+  await import_fs_extra30.copy(claudeMdSource, claudeMdDest);
+  logger.success("Updated CLAUDE.md (new version detected)");
+}
 // src/commands/init/phases/selection-handler.ts
 init_config_manager();
 init_github_client();
@@ -87969,7 +88104,7 @@ async function handleSelection(ctx) {
   };
 }
 // src/commands/init/phases/sync-handler.ts
-import { copyFile as copyFile7, mkdir as mkdir29, open as open4, readFile as readFile47, rename as rename5, stat as stat17, unlink as unlink10, writeFile as writeFile28 } from "node:fs/promises";
+import { copyFile as copyFile7, mkdir as mkdir29, open as open4, readFile as readFile48, rename as rename5, stat as stat17, unlink as unlink10, writeFile as writeFile28 } from "node:fs/promises";
 import { dirname as dirname21, join as join102, resolve as resolve20 } from "node:path";
 init_logger();
 init_path_resolver();
@@ -88137,7 +88272,7 @@ async function executeSyncMerge(ctx) {
     try {
       const sourceMetadataPath = join102(upstreamDir, "metadata.json");
       if (await import_fs_extra33.pathExists(sourceMetadataPath)) {
-        const content = await readFile47(sourceMetadataPath, "utf-8");
+        const content = await readFile48(sourceMetadataPath, "utf-8");
         const sourceMetadata = JSON.parse(content);
         deletions = sourceMetadata.deletions || [];
       }
@@ -88363,7 +88498,7 @@ init_types3();
 init_logger();
 init_types3();
 var import_fs_extra34 = __toESM(require_lib3(), 1);
-import { rename as rename6, rm as rm11 } from "node:fs/promises";
+import { rename as rename6, rm as rm12 } from "node:fs/promises";
 import { join as join103, relative as relative17 } from "node:path";
 async function collectDirsToRename(extractDir, folders) {
   const dirsToRename = [];
@@ -88408,7 +88543,7 @@ async function moveAcrossDevices(src, dest) {
     if (e2.code === "EXDEV") {
       logger.debug(`Cross-device move detected, using copy+delete: ${src} -> ${dest}`);
       await import_fs_extra34.copy(src, dest, { overwrite: true });
-      await rm11(src, { recursive: true, force: true });
+      await rm12(src, { recursive: true, force: true });
     } else {
       throw e2;
     }
@@ -88435,7 +88570,7 @@ async function renameFolders(dirsToRename, extractDir, options2) {
 // src/services/transformers/folder-transform/path-replacer.ts
 init_logger();
 init_types3();
-import { readFile as readFile48, readdir as readdir32, writeFile as writeFile29 } from "node:fs/promises";
+import { readFile as readFile49, readdir as readdir32, writeFile as writeFile29 } from "node:fs/promises";
 import { join as join104, relative as relative18 } from "node:path";
 var TRANSFORMABLE_FILE_PATTERNS = [
   ".md",
@@ -88502,7 +88637,7 @@ async function transformFileContents(dir, compiledReplacements, options2) {
       if (!shouldTransform)
         continue;
       try {
-        const content = await readFile48(fullPath, "utf-8");
+        const content = await readFile49(fullPath, "utf-8");
         let newContent = content;
         let changeCount = 0;
         for (const { regex: regex2, replacement } of compiledReplacements) {
@@ -88624,7 +88759,7 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 
 // src/services/transformers/global-path-transformer.ts
 init_logger();
-import { readFile as readFile49, readdir as readdir33, writeFile as writeFile30 } from "node:fs/promises";
+import { readFile as readFile50, readdir as readdir33, writeFile as writeFile30 } from "node:fs/promises";
 import { platform as platform13 } from "node:os";
 import { extname as extname5, join as join105 } from "node:path";
 var IS_WINDOWS3 = platform13() === "win32";
@@ -88744,7 +88879,7 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
         await processDirectory2(fullPath);
       } else if (entry.isFile() && shouldTransformFile3(entry.name)) {
         try {
-          const content = await readFile49(fullPath, "utf-8");
+          const content = await readFile50(fullPath, "utf-8");
           const { transformed, changes } = transformContent(content);
           if (changes > 0) {
             await writeFile30(fullPath, transformed, "utf-8");
@@ -89006,7 +89141,7 @@ init_checksum_utils();
 init_config_discovery();
 var import_picocolors25 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync50 } from "node:fs";
-import { readFile as readFile50, rm as rm12, unlink as unlink11 } from "node:fs/promises";
+import { readFile as readFile51, rm as rm13, unlink as unlink11 } from "node:fs/promises";
 import { resolve as resolve21 } from "node:path";
 
 // src/commands/portable/conflict-resolver.ts
@@ -89342,7 +89477,7 @@ function getProviderPathKey(type) {
       return type;
   }
 }
-function shouldExecuteAction(action) {
+function shouldExecuteAction2(action) {
   if (action.action === "install" || action.action === "update") {
     return true;
   }
@@ -89357,7 +89492,7 @@ async function executeDeleteAction(action, options2) {
   const shouldPreserveTarget = action.targetPath.length > 0 && preservePaths.has(resolve21(action.targetPath));
   try {
     if (!shouldPreserveTarget && action.targetPath && existsSync50(action.targetPath)) {
-      await rm12(action.targetPath, { recursive: true, force: true });
+      await rm13(action.targetPath, { recursive: true, force: true });
     }
     await removePortableInstallation(action.item, action.type, action.provider, action.global);
     return {
@@ -89580,7 +89715,7 @@ async function migrateCommand(options2) {
       for (const action of conflictActions) {
         if (!action.diff && action.targetPath && existsSync50(action.targetPath)) {
           try {
-            const targetContent = await readFile50(action.targetPath, "utf-8");
+            const targetContent = await readFile51(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];
@@ -89604,7 +89739,7 @@ async function migrateCommand(options2) {
       command: 3,
       skill: 4
     };
-    const plannedExecActions = plan.actions.filter(shouldExecuteAction).sort((a3, b3) => (typePriority[a3.type] ?? 99) - (typePriority[b3.type] ?? 99));
+    const plannedExecActions = plan.actions.filter(shouldExecuteAction2).sort((a3, b3) => (typePriority[a3.type] ?? 99) - (typePriority[b3.type] ?? 99));
     const plannedDeleteActions = plan.actions.filter((a3) => a3.action === "delete");
     if (!options2.yes) {
       const totalItems = plannedExecActions.length + plannedDeleteActions.length;
@@ -89724,7 +89859,7 @@ async function rollbackResults(results) {
         continue;
       const stat18 = await import("node:fs/promises").then((fs19) => fs19.stat(result.path));
       if (stat18.isDirectory()) {
-        await rm12(result.path, { recursive: true, force: true });
+        await rm13(result.path, { recursive: true, force: true });
       } else {
         await unlink11(result.path);
       }
@@ -89774,7 +89909,7 @@ async function computeTargetStates(selectedProviders, global3) {
       continue;
     try {
       if (existsSync50(entry.path)) {
-        const content = await readFile50(entry.path, "utf-8");
+        const content = await readFile51(entry.path, "utf-8");
         states.set(entry.path, {
           path: entry.path,
           exists: true,

package/package.json

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