claudekit-cli 3.36.0-dev.12 → 3.36.0-dev.13

package/dist/index.js

@@ -50720,12 +50720,31 @@ function determineAction(source, providerConfig, input, targetStateIndex, delete
   const registeredSourceChecksum = normalizeChecksum(registryEntry.sourceChecksum);
   const registeredTargetChecksum = normalizeChecksum(registryEntry.targetChecksum);
   if (isUnknownChecksum(registeredSourceChecksum)) {
+    const targetState2 = lookupTargetState(targetStateIndex, registryEntry.path);
+    const currentTargetChecksum = normalizeChecksum(targetState2?.currentChecksum);
+    if (currentTargetChecksum === convertedChecksum) {
+      return {
+        ...common,
+        action: "skip",
+        reason: "Target up-to-date after registry upgrade — checksums will be backfilled",
+        sourceChecksum: convertedChecksum,
+        currentTargetChecksum
+      };
+    }
+    if (!targetState2 || !targetState2.exists) {
+      return {
+        ...common,
+        action: "install",
+        reason: "Target deleted — reinstalling after registry upgrade",
+        sourceChecksum: convertedChecksum
+      };
+    }
     return {
       ...common,
-      action: "skip",
-      reason: "First run after registry upgrade — populating checksums (no writes)",
+      action: "update",
+      reason: "Healing stale target after registry upgrade",
       sourceChecksum: convertedChecksum,
-      currentTargetChecksum: registeredTargetChecksum
+      currentTargetChecksum
     };
   }
   const sourceChanged = convertedChecksum !== registeredSourceChecksum;
@@ -55942,7 +55961,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.36.0-dev.12",
+    version: "3.36.0-dev.13",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -56148,9 +56167,10 @@ async function readMetadataFile(claudeDir2) {
     return null;
   }
 }
-async function promptKitUpdate(beta, yes) {
+async function promptKitUpdate(beta, yes, deps) {
   try {
-    const setup = await getClaudeKitSetup();
+    const execFn = deps?.execAsyncFn ?? execAsync2;
+    const setup = await (deps?.getSetupFn ?? getClaudeKitSetup)();
     const hasLocal = !!setup.project.metadata;
     const hasGlobal = !!setup.global.metadata;
     const localMetadata = hasLocal ? await readMetadataFile(setup.project.path) : null;
@@ -56166,6 +56186,9 @@ async function promptKitUpdate(beta, yes) {
     const isBetaInstalled = isBetaVersion(kitVersion);
     const initCmd = buildInitCommand(selection.isGlobal, selection.kit, beta || isBetaInstalled);
     const promptMessage = selection.promptMessage;
+    if (selection.kit && kitVersion) {
+      logger.info(`Current kit version: ${selection.kit}@${kitVersion}`);
+    }
     if (!yes) {
       logger.info("");
       const shouldUpdate = await se({
@@ -56179,13 +56202,25 @@ async function promptKitUpdate(beta, yes) {
       logger.verbose("Auto-proceeding with kit update (--yes flag)");
     }
     logger.info(`Running: ${initCmd}`);
-    const s = de();
+    const s = (deps?.spinnerFn ?? de)();
     s.start("Updating ClaudeKit content...");
     try {
-      await execAsync2(initCmd, {
+      await execFn(initCmd, {
         timeout: 300000
       });
-      s.stop("Kit content updated");
+      let newKitVersion;
+      try {
+        const claudeDir2 = selection.isGlobal ? setup.global.path : setup.project.path;
+        const updatedMetadata = await readMetadataFile(claudeDir2);
+        newKitVersion = selection.kit ? updatedMetadata?.kits?.[selection.kit]?.version : undefined;
+      } catch {}
+      if (selection.kit && kitVersion && newKitVersion && kitVersion !== newKitVersion) {
+        s.stop(`Kit updated: ${selection.kit}@${kitVersion} -> ${newKitVersion}`);
+      } else if (selection.kit && newKitVersion) {
+        s.stop(`Kit content updated (${selection.kit}@${newKitVersion})`);
+      } else {
+        s.stop("Kit content updated");
+      }
     } catch (error) {
       s.stop("Kit update finished");
       const errorMsg = error instanceof Error ? error.message : "unknown";
@@ -87045,6 +87080,7 @@ class SettingsProcessor {
   tracker = null;
   installingKit;
   cachedVersion = undefined;
+  deletionPatterns = [];
   setGlobalFlag(isGlobal) {
     this.isGlobal = isGlobal;
   }
@@ -87062,6 +87098,9 @@ class SettingsProcessor {
   setInstallingKit(kit) {
     this.installingKit = kit;
   }
+  setDeletions(deletions) {
+    this.deletionPatterns = deletions;
+  }
   initTracker() {
     if (this.projectDir) {
       this.tracker = new InstalledSettingsTracker(this.projectDir, this.isGlobal, this.kitName);
@@ -87171,6 +87210,10 @@ class SettingsProcessor {
     if (pathsFixed) {
       logger.info("Fixed hook command paths to canonical quoted format");
     }
+    const hooksPruned = this.pruneDeletedHooks(mergeResult.merged);
+    if (hooksPruned > 0) {
+      logger.info(`Pruned ${hooksPruned} stale hook(s) referencing deleted files`);
+    }
     await SettingsMerger.writeSettingsFile(destFile, mergeResult.merged);
     logger.success("Merged settings.json (user customizations preserved)");
     await this.injectTeamHooksIfSupported(destFile, mergeResult.merged);
@@ -87215,6 +87258,59 @@ class SettingsProcessor {
       }
     }
   }
+  pruneDeletedHooks(settings) {
+    if (this.deletionPatterns.length === 0 || !settings.hooks)
+      return 0;
+    const hookDeletions = new Set(this.deletionPatterns.filter((p) => p.startsWith("hooks/")));
+    if (hookDeletions.size === 0)
+      return 0;
+    let pruned = 0;
+    const eventKeysToDelete = [];
+    for (const [eventName, entries] of Object.entries(settings.hooks)) {
+      const filteredEntries = [];
+      for (const entry of entries) {
+        if ("hooks" in entry && entry.hooks) {
+          const remainingHooks = entry.hooks.filter((h2) => {
+            const relativePath = this.extractHookRelativePath(h2.command);
+            if (relativePath && hookDeletions.has(relativePath)) {
+              logger.info(`Pruned stale hook: ${h2.command.slice(0, 80)}`);
+              pruned++;
+              return false;
+            }
+            return true;
+          });
+          if (remainingHooks.length > 0) {
+            filteredEntries.push({ ...entry, hooks: remainingHooks });
+          }
+        } else if ("command" in entry) {
+          const relativePath = this.extractHookRelativePath(entry.command);
+          if (relativePath && hookDeletions.has(relativePath)) {
+            logger.info(`Pruned stale hook: ${entry.command.slice(0, 80)}`);
+            pruned++;
+          } else {
+            filteredEntries.push(entry);
+          }
+        } else {
+          filteredEntries.push(entry);
+        }
+      }
+      if (filteredEntries.length > 0) {
+        settings.hooks[eventName] = filteredEntries;
+      } else {
+        eventKeysToDelete.push(eventName);
+      }
+    }
+    for (const key of eventKeysToDelete) {
+      delete settings.hooks[key];
+    }
+    return pruned;
+  }
+  extractHookRelativePath(command) {
+    if (!command)
+      return null;
+    const match2 = command.match(/\.claude[/\\]([\w.\-/\\]+)/);
+    return match2 ? match2[1].replace(/\\/g, "/") : null;
+  }
   async trackInstalledSettings(settings) {
     if (!this.tracker)
       return;
@@ -87483,6 +87579,9 @@ class CopyExecutor {
   setForceOverwriteSettings(force) {
     this.settingsProcessor.setForceOverwriteSettings(force);
   }
+  setDeletions(deletions) {
+    this.settingsProcessor.setDeletions(deletions);
+  }
   setProjectDir(dir) {
     this.settingsProcessor.setProjectDir(dir);
   }
@@ -87655,6 +87754,9 @@ class FileMerger {
   setKitName(kit) {
     this.copyExecutor.setKitName(kit);
   }
+  setDeletions(deletions) {
+    this.copyExecutor.setDeletions(deletions);
+  }
   setManifest(manifest) {
     this.copyExecutor.setManifest(manifest);
   }
@@ -88907,6 +89009,19 @@ async function handleMerge(ctx) {
     }
   }
   const sourceDir = ctx.options.global ? join92(ctx.extractDir, ".claude") : ctx.extractDir;
+  const sourceMetadataPath = ctx.options.global ? join92(sourceDir, "metadata.json") : join92(sourceDir, ".claude", "metadata.json");
+  let sourceMetadata = null;
+  try {
+    if (await import_fs_extra20.pathExists(sourceMetadataPath)) {
+      const metadataContent = await import_fs_extra20.readFile(sourceMetadataPath, "utf-8");
+      sourceMetadata = JSON.parse(metadataContent);
+    }
+  } catch (error) {
+    logger.debug(`Failed to load source metadata: ${error}`);
+  }
+  if (sourceMetadata?.deletions && sourceMetadata.deletions.length > 0) {
+    merger.setDeletions(sourceMetadata.deletions);
+  }
   await merger.merge(sourceDir, ctx.resolvedDir, ctx.isNonInteractive);
   const fileConflicts = merger.getFileConflicts();
   if (fileConflicts.length > 0 && !ctx.isNonInteractive) {
@@ -88914,24 +89029,17 @@ async function handleMerge(ctx) {
     displayConflictSummary(summary);
   }
   try {
-    const sourceMetadataPath = ctx.options.global ? join92(sourceDir, "metadata.json") : join92(sourceDir, ".claude", "metadata.json");
-    if (await import_fs_extra20.pathExists(sourceMetadataPath)) {
-      const metadataContent = await import_fs_extra20.readFile(sourceMetadataPath, "utf-8");
-      const sourceMetadata = JSON.parse(metadataContent);
-      if (sourceMetadata.deletions && sourceMetadata.deletions.length > 0) {
-        const deletionResult = await handleDeletions(sourceMetadata, ctx.claudeDir);
-        if (deletionResult.deletedPaths.length > 0) {
-          logger.info(`Removed ${deletionResult.deletedPaths.length} deprecated file(s)`);
-          for (const path14 of deletionResult.deletedPaths) {
-            logger.verbose(`  - ${path14}`);
-          }
-        }
-        if (deletionResult.preservedPaths.length > 0) {
-          logger.verbose(`Preserved ${deletionResult.preservedPaths.length} user-owned file(s)`);
+    if (sourceMetadata?.deletions && sourceMetadata.deletions.length > 0) {
+      const deletionResult = await handleDeletions(sourceMetadata, ctx.claudeDir);
+      if (deletionResult.deletedPaths.length > 0) {
+        logger.info(`Removed ${deletionResult.deletedPaths.length} deprecated file(s)`);
+        for (const path14 of deletionResult.deletedPaths) {
+          logger.verbose(`  - ${path14}`);
         }
       }
-    } else {
-      logger.debug(`No source metadata found at ${sourceMetadataPath}, skipping deletions`);
+      if (deletionResult.preservedPaths.length > 0) {
+        logger.verbose(`Preserved ${deletionResult.preservedPaths.length} user-owned file(s)`);
+      }
     }
   } catch (error) {
     logger.debug(`Cleanup of deprecated files failed: ${error}`);
@@ -92179,15 +92287,16 @@ async function initCommand(options2) {
 }
 // src/commands/migrate/migrate-command.ts
 init_dist2();
+var import_picocolors25 = __toESM(require_picocolors(), 1);
+import { existsSync as existsSync56 } from "node:fs";
+import { readFile as readFile51, rm as rm14, unlink as unlink12 } from "node:fs/promises";
+import { homedir as homedir28 } from "node:os";
+import { basename as basename16, join as join111, resolve as resolve24 } from "node:path";
 init_logger();
 init_agents_discovery();
 init_commands_discovery();
 init_checksum_utils();
 init_config_discovery();
-var import_picocolors25 = __toESM(require_picocolors(), 1);
-import { existsSync as existsSync56 } from "node:fs";
-import { readFile as readFile51, rm as rm14, unlink as unlink12 } from "node:fs/promises";
-import { basename as basename16, resolve as resolve24 } from "node:path";
 
 // src/commands/portable/conflict-resolver.ts
 init_dist2();
@@ -92600,6 +92709,34 @@ async function executeDeleteAction(action, options2) {
     };
   }
 }
+async function processMetadataDeletions(skillSourcePath, installGlobally) {
+  if (!skillSourcePath)
+    return;
+  const sourceMetadataPath = join111(resolve24(skillSourcePath, ".."), "metadata.json");
+  if (!existsSync56(sourceMetadataPath))
+    return;
+  let sourceMetadata;
+  try {
+    const content = await readFile51(sourceMetadataPath, "utf-8");
+    sourceMetadata = JSON.parse(content);
+  } catch (error) {
+    logger.debug(`[migrate] Failed to parse source metadata.json: ${error}`);
+    return;
+  }
+  if (!sourceMetadata.deletions || sourceMetadata.deletions.length === 0)
+    return;
+  const claudeDir2 = installGlobally ? join111(homedir28(), ".claude") : join111(process.cwd(), ".claude");
+  if (!existsSync56(claudeDir2))
+    return;
+  try {
+    const result = await handleDeletions(sourceMetadata, claudeDir2);
+    if (result.deletedPaths.length > 0) {
+      logger.verbose(`[migrate] Cleaned up ${result.deletedPaths.length} deprecated path(s): ${result.deletedPaths.join(", ")}`);
+    }
+  } catch (error) {
+    logger.warning(`[migrate] Deletion cleanup failed: ${error}`);
+  }
+}
 async function migrateCommand(options2) {
   console.log();
   oe(import_picocolors25.default.bgMagenta(import_picocolors25.default.black(" ck migrate ")));
@@ -92942,12 +93079,28 @@ async function migrateCommand(options2) {
         allResults.push(...await installSkillDirectories(skills, skillProviders, installOpts));
       }
     }
+    await processMetadataDeletions(skillSource, installGlobally);
     const writtenPaths = new Set(allResults.filter((result) => result.success && !result.skipped && result.path.length > 0).map((result) => resolve24(result.path)));
     for (const deleteAction of plannedDeleteActions) {
       allResults.push(await executeDeleteAction(deleteAction, {
         preservePaths: writtenPaths
       }));
     }
+    const skipActionsToPopulate = plan.actions.filter((a3) => a3.action === "skip" && a3.sourceChecksum && !isUnknownChecksum(a3.sourceChecksum) && a3.targetPath);
+    for (const action of skipActionsToPopulate) {
+      const registryEntry = registry.installations.find((i) => i.item === action.item && i.type === action.type && i.provider === action.provider && i.global === action.global);
+      if (registryEntry && isUnknownChecksum(registryEntry.sourceChecksum)) {
+        try {
+          await addPortableInstallation(action.item, action.type, action.provider, action.global, action.targetPath, registryEntry.sourcePath, {
+            sourceChecksum: action.sourceChecksum,
+            targetChecksum: action.currentTargetChecksum,
+            installSource: registryEntry.installSource === "manual" ? "manual" : "kit"
+          });
+        } catch {
+          logger.debug(`Failed to populate checksums for ${action.item} — will retry on next run`);
+        }
+      }
+    }
     installSpinner.stop("Migrate complete");
     displayMigrationSummary(plan, allResults, { color: useColor });
     const failed = allResults.filter((r2) => !r2.success);
@@ -93260,7 +93413,7 @@ async function handleDirectorySetup(ctx) {
 // src/commands/new/phases/project-creation.ts
 init_config_manager();
 init_github_client();
-import { join as join111 } from "node:path";
+import { join as join112 } from "node:path";
 init_logger();
 init_output_manager();
 init_types3();
@@ -93386,7 +93539,7 @@ async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2
   output.section("Installing");
   logger.verbose("Installation target", { directory: resolvedDir });
   const merger = new FileMerger;
-  const claudeDir2 = join111(resolvedDir, ".claude");
+  const claudeDir2 = join112(resolvedDir, ".claude");
   merger.setMultiKitContext(claudeDir2, kit);
   if (validOptions.exclude && validOptions.exclude.length > 0) {
     merger.addIgnorePatterns(validOptions.exclude);
@@ -93433,7 +93586,7 @@ async function handleProjectCreation(ctx) {
 }
 // src/commands/new/phases/post-setup.ts
 init_projects_registry();
-import { join as join112 } from "node:path";
+import { join as join113 } from "node:path";
 init_package_installer();
 init_logger();
 init_path_resolver();
@@ -93465,9 +93618,9 @@ async function postSetup(resolvedDir, validOptions, isNonInteractive2, prompts)
       withSudo: validOptions.withSudo
     });
   }
-  const claudeDir2 = join112(resolvedDir, ".claude");
+  const claudeDir2 = join113(resolvedDir, ".claude");
   await promptSetupWizardIfNeeded({
-    envPath: join112(claudeDir2, ".env"),
+    envPath: join113(claudeDir2, ".env"),
     claudeDir: claudeDir2,
     isGlobal: false,
     isNonInteractive: isNonInteractive2,
@@ -93537,7 +93690,7 @@ Please use only one download method.`);
 // src/commands/plan/plan-command.ts
 init_output_manager();
 import { existsSync as existsSync58, statSync as statSync8 } from "node:fs";
-import { dirname as dirname30, join as join114, parse as parse6, resolve as resolve28 } from "node:path";
+import { dirname as dirname30, join as join115, parse as parse6, resolve as resolve28 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
 init_plan_parser();
@@ -93545,7 +93698,7 @@ init_logger();
 init_output_manager();
 var import_picocolors27 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync57, statSync as statSync7 } from "node:fs";
-import { basename as basename17, dirname as dirname29, join as join113, relative as relative21, resolve as resolve26 } from "node:path";
+import { basename as basename17, dirname as dirname29, join as join114, relative as relative21, resolve as resolve26 } from "node:path";
 async function handleParse(target, options2) {
   const planFile = resolvePlanFile(target);
   if (!planFile) {
@@ -93621,7 +93774,7 @@ async function handleValidate(target, options2) {
 }
 async function handleStatus(target, options2) {
   const t = target ? resolve26(target) : null;
-  const plansDir = t && existsSync57(t) && statSync7(t).isDirectory() && !existsSync57(join113(t, "plan.md")) ? t : null;
+  const plansDir = t && existsSync57(t) && statSync7(t).isDirectory() && !existsSync57(join114(t, "plan.md")) ? t : null;
   if (plansDir) {
     const planFiles = scanPlanDir(plansDir);
     if (planFiles.length === 0) {
@@ -93893,7 +94046,7 @@ function resolvePlanFile(target) {
     const stat18 = statSync8(t);
     if (stat18.isFile())
       return t;
-    const candidate = join114(t, "plan.md");
+    const candidate = join115(t, "plan.md");
     if (existsSync58(candidate))
       return candidate;
   }
@@ -93901,7 +94054,7 @@ function resolvePlanFile(target) {
     let dir = process.cwd();
     const root = parse6(dir).root;
     while (dir !== root) {
-      const candidate = join114(dir, "plan.md");
+      const candidate = join115(dir, "plan.md");
       if (existsSync58(candidate))
         return candidate;
       dir = dirname30(dir);
@@ -94928,7 +95081,7 @@ async function detectInstallations() {
 
 // src/commands/uninstall/removal-handler.ts
 import { readdirSync as readdirSync7, rmSync as rmSync6 } from "node:fs";
-import { join as join116, resolve as resolve30, sep as sep6 } from "node:path";
+import { join as join117, resolve as resolve30, sep as sep6 } from "node:path";
 init_logger();
 init_safe_prompts();
 init_safe_spinner();
@@ -94937,7 +95090,7 @@ var import_fs_extra37 = __toESM(require_lib3(), 1);
 // src/commands/uninstall/analysis-handler.ts
 init_metadata_migration();
 import { readdirSync as readdirSync6, rmSync as rmSync5 } from "node:fs";
-import { dirname as dirname31, join as join115 } from "node:path";
+import { dirname as dirname31, join as join116 } from "node:path";
 init_logger();
 init_safe_prompts();
 var import_picocolors33 = __toESM(require_picocolors(), 1);
@@ -94985,7 +95138,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 = join115(installation.path, trackedFile.path);
+      const filePath = join116(installation.path, trackedFile.path);
       if (uninstallManifest.filesToPreserve.includes(trackedFile.path)) {
         result.toPreserve.push({ path: trackedFile.path, reason: "shared with other kit" });
         continue;
@@ -95015,7 +95168,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
     return result;
   }
   for (const trackedFile of allTrackedFiles) {
-    const filePath = join115(installation.path, trackedFile.path);
+    const filePath = join116(installation.path, trackedFile.path);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -95112,7 +95265,7 @@ async function removeInstallations(installations, options2) {
       let removedCount = 0;
       let cleanedDirs = 0;
       for (const item of analysis.toDelete) {
-        const filePath = join116(installation.path, item.path);
+        const filePath = join117(installation.path, item.path);
         if (!await import_fs_extra37.pathExists(filePath))
           continue;
         if (!await isPathSafeToRemove(filePath, installation.path)) {
@@ -95508,7 +95661,7 @@ init_logger();
 init_path_resolver();
 init_types3();
 import { existsSync as existsSync60, readFileSync as readFileSync13 } from "node:fs";
-import { join as join117 } from "node:path";
+import { join as join118 } from "node:path";
 var packageVersion = package_default.version;
 function formatInstalledKits(metadata) {
   if (!metadata.kits || Object.keys(metadata.kits).length === 0) {
@@ -95540,9 +95693,9 @@ async function displayVersion() {
   let localKitVersion = null;
   let isGlobalOnlyKit = false;
   const globalKitDir = PathResolver.getGlobalKitDir();
-  const globalMetadataPath = join117(globalKitDir, "metadata.json");
+  const globalMetadataPath = join118(globalKitDir, "metadata.json");
   const prefix = PathResolver.getPathPrefix(false);
-  const localMetadataPath = prefix ? join117(process.cwd(), prefix, "metadata.json") : join117(process.cwd(), "metadata.json");
+  const localMetadataPath = prefix ? join118(process.cwd(), prefix, "metadata.json") : join118(process.cwd(), "metadata.json");
   const isLocalSameAsGlobal = localMetadataPath === globalMetadataPath;
   if (!isLocalSameAsGlobal && existsSync60(localMetadataPath)) {
     try {

package/package.json

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